diff options
| author | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
| commit | c50ad14bae20d2a8448bb9fe78e919958dc9d233 (patch) | |
| tree | 3b6b3221cb11b16a105d1edf9e4ffe9519c3900a /synapse/rest/client/v1/login.py | |
| parent | Allow sign in using email address (diff) | |
| parent | Merge pull request #211 from matrix-org/email_in_use (diff) | |
| download | synapse-c50ad14bae20d2a8448bb9fe78e919958dc9d233.tar.xz | |
Merge branch 'develop' into email_login
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 8ce3364820..cb97917608 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -85,9 +85,8 @@ class LoginRestServlet(ClientV1RestServlet): user_id = UserID.create( user_id, self.hs.hostname).to_string() - handler = self.handlers.login_handler - token = yield handler.login( - user=user_id, + token = yield self.handlers.auth_handler.login_with_password( + user_id=user_id password=login_submission["password"]) result = { |