summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-11-17 12:03:07 +0000
committerRichard van der Hoff <richard@matrix.org>2017-11-17 12:03:07 +0000
commitb102e935719c7a8e6470be31d1f6ae041d77ac40 (patch)
tree1e9606df68597b06570da68deb2ffde2d106738e /synapse/handlers
parentRevert "Merge pull request #2679 from jkolo/fix_auth_handler" (diff)
parentBump version in __init__.py (diff)
downloadsynapse-b102e935719c7a8e6470be31d1f6ae041d77ac40.tar.xz
Merge branch 'release-v0.25.1'
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 7a0ba6ef35..080eb14271 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -551,7 +551,7 @@ class AuthHandler(BaseHandler):
                     qualified_user_id, password,
                 )
                 if is_valid:
-                    defer.returnValue(qualified_user_id)
+                    defer.returnValue((qualified_user_id, None))
 
             if (not hasattr(provider, "get_supported_login_types")
                     or not hasattr(provider, "check_auth")):