Merge pull request #238 from matrix-org/fix_set_password

Fix set password
This commit is contained in:
Erik Johnston 2015-08-20 15:39:05 +01:00
commit 61cd03466f
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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, {}))