kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version

Browse Source 
make version optional in body of e2e backup version update
This commit is contained in:
Hubert Chathi
2019-10-11 10:11:59 -04:00
committed by GitHub
parent 6f5c6c8f60 5373de6cce
commit 691dd67fcd
4 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/e2e_room_keys.py
View File

@@ -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
)

2
synapse/rest/client/v2_alpha/room_keys.py
View File

@@ -375,7 +375,7 @@ class RoomKeysVersionServlet(RestServlet):
"ed25519:something": "hijklmnop"
}
},
"version": "42"
"version": "12345"
}
HTTP/1.1 200 OK