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/media | |
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 '')
-rw-r--r-- | synapse/rest/media/v0/content_repository.py | 2 | ||||
-rw-r--r-- | synapse/rest/media/v1/upload_resource.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v0/content_repository.py b/synapse/rest/media/v0/content_repository.py index 79ae0e3d74..22e26e3cd5 100644 --- a/synapse/rest/media/v0/content_repository.py +++ b/synapse/rest/media/v0/content_repository.py @@ -66,7 +66,7 @@ class ContentRepoResource(resource.Resource): @defer.inlineCallbacks def map_request_to_name(self, request): # auth the user - auth_user = yield self.auth.get_user_by_req(request) + auth_user, client = yield self.auth.get_user_by_req(request) # namespace all file uploads on the user prefix = base64.urlsafe_b64encode( diff --git a/synapse/rest/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py index b1718a630b..b939a30e19 100644 --- a/synapse/rest/media/v1/upload_resource.py +++ b/synapse/rest/media/v1/upload_resource.py @@ -42,7 +42,7 @@ class UploadResource(BaseMediaResource): @defer.inlineCallbacks def _async_render_POST(self, request): try: - auth_user = yield self.auth.get_user_by_req(request) + auth_user, client = yield self.auth.get_user_by_req(request) # TODO: The checks here are a bit late. The content will have # already been uploaded to a tmp file at this point content_length = request.getHeader("Content-Length") |