diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 16:58:23 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 16:58:23 +0000 |
commit | 388581e087a3658c1b70d2aa1d17a132953350ca (patch) | |
tree | 66072a2c0728e41603680c7e49467a5754e711a7 /synapse/rest/client/v1/initial_sync.py | |
parent | Return the device_id from get_auth_by_req (diff) | |
download | synapse-388581e087a3658c1b70d2aa1d17a132953350ca.tar.xz |
Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events
Diffstat (limited to 'synapse/rest/client/v1/initial_sync.py')
-rw-r--r-- | synapse/rest/client/v1/initial_sync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/initial_sync.py b/synapse/rest/client/v1/initial_sync.py index 78d30abbf8..4a259bba64 100644 --- a/synapse/rest/client/v1/initial_sync.py +++ b/synapse/rest/client/v1/initial_sync.py @@ -25,7 +25,7 @@ class InitialSyncRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request): - user, device_id = yield self.auth.get_user_by_req(request) + user, client = yield self.auth.get_user_by_req(request) with_feedback = "feedback" in request.args as_client_event = "raw" not in request.args pagination_config = PaginationConfig.from_request(request) |