From b26cbbb60e546d6f84bf567df0334268bf95d6e5 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 16 Nov 2017 17:18:11 +0000
Subject: [PATCH] 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.
---
 synapse/handlers/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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")):