summary refs log tree commit diff
path: root/synapse/config (unfollow)
Commit message (Collapse)AuthorFilesLines
2019-09-11Add note about extra arg to send_membership_event, remove arg in ↵Andrew Morgan2-10/+3
remote_reject_invite (#6009) Some small fixes to `room_member.py` found while doing other PRs. 1. Add requester to the base `_remote_reject_invite` method. 2. `send_membership_event`'s docstring was out of date and took in a `remote_room_hosts` arg that was not used and no calling function provided.
2019-09-11Send id access_token via Authorization headers, not JSON bodyAndrew Morgan2-24/+26
2019-09-11Check dependencies on setup in the nicer way. (#5989)Jorik Schellekens4-28/+20
2019-09-11Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2-2/+27
Two things I missed while implementing [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R80). 1. Access tokens should be provided to the identity server as `access_token`, not `id_access_token`, even though the homeserver may accept the tokens as `id_access_token`. 2. Access tokens must be sent to the identity server in a query parameter, the JSON body is not allowed. We now send the access token as part of an `Authorization: ...` header, which fixes both things. The breaking code was added in https://github.com/matrix-org/synapse/pull/5892 Sytest PR: https://github.com/matrix-org/sytest/pull/697
2019-09-11Address review comments.Andrew Morgan1-16/+7
2019-09-11Remove origin parameter from add_display_name_to_third_party_invite and add ↵Andrew Morgan4-4/+10
params to docstring (#6010) Another small fixup noticed during work on a larger PR. The `origin` field of `add_display_name_to_third_party_invite` is not used and likely was just carried over from the `on_PUT` method of `FederationThirdPartyInviteExchangeServlet` which, like all other servlets, provides an `origin` argument. Since it's not used anywhere in the handler function though, we should remove it from the function arguments.
2019-09-10Add changelogAndrew Morgan3-4/+5
2019-09-10Use account_threepid_delegate for 3pid validationAndrew Morgan3-42/+45
2019-09-10id_access_token -> access_token in query paramsAndrew Morgan1-2/+2
2019-09-09lintAndrew Morgan1-15/+10
2019-09-09address review commentsAndrew Morgan1-24/+37
2019-09-10Add a build info metric to Prometheus (#6005)Amber Brown3-2/+33
2019-09-09Fix code style, againJason Robinson1-3/+1
Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-09-09Fix commentsErik Johnston1-2/+3
2019-09-09Simplify count_real_users SQL to only count user_type is null rowsJason Robinson1-1/+1
Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-09-09Simplify is_real_user_txn check to trust user_type is null if real userJason Robinson1-1/+1
Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-09-09