diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-21 12:51:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-21 12:51:14 +0100 |
| commit | 5dbd10247055dd6c216503b69902a6e235fcb7e8 (patch) | |
| tree | f0e05422ef4f880b9b4f4eeece4624feffd3b528 /synapse/rest/client/v1 | |
| parent | Fix bug where we didn't correctly serialize the redacted_because key over fed... (diff) | |
| parent | Doc string (diff) | |
| download | synapse-5dbd10247055dd6c216503b69902a6e235fcb7e8.tar.xz | |
Merge branch 'erikj/user_dedup' into release-v0.10.0
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/login.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 0d5eafd0fa..2444f27366 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -83,9 +83,10 @@ class LoginRestServlet(ClientV1RestServlet): if not user_id.startswith('@'): user_id = UserID.create( - user_id, self.hs.hostname).to_string() + user_id, self.hs.hostname + ).to_string() - token = yield self.handlers.auth_handler.login_with_password( + user_id, token = yield self.handlers.auth_handler.login_with_password( user_id=user_id, password=login_submission["password"]) |