Fix Google SSO issue with SAML configs when SSO is enforced and not SAML

This commit is contained in:
Carlos Monastyrski
2025-09-04 11:53:33 -03:00
parent 735ddc1138
commit 00a522f9d0
2 changed files with 8 additions and 3 deletions
@@ -92,7 +92,11 @@ export const SelectOrganizationSection = () => {
url = `/api/v1/sso/oidc/login?orgSlug=${organization.slug}${
callbackPort ? `&callbackPort=${callbackPort}` : ""
}`;
} else if (organization.orgAuthMethod === AuthMethod.SAML) {
} else if (
organization.orgAuthMethod === AuthMethod.SAML &&
// if google sso is enforced, we don't want to redirect to saml
!organization.googleSsoAuthEnforced
) {
url = `/api/v1/sso/redirect/saml2/organizations/${organization.slug}`;
if (callbackPort) {