summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-03-07 17:13:56 +0000
committerDavid Baker <dave@matrix.org>2016-03-07 17:13:56 +0000
commit874fd432575044c6cd93ee4f311412f677e6b7fe (patch)
treefb7efe8bd29f7fa68a9557dd8aa5056056ac7973 /synapse/api/auth.py
parentMerge pull request #626 from matrix-org/erikj/visibility (diff)
downloadsynapse-874fd432575044c6cd93ee4f311412f677e6b7fe.tar.xz
Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.
Diffstat (limited to 'synapse/api/auth.py')
-rw-r--r--synapse/api/auth.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 183245443c..3038df4ab8 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -534,7 +534,7 @@ class Auth(object):
                 )
 
             access_token = request.args["access_token"][0]
-            user_info = yield self._get_user_by_access_token(access_token)
+            user_info = yield self.get_user_by_access_token(access_token)
             user = user_info["user"]
             token_id = user_info["token_id"]
             is_guest = user_info["is_guest"]
@@ -595,7 +595,7 @@ class Auth(object):
         defer.returnValue(user_id)
 
     @defer.inlineCallbacks
-    def _get_user_by_access_token(self, token):
+    def get_user_by_access_token(self, token):
         """ Get a registered user's ID.
 
         Args: