awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/pages/auth/SelectOrgPage/SelectOrgSection.tsx
View File

@@ -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) {

5
frontend/src/pages/organization/SettingsPage/components/OrgSsoTab/OrgGeneralAuthSection.tsx
View File

@@ -204,9 +204,10 @@ export const OrgGeneralAuthSection = ({
</OrgPermissionCan>
</div>
<p className="text-sm text-mineshaft-300">
Enforce users to authenticate via Google to access this organization.
Enforce users to authenticate via Google OAuth SSO to access this organization.
<br />
When this is enabled your organization members will only be able to login with Google.
When this is enabled your organization members will only be able to login with Google
OAuth (not Google SAML).
</p>
</div>
</div>