awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-15 05:19:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

requested changes & frontend lint

Browse Source
This commit is contained in:
Daniel Hougaard
2025-08-14 06:53:57 +04:00
parent 2113abcfdc
commit a37f1eb1f8
7 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/org/org-service.ts
+7 -13
View File
@@ -431,6 +431,12 @@ export const orgServiceFactory = ({
ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Edit, OrgPermissionSubjects.Sso);
}
if (authEnforced && googleSsoAuthEnforced) {
throw new BadRequestError({
message: "SAML/OIDC auth enforcement and Google SSO auth enforcement cannot be enabled at the same time."
});
}
if (authEnforced) {
const samlCfg = await samlConfigDAL.findOne({
orgId,
@@ -461,25 +467,13 @@ export const orgServiceFactory = ({
}
}
if (googleSsoAuthEnforced || authEnforced) {
if (googleSsoAuthEnforced && authEnforced) {
throw new BadRequestError({
message: "Google SSO and SAML/OIDC auth enforcement cannot be enabled at the same time."
});
}
if (googleSsoAuthEnforced) {
if (googleSsoAuthEnforced && currentOrg.authEnforced) {
throw new BadRequestError({
message: "Google SSO auth enforcement cannot be enabled when SAML/OIDC auth enforcement is enabled."
});
}
if (authEnforced && currentOrg.googleSsoAuthEnforced) {
throw new BadRequestError({
message: "SAML/OIDC auth enforcement cannot be enabled when Google SSO auth enforcement is enabled."
});
}
if (!currentOrg.googleSsoAuthLastUsed) {
throw new BadRequestError({
message: