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

Merge pull request #4475 from Infisical/fix/googleSsoEnforcedIssueWithSaml

Browse Source 
Fix Google SSO issue with SAML configs when SSO is enforced and not SAML
This commit is contained in:
carlosmonastyrski
2025-09-04 17:50:43 -03:00
committed by GitHub
parent e2be867c95 6c2ea93822
commit f9288a4d2b
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,15 @@ export const SelectOrganizationSection = () => {
// org has an org-level auth method enabled (e.g. SAML)
// -> logout + redirect to SAML SSO
let url = "";
if (organization.orgAuthMethod === AuthMethod.OIDC) {
if (organization.googleSsoAuthEnforced) {
if (authToken.authMethod !== AuthMethod.GOOGLE) {
url = `/api/v1/sso/redirect/google?org_slug=${organization.slug}`;
if (callbackPort) {
url += `&callback_port=${callbackPort}`;
}
}
} else if (organization.orgAuthMethod === AuthMethod.OIDC) {
url = `/api/v1/sso/oidc/login?orgSlug=${organization.slug}${
callbackPort ? `&callbackPort=${callbackPort}` : ""
}`;
@@ -98,15 +106,6 @@ export const SelectOrganizationSection = () => {
if (callbackPort) {
url += `?callback_port=${callbackPort}`;
}
} else if (
organization.googleSsoAuthEnforced &&
authToken.authMethod !== AuthMethod.GOOGLE
) {
url = `/api/v1/sso/redirect/google?org_slug=${organization.slug}`;
if (callbackPort) {
url += `&callback_port=${callbackPort}`;
}
}
// we are conditionally checking if the url is set because it may not be set if google SSO is enforced, but the user is already logged in with google SSO

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
SSO (not Google SAML).
</p>
</div>
</div>