diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-16 11:37:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-16 11:37:53 +0100 |
| commit | 25c2332071f9f26111a54e099b9884b4a382ac2f (patch) | |
| tree | c388750ddc395cf25d44337d1897a133bb7e0b1e /synapse/handlers | |
| parent | Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ... (diff) | |
| parent | Use cached get_user_by_access_token in slaves (diff) | |
| download | synapse-25c2332071f9f26111a54e099b9884b4a382ac2f.tar.xz | |
Merge pull request #1010 from matrix-org/erikj/refactor_deletions
Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/auth.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index a582d6334b..6986930c0d 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -741,7 +741,7 @@ class AuthHandler(BaseHandler): def set_password(self, user_id, newpassword, requester=None): password_hash = self.hash(newpassword) - except_access_token_ids = [requester.access_token_id] if requester else [] + except_access_token_id = requester.access_token_id if requester else None try: yield self.store.user_set_password_hash(user_id, password_hash) @@ -750,10 +750,10 @@ class AuthHandler(BaseHandler): raise SynapseError(404, "Unknown user", Codes.NOT_FOUND) raise e yield self.store.user_delete_access_tokens( - user_id, except_access_token_ids + user_id, except_access_token_id ) yield self.hs.get_pusherpool().remove_pushers_by_user( - user_id, except_access_token_ids + user_id, except_access_token_id ) @defer.inlineCallbacks |