Domain support (#188)

Author: brendan-kellam

Dockerfile

@@ -45,10 +45,6 @@ ARG NEXT_PUBLIC_SOURCEBOT_TELEMETRY_DISABLED=BAKED_NEXT_PUBLIC_SOURCEBOT_TELEMET
 ARG NEXT_PUBLIC_SOURCEBOT_VERSION=BAKED_NEXT_PUBLIC_SOURCEBOT_VERSION
 ENV NEXT_PUBLIC_POSTHOG_PAPIK=BAKED_NEXT_PUBLIC_POSTHOG_PAPIK
 
-# We declare SOURCEBOT_ENCRYPTION_KEY here since it's read during the build stage, since it's read in a server side component
-ARG SOURCEBOT_ENCRYPTION_KEY
-ENV SOURCEBOT_ENCRYPTION_KEY=$SOURCEBOT_ENCRYPTION_KEY
-
 # @nocheckin: This was interfering with the the `matcher` regex in middleware.ts,
 # causing regular expressions parsing errors when making a request. It's unclear
 # why exactly this was happening, but it's likely due to a bad replacement happening
@@ -79,21 +75,16 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV DATA_DIR=/data
-ENV CONFIG_PATH=$DATA_DIR/config.json
 ENV DATA_CACHE_DIR=$DATA_DIR/.sourcebot
 ENV DB_DATA_DIR=$DATA_CACHE_DIR/db
 ENV DB_NAME=sourcebot
 ENV DATABASE_URL="postgresql://postgres@localhost:5432/sourcebot"
+ENV SRC_TENANT_ENFORCEMENT_MODE=strict
 
 ARG SOURCEBOT_VERSION=unknown
 ENV SOURCEBOT_VERSION=$SOURCEBOT_VERSION
 RUN echo "Sourcebot Version: $SOURCEBOT_VERSION"
 
-# Redeclare SOURCEBOT_ENCRYPTION_KEY so that we have it in the runner
-ARG SOURCEBOT_ENCRYPTION_KEY
-
-ENV SOURCEBOT_TENANT_MODE=single
-
 # Valid values are: debug, info, warn, error
 ENV SOURCEBOT_LOG_LEVEL=info
 

entrypoint.sh

@@ -86,27 +86,6 @@ fi
 
 echo "{\"version\": \"$SOURCEBOT_VERSION\", \"install_id\": \"$SOURCEBOT_INSTALL_ID\"}" > "$FIRST_RUN_FILE"
 
-if [ ! -z "$SOURCEBOT_TENANT_MODE" ]; then
-    echo -e "\e[34m[Info] Sourcebot tenant mode: $SOURCEBOT_TENANT_MODE\e[0m"
-else
-    echo -e "\e[31m[Error] SOURCEBOT_TENANT_MODE is not set.\e[0m"
-    exit 1
-fi
-
-# If we're in single tenant mode, fallback to sample config if a config does not exist
-if [ "$SOURCEBOT_TENANT_MODE" = "single" ]; then
-    if echo "$CONFIG_PATH" | grep -qE '^https?://'; then
-        if ! curl --output /dev/null --silent --head --fail "$CONFIG_PATH"; then
-            echo -e "\e[33m[Warning] Remote config file at '$CONFIG_PATH' not found. Falling back on sample config.\e[0m"
-            CONFIG_PATH="./default-config.json"
-        fi
-    elif [ ! -f "$CONFIG_PATH" ]; then
-        echo -e "\e[33m[Warning] Config file at '$CONFIG_PATH' not found. Falling back on sample config.\e[0m"
-        CONFIG_PATH="./default-config.json"
-    fi
-
-    echo -e "\e[34m[Info] Using config file at: '$CONFIG_PATH'.\e[0m"
-fi
 
 # Update NextJs public env variables w/o requiring a rebuild.
 # @see: https://phase.dev/blog/nextjs-public-runtime-variables/

package.json

@@ -6,12 +6,8 @@
     "scripts": {
         "build": "yarn workspaces run build",
         "test": "yarn workspaces run test",
-        "dev": "cross-env SOURCEBOT_TENANT_MODE=single npm-run-all --print-label dev:start",
-        "dev:mt": "cross-env SOURCEBOT_TENANT_MODE=multi npm-run-all --print-label dev:start:mt",
-        "dev:start": "yarn workspace @sourcebot/db prisma:migrate:dev && cross-env npm-run-all --print-label --parallel dev:zoekt dev:backend dev:web",
-        "dev:start:mt": "yarn workspace @sourcebot/db prisma:migrate:dev && cross-env npm-run-all --print-label --parallel dev:zoekt:mt dev:backend dev:web",
-        "dev:zoekt": "export PATH=\"$PWD/bin:$PATH\" && export SRC_TENANT_ENFORCEMENT_MODE=none && zoekt-webserver -index .sourcebot/index -rpc",
-        "dev:zoekt:mt": "export PATH=\"$PWD/bin:$PATH\" && export SRC_TENANT_ENFORCEMENT_MODE=strict && zoekt-webserver -index .sourcebot/index -rpc",
+        "dev": "yarn workspace @sourcebot/db prisma:migrate:dev && cross-env npm-run-all --print-label --parallel dev:zoekt dev:backend dev:web",
+        "dev:zoekt": "export PATH=\"$PWD/bin:$PATH\" && export SRC_TENANT_ENFORCEMENT_MODE=strict && zoekt-webserver -index .sourcebot/index -rpc",
         "dev:backend": "yarn workspace @sourcebot/backend dev:watch",
         "dev:web": "yarn workspace @sourcebot/web dev"
     },

packages/backend/package.json

@@ -5,7 +5,7 @@
     "main": "index.js",
     "type": "module",
     "scripts": {
-        "dev:watch": "tsc-watch --preserveWatchOutput --onSuccess \"yarn dev --configPath ../../config.json --cacheDir ../../.sourcebot\"",
+        "dev:watch": "tsc-watch --preserveWatchOutput --onSuccess \"yarn dev --cacheDir ../../.sourcebot\"",
         "dev": "export PATH=\"$PWD/../../bin:$PATH\" && export CTAGS_COMMAND=ctags && node ./dist/index.js",
         "build": "tsc",
         "test": "vitest --config ./vitest.config.ts"

packages/backend/src/environment.ts

@@ -2,7 +2,7 @@ import dotenv from 'dotenv';
 
 export const getEnv = (env: string | undefined, defaultValue?: string, required?: boolean) => {
 	if (required && !env && !defaultValue) {
-		throw new Error(`Missing required environment variable`);
+		throw new Error(`Missing required environment variable: ${env}`);
 	}
 
 	return env ?? defaultValue;
@@ -20,7 +20,6 @@ dotenv.config({
 });
 
 
-export const SOURCEBOT_TENANT_MODE = getEnv(process.env.SOURCEBOT_TENANT_MODE, undefined, true);
 export const SOURCEBOT_LOG_LEVEL = getEnv(process.env.SOURCEBOT_LOG_LEVEL, 'info')!;
 export const SOURCEBOT_TELEMETRY_DISABLED = getEnvBoolean(process.env.SOURCEBOT_TELEMETRY_DISABLED, false)!;
 export const SOURCEBOT_INSTALL_ID = getEnv(process.env.SOURCEBOT_INSTALL_ID, 'unknown')!;

packages/backend/src/index.ts

@@ -2,11 +2,9 @@ import { ArgumentParser } from "argparse";
 import { existsSync } from 'fs';
 import { mkdir } from 'fs/promises';
 import path from 'path';
-import { isRemotePath } from "./utils.js";
 import { AppContext } from "./types.js";
 import { main } from "./main.js"
 import { PrismaClient } from "@sourcebot/db";
-import { SOURCEBOT_TENANT_MODE } from "./environment.js";
 
 
 const parser = new ArgumentParser({
@@ -18,22 +16,12 @@ type Arguments = {
     cacheDir: string;
 }
 
-parser.add_argument("--configPath", {
-    help: "Path to config file",
-    required: SOURCEBOT_TENANT_MODE === "single",
-});
-
 parser.add_argument("--cacheDir", {
     help: "Path to .sourcebot cache directory",
     required: true,
 });
 const args = parser.parse_args() as Arguments;
 
-if (SOURCEBOT_TENANT_MODE === "single" && !isRemotePath(args.configPath) && !existsSync(args.configPath)) {
-    console.error(`Config file ${args.configPath} does not exist, and is required in single tenant mode`);
-    process.exit(1);
-}
-
 const cacheDir = args.cacheDir;
 const reposPath = path.join(cacheDir, 'repos');
 const indexPath = path.join(cacheDir, 'index');

packages/db/prisma/migrations/20250206180955_add_domain/migration.sql

@@ -0,0 +1,12 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[domain]` on the table `Org` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `domain` to the `Org` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Org" ADD COLUMN     "domain" TEXT NOT NULL;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Org_domain_key" ON "Org"("domain");

packages/db/prisma/migrations/20250212061001_remove_active_org_id/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `activeOrgId` on the `User` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "User" DROP COLUMN "activeOrgId";

packages/db/prisma/schema.prisma

@@ -107,6 +107,7 @@ model Invite {
 model Org {
   id          Int          @id @default(autoincrement())
   name        String
+  domain      String       @unique
   createdAt   DateTime     @default(now())
   updatedAt   DateTime     @updatedAt
   members     UserToOrg[]
@@ -161,7 +162,6 @@ model User {
   image         String?
   accounts      Account[]
   orgs          UserToOrg[]
-  activeOrgId   Int?
 
   /// List of pending invites that the user has created
   invites Invite[]

packages/schemas/src/v2/index.schema.ts

@@ -147,10 +147,6 @@ const schema = {
             ]
           ]
         },
-        "tenantId": {
-          "type": "number",
-          "description": "@nocheckin"
-        },
         "exclude": {
           "type": "object",
           "properties": {

packages/schemas/src/v2/index.type.ts

@@ -95,10 +95,6 @@ export interface GitHubConfig {
    * @minItems 1
    */
   topics?: string[];
-  /**
-   * @nocheckin
-   */
-  tenantId?: number;
   exclude?: {
     /**
      * Exclude forked repositories from syncing.

packages/web/package.json

@@ -104,6 +104,7 @@
     "next-themes": "^0.3.0",
     "posthog-js": "^1.161.5",
     "pretty-bytes": "^6.1.1",
+    "psl": "^1.15.0",
     "react": "^18",
     "react-dom": "^18",
     "react-hook-form": "^7.53.0",
@@ -120,6 +121,7 @@
   },
   "devDependencies": {
     "@types/node": "^20",
+    "@types/psl": "^1.1.3",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@typescript-eslint/eslint-plugin": "^8.3.0",