diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2017-12-31 17:47:11 +0000 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2018-08-12 19:14:31 -0400 |
| commit | fe87890b18f57f0268bd65aeca881e7817bbe9e4 (patch) | |
| tree | 3e1756411d5c395a3567aff3c5011fde33cf1c71 /synapse/rest/client/v2_alpha | |
| parent | linting (diff) | |
| download | synapse-fe87890b18f57f0268bd65aeca881e7817bbe9e4.tar.xz | |
implement remaining tests and make them work
Diffstat (limited to 'synapse/rest/client/v2_alpha')
| -rw-r--r-- | synapse/rest/client/v2_alpha/room_keys.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/room_keys.py b/synapse/rest/client/v2_alpha/room_keys.py index ca69ced1e3..8f10e4e1cd 100644 --- a/synapse/rest/client/v2_alpha/room_keys.py +++ b/synapse/rest/client/v2_alpha/room_keys.py @@ -204,6 +204,12 @@ class RoomKeysServlet(RestServlet): room_keys = yield self.e2e_room_keys_handler.get_room_keys( user_id, version, room_id, session_id ) + + if session_id: + room_keys = room_keys['rooms'][room_id]['sessions'][session_id] + elif room_id: + room_keys = room_keys['rooms'][room_id] + defer.returnValue((200, room_keys)) @defer.inlineCallbacks |