diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 15:36:21 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 15:43:41 +0000 |
commit | c59bcabf0b5c0ab78c0f89da75b031993c4660d9 (patch) | |
tree | 5691f2b6cc16fb0435c78925004bc12392fa3a42 /synapse/rest/client/v1/profile.py | |
parent | Merge pull request #34 from matrix-org/remove_serialize_event_from_hs (diff) | |
download | synapse-c59bcabf0b5c0ab78c0f89da75b031993c4660d9.tar.xz |
Return the device_id from get_auth_by_req
Diffstat (limited to 'synapse/rest/client/v1/profile.py')
-rw-r--r-- | synapse/rest/client/v1/profile.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/profile.py b/synapse/rest/client/v1/profile.py index 24f8d56952..f04abb2c26 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 = yield self.auth.get_user_by_req(request) + auth_user, device_id = 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 = yield self.auth.get_user_by_req(request) + auth_user, device_id = yield self.auth.get_user_by_req(request) user = UserID.from_string(user_id) try: |