From 2cc1017dadf931f359a177f91017a1e6be9931d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Thu, 22 Jun 2023 14:41:09 +0200 Subject: [PATCH 1/3] Fix schema of custom fields in query for appservice API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- data/api/application-service/protocols.yaml | 8 ++++++-- data/api/client-server/third_party_lookup.yaml | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/data/api/application-service/protocols.yaml b/data/api/application-service/protocols.yaml index 59dff5b01..c8ef4033e 100644 --- a/data/api/application-service/protocols.yaml +++ b/data/api/application-service/protocols.yaml @@ -101,7 +101,9 @@ paths: One or more custom fields that are passed to the application service to help identify the user. schema: - type: string + type: object + additionalProperties: + type: string responses: "200": description: The Matrix User IDs found with the given parameters. @@ -166,7 +168,9 @@ paths: One or more custom fields that are passed to the application service to help identify the third-party location. schema: - type: string + type: object + additionalProperties: + type: string responses: "200": description: At least one portal room was found. diff --git a/data/api/client-server/third_party_lookup.yaml b/data/api/client-server/third_party_lookup.yaml index de1b0b635..be07e5c31 100644 --- a/data/api/client-server/third_party_lookup.yaml +++ b/data/api/client-server/third_party_lookup.yaml @@ -143,7 +143,9 @@ paths: description: One or more custom fields that are passed to the AS to help identify the user. schema: - type: string + type: object + additionalProperties: + type: string responses: "200": description: The Matrix User IDs found with the given parameters. From a67f411fa66372b6d38c4d99bf672b48ba1f0fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Thu, 22 Jun 2023 14:50:29 +0200 Subject: [PATCH 2/3] Add changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelogs/application_service/newsfragments/1584.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/application_service/newsfragments/1584.clarification diff --git a/changelogs/application_service/newsfragments/1584.clarification b/changelogs/application_service/newsfragments/1584.clarification new file mode 100644 index 000000000..098c12600 --- /dev/null +++ b/changelogs/application_service/newsfragments/1584.clarification @@ -0,0 +1 @@ +Fix JSON schema of custom fields in query. From 6b2450d0d7fbf969dabf1e89cbf871609eecd400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Wed, 5 Jul 2023 08:57:45 +0200 Subject: [PATCH 3/3] Remove ellipses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- data/api/application-service/protocols.yaml | 4 ++-- data/api/client-server/third_party_lookup.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/api/application-service/protocols.yaml b/data/api/application-service/protocols.yaml index c8ef4033e..dddd26d4d 100644 --- a/data/api/application-service/protocols.yaml +++ b/data/api/application-service/protocols.yaml @@ -96,7 +96,7 @@ paths: schema: type: string - in: query - name: fields... + name: fields description: |- One or more custom fields that are passed to the application service to help identify the user. @@ -163,7 +163,7 @@ paths: schema: type: string - in: query - name: fields... + name: fields description: |- One or more custom fields that are passed to the application service to help identify the third-party location. diff --git a/data/api/client-server/third_party_lookup.yaml b/data/api/client-server/third_party_lookup.yaml index be07e5c31..797f065f7 100644 --- a/data/api/client-server/third_party_lookup.yaml +++ b/data/api/client-server/third_party_lookup.yaml @@ -139,7 +139,7 @@ paths: schema: type: string - in: query - name: fields... + name: fields description: One or more custom fields that are passed to the AS to help identify the user. schema: