diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 15:54:54 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 15:54:54 +0000 |
| commit | 33391db5f8d9d0d365607ca50ba59ce72c90cda0 (patch) | |
| tree | 14761c702a42eda754b04a53dbed4d73f47082c8 | |
| parent | Merge changes from develop (diff) | |
| download | synapse-33391db5f8d9d0d365607ca50ba59ce72c90cda0.tar.xz | |
Merge in auth changes from develop
| -rw-r--r-- | synapse/rest/client/v2_alpha/filter.py | 4 | ||||
| -rw-r--r-- | tests/rest/client/v2_alpha/__init__.py | 1 |
2 files changed, 3 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") diff --git a/tests/rest/client/v2_alpha/__init__.py b/tests/rest/client/v2_alpha/__init__.py index 3fe62d5ac6..fa70575c57 100644 --- a/tests/rest/client/v2_alpha/__init__.py +++ b/tests/rest/client/v2_alpha/__init__.py @@ -51,6 +51,7 @@ class V2AlphaRestTestCase(unittest.TestCase): "user": UserID.from_string(self.USER_ID), "admin": False, "device_id": None, + "token_id": 1, } hs.get_auth().get_user_by_token = _get_user_by_token |