fix

Author: brendan-kellam

packages/web/src/actions.ts

@@ -31,7 +31,6 @@ import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLAS
 import { orgDomainSchema, orgNameSchema, repositoryQuerySchema } from "./lib/schemas";
 import { ApiKeyPayload, TenancyMode } from "./lib/types";
 import { withAuthV2, withOptionalAuthV2 } from "./withAuthV2";
-import { getBaseUrl } from "./lib/utils.server";
 import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
 
 const logger = createLogger('web-actions');
@@ -478,8 +477,7 @@ export const getRepos = async ({
             take,
         });
 
-        const headersList = await headers();
-        const baseUrl = getBaseUrl(headersList);
+        const baseUrl = env.AUTH_URL;
 
         return repos.map((repo) => repositoryQuerySchema.parse({
             codeHostType: repo.external_codeHostType,

packages/web/src/app/api/(server)/chat/blocking/route.ts

@@ -5,13 +5,11 @@ import { convertLLMOutputToPortableMarkdown, getAnswerPartFromAssistantMessage,
 import { ErrorCode } from "@/lib/errorCodes";
 import { requestBodySchemaValidationError, ServiceError, ServiceErrorException, serviceErrorResponse } from "@/lib/serviceError";
 import { isServiceError } from "@/lib/utils";
-import { getBaseUrl } from "@/lib/utils.server";
 import { withOptionalAuthV2 } from "@/withAuthV2";
 import { ChatVisibility, Prisma } from "@sourcebot/db";
-import { createLogger } from "@sourcebot/shared";
+import { createLogger, env } from "@sourcebot/shared";
 import { randomUUID } from "crypto";
 import { StatusCodes } from "http-status-codes";
-import { headers } from "next/headers";
 import { NextRequest, NextResponse } from "next/server";
 import { z } from "zod";
 import { createMessageStream } from "../route";
@@ -188,8 +186,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
             const portableAnswer = convertLLMOutputToPortableMarkdown(answerText);
 
             // Build the chat URL
-            const headersList = await headers();
-            const baseUrl = getBaseUrl(headersList);
+            const baseUrl = env.AUTH_URL;
             const chatUrl = `${baseUrl}/${org.domain}/chat/${chat.id}`;
 
             logger.debug(`Completed blocking agent for chat ${chat.id}`, {

packages/web/src/app/api/(server)/repos/listReposApi.ts

@@ -2,17 +2,14 @@ import { sew } from "@/actions";
 import { repositoryQuerySchema } from "@/lib/schemas";
 import { ListReposQueryParams } from "@/lib/types";
 import { withOptionalAuthV2 } from "@/withAuthV2";
-import { headers } from "next/headers";
-import { getBaseUrl } from "@/lib/utils.server";
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
+import { env } from "@sourcebot/shared";
 
 export const listRepos = async ({ query, page, perPage, sort, direction }: ListReposQueryParams) => sew(() =>
     withOptionalAuthV2(async ({ org, prisma }) => {
         const skip = (page - 1) * perPage;
         const orderByField = sort === 'pushed' ? 'pushedAt' : 'name';
-
-        const headersList = await headers();
-        const baseUrl = getBaseUrl(headersList);
+        const baseUrl = env.AUTH_URL;
 
         const [repos, totalCount] = await Promise.all([
             prisma.repo.findMany({

packages/web/src/app/components/organizationAccessSettings.tsx

@@ -1,13 +1,10 @@
 import { createInviteLink } from "@/lib/utils"
-import { getBaseUrl } from "@/lib/utils.server"
 import { AnonymousAccessToggle } from "./anonymousAccessToggle"
 import { OrganizationAccessSettingsWrapper } from "./organizationAccessSettingsWrapper"
 import { getOrgFromDomain } from "@/data/org"
 import { getOrgMetadata } from "@/lib/utils"
-import { headers } from "next/headers"
 import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
-import { hasEntitlement } from "@sourcebot/shared"
-import { env } from "@sourcebot/shared"
+import { hasEntitlement, env } from "@sourcebot/shared"
 
 export async function OrganizationAccessSettings() {
     const org = await getOrgFromDomain(SINGLE_TENANT_ORG_DOMAIN);
@@ -18,8 +15,7 @@ export async function OrganizationAccessSettings() {
     const metadata = getOrgMetadata(org);
     const anonymousAccessEnabled = metadata?.anonymousAccessEnabled ?? false;
 
-    const headersList = await headers();
-    const baseUrl = getBaseUrl(headersList);
+    const baseUrl = env.AUTH_URL;
     const inviteLink = createInviteLink(baseUrl, org.inviteLinkId)
 
     const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");

packages/web/src/features/search/zoektSearcher.ts

@@ -20,8 +20,6 @@ import { RepositoryInfo, SearchResponse, SearchResultFile, SearchStats, SourceRa
 import { captureEvent } from "@/lib/posthog";
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
 import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
-import { headers } from "next/headers";
-import { getBaseUrl } from "@/lib/utils.server";
 
 const logger = createLogger("zoekt-searcher");
 
@@ -383,9 +381,6 @@ const transformZoektSearchResponse = async (response: ZoektGrpcSearchResponse, r
     files: SearchResultFile[],
     repositoryInfo: RepositoryInfo[],
 }> => {
-    const headersList = await headers();
-    const baseUrl = getBaseUrl(headersList);
-
     const files = response.files.map((file) => {
         const fileNameChunks = file.chunk_matches.filter((chunk) => chunk.file_name);
         const repoId = getRepoIdForFile(file);
@@ -431,7 +426,7 @@ const transformZoektSearchResponse = async (response: ZoektGrpcSearchResponse, r
             repository: repo.name,
             repositoryId: repo.id,
             language: file.language,
-            webUrl: `${baseUrl}${getBrowsePath({
+            webUrl: `${env.AUTH_URL}${getBrowsePath({
                 repoName: repo.name,
                 path: fileName,
                 pathType: 'blob',