Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:26:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'cross-signing_hidden' into cross-signing_keys

Browse source
This commit is contained in:
Hubert Chathi 2019-08-01 16:31:40 -04:00
commit 336c546d6a
298 changed files with 3414 additions and 2145 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/rest/client/v2_alpha/keys.py
View file

@ -96,7 +96,7 @@ class KeyUploadServlet(RestServlet):
result = yield self.e2e_keys_handler.upload_keys_for_user(
user_id, device_id, body
)
defer.returnValue((200, result))
return (200, result)
class KeyQueryServlet(RestServlet):
@ -151,7 +151,7 @@ class KeyQueryServlet(RestServlet):
timeout = parse_integer(request, "timeout", 10 * 1000)
body = parse_json_object_from_request(request)
result = yield self.e2e_keys_handler.query_devices(body, timeout, user_id)
defer.returnValue((200, result))
return (200, result)
class KeyChangesServlet(RestServlet):
@ -191,7 +191,7 @@ class KeyChangesServlet(RestServlet):
results = yield self.device_handler.get_user_ids_changed(user_id, from_token)
defer.returnValue((200, results))
return (200, results)
class OneTimeKeyServlet(RestServlet):
@ -226,7 +226,7 @@ class OneTimeKeyServlet(RestServlet):
timeout = parse_integer(request, "timeout", 10 * 1000)
body = parse_json_object_from_request(request)
result = yield self.e2e_keys_handler.claim_one_time_keys(body, timeout)
defer.returnValue((200, result))
return (200, result)
class SigningKeyUploadServlet(RestServlet):