diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-14 17:02:22 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-14 17:02:22 +0100 |
| commit | 30883d840956c8efc4451465d4a4baca424dbff1 (patch) | |
| tree | 4802c2d0d641881264cbe8f8302da744896e9025 /synapse/rest/client/v1/login.py | |
| parent | Merge pull request #219 from matrix-org/erikj/dictionary_cache (diff) | |
| parent | Merge password checking implementations (diff) | |
| download | synapse-30883d840956c8efc4451465d4a4baca424dbff1.tar.xz | |
Merge pull request #221 from matrix-org/auth
Simplify LoginHander and AuthHandler
Diffstat (limited to 'synapse/rest/client/v1/login.py')
| -rw-r--r-- | synapse/rest/client/v1/login.py | 5 |
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 = { |