diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-17 13:23:44 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-17 13:23:44 +0100 |
| commit | afef6f5d16d9600e11cc2e33efcbcc5fa8b9509f (patch) | |
| tree | ccb3670a75ce04f1a0e87c68bd99f6a8cc02bdc0 /synapse/rest/client/v1/login.py | |
| parent | Batch _get_linearized_receipts_for_rooms (diff) | |
| parent | Fix bug where we were leaking None into state event lists (diff) | |
| download | synapse-afef6f5d16d9600e11cc2e33efcbcc5fa8b9509f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2
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 = { |