diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-26 13:42:45 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-26 13:42:45 +0100 |
| commit | d3c0e488591386b7d24d23c6f6d3b237523fca89 (patch) | |
| tree | a0d8c139b8ec3087421ff039902088980d4534f8 /synapse/rest/client | |
| parent | Merge pull request #251 from matrix-org/removeadmin (diff) | |
| download | synapse-d3c0e488591386b7d24d23c6f6d3b237523fca89.tar.xz | |
Merge erikj/user_dedup to develop
Diffstat (limited to 'synapse/rest/client')
| -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 3a0707c2ee..e580f71964 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -83,10 +83,11 @@ 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() auth_handler = self.handlers.auth_handler - access_token, refresh_token = yield auth_handler.login_with_password( + user_id, access_token, refresh_token = yield auth_handler.login_with_password( user_id=user_id, password=login_submission["password"]) |