always expose scim endpoints

Author: n1ru4l

packages/services/server/.env.template

@@ -60,7 +60,7 @@ FEEDBACK_SLACK_CHANNEL="#hive"
 # Organization level Open ID Connect Authentication
 AUTH_ORGANIZATION_OIDC=1
 # Organization level SCIM provisioning for users and groups
-AUTH_ORGANIZATION_SCIM=1
+AUTH_ORGANIZATION_SCIM=0
 
 ## Enable GitHub login
 AUTH_GITHUB="<sync>"

packages/services/server/src/index.ts

@@ -659,19 +659,17 @@ export async function main() {
       });
     }
 
-    if (env.organizationSCIM) {
-      logger.debug('register scim routes');
-      const scimPlugin = createSCIMPlugin(
-        authN,
-        storage.pool,
-        storage,
-        registry.injector.get(OIDCIntegrationStore),
-        registry.injector.get(RedisRateLimiter),
-        new ClickHouse(env.clickhouse, new HttpClient(), logger),
-        env.graphql.origin + '/scim/v2',
-      );
-      await server.register(scimPlugin, { prefix: '/scim/v2' });
-    }
+    const scimPlugin = createSCIMPlugin(
+      authN,
+      storage.pool,
+      storage,
+      registry.injector.get(OIDCIntegrationStore),
+      registry.injector.get(RedisRateLimiter),
+      new ClickHouse(env.clickhouse, new HttpClient(), logger),
+      env.graphql.origin + '/scim/v2',
+      env.organizationSCIM,
+    );
+    await server.register(scimPlugin, { prefix: '/scim/v2' });
 
     if (env.exposeMemoryUtils) {
       logger.debug('exposing memory utils endpoints');

packages/services/server/src/scim.ts

@@ -195,6 +195,7 @@ export const createSCIMPlugin =
     rateLimiter: RedisRateLimiter,
     clickHouse: ClickHouse,
     baseUri: string,
+    isSCIMEnabled: boolean,
   ): FastifyPluginAsync =>
   async server => {
     async function authenticateAuthorizeAndResolveOrganizationFromRequest(
@@ -262,7 +263,7 @@ export const createSCIMPlugin =
         }),
       ]);
 
-      if (!organization.featureFlags.scim || !oidcIntegration) {
+      if ((!organization.featureFlags.scim && !isSCIMEnabled) || !oidcIntegration) {
         return {
           type: 'error' as const,
           error: createSCIMError({