From b113eabeb70ba4a56511931d99e0b0a89dbccab3 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Tue, 9 Sep 2025 10:27:41 -0700
Subject: [PATCH] improvement: address feedback

---
 backend/src/services/org/org-service.ts | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/backend/src/services/org/org-service.ts b/backend/src/services/org/org-service.ts
index f99737231..ffcf4459e 100644
--- a/backend/src/services/org/org-service.ts
+++ b/backend/src/services/org/org-service.ts
@@ -9,8 +9,10 @@ import {
   ProjectMembershipRole,
   ProjectVersion,
   TableName,
+  TOidcConfigs,
   TProjectMemberships,
   TProjectUserMembershipRolesInsert,
+  TSamlConfigs,
   TUsers
 } from "@app/db/schemas";
 import { TGroupDALFactory } from "@app/ee/services/group/group-dal";
@@ -449,16 +451,20 @@ export const orgServiceFactory = ({
       });
     }
 
-    if (authEnforced) {
-      const samlCfg = await samlConfigDAL.findOne({
+    let samlCfg: TSamlConfigs | undefined;
+    let oidcCfg: TOidcConfigs | undefined;
+    if (authEnforced || googleSsoAuthEnforced) {
+      samlCfg = await samlConfigDAL.findOne({
         orgId,
         isActive: true
       });
-      const oidcCfg = await oidcConfigDAL.findOne({
+      oidcCfg = await oidcConfigDAL.findOne({
         orgId,
         isActive: true
       });
+    }
 
+    if (authEnforced) {
       if (!samlCfg && !oidcCfg)
         throw new NotFoundError({
           message: `SAML or OIDC configuration for organization with ID '${orgId}' not found`
@@ -486,11 +492,6 @@ export const orgServiceFactory = ({
         });
       }
 
-      const samlCfg = await samlConfigDAL.findOne({
-        orgId,
-        isActive: true
-      });
-
       if (samlCfg) {
         throw new BadRequestError({
           message:
@@ -498,11 +499,6 @@ export const orgServiceFactory = ({
         });
       }
 
-      const oidcCfg = await oidcConfigDAL.findOne({
-        orgId,
-        isActive: true
-      });
-
       if (oidcCfg) {
         throw new BadRequestError({
           message: