summary refs log tree commit diff
path: root/synapse/handlers/set_password.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-21 13:27:04 +0100
committerErik Johnston <erik@matrix.org>2019-06-21 13:27:04 +0100
commit67b73fd14741a63b60bfa356ad165705459889fd (patch)
tree3b1dfa664088284709facfb6867013a11c8a3745 /synapse/handlers/set_password.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #5505 from matrix-org/erikj/messages_worker (diff)
downloadsynapse-67b73fd14741a63b60bfa356ad165705459889fd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/set_password.py')
-rw-r--r--synapse/handlers/set_password.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/set_password.py b/synapse/handlers/set_password.py

index 7ecdede4dc..5a0995d4fe 100644 --- a/synapse/handlers/set_password.py +++ b/synapse/handlers/set_password.py
@@ -25,6 +25,7 @@ logger = logging.getLogger(__name__) class SetPasswordHandler(BaseHandler): """Handler which deals with changing user account passwords""" + def __init__(self, hs): super(SetPasswordHandler, self).__init__(hs) self._auth_handler = hs.get_auth_handler() @@ -47,11 +48,11 @@ class SetPasswordHandler(BaseHandler): # we want to log out all of the user's other sessions. First delete # all his other devices. yield self._device_handler.delete_all_devices_for_user( - user_id, except_device_id=except_device_id, + user_id, except_device_id=except_device_id ) # and now delete any access tokens which weren't associated with # devices (or were associated with this device). yield self._auth_handler.delete_access_tokens_for_user( - user_id, except_token_id=except_access_token_id, + user_id, except_token_id=except_access_token_id )