From 3a05abcfaabe787231e4fb6c5f96ee8d1975411d Mon Sep 17 00:00:00 2001 From: agagancarczyk <4890675+agagancarczyk@users.noreply.github.com> Date: Wed, 10 Jul 2024 14:24:51 +0100 Subject: [PATCH] Backport to fix input type and help text for IDP SAML Certificate (#31194) Signed-off-by: Agnieszka Gancarczyk Co-authored-by: Agnieszka Gancarczyk --- .../theme/keycloak.v2/admin/messages/messages_en.properties | 3 ++- .../src/identity-providers/add/DescriptorSettings.tsx | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties index 21c1f40bb11..bb0a6c7f30a 100644 --- a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties +++ b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties @@ -3201,4 +3201,5 @@ redirectWhenEmailMatchesHelp=Automatically redirect the user to this identity pr emailVerificationHelp=Specifies independent timeout for email verification. idpAccountEmailVerificationHelp=Specifies independent timeout for IdP account email verification. forgotPasswordHelp=Specifies independent timeout for forgot password. -executeActionsHelp=Specifies independent timeout for execute actions. \ No newline at end of file +executeActionsHelp=Specifies independent timeout for execute actions. +validatingX509CertsHelp=The public certificates Keycloak uses to validate the signatures of SAML requests and responses from the external IDP when Use metadata descriptor URL is OFF. Multiple certificates can be entered separated by comma (,). The certificates can be re-imported from the Metadata descriptor URL clicking the Import Keys action in the identity provider page. The action downloads the current certificates in the metadata endpoint and assigns them to the config in this same option. You need to click Save to definitely store the re-imported certificates. \ No newline at end of file diff --git a/js/apps/admin-ui/src/identity-providers/add/DescriptorSettings.tsx b/js/apps/admin-ui/src/identity-providers/add/DescriptorSettings.tsx index e4ab8951ecd..d8d3a6f7cac 100644 --- a/js/apps/admin-ui/src/identity-providers/add/DescriptorSettings.tsx +++ b/js/apps/admin-ui/src/identity-providers/add/DescriptorSettings.tsx @@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next"; import { NumberControl, SelectControl, + TextAreaControl, TextControl, } from "@keycloak/keycloak-ui-shared"; import { DefaultSwitchControl } from "../../components/SwitchControl"; @@ -284,9 +285,10 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => { isDisabled={readOnly} /> {useMetadataDescriptorUrl !== "true" && ( - )}