change forceEnableAnonymousAccess to be an env var

msukkari · msukkari · commit 0623f13d5273 · 2025-07-17T19:37:40.000-07:00
diff --git a/docs/docs/configuration/auth/access-settings.mdx b/docs/docs/configuration/auth/access-settings.mdx
@@ -11,7 +11,7 @@ There are various settings to control how users access your Sourcebot deployment
 
 By default, your Sourcebot deployment is gated with a login page. If you'd like users to access the deployment anonymously, you can enable anonymous access. 
 
-This can be enabled by navigating to **Settings -> Access** or by setting the `forceEnableAnonymousAccess` setting in your configuration file.
+This can be enabled by navigating to **Settings -> Access** or by setting the `FORCE_ENABLE_ANONYMOUS_ACCESS` environment variable.
 
 # Member Approval 
 
diff --git a/docs/snippets/schemas/v3/index.schema.mdx b/docs/snippets/schemas/v3/index.schema.mdx
@@ -63,10 +63,6 @@
           "type": "number",
           "description": "The timeout (in milliseconds) for a repo indexing to timeout. Defaults to 2 hours.",
           "minimum": 1
-        },
-        "forceEnableAnonymousAccess": {
-          "type": "boolean",
-          "description": "Force enable anonymous access. When set to true, anonymous access will be enabled and the UI toggle will be disabled."
         }
       },
       "additionalProperties": false
@@ -176,10 +172,6 @@
           "type": "number",
           "description": "The timeout (in milliseconds) for a repo indexing to timeout. Defaults to 2 hours.",
           "minimum": 1
-        },
-        "forceEnableAnonymousAccess": {
-          "type": "boolean",
-          "description": "Force enable anonymous access. When set to true, anonymous access will be enabled and the UI toggle will be disabled."
         }
       },
       "additionalProperties": false
diff --git a/packages/backend/src/constants.ts b/packages/backend/src/constants.ts
@@ -14,6 +14,5 @@ export const DEFAULT_SETTINGS: Settings = {
     maxRepoIndexingJobConcurrency: 8,
     maxRepoGarbageCollectionJobConcurrency: 8,
     repoGarbageCollectionGracePeriodMs: 10 * 1000, // 10 seconds
-    repoIndexTimeoutMs: 1000 * 60 * 60 * 2, // 2 hours
-    forceEnableAnonymousAccess: false,
+    repoIndexTimeoutMs: 1000 * 60 * 60 * 2 // 2 hours
 }
diff --git a/packages/schemas/src/v3/index.schema.ts b/packages/schemas/src/v3/index.schema.ts
@@ -62,10 +62,6 @@ const schema = {
           "type": "number",
           "description": "The timeout (in milliseconds) for a repo indexing to timeout. Defaults to 2 hours.",
           "minimum": 1
-        },
-        "forceEnableAnonymousAccess": {
-          "type": "boolean",
-          "description": "Force enable anonymous access. When set to true, anonymous access will be enabled and the UI toggle will be disabled."
         }
       },
       "additionalProperties": false
@@ -175,10 +171,6 @@ const schema = {
           "type": "number",
           "description": "The timeout (in milliseconds) for a repo indexing to timeout. Defaults to 2 hours.",
           "minimum": 1
-        },
-        "forceEnableAnonymousAccess": {
-          "type": "boolean",
-          "description": "Force enable anonymous access. When set to true, anonymous access will be enabled and the UI toggle will be disabled."
         }
       },
       "additionalProperties": false
diff --git a/packages/schemas/src/v3/index.type.ts b/packages/schemas/src/v3/index.type.ts
@@ -79,10 +79,6 @@ export interface Settings {
    * The timeout (in milliseconds) for a repo indexing to timeout. Defaults to 2 hours.
    */
   repoIndexTimeoutMs?: number;
-  /**
-   * Force enable anonymous access. When set to true, anonymous access will be enabled and the UI toggle will be disabled.
-   */
-  forceEnableAnonymousAccess?: boolean;
 }
 /**
  * Search context
diff --git a/packages/web/src/app/components/organizationAccessSettings.tsx b/packages/web/src/app/components/organizationAccessSettings.tsx
@@ -5,11 +5,8 @@ import { getOrgFromDomain } from "@/data/org"
 import { getOrgMetadata } from "@/types"
 import { headers } from "next/headers"
 import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
-import { hasEntitlement, loadConfig } from "@sourcebot/shared"
+import { hasEntitlement } from "@sourcebot/shared"
 import { env } from "@/env.mjs"
-import { createLogger } from "@sourcebot/logger";
-
-const logger = createLogger("OrganizationAccessSettings");
 
 export async function OrganizationAccessSettings() {
     const org = await getOrgFromDomain(SINGLE_TENANT_ORG_DOMAIN);
@@ -26,13 +23,7 @@ export async function OrganizationAccessSettings() {
 
     const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
 
-    let forceEnableAnonymousAccess = false;
-    if (env.CONFIG_PATH) {
-        const config = await loadConfig(env.CONFIG_PATH);
-        forceEnableAnonymousAccess = config.settings?.forceEnableAnonymousAccess ?? false;
-    } else {
-        logger.warn("CONFIG_PATH is not set, so forceEnableAnonymousAccess will be false");
-    }
+    const forceEnableAnonymousAccess = env.FORCE_ENABLE_ANONYMOUS_ACCESS === 'true';
 
     return (
         <div className="space-y-6">
diff --git a/packages/web/src/env.mjs b/packages/web/src/env.mjs
@@ -80,6 +80,7 @@ export const env = createEnv({
 
         // Misc UI flags
         SECURITY_CARD_ENABLED: booleanSchema.default('false'),
+        FORCE_ENABLE_ANONYMOUS_ACCESS: booleanSchema.default('false'),
 
         // EE License
         SOURCEBOT_EE_LICENSE_KEY: z.string().optional(),
diff --git a/packages/web/src/initialize.ts b/packages/web/src/initialize.ts
@@ -106,10 +106,10 @@ const syncConnections = async (connections?: { [key: string]: ConnectionConfig }
 const syncDeclarativeConfig = async (configPath: string) => {
     const config = await loadConfig(configPath);
 
-    if (config.settings?.forceEnableAnonymousAccess) {
+    if (env.FORCE_ENABLE_ANONYMOUS_ACCESS === 'true') {
         const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
         if (!hasAnonymousAccessEntitlement) {
-            logger.warn(`forceEnableAnonymousAccess is set to true but anonymous access entitlement is not available. Setting will be ignored.`);
+            logger.warn(`FORCE_ENABLE_ANONYMOUS_ACCESS env var is set to true but anonymous access entitlement is not available. Setting will be ignored.`);
         } else {
             const org = await getOrgFromDomain(SINGLE_TENANT_ORG_DOMAIN);
             if (org) {
@@ -123,7 +123,7 @@ const syncDeclarativeConfig = async (configPath: string) => {
                         } 
                     },
                 });
-                logger.info(`Anonymous access enabled via forceEnableAnonymousAccess setting`);
+                logger.info(`Anonymous access enabled via FORCE_ENABLE_ANONYMOUS_ACCESS environment variable`);
             }
         }
     }
diff --git a/schemas/v3/index.json b/schemas/v3/index.json
@@ -61,10 +61,6 @@
                     "type": "number",
                     "description": "The timeout (in milliseconds) for a repo indexing to timeout. Defaults to 2 hours.",
                     "minimum": 1
-                },
-                "forceEnableAnonymousAccess": {
-                    "type": "boolean",
-                    "description": "Force enable anonymous access. When set to true, anonymous access will be enabled and the UI toggle will be disabled."
                 }
             },
             "additionalProperties": false

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,5 @@ export const DEFAULT_SETTINGS: Settings = {`
`14`	`14`	`maxRepoIndexingJobConcurrency: 8,`
`15`	`15`	`maxRepoGarbageCollectionJobConcurrency: 8,`
`16`	`16`	`repoGarbageCollectionGracePeriodMs: 10 * 1000, // 10 seconds`
`17`		`- repoIndexTimeoutMs: 1000 * 60 * 60 * 2, // 2 hours`
`18`		`- forceEnableAnonymousAccess: false,`
	`17`	`+ repoIndexTimeoutMs: 1000 * 60 * 60 * 2 // 2 hours`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,10 +106,10 @@ const syncConnections = async (connections?: { [key: string]: ConnectionConfig }`
`106`	`106`	`const syncDeclarativeConfig = async (configPath: string) => {`
`107`	`107`	`const config = await loadConfig(configPath);`
`108`	`108`
`109`		`- if (config.settings?.forceEnableAnonymousAccess) {`
	`109`	`+ if (env.FORCE_ENABLE_ANONYMOUS_ACCESS === 'true') {`
`110`	`110`	`const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");`
`111`	`111`	`if (!hasAnonymousAccessEntitlement) {`
`112`		- logger.warn(`forceEnableAnonymousAccess is set to true but anonymous access entitlement is not available. Setting will be ignored.`);
	`112`	+ logger.warn(`FORCE_ENABLE_ANONYMOUS_ACCESS env var is set to true but anonymous access entitlement is not available. Setting will be ignored.`);
`113`	`113`	`} else {`
`114`	`114`	`const org = await getOrgFromDomain(SINGLE_TENANT_ORG_DOMAIN);`
`115`	`115`	`if (org) {`
`@@ -123,7 +123,7 @@ const syncDeclarativeConfig = async (configPath: string) => {`
`123`	`123`	`}`
`124`	`124`	`},`
`125`	`125`	`});`
`126`		- logger.info(`Anonymous access enabled via forceEnableAnonymousAccess setting`);
	`126`	+ logger.info(`Anonymous access enabled via FORCE_ENABLE_ANONYMOUS_ACCESS environment variable`);
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`