diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-11 10:11:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 10:11:59 -0400 |
| commit | 691dd67fcd0b376c1e5a5d9f2fe0f7efbf1cc7c9 (patch) | |
| tree | 50dd0336df9ef58b46ed68dfa7d0827ef1a46b26 /synapse | |
| parent | Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url (diff) | |
| parent | change test name to be unique (diff) | |
| download | synapse-691dd67fcd0b376c1e5a5d9f2fe0f7efbf1cc7c9.tar.xz | |
Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version
make version optional in body of e2e backup version update
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/e2e_room_keys.py | 4 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/room_keys.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py index a9d80f708c..0cea445f0d 100644 --- a/synapse/handlers/e2e_room_keys.py +++ b/synapse/handlers/e2e_room_keys.py @@ -352,8 +352,8 @@ class E2eRoomKeysHandler(object): A deferred of an empty dict. """ if "version" not in version_info: - raise SynapseError(400, "Missing version in body", Codes.MISSING_PARAM) - if version_info["version"] != version: + version_info["version"] = version + elif version_info["version"] != version: raise SynapseError( 400, "Version in body does not match", Codes.INVALID_PARAM ) diff --git a/synapse/rest/client/v2_alpha/room_keys.py b/synapse/rest/client/v2_alpha/room_keys.py index df4f44cd36..d596786430 100644 --- a/synapse/rest/client/v2_alpha/room_keys.py +++ b/synapse/rest/client/v2_alpha/room_keys.py @@ -375,7 +375,7 @@ class RoomKeysVersionServlet(RestServlet): "ed25519:something": "hijklmnop" } }, - "version": "42" + "version": "12345" } HTTP/1.1 200 OK |