aniketshukla1 · Jul 30, 2026 · Jul 31, 2026 · Jul 31, 2026 · Jul 31, 2026 · coderabbitai
diff --git a/backend/account_v2/constants.py b/backend/account_v2/constants.py
@@ -45,8 +45,8 @@ class ErrorMessage:
 
 
 class DefaultOrg:
-    ORGANIZATION_NAME = "mock_org"
-    MOCK_ORG = "mock_org"
+    ORGANIZATION_NAME = settings.DEFAULT_ORGANIZATION_NAME
+    MOCK_ORG = settings.DEFAULT_ORGANIZATION_NAME
     MOCK_USER = settings.DEFAULT_AUTH_USERNAME
     MOCK_USER_ID = "mock_user_id"
     MOCK_USER_EMAIL = "email@mock.com"

diff --git a/backend/backend/settings/base.py b/backend/backend/settings/base.py
@@ -172,6 +172,10 @@ def get_required_setting(setting_key: str, default: str | None = None) -> str |
 
 DEFAULT_AUTH_USERNAME = os.environ.get("DEFAULT_AUTH_USERNAME", "unstract")
 DEFAULT_AUTH_PASSWORD = os.environ.get("DEFAULT_AUTH_PASSWORD", "unstract")
+# Name/id of the default organization created for the open-source (single-tenant)
+# deployment. Configurable so the org segment of URLs (e.g. /mock_org/tools) can be
+# a meaningful name. Defaults to "mock_org" for backward compatibility.
+DEFAULT_ORGANIZATION_NAME = os.environ.get("DEFAULT_ORGANIZATION_NAME", "mock_org")
 SYSTEM_ADMIN_USERNAME = get_required_setting("SYSTEM_ADMIN_USERNAME")
 SYSTEM_ADMIN_PASSWORD = get_required_setting("SYSTEM_ADMIN_PASSWORD")
 SYSTEM_ADMIN_EMAIL = get_required_setting("SYSTEM_ADMIN_EMAIL")

diff --git a/backend/sample.env b/backend/sample.env
@@ -137,6 +137,11 @@ API_DEPLOYMENT_RATE_LIMIT_LOCK_BLOCKING_TIMEOUT=5
 DEFAULT_AUTH_USERNAME=
 DEFAULT_AUTH_PASSWORD=
 
+# Name of the default organization for the open-source (single-tenant) deployment.
+# Appears as the org segment of URLs (e.g. /mock_org/tools). Defaults to "mock_org".
+# If you change this, set the frontend VITE_DEFAULT_ORG_NAME to the same value.
+DEFAULT_ORGANIZATION_NAME=mock_org
+
 # System admin credentials
 SYSTEM_ADMIN_USERNAME="admin"
 SYSTEM_ADMIN_PASSWORD="admin"

diff --git a/frontend/generate-runtime-config.sh b/frontend/generate-runtime-config.sh
@@ -19,6 +19,7 @@ window.RUNTIME_CONFIG = {
   faviconPath: "${VITE_FAVICON_PATH:-${REACT_APP_FAVICON_PATH}}",
   logoUrl: "${VITE_CUSTOM_LOGO_URL:-${REACT_APP_CUSTOM_LOGO_URL}}",
   enablePosthog: "${VITE_ENABLE_POSTHOG:-${REACT_APP_ENABLE_POSTHOG}}",
+  defaultOrgName: "${VITE_DEFAULT_ORG_NAME:-${REACT_APP_DEFAULT_ORG_NAME:-mock_org}}",
   version: "${APP_VERSION}"
 };
 EOF

diff --git a/frontend/sample.env b/frontend/sample.env
@@ -4,6 +4,11 @@ VITE_BACKEND_URL=http://localhost:8000
 # Default: false for local development
 VITE_ENABLE_POSTHOG=false
 
+# Name of the default organization for the open-source deployment (org segment of
+# URLs, e.g. /mock_org/tools). Must match the backend DEFAULT_ORGANIZATION_NAME.
+# Defaults to "mock_org".
+VITE_DEFAULT_ORG_NAME=mock_org
+
 # For development
 NODE_ENV=development
 # Enable file watching via polling instead of filesystem events

diff --git a/frontend/src/components/helpers/auth/RequireAdmin.js b/frontend/src/components/helpers/auth/RequireAdmin.js
@@ -1,6 +1,7 @@
 import { useEffect, useState } from "react";
 import { Outlet } from "react-router-dom";
 
+import config from "../../../config";
 import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate";
 import { useSessionStore } from "../../../store/session-store";
 import { NotFound } from "../../error/NotFound/NotFound.jsx";
@@ -12,7 +13,7 @@ const RequireAdmin = () => {
   const [isVerifying, setIsVerifying] = useState(true);
   const orgId = sessionDetails?.orgId;
   const orgName = sessionDetails?.orgName;
-  const isOpenSource = orgName === "mock_org";
+  const isOpenSource = orgName === config.defaultOrgName;
 
   useEffect(() => {
     const verifyAdminStatus = async () => {

diff --git a/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx b/frontend/src/components/navigations/top-nav-bar/TopNavBar.jsx
@@ -176,7 +176,7 @@ function TopNavBar({ isSimpleLayout, topNavBarOptions }) {
   const isUnstract = !(effectiveProduct && effectiveProduct !== "unstract");
   const isAPIHub = effectiveProduct === "verticals";
   const isStaff = sessionDetails?.isStaff || sessionDetails?.is_staff;
-  const isOpenSource = orgName === "mock_org";
+  const isOpenSource = orgName === config.defaultOrgName;
 
   // Check user role and whether the onboarding is incomplete
   useEffect(() => {

diff --git a/frontend/src/config.js b/frontend/src/config.js
@@ -18,6 +18,12 @@ const config = {
     "/favicon.ico",
   logoUrl: runtimeConfig.logoUrl || import.meta.env.VITE_CUSTOM_LOGO_URL,
   version: runtimeConfig.version || import.meta.env.VITE_VERSION,
+  // Name of the default org for the open-source deployment. Must match the backend
+  // DEFAULT_ORGANIZATION_NAME so the open-source check below stays correct.
+  defaultOrgName:
+    runtimeConfig.defaultOrgName ||
+    import.meta.env.VITE_DEFAULT_ORG_NAME ||
+    "mock_org",
   // Add more values as OR case, if needed for fallback.
 };
 

diff --git a/frontend/src/hooks/usePostHogEvents.js b/frontend/src/hooks/usePostHogEvents.js
@@ -1,5 +1,6 @@
 import { usePostHog } from "posthog-js/react";
 
+import config from "../config";
 import { isSaasProdDeployment } from "../helpers/PostHogDeployment";
 import { useSessionStore } from "../store/session-store";
 
@@ -61,7 +62,7 @@ const usePostHogEvents = () => {
     try {
       const orgId = sessionDetails?.orgId;
       const orgName = sessionDetails?.orgName;
-      const isOpenSource = orgName === "mock_org";
+      const isOpenSource = orgName === config.defaultOrgName;
       const software = isOpenSource ? "OSS" : "SAAS";
       const email = sessionDetails?.email;
       const userId = sessionDetails?.id;

diff --git a/frontend/src/pages/UnstractAdministrationPage.jsx b/frontend/src/pages/UnstractAdministrationPage.jsx
@@ -1,4 +1,5 @@
 import "./UnstractAdministrationPage.css";
+import config from "../config";
 import { useSessionStore } from "../store/session-store";
 
 let UnstractAdministration;
@@ -23,7 +24,7 @@ function UnstractAdministrationPage() {
 
   const isStaff = sessionDetails?.isStaff || sessionDetails?.is_staff;
   const orgName = sessionDetails?.orgName;
-  const isOpenSource = orgName === "mock_org";
+  const isOpenSource = orgName === config.defaultOrgName;
 
   // Staff permission check - protects route at component level
   if (!isStaff || isOpenSource) {