wip

Author: brendan-kellam

packages/db/prisma/migrations/20260402052154_remove_domain_from_org/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `domain` on the `Org` table. All the data in the column will be lost.
+
+*/
+-- DropIndex
+DROP INDEX "Org_domain_key";
+
+-- AlterTable
+ALTER TABLE "Org" DROP COLUMN "domain";

packages/db/prisma/schema.prisma

@@ -265,7 +265,6 @@ model AccountRequest {
 model Org {
   id          Int          @id @default(autoincrement())
   name        String
-  domain      String       @unique
   createdAt   DateTime     @default(now())
   updatedAt   DateTime     @updatedAt
   members     UserToOrg[]

packages/web/src/__mocks__/prisma.ts

@@ -1,4 +1,4 @@
-import { SINGLE_TENANT_ORG_DOMAIN, SINGLE_TENANT_ORG_ID, SINGLE_TENANT_ORG_NAME } from '@/lib/constants';
+import { SINGLE_TENANT_ORG_ID, SINGLE_TENANT_ORG_NAME } from '@/lib/constants';
 import { Account, ApiKey, OAuthRefreshToken, OAuthToken, Org, PrismaClient, User } from '@prisma/client';
 import { beforeEach, vi } from 'vitest';
 import { mockDeep, mockReset } from 'vitest-mock-extended';
@@ -12,7 +12,6 @@ export const prisma = mockDeep<PrismaClient>();
 export const MOCK_ORG: Org = {
     id: SINGLE_TENANT_ORG_ID,
     name: SINGLE_TENANT_ORG_NAME,
-    domain: SINGLE_TENANT_ORG_DOMAIN,
     createdAt: new Date(),
     updatedAt: new Date(),
     isOnboarded: true,

packages/web/src/actions.ts

@@ -8,8 +8,8 @@ import { notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
 import { getOrgMetadata, isHttpError, isServiceError } from "@/lib/utils";
 import { prisma } from "@/prisma";
 import { render } from "@react-email/components";
-import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/shared";
-import { ApiKey, ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
+import { generateApiKey, getTokenFromConfig } from "@sourcebot/shared";
+import { ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
 import { createLogger } from "@sourcebot/shared";
 import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
 import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
@@ -19,15 +19,14 @@ import { StatusCodes } from "http-status-codes";
 import { cookies } from "next/headers";
 import { createTransport } from "nodemailer";
 import { Octokit } from "octokit";
-import { getOrgFromDomain } from "./data/org";
 import InviteUserEmail from "./emails/inviteUserEmail";
 import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
 import JoinRequestSubmittedEmail from "./emails/joinRequestSubmittedEmail";
-import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
-import { ApiKeyPayload, RepositoryQuery } from "./lib/types";
+import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SINGLE_TENANT_ORG_ID, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
+import { RepositoryQuery } from "./lib/types";
 import { withAuth, withOptionalAuth, withAuth_skipOrgMembershipCheck } from "./middleware/withAuth";
 import { withMinimumOrgRole } from "./middleware/withMinimumOrgRole";
-import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
+import { getBrowsePath } from "./app/(app)/browse/hooks/utils";
 import { sew } from "@/middleware/sew";
 
 const logger = createLogger('web-actions');
@@ -48,59 +47,6 @@ export const completeOnboarding = async (): Promise<{ success: boolean } | Servi
         }
     }));
 
-export const verifyApiKey = async (apiKeyPayload: ApiKeyPayload): Promise<{ apiKey: ApiKey } | ServiceError> => sew(async () => {
-    const parts = apiKeyPayload.apiKey.split("-");
-    if (parts.length !== 2 || parts[0] !== "sourcebot") {
-        return {
-            statusCode: StatusCodes.BAD_REQUEST,
-            errorCode: ErrorCode.INVALID_API_KEY,
-            message: "Invalid API key",
-        } satisfies ServiceError;
-    }
-
-    const hash = hashSecret(parts[1])
-    const apiKey = await prisma.apiKey.findUnique({
-        where: {
-            hash,
-        },
-    });
-
-    if (!apiKey) {
-        return {
-            statusCode: StatusCodes.UNAUTHORIZED,
-            errorCode: ErrorCode.INVALID_API_KEY,
-            message: "Invalid API key",
-        } satisfies ServiceError;
-    }
-
-    const apiKeyTargetOrg = await prisma.org.findUnique({
-        where: {
-            domain: apiKeyPayload.domain,
-        },
-    });
-
-    if (!apiKeyTargetOrg) {
-        return {
-            statusCode: StatusCodes.UNAUTHORIZED,
-            errorCode: ErrorCode.INVALID_API_KEY,
-            message: `Invalid API key payload. Provided domain ${apiKeyPayload.domain} does not exist.`,
-        } satisfies ServiceError;
-    }
-
-    if (apiKey.orgId !== apiKeyTargetOrg.id) {
-        return {
-            statusCode: StatusCodes.UNAUTHORIZED,
-            errorCode: ErrorCode.INVALID_API_KEY,
-            message: `Invalid API key payload. Provided domain ${apiKeyPayload.domain} does not match the API key's org.`,
-        } satisfies ServiceError;
-    }
-
-    return {
-        apiKey,
-    }
-});
-
-
 export const createApiKey = async (name: string): Promise<{ key: string } | ServiceError> => sew(() =>
     withAuth(async ({ org, user, role, prisma }) => {
         if ((env.DISABLE_API_KEY_CREATION_FOR_NON_OWNER_USERS === 'true' || env.DISABLE_API_KEY_USAGE_FOR_NON_OWNER_USERS === 'true') && role !== OrgRole.OWNER) {
@@ -188,7 +134,7 @@ export const deleteApiKey = async (name: string): Promise<{ success: boolean } |
                     type: "user"
                 },
                 target: {
-                    id: org.domain,
+                    id: org.id.toString(),
                     type: "org"
                 },
                 orgId: org.id,
@@ -600,7 +546,7 @@ export const createInvites = async (emails: string[]): Promise<{ success: boolea
                 });
             }
 
-            const hasAvailability = await orgHasAvailability(org.domain);
+            const hasAvailability = await orgHasAvailability();
             if (!hasAvailability) {
                 await auditService.createAudit({
                     action: "user.invite_failed",
@@ -807,7 +753,6 @@ export const getMe = async () => sew(() =>
             memberships: userWithOrgs.orgs.map((org) => ({
                 id: org.orgId,
                 role: org.role,
-                domain: org.org.domain,
                 name: org.org.name,
             }))
         }
@@ -847,7 +792,7 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
         }
 
 
-        const hasAvailability = await orgHasAvailability(invite.org.domain);
+        const hasAvailability = await orgHasAvailability();
         if (!hasAvailability) {
             await failAuditCallback("Organization is at max capacity");
             return {
@@ -911,7 +856,6 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
             id: invite.id,
             orgName: invite.org.name,
             orgImageUrl: invite.org.imageUrl ?? undefined,
-            orgDomain: invite.org.domain,
             host: {
                 name: invite.host.name ?? undefined,
                 email: invite.host.email!,
@@ -983,7 +927,7 @@ export const getOrgAccountRequests = async () => sew(() =>
         }));
     }));
 
-export const createAccountRequest = async (userId: string, domain: string) => sew(async () => {
+export const createAccountRequest = async (userId: string) => sew(async () => {
     const user = await prisma.user.findUnique({
         where: {
             id: userId,
@@ -996,7 +940,7 @@ export const createAccountRequest = async (userId: string, domain: string) => se
 
     const org = await prisma.org.findUnique({
         where: {
-            domain,
+            id: SINGLE_TENANT_ORG_ID,
         },
     });
 
@@ -1057,7 +1001,6 @@ export const createAccountRequest = async (userId: string, domain: string) => se
                         avatarUrl: user.image ?? undefined,
                     },
                     orgName: org.name,
-                    orgDomain: org.domain,
                     orgImageUrl: org.imageUrl ?? undefined,
                 }));
 
@@ -1086,10 +1029,10 @@ export const createAccountRequest = async (userId: string, domain: string) => se
     }
 });
 
-export const getMemberApprovalRequired = async (domain: string): Promise<boolean | ServiceError> => sew(async () => {
+export const getMemberApprovalRequired = async (): Promise<boolean | ServiceError> => sew(async () => {
     const org = await prisma.org.findUnique({
         where: {
-            domain,
+            id: SINGLE_TENANT_ORG_ID,
         },
     });
 
@@ -1182,7 +1125,6 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
                         avatarUrl: request.requestedBy.image ?? undefined,
                     },
                     orgName: org.name,
-                    orgDomain: org.domain
                 }));
 
                 const transport = createTransport(smtpConnectionUrl);
@@ -1191,7 +1133,7 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
                     from: env.EMAIL_FROM_ADDRESS,
                     subject: `Your request to join ${org.name} has been approved`,
                     html,
-                    text: `Your request to join ${org.name} on Sourcebot has been approved. You can now access the organization at ${env.AUTH_URL}/${org.domain}`,
+                    text: `Your request to join ${org.name} on Sourcebot has been approved. You can now access the organization at ${env.AUTH_URL}`,
                 });
 
                 const failed = result.rejected.concat(result.pending).filter(Boolean);
@@ -1334,8 +1276,10 @@ export const getRepoImage = async (repoId: number): Promise<ArrayBuffer | Servic
     })
 });
 
-export const getAnonymousAccessStatus = async (domain: string): Promise<boolean | ServiceError> => sew(async () => {
-    const org = await getOrgFromDomain(domain);
+export const getAnonymousAccessStatus = async (): Promise<boolean | ServiceError> => sew(async () => {
+    const org = await prisma.org.findUnique({
+        where: { id: SINGLE_TENANT_ORG_ID },
+    });
     if (!org) {
         return {
             statusCode: StatusCodes.NOT_FOUND,

…ges/web/src/app/[domain]/agents/page.tsx …ckages/web/src/app/(app)/agents/page.tsxpackages/web/src/app/[domain]/agents/page.tsx renamed to packages/web/src/app/(app)/agents/page.tsx packages/web/src/app/[domain]/agents/page.tsx renamed to packages/web/src/app/(app)/agents/page.tsx

@@ -13,16 +13,10 @@ const agents = [
   },
 ];
 
-export default async function AgentsPage(props: { params: Promise<{ domain: string }> }) {
-  const params = await props.params;
-
-  const {
-    domain
-  } = params;
-
+export default async function AgentsPage() {
   return (
     <div className="flex flex-col items-center overflow-hidden min-h-screen">
-      <NavigationMenu domain={domain} />
+      <NavigationMenu />
       <div className="w-full max-w-6xl px-4 mt-12 mb-24">
         <div
           className={

…app/[domain]/askgh/[owner]/[repo]/api.ts …rc/app/(app)/askgh/[owner]/[repo]/api.tspackages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts renamed to packages/web/src/app/(app)/askgh/[owner]/[repo]/api.ts packages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts renamed to packages/web/src/app/(app)/askgh/[owner]/[repo]/api.ts

@@ -1,7 +1,7 @@
 'use client';
 
 import Image from 'next/image';
-import { SearchModeSelector } from "@/app/[domain]/components/searchModeSelector";
+import { SearchModeSelector } from "@/app/(app)/components/searchModeSelector";
 import { Separator } from "@/components/ui/separator";
 import { ChatBox } from "@/features/chat/components/chatBox";
 import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";

…owner]/[repo]/components/landingPage.tsx …owner]/[repo]/components/landingPage.tsxpackages/web/src/app/[domain]/askgh/[owner]/[repo]/components/landingPage.tsx renamed to packages/web/src/app/(app)/askgh/[owner]/[repo]/components/landingPage.tsx packages/web/src/app/[domain]/askgh/[owner]/[repo]/components/landingPage.tsx renamed to packages/web/src/app/(app)/askgh/[owner]/[repo]/components/landingPage.tsx

@@ -2,7 +2,6 @@ import { addGithubRepo } from "@/features/workerApi/actions";
 import { isServiceError } from "@/lib/utils";
 import { ServiceErrorException } from "@/lib/serviceError";
 import { prisma } from "@/prisma";
-import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
 import { getRepoInfo } from "./api";
 import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
 import { RepoIndexedGuard } from "./components/repoIndexedGuard";
@@ -24,7 +23,6 @@ export default async function GitHubRepoPage(props: PageProps) {
         const displayName = `${owner}/${repo}`;
         const existingRepo = await prisma.repo.findFirst({
             where: {
-                orgId: SINGLE_TENANT_ORG_ID,
                 displayName: displayName,
                 external_codeHostType: 'github',
                 external_codeHostUrl: 'https://github.com',