From d5e1d590daf73b7a177103c14e03ae5173965901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Thu, 17 Nov 2022 18:29:54 +0100 Subject: [PATCH 1/2] Fix `POST _matrix/federation/v1/user/keys/claim` response schema MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The syntax was not compliant with the Swagger spec. It also lacked one level of nesting. Signed-off-by: Kévin Commaille --- data/api/server-server/user_keys.yaml | 37 +++++++++++++++------------ 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/data/api/server-server/user_keys.yaml b/data/api/server-server/user_keys.yaml index efad00562..fe84cbbdf 100644 --- a/data/api/server-server/user_keys.yaml +++ b/data/api/server-server/user_keys.yaml @@ -76,29 +76,32 @@ paths: See the [Client-Server Key Algorithms](/client-server-api/#key-algorithms) section for more information on the Key Object format. + # User additionalProperties: type: object + # Device additionalProperties: - type: - - string - - type: object - title: KeyObject - properties: - key: - type: string - description: The key, encoded using unpadded base64. - signatures: + type: object + # Key + additionalProperties: + type: object + title: KeyObject + properties: + key: + type: string + description: The key, encoded using unpadded base64. + signatures: + type: object + title: Signatures + additionalProperties: type: object - title: Signatures additionalProperties: - type: object - additionalProperties: - type: string - description: |- - Signature of the key object. + type: string + description: |- + Signature of the key object. - The signature is calculated using the process described at [Signing JSON](/appendices/#signing-json). - required: ['key', 'signatures'] + The signature is calculated using the process described at [Signing JSON](/appendices/#signing-json). + required: ['key', 'signatures'] example: { "@alice:example.com": { "JLAFKJWSCS": { From 13296719fd70d2c45e599e33781cfef654a2a34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Thu, 17 Nov 2022 18:35:08 +0100 Subject: [PATCH 2/2] Add newsfragment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelogs/server_server/newsfragments/1351.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/server_server/newsfragments/1351.clarification diff --git a/changelogs/server_server/newsfragments/1351.clarification b/changelogs/server_server/newsfragments/1351.clarification new file mode 100644 index 000000000..935332ad2 --- /dev/null +++ b/changelogs/server_server/newsfragments/1351.clarification @@ -0,0 +1 @@ +Fix `POST _matrix/federation/v1/user/keys/claim` response schema.