summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-27 09:43:42 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-27 09:43:42 +0100
commitdfa0cd1d90cb80de7e42fc2c8aaac8911287d718 (patch)
treeeac44e8ff4b18b5649d4f46adcfd25c562b7fb9e /synapse/api/auth.py
parentPepper UT TODOs (diff)
downloadsynapse-dfa0cd1d90cb80de7e42fc2c8aaac8911287d718.tar.xz
Modified /join/$identifier to support $identifier being a room ID in addition to a room alias.
Diffstat (limited to 'synapse/api/auth.py')
-rw-r--r--synapse/api/auth.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 15407df14a..886e132e10 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -162,6 +162,8 @@ class Auth(object):
         """
         try:
             user_id = yield self.store.get_user_by_token(token=token)
+            if not user_id:
+                raise StoreError()
             defer.returnValue(self.hs.parse_userid(user_id))
         except StoreError:
             raise AuthError(403, "Unrecognised access token.",