From 06d49eb27040e1295a7a692c29cfff272e5413cf Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 4 Oct 2022 13:00:39 -0700 Subject: [PATCH] SHIBUI-2380/2411 Fixing audience issues --- .../resources/metadata-sources-ui-schema-oidc.json | 2 +- .../assets/schema/source/metadata-source-oidc.json | 2 +- .../domain/source/definition/OidcSourceDefinition.js | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/backend/src/main/resources/metadata-sources-ui-schema-oidc.json b/backend/src/main/resources/metadata-sources-ui-schema-oidc.json index 109742cd5..a98bfc55d 100644 --- a/backend/src/main/resources/metadata-sources-ui-schema-oidc.json +++ b/backend/src/main/resources/metadata-sources-ui-schema-oidc.json @@ -152,7 +152,7 @@ "type": "string" } }, - "audience": { + "audiences": { "title": "label.audience", "description": "tooltip.audience", "type": "array", diff --git a/ui/public/assets/schema/source/metadata-source-oidc.json b/ui/public/assets/schema/source/metadata-source-oidc.json index d8be99ec6..6714441fe 100644 --- a/ui/public/assets/schema/source/metadata-source-oidc.json +++ b/ui/public/assets/schema/source/metadata-source-oidc.json @@ -136,7 +136,7 @@ "type": "string" } }, - "audience": { + "audiences": { "title": "label.audience", "description": "tooltip.audience", "type": "array", diff --git a/ui/src/app/metadata/domain/source/definition/OidcSourceDefinition.js b/ui/src/app/metadata/domain/source/definition/OidcSourceDefinition.js index bcc19dad9..11192fe18 100644 --- a/ui/src/app/metadata/domain/source/definition/OidcSourceDefinition.js +++ b/ui/src/app/metadata/domain/source/definition/OidcSourceDefinition.js @@ -53,7 +53,7 @@ export const OidcSourceEditor = defaultsDeep({ 'postLogoutRedirectUris', 'defaultAcrValues', 'requestUris', - 'audience' + 'audiences' ], }, ] @@ -73,7 +73,7 @@ export const OidcSourceEditor = defaultsDeep({ orderable: false }, }, - audience: { + audiences: { "ui:options": { orderable: false }, @@ -126,7 +126,7 @@ export const OidcSourceWizard = defaultsDeep({ 'postLogoutRedirectUris', 'defaultAcrValues', 'requestUris', - 'audience' + 'audiences' ], }, ] @@ -146,7 +146,7 @@ export const OidcSourceWizard = defaultsDeep({ orderable: false }, }, - audience: { + audiences: { "ui:options": { orderable: false }, @@ -156,5 +156,3 @@ export const OidcSourceWizard = defaultsDeep({ } }, SourceBase.uiSchema) }, OidcSourceBase); - -