requested changes & frontend lint

backend/src/@types/fastify.d.ts

@@ -148,7 +148,7 @@ declare module "fastify" {
   interface Session {
     callbackPort: string;
     isAdminLogin: boolean;
-    orgSlug: string;
+    orgSlug?: string;
   }
 
   interface FastifyRequest {

backend/src/db/migrations/20250813214709_enforce-google-sso.ts

@@ -15,7 +15,8 @@ export async function up(knex: Knex): Promise<void> {
   );
 
   await knex.schema.alterTable(TableName.Organization, (table) => {
-    if (!hasGoogleSsoAuthEnforcedColumn) table.boolean(GOOGLE_SSO_AUTH_ENFORCED_COLUMN_NAME).defaultTo(false);
+    if (!hasGoogleSsoAuthEnforcedColumn)
+      table.boolean(GOOGLE_SSO_AUTH_ENFORCED_COLUMN_NAME).defaultTo(false).notNullable();
     if (!hasGoogleSsoAuthLastUsedColumn) table.timestamp(GOOGLE_SSO_AUTH_LAST_USED_COLUMN_NAME).nullable();
   });
 }

backend/src/db/schemas/organizations.ts

@@ -37,7 +37,7 @@ export const OrganizationsSchema = z.object({
   shareSecretsProductEnabled: z.boolean().default(true).nullable().optional(),
   maxSharedSecretLifetime: z.number().default(2592000).nullable().optional(),
   maxSharedSecretViewLimit: z.number().nullable().optional(),
-  googleSsoAuthEnforced: z.boolean().default(false).nullable().optional(),
+  googleSsoAuthEnforced: z.boolean().default(false),
   googleSsoAuthLastUsed: z.date().nullable().optional()
 });
 

backend/src/services/org/org-service.ts

@@ -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: