OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

switch get_current_version_info back to being get_version_info

pull/3757/head
Matthew Hodgson 2017-12-31 14:10:31 +00:00 committed by Hubert Chathi
parent 982edca380
commit 5e42c45c96
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/handlers/e2e_room_keys.py
View File

@ -111,7 +111,7 @@ class E2eRoomKeysHandler(object):
with (yield self._upload_linearizer.queue(user_id)): with (yield self._upload_linearizer.queue(user_id)):
# Check that the version we're trying to upload is the current version # Check that the version we're trying to upload is the current version
try: try:
version_info = yield self.get_current_version_info(user_id) version_info = yield self.get_version_info(user_id)
except StoreError as e: except StoreError as e:
if e.code == 404: if e.code == 404:
raise SynapseError(404, "Version '%s' not found" % (version,)) raise SynapseError(404, "Version '%s' not found" % (version,))
@ -222,17 +222,20 @@ class E2eRoomKeysHandler(object):
defer.returnValue(new_version) defer.returnValue(new_version)
@defer.inlineCallbacks @defer.inlineCallbacks
def get_current_version_info(self, user_id): def get_version_info(self, user_id, version=None):
"""Get the user's current backup version. """Get the info about a given version of the user's backup
Args: Args:
user_id(str): the user whose current backup version we're querying user_id(str): the user whose current backup version we're querying
version(str): Optional; if None gives the most recent version
otherwise a historical one.
Raises: Raises:
StoreError: code 404 if there is no current backup version StoreError: code 404 if the requested backup version doesn't exist
Returns: Returns:
A deferred of a info dict that gives the info about the new version. A deferred of a info dict that gives the info about the new version.
{ {
"version": "1234",
"algorithm": "m.megolm_backup.v1", "algorithm": "m.megolm_backup.v1",
"auth_data": "dGhpcyBzaG91bGQgYWN0dWFsbHkgYmUgZW5jcnlwdGVkIGpzb24K" "auth_data": "dGhpcyBzaG91bGQgYWN0dWFsbHkgYmUgZW5jcnlwdGVkIGpzb24K"
} }