From 260107941d0a65143f7bb230ea20fe5ef6684320 Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Tue, 28 Feb 2023 14:53:36 +0100 Subject: [PATCH] Cleanup additionalProperties usage In capabilities.yaml, additional properties are more likely to be strings (but can also be objects); in cross_signing_key.yaml, the parameter documentation already restricts the number of properties. --- data/api/client-server/capabilities.yaml | 3 +-- data/api/client-server/definitions/cross_signing_key.yaml | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/api/client-server/capabilities.yaml b/data/api/client-server/capabilities.yaml index d31d01d7..e6b92f15 100644 --- a/data/api/client-server/capabilities.yaml +++ b/data/api/client-server/capabilities.yaml @@ -69,8 +69,7 @@ paths: description: |- The custom capabilities the server supports, using the Java package naming convention. - additionalProperties: - type: object + additionalProperties: true properties: "m.change_password": type: object diff --git a/data/api/client-server/definitions/cross_signing_key.yaml b/data/api/client-server/definitions/cross_signing_key.yaml index cebc5ecd..d937daab 100644 --- a/data/api/client-server/definitions/cross_signing_key.yaml +++ b/data/api/client-server/definitions/cross_signing_key.yaml @@ -35,6 +35,8 @@ properties: The public key. The object must have exactly one property, whose name is in the form `:`, and whose value is the unpadded base64 public key. + minProperties: 1 + maxProperties: 1 example: "ed25519:alice+base64+public+key": "alice+base64+public+key" signatures: