Skip to content

Commit 5e0d6d9

Browse files
committed
Specify the order in which one-time keys are returned (MSC4225)
Signed-off-by: Andy Balaam <[email protected]>
1 parent 075a98d commit 5e0d6d9

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Specify order of one-time keys, as per [MSC4225](https://github.com/matrix-org/matrix-spec-proposals/pull/4225).

data/api/client-server/keys.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,17 @@ paths:
288288
/keys/claim:
289289
post:
290290
summary: Claim one-time encryption keys.
291-
description: Claims one-time keys for use in pre-key messages.
291+
description: |-
292+
Claims one-time keys for use in pre-key messages.
293+
294+
The request contains the user ID, device ID and algorithm name of the
295+
keys that are required. The response contains a key matching this -
296+
either a one-time key, or if none are available, a fallback key.
297+
298+
One-time keys are given out in the order that they were uploaded via
299+
[/keys/upload](/client-server-api/#post_matrixclientv3keysupload). (All
300+
keys uploaded within a given call to `/keys/upload` are considered
301+
equivalent in this regard; no ordering is specified within them.)
292302
operationId: claimKeys
293303
security:
294304
- accessTokenQuery: []

data/api/server-server/user_keys.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ paths:
2020
/user/keys/claim:
2121
post:
2222
summary: Claims one-time encryption keys for a user.
23-
description: Claims one-time keys for use in pre-key messages.
23+
description: |-
24+
Claims one-time keys for use in pre-key messages.
25+
26+
The request contains the user ID, device ID and algorithm name of the
27+
keys that are required. The response contains a key matching this -
28+
either a one-time key, or if none are available, a fallback key.
29+
30+
One-time keys are given out in the order that they were uploaded via
31+
[/keys/upload](/client-server-api/#post_matrixclientv3keysupload). (All
32+
keys uploaded within a given call to `/keys/upload` are considered
33+
equivalent in this regard; no ordering is specified within them.)
2434
operationId: claimUserEncryptionKeys
2535
security:
2636
- signedRequest: []

0 commit comments

Comments
 (0)