diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-09-11 16:02:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 16:02:42 +0100 |
| commit | 9fc71dc5eed7531454a34f8fec34bd451458c7c6 (patch) | |
| tree | 73dfc6fac705680ea05fe8eef5dd0823569ef9a9 /synapse/rest/client/v1/room.py | |
| parent | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction (diff) | |
| download | synapse-9fc71dc5eed7531454a34f8fec34bd451458c7c6.tar.xz | |
Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)
This is a redo of https://github.com/matrix-org/synapse/pull/5897 but with `id_access_token` accepted. Implements [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134) plus Identity Service v2 authentication ala [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140). Identity lookup-related functions were also moved from `RoomMemberHandler` to `IdentityHandler`.
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 3582259026..a6a7b3b57e 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -701,6 +701,7 @@ class RoomMembershipRestServlet(TransactionRestServlet): content["id_server"], requester, txn_id, + content.get("id_access_token"), ) return 200, {} |