Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Fixed issue where external links would use internal service DNS names in k8s deployments, making them inaccessible. [#844](https://github.com/sourcebot-dev/sourcebot/pull/844)

## [4.10.23] - 2026-02-02

### Added
Expand Down
13 changes: 4 additions & 9 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { getPlan, hasEntitlement } from "@sourcebot/shared";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
import { cookies } from "next/headers";
import { createTransport } from "nodemailer";
import { Octokit } from "octokit";
import { auth } from "./auth";
Expand All@@ -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');
Expand DownExpand Up@@ -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,
Expand DownExpand Up@@ -893,7 +891,6 @@ export const createInvites = async (emails: string[], domain: string): Promise<{

// Send invites to recipients
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;
await Promise.all(emails.map(async (email) => {
const invite = await prisma.invite.findUnique({
where: {
Expand All@@ -916,7 +913,7 @@ export const createInvites = async (emails: string[], domain: string): Promise<{
email,
},
});
const inviteLink = `${origin}/redeem?invite_id=${invite.id}`;
const inviteLink = `${env.AUTH_URL}/redeem?invite_id=${invite.id}`;
const transport = createTransport(env.SMTP_CONNECTION_URL);
const html = await render(InviteUserEmail({
host: {
Expand DownExpand Up@@ -1585,10 +1582,8 @@ export const approveAccountRequest = async (requestId: string, domain: string) =

// Send approval email to the user
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;

const html = await render(JoinRequestApprovedEmail({
baseUrl: origin,
baseUrl: env.AUTH_URL,
user: {
name: request.requestedBy.name ?? undefined,
email: request.requestedBy.email!,
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/chat/blocking/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -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}`, {
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/repos/listReposApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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({
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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);
Expand All@@ -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");
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/features/search/zoektSearcher.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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");

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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',
Expand Down
19 changes: 0 additions & 19 deletions packages/web/src/lib/utils.server.ts

This file was deleted.

, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Fixed issue where external links would use internal service DNS names in k8s deployments, making them inaccessible. [#844](https://github.com/sourcebot-dev/sourcebot/pull/844)

## [4.10.23] - 2026-02-02

### Added
Expand Down
13 changes: 4 additions & 9 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { getPlan, hasEntitlement } from "@sourcebot/shared";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
import { cookies } from "next/headers";
import { createTransport } from "nodemailer";
import { Octokit } from "octokit";
import { auth } from "./auth";
Expand All@@ -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');
Expand DownExpand Up@@ -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,
Expand DownExpand Up@@ -893,7 +891,6 @@ export const createInvites = async (emails: string[], domain: string): Promise<{

// Send invites to recipients
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;
await Promise.all(emails.map(async (email) => {
const invite = await prisma.invite.findUnique({
where: {
Expand All@@ -916,7 +913,7 @@ export const createInvites = async (emails: string[], domain: string): Promise<{
email,
},
});
const inviteLink = `${origin}/redeem?invite_id=${invite.id}`;
const inviteLink = `${env.AUTH_URL}/redeem?invite_id=${invite.id}`;
const transport = createTransport(env.SMTP_CONNECTION_URL);
const html = await render(InviteUserEmail({
host: {
Expand DownExpand Up@@ -1585,10 +1582,8 @@ export const approveAccountRequest = async (requestId: string, domain: string) =

// Send approval email to the user
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;

const html = await render(JoinRequestApprovedEmail({
baseUrl: origin,
baseUrl: env.AUTH_URL,
user: {
name: request.requestedBy.name ?? undefined,
email: request.requestedBy.email!,
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/chat/blocking/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -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}`, {
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/repos/listReposApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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({
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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);
Expand All@@ -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");
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/features/search/zoektSearcher.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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");

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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',
Expand Down
19 changes: 0 additions & 19 deletions packages/web/src/lib/utils.server.ts

This file was deleted.

, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Fixed issue where external links would use internal service DNS names in k8s deployments, making them inaccessible. [#844](https://github.com/sourcebot-dev/sourcebot/pull/844)

## [4.10.23] - 2026-02-02

### Added
Expand Down
13 changes: 4 additions & 9 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { getPlan, hasEntitlement } from "@sourcebot/shared";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
import { cookies } from "next/headers";
import { createTransport } from "nodemailer";
import { Octokit } from "octokit";
import { auth } from "./auth";
Expand All@@ -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');
Expand DownExpand Up@@ -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,
Expand DownExpand Up@@ -893,7 +891,6 @@ export const createInvites = async (emails: string[], domain: string): Promise<{

// Send invites to recipients
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;
await Promise.all(emails.map(async (email) => {
const invite = await prisma.invite.findUnique({
where: {
Expand All@@ -916,7 +913,7 @@ export const createInvites = async (emails: string[], domain: string): Promise<{
email,
},
});
const inviteLink = `${origin}/redeem?invite_id=${invite.id}`;
const inviteLink = `${env.AUTH_URL}/redeem?invite_id=${invite.id}`;
const transport = createTransport(env.SMTP_CONNECTION_URL);
const html = await render(InviteUserEmail({
host: {
Expand DownExpand Up@@ -1585,10 +1582,8 @@ export const approveAccountRequest = async (requestId: string, domain: string) =

// Send approval email to the user
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;

const html = await render(JoinRequestApprovedEmail({
baseUrl: origin,
baseUrl: env.AUTH_URL,
user: {
name: request.requestedBy.name ?? undefined,
email: request.requestedBy.email!,
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/chat/blocking/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -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}`, {
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/repos/listReposApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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({
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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);
Expand All@@ -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");
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/features/search/zoektSearcher.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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");

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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',
Expand Down
19 changes: 0 additions & 19 deletions packages/web/src/lib/utils.server.ts

This file was deleted.

, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Fixed issue where external links would use internal service DNS names in k8s deployments, making them inaccessible. [#844](https://github.com/sourcebot-dev/sourcebot/pull/844)

## [4.10.23] - 2026-02-02

### Added
Expand Down
13 changes: 4 additions & 9 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { getPlan, hasEntitlement } from "@sourcebot/shared";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
import { cookies } from "next/headers";
import { createTransport } from "nodemailer";
import { Octokit } from "octokit";
import { auth } from "./auth";
Expand All@@ -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');
Expand DownExpand Up@@ -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,
Expand DownExpand Up@@ -893,7 +891,6 @@ export const createInvites = async (emails: string[], domain: string): Promise<{

// Send invites to recipients
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;
await Promise.all(emails.map(async (email) => {
const invite = await prisma.invite.findUnique({
where: {
Expand All@@ -916,7 +913,7 @@ export const createInvites = async (emails: string[], domain: string): Promise<{
email,
},
});
const inviteLink = `${origin}/redeem?invite_id=${invite.id}`;
const inviteLink = `${env.AUTH_URL}/redeem?invite_id=${invite.id}`;
const transport = createTransport(env.SMTP_CONNECTION_URL);
const html = await render(InviteUserEmail({
host: {
Expand DownExpand Up@@ -1585,10 +1582,8 @@ export const approveAccountRequest = async (requestId: string, domain: string) =

// Send approval email to the user
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;

const html = await render(JoinRequestApprovedEmail({
baseUrl: origin,
baseUrl: env.AUTH_URL,
user: {
name: request.requestedBy.name ?? undefined,
email: request.requestedBy.email!,
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/chat/blocking/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -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}`, {
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/repos/listReposApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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({
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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);
Expand All@@ -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");
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/features/search/zoektSearcher.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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");

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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',
Expand Down
19 changes: 0 additions & 19 deletions packages/web/src/lib/utils.server.ts

This file was deleted.

, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Fixed issue where external links would use internal service DNS names in k8s deployments, making them inaccessible. [#844](https://github.com/sourcebot-dev/sourcebot/pull/844)

## [4.10.23] - 2026-02-02

### Added
Expand Down
13 changes: 4 additions & 9 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { getPlan, hasEntitlement } from "@sourcebot/shared";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
import { cookies } from "next/headers";
import { createTransport } from "nodemailer";
import { Octokit } from "octokit";
import { auth } from "./auth";
Expand All@@ -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');
Expand DownExpand Up@@ -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,
Expand DownExpand Up@@ -893,7 +891,6 @@ export const createInvites = async (emails: string[], domain: string): Promise<{

// Send invites to recipients
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;
await Promise.all(emails.map(async (email) => {
const invite = await prisma.invite.findUnique({
where: {
Expand All@@ -916,7 +913,7 @@ export const createInvites = async (emails: string[], domain: string): Promise<{
email,
},
});
const inviteLink = `${origin}/redeem?invite_id=${invite.id}`;
const inviteLink = `${env.AUTH_URL}/redeem?invite_id=${invite.id}`;
const transport = createTransport(env.SMTP_CONNECTION_URL);
const html = await render(InviteUserEmail({
host: {
Expand DownExpand Up@@ -1585,10 +1582,8 @@ export const approveAccountRequest = async (requestId: string, domain: string) =

// Send approval email to the user
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;

const html = await render(JoinRequestApprovedEmail({
baseUrl: origin,
baseUrl: env.AUTH_URL,
user: {
name: request.requestedBy.name ?? undefined,
email: request.requestedBy.email!,
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/chat/blocking/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -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}`, {
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/repos/listReposApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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({
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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);
Expand All@@ -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");
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/features/search/zoektSearcher.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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");

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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',
Expand Down
19 changes: 0 additions & 19 deletions packages/web/src/lib/utils.server.ts

This file was deleted.

, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Fixed issue where external links would use internal service DNS names in k8s deployments, making them inaccessible. [#844](https://github.com/sourcebot-dev/sourcebot/pull/844)

## [4.10.23] - 2026-02-02

### Added
Expand Down
13 changes: 4 additions & 9 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { getPlan, hasEntitlement } from "@sourcebot/shared";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
import { cookies } from "next/headers";
import { createTransport } from "nodemailer";
import { Octokit } from "octokit";
import { auth } from "./auth";
Expand All@@ -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');
Expand DownExpand Up@@ -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,
Expand DownExpand Up@@ -893,7 +891,6 @@ export const createInvites = async (emails: string[], domain: string): Promise<{

// Send invites to recipients
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;
await Promise.all(emails.map(async (email) => {
const invite = await prisma.invite.findUnique({
where: {
Expand All@@ -916,7 +913,7 @@ export const createInvites = async (emails: string[], domain: string): Promise<{
email,
},
});
const inviteLink = `${origin}/redeem?invite_id=${invite.id}`;
const inviteLink = `${env.AUTH_URL}/redeem?invite_id=${invite.id}`;
const transport = createTransport(env.SMTP_CONNECTION_URL);
const html = await render(InviteUserEmail({
host: {
Expand DownExpand Up@@ -1585,10 +1582,8 @@ export const approveAccountRequest = async (requestId: string, domain: string) =

// Send approval email to the user
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;

const html = await render(JoinRequestApprovedEmail({
baseUrl: origin,
baseUrl: env.AUTH_URL,
user: {
name: request.requestedBy.name ?? undefined,
email: request.requestedBy.email!,
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/chat/blocking/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -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}`, {
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/repos/listReposApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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({
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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);
Expand All@@ -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");
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/features/search/zoektSearcher.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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");

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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',
Expand Down
19 changes: 0 additions & 19 deletions packages/web/src/lib/utils.server.ts

This file was deleted.

, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Fixed issue where external links would use internal service DNS names in k8s deployments, making them inaccessible. [#844](https://github.com/sourcebot-dev/sourcebot/pull/844)

## [4.10.23] - 2026-02-02

### Added
Expand Down
13 changes: 4 additions & 9 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { getPlan, hasEntitlement } from "@sourcebot/shared";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
import { cookies } from "next/headers";
import { createTransport } from "nodemailer";
import { Octokit } from "octokit";
import { auth } from "./auth";
Expand All@@ -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');
Expand DownExpand Up@@ -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,
Expand DownExpand Up@@ -893,7 +891,6 @@ export const createInvites = async (emails: string[], domain: string): Promise<{

// Send invites to recipients
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;
await Promise.all(emails.map(async (email) => {
const invite = await prisma.invite.findUnique({
where: {
Expand All@@ -916,7 +913,7 @@ export const createInvites = async (emails: string[], domain: string): Promise<{
email,
},
});
const inviteLink = `${origin}/redeem?invite_id=${invite.id}`;
const inviteLink = `${env.AUTH_URL}/redeem?invite_id=${invite.id}`;
const transport = createTransport(env.SMTP_CONNECTION_URL);
const html = await render(InviteUserEmail({
host: {
Expand DownExpand Up@@ -1585,10 +1582,8 @@ export const approveAccountRequest = async (requestId: string, domain: string) =

// Send approval email to the user
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;

const html = await render(JoinRequestApprovedEmail({
baseUrl: origin,
baseUrl: env.AUTH_URL,
user: {
name: request.requestedBy.name ?? undefined,
email: request.requestedBy.email!,
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/chat/blocking/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -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}`, {
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/repos/listReposApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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({
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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);
Expand All@@ -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");
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/features/search/zoektSearcher.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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");

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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',
Expand Down
19 changes: 0 additions & 19 deletions packages/web/src/lib/utils.server.ts

This file was deleted.

, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Fixed issue where external links would use internal service DNS names in k8s deployments, making them inaccessible. [#844](https://github.com/sourcebot-dev/sourcebot/pull/844)

## [4.10.23] - 2026-02-02

### Added
Expand Down
13 changes: 4 additions & 9 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
import { getPlan, hasEntitlement } from "@sourcebot/shared";
import { StatusCodes } from "http-status-codes";
import { cookies, headers } from "next/headers";
import { cookies } from "next/headers";
import { createTransport } from "nodemailer";
import { Octokit } from "octokit";
import { auth } from "./auth";
Expand All@@ -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');
Expand DownExpand Up@@ -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,
Expand DownExpand Up@@ -893,7 +891,6 @@ export const createInvites = async (emails: string[], domain: string): Promise<{

// Send invites to recipients
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;
await Promise.all(emails.map(async (email) => {
const invite = await prisma.invite.findUnique({
where: {
Expand All@@ -916,7 +913,7 @@ export const createInvites = async (emails: string[], domain: string): Promise<{
email,
},
});
const inviteLink = `${origin}/redeem?invite_id=${invite.id}`;
const inviteLink = `${env.AUTH_URL}/redeem?invite_id=${invite.id}`;
const transport = createTransport(env.SMTP_CONNECTION_URL);
const html = await render(InviteUserEmail({
host: {
Expand DownExpand Up@@ -1585,10 +1582,8 @@ export const approveAccountRequest = async (requestId: string, domain: string) =

// Send approval email to the user
if (env.SMTP_CONNECTION_URL && env.EMAIL_FROM_ADDRESS) {
const origin = (await headers()).get('origin')!;

const html = await render(JoinRequestApprovedEmail({
baseUrl: origin,
baseUrl: env.AUTH_URL,
user: {
name: request.requestedBy.name ?? undefined,
email: request.requestedBy.email!,
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/chat/blocking/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -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}`, {
Expand Down
7 changes: 2 additions & 5 deletions packages/web/src/app/api/(server)/repos/listReposApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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({
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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);
Expand All@@ -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");
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/features/search/zoektSearcher.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -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");

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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',
Expand Down
19 changes: 0 additions & 19 deletions packages/web/src/lib/utils.server.ts

This file was deleted.