summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-08-14 17:02:22 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-08-14 17:02:22 +0100
commit30883d840956c8efc4451465d4a4baca424dbff1 (patch)
tree4802c2d0d641881264cbe8f8302da744896e9025 /synapse/storage
parentMerge pull request #219 from matrix-org/erikj/dictionary_cache (diff)
parentMerge password checking implementations (diff)
downloadsynapse-30883d840956c8efc4451465d4a4baca424dbff1.tar.xz
Merge pull request #221 from matrix-org/auth
Simplify LoginHander and AuthHandler
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/registration.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index aa446f94c6..bf803f2c6e 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -112,16 +112,16 @@ class RegistrationStore(SQLBaseStore):
         })
 
     @defer.inlineCallbacks
-    def user_delete_access_tokens_apart_from(self, user_id, token_id):
+    def user_delete_access_tokens(self, user_id):
         yield self.runInteraction(
-            "user_delete_access_tokens_apart_from",
-            self._user_delete_access_tokens_apart_from, user_id, token_id
+            "user_delete_access_tokens",
+            self._user_delete_access_tokens, user_id
         )
 
-    def _user_delete_access_tokens_apart_from(self, txn, user_id, token_id):
+    def _user_delete_access_tokens(self, txn, user_id):
         txn.execute(
-            "DELETE FROM access_tokens WHERE user_id = ? AND id != ?",
-            (user_id, token_id)
+            "DELETE FROM access_tokens WHERE user_id = ?",
+            (user_id, )
         )
 
     @defer.inlineCallbacks