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
2 changes: 0 additions & 2 deletions .env.development
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,5 +76,3 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
# CONFIG_MAX_REPOS_NO_TOKEN=
NODE_ENV=development
# SOURCEBOT_TENANCY_MODE=single

# NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=
87 changes: 0 additions & 87 deletions .github/workflows/_gcp-deploy.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/deploy-demo.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
# @see: https://docs.docker.com/build/building/variables/#scoping

ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_SENTRY_BACKEND_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand DownExpand Up@@ -52,8 +51,6 @@ ENV SKIP_ENV_VALIDATION=1
# -----------
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ENV NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=$NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ENV NEXT_PUBLIC_SENTRY_WEBAPP_DSN=$NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand Down
7 changes: 0 additions & 7 deletions packages/shared/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,6 @@ import { ConfigSettings } from "./types.js";

export const SOURCEBOT_SUPPORT_EMAIL = 'team@sourcebot.dev';

export const SOURCEBOT_CLOUD_ENVIRONMENT = [
"dev",
"demo",
"staging",
"prod",
] as const;

export const SOURCEBOT_UNLIMITED_SEATS = -1;

/**
Expand Down
23 changes: 0 additions & 23 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { base64Decode } from "./utils.js";
import { z } from "zod";
import { createLogger } from "./logger.js";
import { env } from "./env.server.js";
import { env as clientEnv } from "./env.client.js";
import { SOURCEBOT_SUPPORT_EMAIL, SOURCEBOT_UNLIMITED_SEATS } from "./constants.js";
import { verifySignature } from "./crypto.js";

Expand All@@ -23,8 +22,6 @@ type LicenseKeyPayload = z.infer<typeof eeLicenseKeyPayloadSchema>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const planLabels = {
oss: "OSS",
"cloud:team": "Team",
"cloud:demo": "Demo",
"self-hosted:enterprise": "Enterprise (Self-Hosted)",
"self-hosted:enterprise-unlimited": "Enterprise (Self-Hosted) Unlimited",
} as const;
Expand All@@ -49,12 +46,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
oss: [
"anonymous-access"
],
"cloud:team": [
"billing",
"multi-tenancy",
"sso",
"code-nav"
],
"self-hosted:enterprise": [
"search-contexts",
"sso",
Expand All@@ -74,12 +65,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
"github-app",
"anonymous-access"
],
// Special entitlement for https://demo.sourcebot.dev
"cloud:demo": [
"anonymous-access",
"code-nav",
"search-contexts"
],
} as const;


Expand DownExpand Up@@ -118,14 +103,6 @@ export const getLicenseKey = (): LicenseKeyPayload | null => {
}

export const getPlan = (): Plan => {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT) {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo") {
return "cloud:demo";
}

return "cloud:team";
}

const licenseKey = getLicenseKey();
if (licenseKey) {
const expiryDate = new Date(licenseKey.expiryDate);
Expand Down
3 changes: 0 additions & 3 deletions packages/shared/src/env.client.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
import { createEnv } from "@t3-oss/env-core";
import { z } from "zod";
import { SOURCEBOT_CLOUD_ENVIRONMENT } from "./constants.js";

export const env = createEnv({
clientPrefix: "NEXT_PUBLIC_",
client: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(),
NEXT_PUBLIC_SENTRY_BACKEND_DSN: z.string().optional(),
NEXT_PUBLIC_SENTRY_ENVIRONMENT: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_BASE_URL: z.string().optional()
},
runtimeEnvStrict: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT,
NEXT_PUBLIC_SENTRY_BACKEND_DSN: process.env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
NEXT_PUBLIC_SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: process.env.NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY,
Expand Down
17 changes: 16 additions & 1 deletion packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,6 @@ export const env = createEnv({
// Misc
CONFIG_MAX_REPOS_NO_TOKEN: numberSchema.default(Number.MAX_SAFE_INTEGER),
NODE_ENV: z.enum(["development", "test", "production"]),
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),
// @note: this is also declared in the Dockerfile.
POSTHOG_PAPIK: z.string().default("phc_lLPuFFi5LH6c94eFJcqvYVFwiJffVcV6HD8U4a1OnRW"),

Expand DownExpand Up@@ -274,6 +273,22 @@ export const env = createEnv({
// A comma separated list of glob patterns that shwould always be indexed regardless of their size.
ALWAYS_INDEX_FILE_PATTERNS: z.string().optional(),

/**
* Configure whether to send telemetry events.
* By default, all events are anonymized and do not contain PII data,
* unless SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED is set to true.
*/
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),

/**
* Configure whether to collect PII data in telemetry events.
* If SOURCEBOT_TELEMETRY_DISABLED is true, this setting is
* ignored.
*/
SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED: booleanSchema.default('false'),

//// DEPRECATED ////

/**
* @deprecated This setting is deprecated. Please use the `identityProviders` section of the config file instead.
*/
Expand Down
14 changes: 0 additions & 14 deletions packages/web/src/app/[domain]/components/repositoryCarousel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,20 +85,6 @@ export function RepositoryCarousel({
))}
</CarouselContent>
</Carousel>
{process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo" && (
<p className="text-sm text-muted-foreground text-center">
Interested in using Sourcebot on your code? Check out our{' '}
<a
href="https://docs.sourcebot.dev/docs/overview"
target="_blank"
rel="noopener noreferrer"
className="text-primary hover:underline"
onClick={() => captureEvent('wa_demo_docs_link_pressed', {})}
>
docs
</a>
</p>
)}
</div>
)
}
Expand Down
11 changes: 4 additions & 7 deletions packages/web/src/app/[domain]/settings/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { ServiceErrorException } from "@/lib/serviceError";
import { getOrgFromDomain } from "@/data/org";
import { OrgRole } from "@prisma/client";
import { hasEntitlement } from "@sourcebot/shared";
import { env } from "@sourcebot/shared/client";

interface LayoutProps {
children: React.ReactNode;
Expand DownExpand Up@@ -115,12 +114,10 @@ export default async function SettingsLayout(
href: `/${domain}/settings/permission-syncing`,
}
] : []),
...(env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
{
title: "License",
href: `/${domain}/settings/license`,
}
] : []),
{
title: "License",
href: `/${domain}/settings/license`,
}
]

return (
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/app/[domain]/settings/license/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,7 @@ import { Button } from "@/components/ui/button";
import { Info, Mail } from "lucide-react";
import { getOrgMembers } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { notFound, ServiceErrorException } from "@/lib/serviceError";
import { env } from "@sourcebot/shared/client";
import { ServiceErrorException } from "@/lib/serviceError";

interface LicensePageProps {
params: Promise<{
Expand All@@ -19,10 +18,6 @@ export default async function LicensePage(props: LicensePageProps) {
domain
} = params;

if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
notFound();
}

const licenseKey = getLicenseKey();
const entitlements = getEntitlements();
const plan = getPlan();
Expand Down
5 changes: 0 additions & 5 deletions packages/web/src/app/components/authSecurityNotice.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,11 +59,6 @@ export const AuthSecurityNotice = ({ closable = false }: AuthSecurityNoticeProps
return null;
}

// Only render for self-hosted deployments
if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
return null;
}

return (
<div className={`p-4 rounded-lg bg-[var(--highlight)]/10 border border-[var(--highlight)]/20 relative ${closable ? 'pr-10' : ''}`}>
{closable && (
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ export default function RootLayout({
<SessionProvider>
<PlanProvider entitlements={getEntitlements()}>
<PostHogProvider
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === "true"}
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === 'true'}
isPiiEnabled={env.SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED === 'true'}
// @note: the posthog api key doesn't need to be kept secret,
// so we are safe to send it to the client.
posthogApiKey={env.POSTHOG_PAPIK}
Expand Down
15 changes: 8 additions & 7 deletions packages/web/src/app/posthogProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ function PostHogPageView() {
interface PostHogProviderProps {
children: React.ReactNode
isDisabled: boolean
isPiiEnabled: boolean
posthogApiKey: string
sourcebotVersion: string
sourcebotInstallId: string
Expand All@@ -41,6 +42,7 @@ interface PostHogProviderProps {
export function PostHogProvider({
children,
isDisabled,
isPiiEnabled,
posthogApiKey,
sourcebotVersion,
sourcebotInstallId,
Expand All@@ -55,10 +57,10 @@ export function PostHogProvider({
person_profiles: 'identified_only',
capture_pageview: false,
autocapture: false,
// In self-hosted mode, we don't want to capture the following
// default properties.
// If PII is not enabled, we don't want to capture the following
// default properties that may contain PII.
// @see: https://posthog.com/docs/data/events#default-properties
property_denylist: env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
property_denylist: isPiiEnabled === false ? [
'$current_url',
'$pathname',
'$session_entry_url',
Expand All@@ -81,7 +83,7 @@ export function PostHogProvider({
} else {
console.debug("PostHog telemetry disabled");
}
}, [isDisabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);
}, [isDisabled, isPiiEnabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);

useEffect(() => {
if (!session) {
Expand All@@ -90,13 +92,12 @@ export function PostHogProvider({

posthog.identify(
session.user.id,
// Only include email & name when running in a cloud environment.
env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined ? {
isPiiEnabled === true ? {
email: session.user.email,
name: session.user.name,
} : undefined
);
}, [session]);
}, [isPiiEnabled, session]);

return (
<PHProvider client={posthog}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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
2 changes: 0 additions & 2 deletions .env.development
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,5 +76,3 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
# CONFIG_MAX_REPOS_NO_TOKEN=
NODE_ENV=development
# SOURCEBOT_TENANCY_MODE=single

# NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=
87 changes: 0 additions & 87 deletions .github/workflows/_gcp-deploy.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/deploy-demo.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
# @see: https://docs.docker.com/build/building/variables/#scoping

ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_SENTRY_BACKEND_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand DownExpand Up@@ -52,8 +51,6 @@ ENV SKIP_ENV_VALIDATION=1
# -----------
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ENV NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=$NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ENV NEXT_PUBLIC_SENTRY_WEBAPP_DSN=$NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand Down
7 changes: 0 additions & 7 deletions packages/shared/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,6 @@ import { ConfigSettings } from "./types.js";

export const SOURCEBOT_SUPPORT_EMAIL = 'team@sourcebot.dev';

export const SOURCEBOT_CLOUD_ENVIRONMENT = [
"dev",
"demo",
"staging",
"prod",
] as const;

export const SOURCEBOT_UNLIMITED_SEATS = -1;

/**
Expand Down
23 changes: 0 additions & 23 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { base64Decode } from "./utils.js";
import { z } from "zod";
import { createLogger } from "./logger.js";
import { env } from "./env.server.js";
import { env as clientEnv } from "./env.client.js";
import { SOURCEBOT_SUPPORT_EMAIL, SOURCEBOT_UNLIMITED_SEATS } from "./constants.js";
import { verifySignature } from "./crypto.js";

Expand All@@ -23,8 +22,6 @@ type LicenseKeyPayload = z.infer<typeof eeLicenseKeyPayloadSchema>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const planLabels = {
oss: "OSS",
"cloud:team": "Team",
"cloud:demo": "Demo",
"self-hosted:enterprise": "Enterprise (Self-Hosted)",
"self-hosted:enterprise-unlimited": "Enterprise (Self-Hosted) Unlimited",
} as const;
Expand All@@ -49,12 +46,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
oss: [
"anonymous-access"
],
"cloud:team": [
"billing",
"multi-tenancy",
"sso",
"code-nav"
],
"self-hosted:enterprise": [
"search-contexts",
"sso",
Expand All@@ -74,12 +65,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
"github-app",
"anonymous-access"
],
// Special entitlement for https://demo.sourcebot.dev
"cloud:demo": [
"anonymous-access",
"code-nav",
"search-contexts"
],
} as const;


Expand DownExpand Up@@ -118,14 +103,6 @@ export const getLicenseKey = (): LicenseKeyPayload | null => {
}

export const getPlan = (): Plan => {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT) {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo") {
return "cloud:demo";
}

return "cloud:team";
}

const licenseKey = getLicenseKey();
if (licenseKey) {
const expiryDate = new Date(licenseKey.expiryDate);
Expand Down
3 changes: 0 additions & 3 deletions packages/shared/src/env.client.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
import { createEnv } from "@t3-oss/env-core";
import { z } from "zod";
import { SOURCEBOT_CLOUD_ENVIRONMENT } from "./constants.js";

export const env = createEnv({
clientPrefix: "NEXT_PUBLIC_",
client: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(),
NEXT_PUBLIC_SENTRY_BACKEND_DSN: z.string().optional(),
NEXT_PUBLIC_SENTRY_ENVIRONMENT: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_BASE_URL: z.string().optional()
},
runtimeEnvStrict: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT,
NEXT_PUBLIC_SENTRY_BACKEND_DSN: process.env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
NEXT_PUBLIC_SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: process.env.NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY,
Expand Down
17 changes: 16 additions & 1 deletion packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,6 @@ export const env = createEnv({
// Misc
CONFIG_MAX_REPOS_NO_TOKEN: numberSchema.default(Number.MAX_SAFE_INTEGER),
NODE_ENV: z.enum(["development", "test", "production"]),
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),
// @note: this is also declared in the Dockerfile.
POSTHOG_PAPIK: z.string().default("phc_lLPuFFi5LH6c94eFJcqvYVFwiJffVcV6HD8U4a1OnRW"),

Expand DownExpand Up@@ -274,6 +273,22 @@ export const env = createEnv({
// A comma separated list of glob patterns that shwould always be indexed regardless of their size.
ALWAYS_INDEX_FILE_PATTERNS: z.string().optional(),

/**
* Configure whether to send telemetry events.
* By default, all events are anonymized and do not contain PII data,
* unless SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED is set to true.
*/
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),

/**
* Configure whether to collect PII data in telemetry events.
* If SOURCEBOT_TELEMETRY_DISABLED is true, this setting is
* ignored.
*/
SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED: booleanSchema.default('false'),

//// DEPRECATED ////

/**
* @deprecated This setting is deprecated. Please use the `identityProviders` section of the config file instead.
*/
Expand Down
14 changes: 0 additions & 14 deletions packages/web/src/app/[domain]/components/repositoryCarousel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,20 +85,6 @@ export function RepositoryCarousel({
))}
</CarouselContent>
</Carousel>
{process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo" && (
<p className="text-sm text-muted-foreground text-center">
Interested in using Sourcebot on your code? Check out our{' '}
<a
href="https://docs.sourcebot.dev/docs/overview"
target="_blank"
rel="noopener noreferrer"
className="text-primary hover:underline"
onClick={() => captureEvent('wa_demo_docs_link_pressed', {})}
>
docs
</a>
</p>
)}
</div>
)
}
Expand Down
11 changes: 4 additions & 7 deletions packages/web/src/app/[domain]/settings/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { ServiceErrorException } from "@/lib/serviceError";
import { getOrgFromDomain } from "@/data/org";
import { OrgRole } from "@prisma/client";
import { hasEntitlement } from "@sourcebot/shared";
import { env } from "@sourcebot/shared/client";

interface LayoutProps {
children: React.ReactNode;
Expand DownExpand Up@@ -115,12 +114,10 @@ export default async function SettingsLayout(
href: `/${domain}/settings/permission-syncing`,
}
] : []),
...(env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
{
title: "License",
href: `/${domain}/settings/license`,
}
] : []),
{
title: "License",
href: `/${domain}/settings/license`,
}
]

return (
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/app/[domain]/settings/license/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,7 @@ import { Button } from "@/components/ui/button";
import { Info, Mail } from "lucide-react";
import { getOrgMembers } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { notFound, ServiceErrorException } from "@/lib/serviceError";
import { env } from "@sourcebot/shared/client";
import { ServiceErrorException } from "@/lib/serviceError";

interface LicensePageProps {
params: Promise<{
Expand All@@ -19,10 +18,6 @@ export default async function LicensePage(props: LicensePageProps) {
domain
} = params;

if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
notFound();
}

const licenseKey = getLicenseKey();
const entitlements = getEntitlements();
const plan = getPlan();
Expand Down
5 changes: 0 additions & 5 deletions packages/web/src/app/components/authSecurityNotice.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,11 +59,6 @@ export const AuthSecurityNotice = ({ closable = false }: AuthSecurityNoticeProps
return null;
}

// Only render for self-hosted deployments
if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
return null;
}

return (
<div className={`p-4 rounded-lg bg-[var(--highlight)]/10 border border-[var(--highlight)]/20 relative ${closable ? 'pr-10' : ''}`}>
{closable && (
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ export default function RootLayout({
<SessionProvider>
<PlanProvider entitlements={getEntitlements()}>
<PostHogProvider
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === "true"}
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === 'true'}
isPiiEnabled={env.SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED === 'true'}
// @note: the posthog api key doesn't need to be kept secret,
// so we are safe to send it to the client.
posthogApiKey={env.POSTHOG_PAPIK}
Expand Down
15 changes: 8 additions & 7 deletions packages/web/src/app/posthogProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ function PostHogPageView() {
interface PostHogProviderProps {
children: React.ReactNode
isDisabled: boolean
isPiiEnabled: boolean
posthogApiKey: string
sourcebotVersion: string
sourcebotInstallId: string
Expand All@@ -41,6 +42,7 @@ interface PostHogProviderProps {
export function PostHogProvider({
children,
isDisabled,
isPiiEnabled,
posthogApiKey,
sourcebotVersion,
sourcebotInstallId,
Expand All@@ -55,10 +57,10 @@ export function PostHogProvider({
person_profiles: 'identified_only',
capture_pageview: false,
autocapture: false,
// In self-hosted mode, we don't want to capture the following
// default properties.
// If PII is not enabled, we don't want to capture the following
// default properties that may contain PII.
// @see: https://posthog.com/docs/data/events#default-properties
property_denylist: env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
property_denylist: isPiiEnabled === false ? [
'$current_url',
'$pathname',
'$session_entry_url',
Expand All@@ -81,7 +83,7 @@ export function PostHogProvider({
} else {
console.debug("PostHog telemetry disabled");
}
}, [isDisabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);
}, [isDisabled, isPiiEnabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);

useEffect(() => {
if (!session) {
Expand All@@ -90,13 +92,12 @@ export function PostHogProvider({

posthog.identify(
session.user.id,
// Only include email & name when running in a cloud environment.
env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined ? {
isPiiEnabled === true ? {
email: session.user.email,
name: session.user.name,
} : undefined
);
}, [session]);
}, [isPiiEnabled, session]);

return (
<PHProvider client={posthog}>
Expand Down
Loading
, '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
2 changes: 0 additions & 2 deletions .env.development
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,5 +76,3 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
# CONFIG_MAX_REPOS_NO_TOKEN=
NODE_ENV=development
# SOURCEBOT_TENANCY_MODE=single

# NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=
87 changes: 0 additions & 87 deletions .github/workflows/_gcp-deploy.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/deploy-demo.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
# @see: https://docs.docker.com/build/building/variables/#scoping

ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_SENTRY_BACKEND_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand DownExpand Up@@ -52,8 +51,6 @@ ENV SKIP_ENV_VALIDATION=1
# -----------
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ENV NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=$NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ENV NEXT_PUBLIC_SENTRY_WEBAPP_DSN=$NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand Down
7 changes: 0 additions & 7 deletions packages/shared/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,6 @@ import { ConfigSettings } from "./types.js";

export const SOURCEBOT_SUPPORT_EMAIL = 'team@sourcebot.dev';

export const SOURCEBOT_CLOUD_ENVIRONMENT = [
"dev",
"demo",
"staging",
"prod",
] as const;

export const SOURCEBOT_UNLIMITED_SEATS = -1;

/**
Expand Down
23 changes: 0 additions & 23 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { base64Decode } from "./utils.js";
import { z } from "zod";
import { createLogger } from "./logger.js";
import { env } from "./env.server.js";
import { env as clientEnv } from "./env.client.js";
import { SOURCEBOT_SUPPORT_EMAIL, SOURCEBOT_UNLIMITED_SEATS } from "./constants.js";
import { verifySignature } from "./crypto.js";

Expand All@@ -23,8 +22,6 @@ type LicenseKeyPayload = z.infer<typeof eeLicenseKeyPayloadSchema>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const planLabels = {
oss: "OSS",
"cloud:team": "Team",
"cloud:demo": "Demo",
"self-hosted:enterprise": "Enterprise (Self-Hosted)",
"self-hosted:enterprise-unlimited": "Enterprise (Self-Hosted) Unlimited",
} as const;
Expand All@@ -49,12 +46,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
oss: [
"anonymous-access"
],
"cloud:team": [
"billing",
"multi-tenancy",
"sso",
"code-nav"
],
"self-hosted:enterprise": [
"search-contexts",
"sso",
Expand All@@ -74,12 +65,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
"github-app",
"anonymous-access"
],
// Special entitlement for https://demo.sourcebot.dev
"cloud:demo": [
"anonymous-access",
"code-nav",
"search-contexts"
],
} as const;


Expand DownExpand Up@@ -118,14 +103,6 @@ export const getLicenseKey = (): LicenseKeyPayload | null => {
}

export const getPlan = (): Plan => {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT) {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo") {
return "cloud:demo";
}

return "cloud:team";
}

const licenseKey = getLicenseKey();
if (licenseKey) {
const expiryDate = new Date(licenseKey.expiryDate);
Expand Down
3 changes: 0 additions & 3 deletions packages/shared/src/env.client.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
import { createEnv } from "@t3-oss/env-core";
import { z } from "zod";
import { SOURCEBOT_CLOUD_ENVIRONMENT } from "./constants.js";

export const env = createEnv({
clientPrefix: "NEXT_PUBLIC_",
client: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(),
NEXT_PUBLIC_SENTRY_BACKEND_DSN: z.string().optional(),
NEXT_PUBLIC_SENTRY_ENVIRONMENT: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_BASE_URL: z.string().optional()
},
runtimeEnvStrict: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT,
NEXT_PUBLIC_SENTRY_BACKEND_DSN: process.env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
NEXT_PUBLIC_SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: process.env.NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY,
Expand Down
17 changes: 16 additions & 1 deletion packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,6 @@ export const env = createEnv({
// Misc
CONFIG_MAX_REPOS_NO_TOKEN: numberSchema.default(Number.MAX_SAFE_INTEGER),
NODE_ENV: z.enum(["development", "test", "production"]),
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),
// @note: this is also declared in the Dockerfile.
POSTHOG_PAPIK: z.string().default("phc_lLPuFFi5LH6c94eFJcqvYVFwiJffVcV6HD8U4a1OnRW"),

Expand DownExpand Up@@ -274,6 +273,22 @@ export const env = createEnv({
// A comma separated list of glob patterns that shwould always be indexed regardless of their size.
ALWAYS_INDEX_FILE_PATTERNS: z.string().optional(),

/**
* Configure whether to send telemetry events.
* By default, all events are anonymized and do not contain PII data,
* unless SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED is set to true.
*/
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),

/**
* Configure whether to collect PII data in telemetry events.
* If SOURCEBOT_TELEMETRY_DISABLED is true, this setting is
* ignored.
*/
SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED: booleanSchema.default('false'),

//// DEPRECATED ////

/**
* @deprecated This setting is deprecated. Please use the `identityProviders` section of the config file instead.
*/
Expand Down
14 changes: 0 additions & 14 deletions packages/web/src/app/[domain]/components/repositoryCarousel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,20 +85,6 @@ export function RepositoryCarousel({
))}
</CarouselContent>
</Carousel>
{process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo" && (
<p className="text-sm text-muted-foreground text-center">
Interested in using Sourcebot on your code? Check out our{' '}
<a
href="https://docs.sourcebot.dev/docs/overview"
target="_blank"
rel="noopener noreferrer"
className="text-primary hover:underline"
onClick={() => captureEvent('wa_demo_docs_link_pressed', {})}
>
docs
</a>
</p>
)}
</div>
)
}
Expand Down
11 changes: 4 additions & 7 deletions packages/web/src/app/[domain]/settings/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { ServiceErrorException } from "@/lib/serviceError";
import { getOrgFromDomain } from "@/data/org";
import { OrgRole } from "@prisma/client";
import { hasEntitlement } from "@sourcebot/shared";
import { env } from "@sourcebot/shared/client";

interface LayoutProps {
children: React.ReactNode;
Expand DownExpand Up@@ -115,12 +114,10 @@ export default async function SettingsLayout(
href: `/${domain}/settings/permission-syncing`,
}
] : []),
...(env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
{
title: "License",
href: `/${domain}/settings/license`,
}
] : []),
{
title: "License",
href: `/${domain}/settings/license`,
}
]

return (
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/app/[domain]/settings/license/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,7 @@ import { Button } from "@/components/ui/button";
import { Info, Mail } from "lucide-react";
import { getOrgMembers } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { notFound, ServiceErrorException } from "@/lib/serviceError";
import { env } from "@sourcebot/shared/client";
import { ServiceErrorException } from "@/lib/serviceError";

interface LicensePageProps {
params: Promise<{
Expand All@@ -19,10 +18,6 @@ export default async function LicensePage(props: LicensePageProps) {
domain
} = params;

if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
notFound();
}

const licenseKey = getLicenseKey();
const entitlements = getEntitlements();
const plan = getPlan();
Expand Down
5 changes: 0 additions & 5 deletions packages/web/src/app/components/authSecurityNotice.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,11 +59,6 @@ export const AuthSecurityNotice = ({ closable = false }: AuthSecurityNoticeProps
return null;
}

// Only render for self-hosted deployments
if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
return null;
}

return (
<div className={`p-4 rounded-lg bg-[var(--highlight)]/10 border border-[var(--highlight)]/20 relative ${closable ? 'pr-10' : ''}`}>
{closable && (
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ export default function RootLayout({
<SessionProvider>
<PlanProvider entitlements={getEntitlements()}>
<PostHogProvider
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === "true"}
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === 'true'}
isPiiEnabled={env.SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED === 'true'}
// @note: the posthog api key doesn't need to be kept secret,
// so we are safe to send it to the client.
posthogApiKey={env.POSTHOG_PAPIK}
Expand Down
15 changes: 8 additions & 7 deletions packages/web/src/app/posthogProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ function PostHogPageView() {
interface PostHogProviderProps {
children: React.ReactNode
isDisabled: boolean
isPiiEnabled: boolean
posthogApiKey: string
sourcebotVersion: string
sourcebotInstallId: string
Expand All@@ -41,6 +42,7 @@ interface PostHogProviderProps {
export function PostHogProvider({
children,
isDisabled,
isPiiEnabled,
posthogApiKey,
sourcebotVersion,
sourcebotInstallId,
Expand All@@ -55,10 +57,10 @@ export function PostHogProvider({
person_profiles: 'identified_only',
capture_pageview: false,
autocapture: false,
// In self-hosted mode, we don't want to capture the following
// default properties.
// If PII is not enabled, we don't want to capture the following
// default properties that may contain PII.
// @see: https://posthog.com/docs/data/events#default-properties
property_denylist: env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
property_denylist: isPiiEnabled === false ? [
'$current_url',
'$pathname',
'$session_entry_url',
Expand All@@ -81,7 +83,7 @@ export function PostHogProvider({
} else {
console.debug("PostHog telemetry disabled");
}
}, [isDisabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);
}, [isDisabled, isPiiEnabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);

useEffect(() => {
if (!session) {
Expand All@@ -90,13 +92,12 @@ export function PostHogProvider({

posthog.identify(
session.user.id,
// Only include email & name when running in a cloud environment.
env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined ? {
isPiiEnabled === true ? {
email: session.user.email,
name: session.user.name,
} : undefined
);
}, [session]);
}, [isPiiEnabled, session]);

return (
<PHProvider client={posthog}>
Expand Down
Loading
, '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 \u003e 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
2 changes: 0 additions & 2 deletions .env.development
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,5 +76,3 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
# CONFIG_MAX_REPOS_NO_TOKEN=
NODE_ENV=development
# SOURCEBOT_TENANCY_MODE=single

# NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=
87 changes: 0 additions & 87 deletions .github/workflows/_gcp-deploy.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/deploy-demo.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
# @see: https://docs.docker.com/build/building/variables/#scoping

ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_SENTRY_BACKEND_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand DownExpand Up@@ -52,8 +51,6 @@ ENV SKIP_ENV_VALIDATION=1
# -----------
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ENV NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=$NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ENV NEXT_PUBLIC_SENTRY_WEBAPP_DSN=$NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand Down
7 changes: 0 additions & 7 deletions packages/shared/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,6 @@ import { ConfigSettings } from "./types.js";

export const SOURCEBOT_SUPPORT_EMAIL = 'team@sourcebot.dev';

export const SOURCEBOT_CLOUD_ENVIRONMENT = [
"dev",
"demo",
"staging",
"prod",
] as const;

export const SOURCEBOT_UNLIMITED_SEATS = -1;

/**
Expand Down
23 changes: 0 additions & 23 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { base64Decode } from "./utils.js";
import { z } from "zod";
import { createLogger } from "./logger.js";
import { env } from "./env.server.js";
import { env as clientEnv } from "./env.client.js";
import { SOURCEBOT_SUPPORT_EMAIL, SOURCEBOT_UNLIMITED_SEATS } from "./constants.js";
import { verifySignature } from "./crypto.js";

Expand All@@ -23,8 +22,6 @@ type LicenseKeyPayload = z.infer<typeof eeLicenseKeyPayloadSchema>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const planLabels = {
oss: "OSS",
"cloud:team": "Team",
"cloud:demo": "Demo",
"self-hosted:enterprise": "Enterprise (Self-Hosted)",
"self-hosted:enterprise-unlimited": "Enterprise (Self-Hosted) Unlimited",
} as const;
Expand All@@ -49,12 +46,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
oss: [
"anonymous-access"
],
"cloud:team": [
"billing",
"multi-tenancy",
"sso",
"code-nav"
],
"self-hosted:enterprise": [
"search-contexts",
"sso",
Expand All@@ -74,12 +65,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
"github-app",
"anonymous-access"
],
// Special entitlement for https://demo.sourcebot.dev
"cloud:demo": [
"anonymous-access",
"code-nav",
"search-contexts"
],
} as const;


Expand DownExpand Up@@ -118,14 +103,6 @@ export const getLicenseKey = (): LicenseKeyPayload | null => {
}

export const getPlan = (): Plan => {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT) {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo") {
return "cloud:demo";
}

return "cloud:team";
}

const licenseKey = getLicenseKey();
if (licenseKey) {
const expiryDate = new Date(licenseKey.expiryDate);
Expand Down
3 changes: 0 additions & 3 deletions packages/shared/src/env.client.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
import { createEnv } from "@t3-oss/env-core";
import { z } from "zod";
import { SOURCEBOT_CLOUD_ENVIRONMENT } from "./constants.js";

export const env = createEnv({
clientPrefix: "NEXT_PUBLIC_",
client: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(),
NEXT_PUBLIC_SENTRY_BACKEND_DSN: z.string().optional(),
NEXT_PUBLIC_SENTRY_ENVIRONMENT: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_BASE_URL: z.string().optional()
},
runtimeEnvStrict: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT,
NEXT_PUBLIC_SENTRY_BACKEND_DSN: process.env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
NEXT_PUBLIC_SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: process.env.NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY,
Expand Down
17 changes: 16 additions & 1 deletion packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,6 @@ export const env = createEnv({
// Misc
CONFIG_MAX_REPOS_NO_TOKEN: numberSchema.default(Number.MAX_SAFE_INTEGER),
NODE_ENV: z.enum(["development", "test", "production"]),
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),
// @note: this is also declared in the Dockerfile.
POSTHOG_PAPIK: z.string().default("phc_lLPuFFi5LH6c94eFJcqvYVFwiJffVcV6HD8U4a1OnRW"),

Expand DownExpand Up@@ -274,6 +273,22 @@ export const env = createEnv({
// A comma separated list of glob patterns that shwould always be indexed regardless of their size.
ALWAYS_INDEX_FILE_PATTERNS: z.string().optional(),

/**
* Configure whether to send telemetry events.
* By default, all events are anonymized and do not contain PII data,
* unless SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED is set to true.
*/
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),

/**
* Configure whether to collect PII data in telemetry events.
* If SOURCEBOT_TELEMETRY_DISABLED is true, this setting is
* ignored.
*/
SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED: booleanSchema.default('false'),

//// DEPRECATED ////

/**
* @deprecated This setting is deprecated. Please use the `identityProviders` section of the config file instead.
*/
Expand Down
14 changes: 0 additions & 14 deletions packages/web/src/app/[domain]/components/repositoryCarousel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,20 +85,6 @@ export function RepositoryCarousel({
))}
</CarouselContent>
</Carousel>
{process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo" && (
<p className="text-sm text-muted-foreground text-center">
Interested in using Sourcebot on your code? Check out our{' '}
<a
href="https://docs.sourcebot.dev/docs/overview"
target="_blank"
rel="noopener noreferrer"
className="text-primary hover:underline"
onClick={() => captureEvent('wa_demo_docs_link_pressed', {})}
>
docs
</a>
</p>
)}
</div>
)
}
Expand Down
11 changes: 4 additions & 7 deletions packages/web/src/app/[domain]/settings/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { ServiceErrorException } from "@/lib/serviceError";
import { getOrgFromDomain } from "@/data/org";
import { OrgRole } from "@prisma/client";
import { hasEntitlement } from "@sourcebot/shared";
import { env } from "@sourcebot/shared/client";

interface LayoutProps {
children: React.ReactNode;
Expand DownExpand Up@@ -115,12 +114,10 @@ export default async function SettingsLayout(
href: `/${domain}/settings/permission-syncing`,
}
] : []),
...(env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
{
title: "License",
href: `/${domain}/settings/license`,
}
] : []),
{
title: "License",
href: `/${domain}/settings/license`,
}
]

return (
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/app/[domain]/settings/license/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,7 @@ import { Button } from "@/components/ui/button";
import { Info, Mail } from "lucide-react";
import { getOrgMembers } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { notFound, ServiceErrorException } from "@/lib/serviceError";
import { env } from "@sourcebot/shared/client";
import { ServiceErrorException } from "@/lib/serviceError";

interface LicensePageProps {
params: Promise<{
Expand All@@ -19,10 +18,6 @@ export default async function LicensePage(props: LicensePageProps) {
domain
} = params;

if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
notFound();
}

const licenseKey = getLicenseKey();
const entitlements = getEntitlements();
const plan = getPlan();
Expand Down
5 changes: 0 additions & 5 deletions packages/web/src/app/components/authSecurityNotice.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,11 +59,6 @@ export const AuthSecurityNotice = ({ closable = false }: AuthSecurityNoticeProps
return null;
}

// Only render for self-hosted deployments
if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
return null;
}

return (
<div className={`p-4 rounded-lg bg-[var(--highlight)]/10 border border-[var(--highlight)]/20 relative ${closable ? 'pr-10' : ''}`}>
{closable && (
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ export default function RootLayout({
<SessionProvider>
<PlanProvider entitlements={getEntitlements()}>
<PostHogProvider
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === "true"}
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === 'true'}
isPiiEnabled={env.SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED === 'true'}
// @note: the posthog api key doesn't need to be kept secret,
// so we are safe to send it to the client.
posthogApiKey={env.POSTHOG_PAPIK}
Expand Down
15 changes: 8 additions & 7 deletions packages/web/src/app/posthogProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ function PostHogPageView() {
interface PostHogProviderProps {
children: React.ReactNode
isDisabled: boolean
isPiiEnabled: boolean
posthogApiKey: string
sourcebotVersion: string
sourcebotInstallId: string
Expand All@@ -41,6 +42,7 @@ interface PostHogProviderProps {
export function PostHogProvider({
children,
isDisabled,
isPiiEnabled,
posthogApiKey,
sourcebotVersion,
sourcebotInstallId,
Expand All@@ -55,10 +57,10 @@ export function PostHogProvider({
person_profiles: 'identified_only',
capture_pageview: false,
autocapture: false,
// In self-hosted mode, we don't want to capture the following
// default properties.
// If PII is not enabled, we don't want to capture the following
// default properties that may contain PII.
// @see: https://posthog.com/docs/data/events#default-properties
property_denylist: env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
property_denylist: isPiiEnabled === false ? [
'$current_url',
'$pathname',
'$session_entry_url',
Expand All@@ -81,7 +83,7 @@ export function PostHogProvider({
} else {
console.debug("PostHog telemetry disabled");
}
}, [isDisabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);
}, [isDisabled, isPiiEnabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);

useEffect(() => {
if (!session) {
Expand All@@ -90,13 +92,12 @@ export function PostHogProvider({

posthog.identify(
session.user.id,
// Only include email & name when running in a cloud environment.
env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined ? {
isPiiEnabled === true ? {
email: session.user.email,
name: session.user.name,
} : undefined
);
}, [session]);
}, [isPiiEnabled, session]);

return (
<PHProvider client={posthog}>
Expand Down
Loading
, '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
2 changes: 0 additions & 2 deletions .env.development
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,5 +76,3 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
# CONFIG_MAX_REPOS_NO_TOKEN=
NODE_ENV=development
# SOURCEBOT_TENANCY_MODE=single

# NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=
87 changes: 0 additions & 87 deletions .github/workflows/_gcp-deploy.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/deploy-demo.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
# @see: https://docs.docker.com/build/building/variables/#scoping

ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_SENTRY_BACKEND_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand DownExpand Up@@ -52,8 +51,6 @@ ENV SKIP_ENV_VALIDATION=1
# -----------
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ENV NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=$NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ENV NEXT_PUBLIC_SENTRY_WEBAPP_DSN=$NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand Down
7 changes: 0 additions & 7 deletions packages/shared/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,6 @@ import { ConfigSettings } from "./types.js";

export const SOURCEBOT_SUPPORT_EMAIL = 'team@sourcebot.dev';

export const SOURCEBOT_CLOUD_ENVIRONMENT = [
"dev",
"demo",
"staging",
"prod",
] as const;

export const SOURCEBOT_UNLIMITED_SEATS = -1;

/**
Expand Down
23 changes: 0 additions & 23 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { base64Decode } from "./utils.js";
import { z } from "zod";
import { createLogger } from "./logger.js";
import { env } from "./env.server.js";
import { env as clientEnv } from "./env.client.js";
import { SOURCEBOT_SUPPORT_EMAIL, SOURCEBOT_UNLIMITED_SEATS } from "./constants.js";
import { verifySignature } from "./crypto.js";

Expand All@@ -23,8 +22,6 @@ type LicenseKeyPayload = z.infer<typeof eeLicenseKeyPayloadSchema>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const planLabels = {
oss: "OSS",
"cloud:team": "Team",
"cloud:demo": "Demo",
"self-hosted:enterprise": "Enterprise (Self-Hosted)",
"self-hosted:enterprise-unlimited": "Enterprise (Self-Hosted) Unlimited",
} as const;
Expand All@@ -49,12 +46,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
oss: [
"anonymous-access"
],
"cloud:team": [
"billing",
"multi-tenancy",
"sso",
"code-nav"
],
"self-hosted:enterprise": [
"search-contexts",
"sso",
Expand All@@ -74,12 +65,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
"github-app",
"anonymous-access"
],
// Special entitlement for https://demo.sourcebot.dev
"cloud:demo": [
"anonymous-access",
"code-nav",
"search-contexts"
],
} as const;


Expand DownExpand Up@@ -118,14 +103,6 @@ export const getLicenseKey = (): LicenseKeyPayload | null => {
}

export const getPlan = (): Plan => {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT) {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo") {
return "cloud:demo";
}

return "cloud:team";
}

const licenseKey = getLicenseKey();
if (licenseKey) {
const expiryDate = new Date(licenseKey.expiryDate);
Expand Down
3 changes: 0 additions & 3 deletions packages/shared/src/env.client.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
import { createEnv } from "@t3-oss/env-core";
import { z } from "zod";
import { SOURCEBOT_CLOUD_ENVIRONMENT } from "./constants.js";

export const env = createEnv({
clientPrefix: "NEXT_PUBLIC_",
client: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(),
NEXT_PUBLIC_SENTRY_BACKEND_DSN: z.string().optional(),
NEXT_PUBLIC_SENTRY_ENVIRONMENT: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_BASE_URL: z.string().optional()
},
runtimeEnvStrict: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT,
NEXT_PUBLIC_SENTRY_BACKEND_DSN: process.env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
NEXT_PUBLIC_SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: process.env.NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY,
Expand Down
17 changes: 16 additions & 1 deletion packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,6 @@ export const env = createEnv({
// Misc
CONFIG_MAX_REPOS_NO_TOKEN: numberSchema.default(Number.MAX_SAFE_INTEGER),
NODE_ENV: z.enum(["development", "test", "production"]),
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),
// @note: this is also declared in the Dockerfile.
POSTHOG_PAPIK: z.string().default("phc_lLPuFFi5LH6c94eFJcqvYVFwiJffVcV6HD8U4a1OnRW"),

Expand DownExpand Up@@ -274,6 +273,22 @@ export const env = createEnv({
// A comma separated list of glob patterns that shwould always be indexed regardless of their size.
ALWAYS_INDEX_FILE_PATTERNS: z.string().optional(),

/**
* Configure whether to send telemetry events.
* By default, all events are anonymized and do not contain PII data,
* unless SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED is set to true.
*/
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),

/**
* Configure whether to collect PII data in telemetry events.
* If SOURCEBOT_TELEMETRY_DISABLED is true, this setting is
* ignored.
*/
SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED: booleanSchema.default('false'),

//// DEPRECATED ////

/**
* @deprecated This setting is deprecated. Please use the `identityProviders` section of the config file instead.
*/
Expand Down
14 changes: 0 additions & 14 deletions packages/web/src/app/[domain]/components/repositoryCarousel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,20 +85,6 @@ export function RepositoryCarousel({
))}
</CarouselContent>
</Carousel>
{process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo" && (
<p className="text-sm text-muted-foreground text-center">
Interested in using Sourcebot on your code? Check out our{' '}
<a
href="https://docs.sourcebot.dev/docs/overview"
target="_blank"
rel="noopener noreferrer"
className="text-primary hover:underline"
onClick={() => captureEvent('wa_demo_docs_link_pressed', {})}
>
docs
</a>
</p>
)}
</div>
)
}
Expand Down
11 changes: 4 additions & 7 deletions packages/web/src/app/[domain]/settings/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { ServiceErrorException } from "@/lib/serviceError";
import { getOrgFromDomain } from "@/data/org";
import { OrgRole } from "@prisma/client";
import { hasEntitlement } from "@sourcebot/shared";
import { env } from "@sourcebot/shared/client";

interface LayoutProps {
children: React.ReactNode;
Expand DownExpand Up@@ -115,12 +114,10 @@ export default async function SettingsLayout(
href: `/${domain}/settings/permission-syncing`,
}
] : []),
...(env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
{
title: "License",
href: `/${domain}/settings/license`,
}
] : []),
{
title: "License",
href: `/${domain}/settings/license`,
}
]

return (
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/app/[domain]/settings/license/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,7 @@ import { Button } from "@/components/ui/button";
import { Info, Mail } from "lucide-react";
import { getOrgMembers } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { notFound, ServiceErrorException } from "@/lib/serviceError";
import { env } from "@sourcebot/shared/client";
import { ServiceErrorException } from "@/lib/serviceError";

interface LicensePageProps {
params: Promise<{
Expand All@@ -19,10 +18,6 @@ export default async function LicensePage(props: LicensePageProps) {
domain
} = params;

if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
notFound();
}

const licenseKey = getLicenseKey();
const entitlements = getEntitlements();
const plan = getPlan();
Expand Down
5 changes: 0 additions & 5 deletions packages/web/src/app/components/authSecurityNotice.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,11 +59,6 @@ export const AuthSecurityNotice = ({ closable = false }: AuthSecurityNoticeProps
return null;
}

// Only render for self-hosted deployments
if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
return null;
}

return (
<div className={`p-4 rounded-lg bg-[var(--highlight)]/10 border border-[var(--highlight)]/20 relative ${closable ? 'pr-10' : ''}`}>
{closable && (
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ export default function RootLayout({
<SessionProvider>
<PlanProvider entitlements={getEntitlements()}>
<PostHogProvider
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === "true"}
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === 'true'}
isPiiEnabled={env.SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED === 'true'}
// @note: the posthog api key doesn't need to be kept secret,
// so we are safe to send it to the client.
posthogApiKey={env.POSTHOG_PAPIK}
Expand Down
15 changes: 8 additions & 7 deletions packages/web/src/app/posthogProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ function PostHogPageView() {
interface PostHogProviderProps {
children: React.ReactNode
isDisabled: boolean
isPiiEnabled: boolean
posthogApiKey: string
sourcebotVersion: string
sourcebotInstallId: string
Expand All@@ -41,6 +42,7 @@ interface PostHogProviderProps {
export function PostHogProvider({
children,
isDisabled,
isPiiEnabled,
posthogApiKey,
sourcebotVersion,
sourcebotInstallId,
Expand All@@ -55,10 +57,10 @@ export function PostHogProvider({
person_profiles: 'identified_only',
capture_pageview: false,
autocapture: false,
// In self-hosted mode, we don't want to capture the following
// default properties.
// If PII is not enabled, we don't want to capture the following
// default properties that may contain PII.
// @see: https://posthog.com/docs/data/events#default-properties
property_denylist: env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
property_denylist: isPiiEnabled === false ? [
'$current_url',
'$pathname',
'$session_entry_url',
Expand All@@ -81,7 +83,7 @@ export function PostHogProvider({
} else {
console.debug("PostHog telemetry disabled");
}
}, [isDisabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);
}, [isDisabled, isPiiEnabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);

useEffect(() => {
if (!session) {
Expand All@@ -90,13 +92,12 @@ export function PostHogProvider({

posthog.identify(
session.user.id,
// Only include email & name when running in a cloud environment.
env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined ? {
isPiiEnabled === true ? {
email: session.user.email,
name: session.user.name,
} : undefined
);
}, [session]);
}, [isPiiEnabled, session]);

return (
<PHProvider client={posthog}>
Expand Down
Loading
, '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
2 changes: 0 additions & 2 deletions .env.development
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,5 +76,3 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
# CONFIG_MAX_REPOS_NO_TOKEN=
NODE_ENV=development
# SOURCEBOT_TENANCY_MODE=single

# NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=
87 changes: 0 additions & 87 deletions .github/workflows/_gcp-deploy.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/deploy-demo.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
# @see: https://docs.docker.com/build/building/variables/#scoping

ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_SENTRY_BACKEND_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand DownExpand Up@@ -52,8 +51,6 @@ ENV SKIP_ENV_VALIDATION=1
# -----------
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ENV NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=$NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ENV NEXT_PUBLIC_SENTRY_WEBAPP_DSN=$NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand Down
7 changes: 0 additions & 7 deletions packages/shared/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,6 @@ import { ConfigSettings } from "./types.js";

export const SOURCEBOT_SUPPORT_EMAIL = 'team@sourcebot.dev';

export const SOURCEBOT_CLOUD_ENVIRONMENT = [
"dev",
"demo",
"staging",
"prod",
] as const;

export const SOURCEBOT_UNLIMITED_SEATS = -1;

/**
Expand Down
23 changes: 0 additions & 23 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { base64Decode } from "./utils.js";
import { z } from "zod";
import { createLogger } from "./logger.js";
import { env } from "./env.server.js";
import { env as clientEnv } from "./env.client.js";
import { SOURCEBOT_SUPPORT_EMAIL, SOURCEBOT_UNLIMITED_SEATS } from "./constants.js";
import { verifySignature } from "./crypto.js";

Expand All@@ -23,8 +22,6 @@ type LicenseKeyPayload = z.infer<typeof eeLicenseKeyPayloadSchema>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const planLabels = {
oss: "OSS",
"cloud:team": "Team",
"cloud:demo": "Demo",
"self-hosted:enterprise": "Enterprise (Self-Hosted)",
"self-hosted:enterprise-unlimited": "Enterprise (Self-Hosted) Unlimited",
} as const;
Expand All@@ -49,12 +46,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
oss: [
"anonymous-access"
],
"cloud:team": [
"billing",
"multi-tenancy",
"sso",
"code-nav"
],
"self-hosted:enterprise": [
"search-contexts",
"sso",
Expand All@@ -74,12 +65,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
"github-app",
"anonymous-access"
],
// Special entitlement for https://demo.sourcebot.dev
"cloud:demo": [
"anonymous-access",
"code-nav",
"search-contexts"
],
} as const;


Expand DownExpand Up@@ -118,14 +103,6 @@ export const getLicenseKey = (): LicenseKeyPayload | null => {
}

export const getPlan = (): Plan => {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT) {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo") {
return "cloud:demo";
}

return "cloud:team";
}

const licenseKey = getLicenseKey();
if (licenseKey) {
const expiryDate = new Date(licenseKey.expiryDate);
Expand Down
3 changes: 0 additions & 3 deletions packages/shared/src/env.client.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
import { createEnv } from "@t3-oss/env-core";
import { z } from "zod";
import { SOURCEBOT_CLOUD_ENVIRONMENT } from "./constants.js";

export const env = createEnv({
clientPrefix: "NEXT_PUBLIC_",
client: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(),
NEXT_PUBLIC_SENTRY_BACKEND_DSN: z.string().optional(),
NEXT_PUBLIC_SENTRY_ENVIRONMENT: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_BASE_URL: z.string().optional()
},
runtimeEnvStrict: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT,
NEXT_PUBLIC_SENTRY_BACKEND_DSN: process.env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
NEXT_PUBLIC_SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: process.env.NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY,
Expand Down
17 changes: 16 additions & 1 deletion packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,6 @@ export const env = createEnv({
// Misc
CONFIG_MAX_REPOS_NO_TOKEN: numberSchema.default(Number.MAX_SAFE_INTEGER),
NODE_ENV: z.enum(["development", "test", "production"]),
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),
// @note: this is also declared in the Dockerfile.
POSTHOG_PAPIK: z.string().default("phc_lLPuFFi5LH6c94eFJcqvYVFwiJffVcV6HD8U4a1OnRW"),

Expand DownExpand Up@@ -274,6 +273,22 @@ export const env = createEnv({
// A comma separated list of glob patterns that shwould always be indexed regardless of their size.
ALWAYS_INDEX_FILE_PATTERNS: z.string().optional(),

/**
* Configure whether to send telemetry events.
* By default, all events are anonymized and do not contain PII data,
* unless SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED is set to true.
*/
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),

/**
* Configure whether to collect PII data in telemetry events.
* If SOURCEBOT_TELEMETRY_DISABLED is true, this setting is
* ignored.
*/
SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED: booleanSchema.default('false'),

//// DEPRECATED ////

/**
* @deprecated This setting is deprecated. Please use the `identityProviders` section of the config file instead.
*/
Expand Down
14 changes: 0 additions & 14 deletions packages/web/src/app/[domain]/components/repositoryCarousel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,20 +85,6 @@ export function RepositoryCarousel({
))}
</CarouselContent>
</Carousel>
{process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo" && (
<p className="text-sm text-muted-foreground text-center">
Interested in using Sourcebot on your code? Check out our{' '}
<a
href="https://docs.sourcebot.dev/docs/overview"
target="_blank"
rel="noopener noreferrer"
className="text-primary hover:underline"
onClick={() => captureEvent('wa_demo_docs_link_pressed', {})}
>
docs
</a>
</p>
)}
</div>
)
}
Expand Down
11 changes: 4 additions & 7 deletions packages/web/src/app/[domain]/settings/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { ServiceErrorException } from "@/lib/serviceError";
import { getOrgFromDomain } from "@/data/org";
import { OrgRole } from "@prisma/client";
import { hasEntitlement } from "@sourcebot/shared";
import { env } from "@sourcebot/shared/client";

interface LayoutProps {
children: React.ReactNode;
Expand DownExpand Up@@ -115,12 +114,10 @@ export default async function SettingsLayout(
href: `/${domain}/settings/permission-syncing`,
}
] : []),
...(env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
{
title: "License",
href: `/${domain}/settings/license`,
}
] : []),
{
title: "License",
href: `/${domain}/settings/license`,
}
]

return (
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/app/[domain]/settings/license/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,7 @@ import { Button } from "@/components/ui/button";
import { Info, Mail } from "lucide-react";
import { getOrgMembers } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { notFound, ServiceErrorException } from "@/lib/serviceError";
import { env } from "@sourcebot/shared/client";
import { ServiceErrorException } from "@/lib/serviceError";

interface LicensePageProps {
params: Promise<{
Expand All@@ -19,10 +18,6 @@ export default async function LicensePage(props: LicensePageProps) {
domain
} = params;

if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
notFound();
}

const licenseKey = getLicenseKey();
const entitlements = getEntitlements();
const plan = getPlan();
Expand Down
5 changes: 0 additions & 5 deletions packages/web/src/app/components/authSecurityNotice.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,11 +59,6 @@ export const AuthSecurityNotice = ({ closable = false }: AuthSecurityNoticeProps
return null;
}

// Only render for self-hosted deployments
if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
return null;
}

return (
<div className={`p-4 rounded-lg bg-[var(--highlight)]/10 border border-[var(--highlight)]/20 relative ${closable ? 'pr-10' : ''}`}>
{closable && (
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ export default function RootLayout({
<SessionProvider>
<PlanProvider entitlements={getEntitlements()}>
<PostHogProvider
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === "true"}
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === 'true'}
isPiiEnabled={env.SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED === 'true'}
// @note: the posthog api key doesn't need to be kept secret,
// so we are safe to send it to the client.
posthogApiKey={env.POSTHOG_PAPIK}
Expand Down
15 changes: 8 additions & 7 deletions packages/web/src/app/posthogProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ function PostHogPageView() {
interface PostHogProviderProps {
children: React.ReactNode
isDisabled: boolean
isPiiEnabled: boolean
posthogApiKey: string
sourcebotVersion: string
sourcebotInstallId: string
Expand All@@ -41,6 +42,7 @@ interface PostHogProviderProps {
export function PostHogProvider({
children,
isDisabled,
isPiiEnabled,
posthogApiKey,
sourcebotVersion,
sourcebotInstallId,
Expand All@@ -55,10 +57,10 @@ export function PostHogProvider({
person_profiles: 'identified_only',
capture_pageview: false,
autocapture: false,
// In self-hosted mode, we don't want to capture the following
// default properties.
// If PII is not enabled, we don't want to capture the following
// default properties that may contain PII.
// @see: https://posthog.com/docs/data/events#default-properties
property_denylist: env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
property_denylist: isPiiEnabled === false ? [
'$current_url',
'$pathname',
'$session_entry_url',
Expand All@@ -81,7 +83,7 @@ export function PostHogProvider({
} else {
console.debug("PostHog telemetry disabled");
}
}, [isDisabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);
}, [isDisabled, isPiiEnabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);

useEffect(() => {
if (!session) {
Expand All@@ -90,13 +92,12 @@ export function PostHogProvider({

posthog.identify(
session.user.id,
// Only include email & name when running in a cloud environment.
env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined ? {
isPiiEnabled === true ? {
email: session.user.email,
name: session.user.name,
} : undefined
);
}, [session]);
}, [isPiiEnabled, session]);

return (
<PHProvider client={posthog}>
Expand Down
Loading
, '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
2 changes: 0 additions & 2 deletions .env.development
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,5 +76,3 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
# CONFIG_MAX_REPOS_NO_TOKEN=
NODE_ENV=development
# SOURCEBOT_TENANCY_MODE=single

# NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=
87 changes: 0 additions & 87 deletions .github/workflows/_gcp-deploy.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/deploy-demo.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
# @see: https://docs.docker.com/build/building/variables/#scoping

ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_SENTRY_BACKEND_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand DownExpand Up@@ -52,8 +51,6 @@ ENV SKIP_ENV_VALIDATION=1
# -----------
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ENV NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=$NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ENV NEXT_PUBLIC_SENTRY_WEBAPP_DSN=$NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand Down
7 changes: 0 additions & 7 deletions packages/shared/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,6 @@ import { ConfigSettings } from "./types.js";

export const SOURCEBOT_SUPPORT_EMAIL = 'team@sourcebot.dev';

export const SOURCEBOT_CLOUD_ENVIRONMENT = [
"dev",
"demo",
"staging",
"prod",
] as const;

export const SOURCEBOT_UNLIMITED_SEATS = -1;

/**
Expand Down
23 changes: 0 additions & 23 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { base64Decode } from "./utils.js";
import { z } from "zod";
import { createLogger } from "./logger.js";
import { env } from "./env.server.js";
import { env as clientEnv } from "./env.client.js";
import { SOURCEBOT_SUPPORT_EMAIL, SOURCEBOT_UNLIMITED_SEATS } from "./constants.js";
import { verifySignature } from "./crypto.js";

Expand All@@ -23,8 +22,6 @@ type LicenseKeyPayload = z.infer<typeof eeLicenseKeyPayloadSchema>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const planLabels = {
oss: "OSS",
"cloud:team": "Team",
"cloud:demo": "Demo",
"self-hosted:enterprise": "Enterprise (Self-Hosted)",
"self-hosted:enterprise-unlimited": "Enterprise (Self-Hosted) Unlimited",
} as const;
Expand All@@ -49,12 +46,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
oss: [
"anonymous-access"
],
"cloud:team": [
"billing",
"multi-tenancy",
"sso",
"code-nav"
],
"self-hosted:enterprise": [
"search-contexts",
"sso",
Expand All@@ -74,12 +65,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
"github-app",
"anonymous-access"
],
// Special entitlement for https://demo.sourcebot.dev
"cloud:demo": [
"anonymous-access",
"code-nav",
"search-contexts"
],
} as const;


Expand DownExpand Up@@ -118,14 +103,6 @@ export const getLicenseKey = (): LicenseKeyPayload | null => {
}

export const getPlan = (): Plan => {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT) {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo") {
return "cloud:demo";
}

return "cloud:team";
}

const licenseKey = getLicenseKey();
if (licenseKey) {
const expiryDate = new Date(licenseKey.expiryDate);
Expand Down
3 changes: 0 additions & 3 deletions packages/shared/src/env.client.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
import { createEnv } from "@t3-oss/env-core";
import { z } from "zod";
import { SOURCEBOT_CLOUD_ENVIRONMENT } from "./constants.js";

export const env = createEnv({
clientPrefix: "NEXT_PUBLIC_",
client: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(),
NEXT_PUBLIC_SENTRY_BACKEND_DSN: z.string().optional(),
NEXT_PUBLIC_SENTRY_ENVIRONMENT: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_BASE_URL: z.string().optional()
},
runtimeEnvStrict: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT,
NEXT_PUBLIC_SENTRY_BACKEND_DSN: process.env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
NEXT_PUBLIC_SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: process.env.NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY,
Expand Down
17 changes: 16 additions & 1 deletion packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,6 @@ export const env = createEnv({
// Misc
CONFIG_MAX_REPOS_NO_TOKEN: numberSchema.default(Number.MAX_SAFE_INTEGER),
NODE_ENV: z.enum(["development", "test", "production"]),
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),
// @note: this is also declared in the Dockerfile.
POSTHOG_PAPIK: z.string().default("phc_lLPuFFi5LH6c94eFJcqvYVFwiJffVcV6HD8U4a1OnRW"),

Expand DownExpand Up@@ -274,6 +273,22 @@ export const env = createEnv({
// A comma separated list of glob patterns that shwould always be indexed regardless of their size.
ALWAYS_INDEX_FILE_PATTERNS: z.string().optional(),

/**
* Configure whether to send telemetry events.
* By default, all events are anonymized and do not contain PII data,
* unless SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED is set to true.
*/
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),

/**
* Configure whether to collect PII data in telemetry events.
* If SOURCEBOT_TELEMETRY_DISABLED is true, this setting is
* ignored.
*/
SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED: booleanSchema.default('false'),

//// DEPRECATED ////

/**
* @deprecated This setting is deprecated. Please use the `identityProviders` section of the config file instead.
*/
Expand Down
14 changes: 0 additions & 14 deletions packages/web/src/app/[domain]/components/repositoryCarousel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,20 +85,6 @@ export function RepositoryCarousel({
))}
</CarouselContent>
</Carousel>
{process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo" && (
<p className="text-sm text-muted-foreground text-center">
Interested in using Sourcebot on your code? Check out our{' '}
<a
href="https://docs.sourcebot.dev/docs/overview"
target="_blank"
rel="noopener noreferrer"
className="text-primary hover:underline"
onClick={() => captureEvent('wa_demo_docs_link_pressed', {})}
>
docs
</a>
</p>
)}
</div>
)
}
Expand Down
11 changes: 4 additions & 7 deletions packages/web/src/app/[domain]/settings/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { ServiceErrorException } from "@/lib/serviceError";
import { getOrgFromDomain } from "@/data/org";
import { OrgRole } from "@prisma/client";
import { hasEntitlement } from "@sourcebot/shared";
import { env } from "@sourcebot/shared/client";

interface LayoutProps {
children: React.ReactNode;
Expand DownExpand Up@@ -115,12 +114,10 @@ export default async function SettingsLayout(
href: `/${domain}/settings/permission-syncing`,
}
] : []),
...(env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
{
title: "License",
href: `/${domain}/settings/license`,
}
] : []),
{
title: "License",
href: `/${domain}/settings/license`,
}
]

return (
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/app/[domain]/settings/license/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,7 @@ import { Button } from "@/components/ui/button";
import { Info, Mail } from "lucide-react";
import { getOrgMembers } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { notFound, ServiceErrorException } from "@/lib/serviceError";
import { env } from "@sourcebot/shared/client";
import { ServiceErrorException } from "@/lib/serviceError";

interface LicensePageProps {
params: Promise<{
Expand All@@ -19,10 +18,6 @@ export default async function LicensePage(props: LicensePageProps) {
domain
} = params;

if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
notFound();
}

const licenseKey = getLicenseKey();
const entitlements = getEntitlements();
const plan = getPlan();
Expand Down
5 changes: 0 additions & 5 deletions packages/web/src/app/components/authSecurityNotice.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,11 +59,6 @@ export const AuthSecurityNotice = ({ closable = false }: AuthSecurityNoticeProps
return null;
}

// Only render for self-hosted deployments
if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
return null;
}

return (
<div className={`p-4 rounded-lg bg-[var(--highlight)]/10 border border-[var(--highlight)]/20 relative ${closable ? 'pr-10' : ''}`}>
{closable && (
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ export default function RootLayout({
<SessionProvider>
<PlanProvider entitlements={getEntitlements()}>
<PostHogProvider
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === "true"}
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === 'true'}
isPiiEnabled={env.SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED === 'true'}
// @note: the posthog api key doesn't need to be kept secret,
// so we are safe to send it to the client.
posthogApiKey={env.POSTHOG_PAPIK}
Expand Down
15 changes: 8 additions & 7 deletions packages/web/src/app/posthogProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ function PostHogPageView() {
interface PostHogProviderProps {
children: React.ReactNode
isDisabled: boolean
isPiiEnabled: boolean
posthogApiKey: string
sourcebotVersion: string
sourcebotInstallId: string
Expand All@@ -41,6 +42,7 @@ interface PostHogProviderProps {
export function PostHogProvider({
children,
isDisabled,
isPiiEnabled,
posthogApiKey,
sourcebotVersion,
sourcebotInstallId,
Expand All@@ -55,10 +57,10 @@ export function PostHogProvider({
person_profiles: 'identified_only',
capture_pageview: false,
autocapture: false,
// In self-hosted mode, we don't want to capture the following
// default properties.
// If PII is not enabled, we don't want to capture the following
// default properties that may contain PII.
// @see: https://posthog.com/docs/data/events#default-properties
property_denylist: env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
property_denylist: isPiiEnabled === false ? [
'$current_url',
'$pathname',
'$session_entry_url',
Expand All@@ -81,7 +83,7 @@ export function PostHogProvider({
} else {
console.debug("PostHog telemetry disabled");
}
}, [isDisabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);
}, [isDisabled, isPiiEnabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);

useEffect(() => {
if (!session) {
Expand All@@ -90,13 +92,12 @@ export function PostHogProvider({

posthog.identify(
session.user.id,
// Only include email & name when running in a cloud environment.
env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined ? {
isPiiEnabled === true ? {
email: session.user.email,
name: session.user.name,
} : undefined
);
}, [session]);
}, [isPiiEnabled, session]);

return (
<PHProvider client={posthog}>
Expand Down
Loading
, '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
2 changes: 0 additions & 2 deletions .env.development
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,5 +76,3 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
# CONFIG_MAX_REPOS_NO_TOKEN=
NODE_ENV=development
# SOURCEBOT_TENANCY_MODE=single

# NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=
87 changes: 0 additions & 87 deletions .github/workflows/_gcp-deploy.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/deploy-demo.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
# @see: https://docs.docker.com/build/building/variables/#scoping

ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_SENTRY_BACKEND_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand DownExpand Up@@ -52,8 +51,6 @@ ENV SKIP_ENV_VALIDATION=1
# -----------
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ENV NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=$NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ENV NEXT_PUBLIC_SENTRY_WEBAPP_DSN=$NEXT_PUBLIC_SENTRY_WEBAPP_DSN
ARG NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY
Expand Down
7 changes: 0 additions & 7 deletions packages/shared/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,6 @@ import { ConfigSettings } from "./types.js";

export const SOURCEBOT_SUPPORT_EMAIL = 'team@sourcebot.dev';

export const SOURCEBOT_CLOUD_ENVIRONMENT = [
"dev",
"demo",
"staging",
"prod",
] as const;

export const SOURCEBOT_UNLIMITED_SEATS = -1;

/**
Expand Down
23 changes: 0 additions & 23 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { base64Decode } from "./utils.js";
import { z } from "zod";
import { createLogger } from "./logger.js";
import { env } from "./env.server.js";
import { env as clientEnv } from "./env.client.js";
import { SOURCEBOT_SUPPORT_EMAIL, SOURCEBOT_UNLIMITED_SEATS } from "./constants.js";
import { verifySignature } from "./crypto.js";

Expand All@@ -23,8 +22,6 @@ type LicenseKeyPayload = z.infer<typeof eeLicenseKeyPayloadSchema>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const planLabels = {
oss: "OSS",
"cloud:team": "Team",
"cloud:demo": "Demo",
"self-hosted:enterprise": "Enterprise (Self-Hosted)",
"self-hosted:enterprise-unlimited": "Enterprise (Self-Hosted) Unlimited",
} as const;
Expand All@@ -49,12 +46,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
oss: [
"anonymous-access"
],
"cloud:team": [
"billing",
"multi-tenancy",
"sso",
"code-nav"
],
"self-hosted:enterprise": [
"search-contexts",
"sso",
Expand All@@ -74,12 +65,6 @@ const entitlementsByPlan: Record<Plan, Entitlement[]> = {
"github-app",
"anonymous-access"
],
// Special entitlement for https://demo.sourcebot.dev
"cloud:demo": [
"anonymous-access",
"code-nav",
"search-contexts"
],
} as const;


Expand DownExpand Up@@ -118,14 +103,6 @@ export const getLicenseKey = (): LicenseKeyPayload | null => {
}

export const getPlan = (): Plan => {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT) {
if (clientEnv.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo") {
return "cloud:demo";
}

return "cloud:team";
}

const licenseKey = getLicenseKey();
if (licenseKey) {
const expiryDate = new Date(licenseKey.expiryDate);
Expand Down
3 changes: 0 additions & 3 deletions packages/shared/src/env.client.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
import { createEnv } from "@t3-oss/env-core";
import { z } from "zod";
import { SOURCEBOT_CLOUD_ENVIRONMENT } from "./constants.js";

export const env = createEnv({
clientPrefix: "NEXT_PUBLIC_",
client: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(),
NEXT_PUBLIC_SENTRY_BACKEND_DSN: z.string().optional(),
NEXT_PUBLIC_SENTRY_ENVIRONMENT: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: z.string().optional(),
NEXT_PUBLIC_LANGFUSE_BASE_URL: z.string().optional()
},
runtimeEnvStrict: {
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT,
NEXT_PUBLIC_SENTRY_BACKEND_DSN: process.env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
NEXT_PUBLIC_SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: process.env.NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY,
Expand Down
17 changes: 16 additions & 1 deletion packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,6 @@ export const env = createEnv({
// Misc
CONFIG_MAX_REPOS_NO_TOKEN: numberSchema.default(Number.MAX_SAFE_INTEGER),
NODE_ENV: z.enum(["development", "test", "production"]),
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),
// @note: this is also declared in the Dockerfile.
POSTHOG_PAPIK: z.string().default("phc_lLPuFFi5LH6c94eFJcqvYVFwiJffVcV6HD8U4a1OnRW"),

Expand DownExpand Up@@ -274,6 +273,22 @@ export const env = createEnv({
// A comma separated list of glob patterns that shwould always be indexed regardless of their size.
ALWAYS_INDEX_FILE_PATTERNS: z.string().optional(),

/**
* Configure whether to send telemetry events.
* By default, all events are anonymized and do not contain PII data,
* unless SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED is set to true.
*/
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default('false'),

/**
* Configure whether to collect PII data in telemetry events.
* If SOURCEBOT_TELEMETRY_DISABLED is true, this setting is
* ignored.
*/
SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED: booleanSchema.default('false'),

//// DEPRECATED ////

/**
* @deprecated This setting is deprecated. Please use the `identityProviders` section of the config file instead.
*/
Expand Down
14 changes: 0 additions & 14 deletions packages/web/src/app/[domain]/components/repositoryCarousel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,20 +85,6 @@ export function RepositoryCarousel({
))}
</CarouselContent>
</Carousel>
{process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === "demo" && (
<p className="text-sm text-muted-foreground text-center">
Interested in using Sourcebot on your code? Check out our{' '}
<a
href="https://docs.sourcebot.dev/docs/overview"
target="_blank"
rel="noopener noreferrer"
className="text-primary hover:underline"
onClick={() => captureEvent('wa_demo_docs_link_pressed', {})}
>
docs
</a>
</p>
)}
</div>
)
}
Expand Down
11 changes: 4 additions & 7 deletions packages/web/src/app/[domain]/settings/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ import { ServiceErrorException } from "@/lib/serviceError";
import { getOrgFromDomain } from "@/data/org";
import { OrgRole } from "@prisma/client";
import { hasEntitlement } from "@sourcebot/shared";
import { env } from "@sourcebot/shared/client";

interface LayoutProps {
children: React.ReactNode;
Expand DownExpand Up@@ -115,12 +114,10 @@ export default async function SettingsLayout(
href: `/${domain}/settings/permission-syncing`,
}
] : []),
...(env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
{
title: "License",
href: `/${domain}/settings/license`,
}
] : []),
{
title: "License",
href: `/${domain}/settings/license`,
}
]

return (
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/app/[domain]/settings/license/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,7 @@ import { Button } from "@/components/ui/button";
import { Info, Mail } from "lucide-react";
import { getOrgMembers } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { notFound, ServiceErrorException } from "@/lib/serviceError";
import { env } from "@sourcebot/shared/client";
import { ServiceErrorException } from "@/lib/serviceError";

interface LicensePageProps {
params: Promise<{
Expand All@@ -19,10 +18,6 @@ export default async function LicensePage(props: LicensePageProps) {
domain
} = params;

if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
notFound();
}

const licenseKey = getLicenseKey();
const entitlements = getEntitlements();
const plan = getPlan();
Expand Down
5 changes: 0 additions & 5 deletions packages/web/src/app/components/authSecurityNotice.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,11 +59,6 @@ export const AuthSecurityNotice = ({ closable = false }: AuthSecurityNoticeProps
return null;
}

// Only render for self-hosted deployments
if (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined) {
return null;
}

return (
<div className={`p-4 rounded-lg bg-[var(--highlight)]/10 border border-[var(--highlight)]/20 relative ${closable ? 'pr-10' : ''}`}>
{closable && (
Expand Down
3 changes: 2 additions & 1 deletion packages/web/src/app/layout.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,8 @@ export default function RootLayout({
<SessionProvider>
<PlanProvider entitlements={getEntitlements()}>
<PostHogProvider
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === "true"}
isDisabled={env.SOURCEBOT_TELEMETRY_DISABLED === 'true'}
isPiiEnabled={env.SOURCEBOT_TELEMETRY_PII_COLLECTION_ENABLED === 'true'}
// @note: the posthog api key doesn't need to be kept secret,
// so we are safe to send it to the client.
posthogApiKey={env.POSTHOG_PAPIK}
Expand Down
15 changes: 8 additions & 7 deletions packages/web/src/app/posthogProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ function PostHogPageView() {
interface PostHogProviderProps {
children: React.ReactNode
isDisabled: boolean
isPiiEnabled: boolean
posthogApiKey: string
sourcebotVersion: string
sourcebotInstallId: string
Expand All@@ -41,6 +42,7 @@ interface PostHogProviderProps {
export function PostHogProvider({
children,
isDisabled,
isPiiEnabled,
posthogApiKey,
sourcebotVersion,
sourcebotInstallId,
Expand All@@ -55,10 +57,10 @@ export function PostHogProvider({
person_profiles: 'identified_only',
capture_pageview: false,
autocapture: false,
// In self-hosted mode, we don't want to capture the following
// default properties.
// If PII is not enabled, we don't want to capture the following
// default properties that may contain PII.
// @see: https://posthog.com/docs/data/events#default-properties
property_denylist: env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT === undefined ? [
property_denylist: isPiiEnabled === false ? [
'$current_url',
'$pathname',
'$session_entry_url',
Expand All@@ -81,7 +83,7 @@ export function PostHogProvider({
} else {
console.debug("PostHog telemetry disabled");
}
}, [isDisabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);
}, [isDisabled, isPiiEnabled, posthogApiKey, sourcebotInstallId, sourcebotVersion]);

useEffect(() => {
if (!session) {
Expand All@@ -90,13 +92,12 @@ export function PostHogProvider({

posthog.identify(
session.user.id,
// Only include email & name when running in a cloud environment.
env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined ? {
isPiiEnabled === true ? {
email: session.user.email,
name: session.user.name,
} : undefined
);
}, [session]);
}, [isPiiEnabled, session]);

return (
<PHProvider client={posthog}>
Expand Down
Loading