diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py
index f031267751..9a0c842283 100644
--- a/synapse/rest/client/v2_alpha/keys.py
+++ b/synapse/rest/client/v2_alpha/keys.py
@@ -207,9 +207,9 @@ class KeyQueryServlet(RestServlet):
class OneTimeKeyServlet(RestServlet):
"""
- GET /keys/take/<user-id>/<device-id>/<algorithm> HTTP/1.1
+ GET /keys/claim/<user-id>/<device-id>/<algorithm> HTTP/1.1
- POST /keys/take HTTP/1.1
+ POST /keys/claim HTTP/1.1
{
"one_time_keys": {
"<user_id>": {
@@ -226,7 +226,7 @@ class OneTimeKeyServlet(RestServlet):
"""
PATTERN = client_v2_pattern(
- "/keys/take(?:/?|(?:/"
+ "/keys/claim(?:/?|(?:/"
"(?P<user_id>[^/]*)/(?P<device_id>[^/]*)/(?P<algorithm>[^/]*)"
")?)"
)
@@ -240,7 +240,7 @@ class OneTimeKeyServlet(RestServlet):
@defer.inlineCallbacks
def on_GET(self, request, user_id, device_id, algorithm):
yield self.auth.get_user_by_req(request)
- results = yield self.store.take_e2e_one_time_keys(
+ results = yield self.store.claim_e2e_one_time_keys(
[(user_id, device_id, algorithm)]
)
defer.returnValue(self.json_result(request, results))
@@ -256,7 +256,7 @@ class OneTimeKeyServlet(RestServlet):
for user_id, device_keys in body.get("one_time_keys", {}).items():
for device_id, algorithm in device_keys.items():
query.append((user_id, device_id, algorithm))
- results = yield self.store.take_e2e_one_time_keys(query)
+ results = yield self.store.claim_e2e_one_time_keys(query)
defer.returnValue(self.json_result(request, results))
def json_result(self, request, results):
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py
index 99dc864e46..325740d7d0 100644
--- a/synapse/storage/end_to_end_keys.py
+++ b/synapse/storage/end_to_end_keys.py
@@ -95,9 +95,9 @@ class EndToEndKeyStore(SQLBaseStore):
"count_e2e_one_time_keys", _count_e2e_one_time_keys
)
- def take_e2e_one_time_keys(self, query_list):
+ def claim_e2e_one_time_keys(self, query_list):
"""Take a list of one time keys out of the database"""
- def _take_e2e_one_time_keys(txn):
+ def _claim_e2e_one_time_keys(txn):
sql = (
"SELECT key_id, key_json FROM e2e_one_time_keys_json"
" WHERE user_id = ? AND device_id = ? AND algorithm = ?"
@@ -121,5 +121,5 @@ class EndToEndKeyStore(SQLBaseStore):
txn.execute(sql, (user_id, device_id, algorithm, key_id))
return result
return self.runInteraction(
- "take_e2e_one_time_keys", _take_e2e_one_time_keys
+ "claim_e2e_one_time_keys", _claim_e2e_one_time_keys
)
|
