summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-11-16 17:09:00 +0000
committerGitHub <noreply@github.com>2017-11-16 17:09:00 +0000
commit203058a027193b6a07a148319a9a728bf7f8420c (patch)
treedaa71dbaa44d6482599d07f5de0c793a91b9b478
parentMerge branch 'release-v0.25.0' of github.com:matrix-org/synapse (diff)
parentFix auth handler #2678 (diff)
downloadsynapse-203058a027193b6a07a148319a9a728bf7f8420c.tar.xz
Merge pull request #2679 from jkolo/fix_auth_handler
Fix auth handler
-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")):