summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-12 15:49:37 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-12 15:49:37 +0100
commit415c2f05491ce65a4fc34326519754cd1edd9c54 (patch)
tree85f397b2fca667a430299a694d701cd6abe5822a /synapse/rest/client/v1
parentMerge branch 'develop' into auth (diff)
downloadsynapse-415c2f05491ce65a4fc34326519754cd1edd9c54.tar.xz
Simplify LoginHander and AuthHandler
 * Merge LoginHandler -> AuthHandler
 * Add a bunch of documentation
 * Improve some naming
 * Remove unused branches

I will start merging the actual logic of the two handlers shortly
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r--synapse/rest/client/v1/login.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index 998d4d44c6..694072693d 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -78,9 +78,8 @@ class LoginRestServlet(ClientV1RestServlet):
             login_submission["user"] = UserID.create(
                 login_submission["user"], self.hs.hostname).to_string()
 
-        handler = self.handlers.login_handler
-        token = yield handler.login(
-            user=login_submission["user"],
+        token = yield self.handlers.auth_handler.login_with_password(
+            user_id=login_submission["user"],
             password=login_submission["password"])
 
         result = {