summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 15:54:54 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 15:54:54 +0000
commit33391db5f8d9d0d365607ca50ba59ce72c90cda0 (patch)
tree14761c702a42eda754b04a53dbed4d73f47082c8 /synapse
parentMerge changes from develop (diff)
downloadsynapse-33391db5f8d9d0d365607ca50ba59ce72c90cda0.tar.xz
Merge in auth changes from develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/client/v2_alpha/filter.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/filter.py b/synapse/rest/client/v2_alpha/filter.py
index 81a3e95155..cee06ccaca 100644
--- a/synapse/rest/client/v2_alpha/filter.py
+++ b/synapse/rest/client/v2_alpha/filter.py
@@ -40,7 +40,7 @@ class GetFilterRestServlet(RestServlet):
     @defer.inlineCallbacks
     def on_GET(self, request, user_id, filter_id):
         target_user = UserID.from_string(user_id)
-        auth_user = yield self.auth.get_user_by_req(request)
+        auth_user, client = yield self.auth.get_user_by_req(request)
 
         if target_user != auth_user:
             raise AuthError(403, "Cannot get filters for other users")
@@ -76,7 +76,7 @@ class CreateFilterRestServlet(RestServlet):
     @defer.inlineCallbacks
     def on_POST(self, request, user_id):
         target_user = UserID.from_string(user_id)
-        auth_user = yield self.auth.get_user_by_req(request)
+        auth_user, client = yield self.auth.get_user_by_req(request)
 
         if target_user != auth_user:
             raise AuthError(403, "Cannot create filters for other users")