diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-27 16:14:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-27 16:14:44 -0500 |
| commit | 0d27aba900136514a8801b902f9a8ac69150e2c0 (patch) | |
| tree | 3ac15cbb5b33f0c18618967afa7c1bfeb70245bc /synapse/rest | |
| parent | Add more tests to the worker blacklist (#6429) (diff) | |
| download | synapse-0d27aba900136514a8801b902f9a8ac69150e2c0.tar.xz | |
add etag and count to key backup endpoints (#5858)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/room_keys.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/client/v2_alpha/room_keys.py b/synapse/rest/client/v2_alpha/room_keys.py index d596786430..d83ac8e3c5 100644 --- a/synapse/rest/client/v2_alpha/room_keys.py +++ b/synapse/rest/client/v2_alpha/room_keys.py @@ -134,8 +134,8 @@ class RoomKeysServlet(RestServlet): if room_id: body = {"rooms": {room_id: body}} - yield self.e2e_room_keys_handler.upload_room_keys(user_id, version, body) - return 200, {} + ret = yield self.e2e_room_keys_handler.upload_room_keys(user_id, version, body) + return 200, ret @defer.inlineCallbacks def on_GET(self, request, room_id, session_id): @@ -239,10 +239,10 @@ class RoomKeysServlet(RestServlet): user_id = requester.user.to_string() version = parse_string(request, "version") - yield self.e2e_room_keys_handler.delete_room_keys( + ret = yield self.e2e_room_keys_handler.delete_room_keys( user_id, version, room_id, session_id ) - return 200, {} + return 200, ret class RoomKeysNewVersionServlet(RestServlet): |