diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-11-16 17:18:11 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-11-16 17:18:11 +0000 |
| commit | b26cbbb60e546d6f84bf567df0334268bf95d6e5 (patch) | |
| tree | 71da1c70b084a38a032380f8976a0c4deef33d64 /synapse/handlers/auth.py | |
| parent | Merge pull request #2679 from jkolo/fix_auth_handler (diff) | |
| download | synapse-b26cbbb60e546d6f84bf567df0334268bf95d6e5.tar.xz | |
Revert "Merge pull request #2679 from jkolo/fix_auth_handler"
This PR was against master, not develop :( This reverts commit 203058a027193b6a07a148319a9a728bf7f8420c, reversing changes made to 552f123bea1014680ab798b7e34cd1b23424a189.
Diffstat (limited to 'synapse/handlers/auth.py')
| -rw-r--r-- | synapse/handlers/auth.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 080eb14271..7a0ba6ef35 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, None)) + defer.returnValue(qualified_user_id) if (not hasattr(provider, "get_supported_login_types") or not hasattr(provider, "check_auth")): |