summary refs log tree commit diff
path: root/synapse/rest/media
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/media
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/media')
-rw-r--r--synapse/rest/media/v0/content_repository.py2
-rw-r--r--synapse/rest/media/v1/upload_resource.py2
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 311ab89edb..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, device_id = 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 6bed8a8efa..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, device_id = 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")