summary refs log tree commit diff
path: root/synapse/rest/client/v1/profile.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-28 16:58:23 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-28 16:58:23 +0000
commit388581e087a3658c1b70d2aa1d17a132953350ca (patch)
tree66072a2c0728e41603680c7e49467a5754e711a7 /synapse/rest/client/v1/profile.py
parentReturn the device_id from get_auth_by_req (diff)
downloadsynapse-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/profile.py')
-rw-r--r--synapse/rest/client/v1/profile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/profile.py b/synapse/rest/client/v1/profile.py
index f04abb2c26..15d6f3fc6c 100644
--- a/synapse/rest/client/v1/profile.py
+++ b/synapse/rest/client/v1/profile.py
@@ -37,7 +37,7 @@ class ProfileDisplaynameRestServlet(ClientV1RestServlet):
 
     @defer.inlineCallbacks
     def on_PUT(self, request, user_id):
-        auth_user, device_id = yield self.auth.get_user_by_req(request)
+        auth_user, client = yield self.auth.get_user_by_req(request)
         user = UserID.from_string(user_id)
 
         try:
@@ -70,7 +70,7 @@ class ProfileAvatarURLRestServlet(ClientV1RestServlet):
 
     @defer.inlineCallbacks
     def on_PUT(self, request, user_id):
-        auth_user, device_id = yield self.auth.get_user_by_req(request)
+        auth_user, client = yield self.auth.get_user_by_req(request)
         user = UserID.from_string(user_id)
 
         try: