diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-01-28 17:19:28 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-01-28 17:19:28 +0000 |
| commit | 26c8fff19ebfca3914305f820b29897db8ea4fca (patch) | |
| tree | c346408ce8f8ced5d1cb2e8dce4ea7fb934bb37e /synapse/rest/client/v1/profile.py | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ... (diff) | |
| download | synapse-26c8fff19ebfca3914305f820b29897db8ea4fca.tar.xz | |
Merge pull request #36 from matrix-org/device_id_from_access_token
Extract the device id and token id from the access token when autheniticating users
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..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 = 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 = 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: |