From 608e9a644cfb82fabafb795eef3ce10d98cfeb2b Mon Sep 17 00:00:00 2001 From: carlosmonastyrski Date: Mon, 21 Apr 2025 14:52:33 -0300 Subject: [PATCH 1/2] Make entryPoint mandatory on SSOModal and check all fields on isSamlConfigured check --- .../SettingsPage/components/OrgAuthTab/OrgAuthTab.tsx | 4 +++- .../SettingsPage/components/OrgAuthTab/SSOModal.tsx | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OrgAuthTab.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OrgAuthTab.tsx index cc6358e3c..40d0e7840 100644 --- a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OrgAuthTab.tsx +++ b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OrgAuthTab.tsx @@ -45,6 +45,7 @@ export const OrgAuthTab = withPermission( const { data: samlConfig, isPending: isLoadingSamlConfig } = useGetSSOConfig( currentOrg?.id ?? "" ); + const { data: ldapConfig, isPending: isLoadingLdapConfig } = useGetLDAPConfig( currentOrg?.id ?? "" ); @@ -54,7 +55,8 @@ export const OrgAuthTab = withPermission( !enabledLoginMethods || enabledLoginMethods.includes(method); const isOidcConfigured = oidcConfig && (oidcConfig.discoveryURL || oidcConfig.issuer); - const isSamlConfigured = samlConfig && samlConfig.entryPoint; + const isSamlConfigured = + samlConfig && (samlConfig.entryPoint || samlConfig.issuer || samlConfig.cert); const isLdapConfigured = ldapConfig && ldapConfig.url; const shouldShowCreateIdentityProviderView = diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/SSOModal.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/SSOModal.tsx index 32fa681e2..a7dff9d02 100644 --- a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/SSOModal.tsx +++ b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/SSOModal.tsx @@ -301,6 +301,7 @@ export const SSOModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDelet label={renderLabels(authProvider).entryPoint} errorText={error?.message} isError={Boolean(error)} + isRequired > Date: Mon, 21 Apr 2025 15:28:59 -0300 Subject: [PATCH 2/2] Add entryPoint zod validation --- .../SettingsPage/components/OrgAuthTab/SSOModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/SSOModal.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/SSOModal.tsx index a7dff9d02..c38ec6889 100644 --- a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/SSOModal.tsx +++ b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/SSOModal.tsx @@ -63,7 +63,7 @@ const ssoAuthProviders = [ const schema = z .object({ authProvider: z.string().min(1, "SSO Type is required"), - entryPoint: z.string().default(""), + entryPoint: z.string().min(1, "Entry Point is required").default(""), issuer: z.string().default(""), cert: z.string().default("") })