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/media/v1 | |
| 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/media/v1')
| -rw-r--r-- | synapse/rest/media/v1/upload_resource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py index b1718a630b..6bed8a8efa 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, device_id = 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") |