diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-20 15:39:05 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-20 15:39:05 +0100 |
| commit | 61cd03466f53dfd1ad07a91294abc00040ef59fd (patch) | |
| tree | 975ec3534fa5c85ef1324e717c86bf0d6a62bee1 | |
| parent | Merge pull request #231 from matrix-org/erikj/pushers_store_last_token (diff) | |
| parent | Remove spurious extra arg to set_password (diff) | |
| download | synapse-61cd03466f53dfd1ad07a91294abc00040ef59fd.tar.xz | |
Merge pull request #238 from matrix-org/fix_set_password
Fix set password
| -rw-r--r-- | synapse/handlers/auth.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index be2baeaece..ff2c66f442 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -162,7 +162,7 @@ class AuthHandler(BaseHandler): if not user_id.startswith('@'): user_id = UserID.create(user_id, self.hs.hostname).to_string() - self._check_password(user_id, password) + yield self._check_password(user_id, password) defer.returnValue(user_id) @defer.inlineCallbacks diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 897c54b539..522a312c9e 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -79,7 +79,7 @@ class PasswordRestServlet(RestServlet): new_password = params['new_password'] yield self.auth_handler.set_password( - user_id, new_password, None + user_id, new_password ) defer.returnValue((200, {})) |