diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-30 16:46:31 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-30 16:46:31 -0400 |
| commit | 670972c0e1b98690480b7eac3a4b9b863e8d6761 (patch) | |
| tree | e1c3fc0059a7df9da7a91385452eda28585dfc76 /synapse/replication/http/login.py | |
| parent | add changelog (diff) | |
| parent | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_store (diff) | |
| download | synapse-670972c0e1b98690480b7eac3a4b9b863e8d6761.tar.xz | |
Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify
Diffstat (limited to 'synapse/replication/http/login.py')
| -rw-r--r-- | synapse/replication/http/login.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/replication/http/login.py b/synapse/replication/http/login.py index 786f5232b2..798b9d3af5 100644 --- a/synapse/replication/http/login.py +++ b/synapse/replication/http/login.py @@ -15,8 +15,6 @@ import logging -from twisted.internet import defer - from synapse.http.servlet import parse_json_object_from_request from synapse.replication.http._base import ReplicationEndpoint @@ -52,15 +50,14 @@ class RegisterDeviceReplicationServlet(ReplicationEndpoint): "is_guest": is_guest, } - @defer.inlineCallbacks - def _handle_request(self, request, user_id): + async def _handle_request(self, request, user_id): content = parse_json_object_from_request(request) device_id = content["device_id"] initial_display_name = content["initial_display_name"] is_guest = content["is_guest"] - device_id, access_token = yield self.registration_handler.register_device( + device_id, access_token = await self.registration_handler.register_device( user_id, device_id, initial_display_name, is_guest ) |