summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorSteven Hammerton <steven.hammerton@openmarket.com>2015-11-11 11:20:23 +0000
committerSteven Hammerton <steven.hammerton@openmarket.com>2015-11-11 11:21:43 +0000
commit2b779af10fe5c39f6119acddb5290be2b2a5930f (patch)
tree77cede9eab89d7d30e8362d984e429dc1050e236 /synapse/handlers
parentShare more code between macaroon validation (diff)
downloadsynapse-2b779af10fe5c39f6119acddb5290be2b2a5930f.tar.xz
Minor review fixes
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/auth.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 01976a5759..be157e2bb7 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -298,11 +298,11 @@ class AuthHandler(BaseHandler):
         defer.returnValue((user_id, access_token, refresh_token))
 
     @defer.inlineCallbacks
-    def login_with_user_id(self, user_id):
+    def get_login_tuple_for_user_id(self, user_id):
         """
-        Authenticates the user with the given user ID,
-        it is intended that the authentication of the user has
-        already been verified by other mechanism (e.g. CAS)
+        Gets login tuple for the user with the given user ID.
+        The user is assumed to have been authenticated by some other
+        machanism (e.g. CAS)
 
         Args:
             user_id (str): User ID