[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable#1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 3 commits into from
May 28, 2026
+196 −134
Merged

[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a00b737
s
brendan-kellam May 28, 2026
875a0e0
feedback
brendan-kellam May 28, 2026
52db56f
Merge branch 'v5' into bkellam/existing-customer
brendan-kellam May 28, 2026
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
4 changes: 4 additions & 0 deletions packages/web/src/app/(app)/components/banners/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
import { cookies } from 'next/headers';
import { DISMISS_COOKIE_PREFIX, type BannerId } from './types';
import { compareVersions, formatVersion, parseVersion } from "@sourcebot/shared/client";
import { createLogger } from "@sourcebot/shared";

const logger = createLogger("banner-actions");

// eslint-disable-next-line authz/require-auth-wrapper
export async function dismissBanner(id: BannerId) {
Expand DownExpand Up@@ -32,6 +35,7 @@ export async function tryGetLatestSourcebotTag({ timeoutMs }: { timeoutMs: numbe
signal: AbortSignal.timeout(timeoutMs),
});
if (!response.ok) {
logger.warn(`Failed to fetch Sourcebot version information. Status code: ${response.status}, status text: ${response.statusText}`);
return null;
}
const data = (await response.json()) as { name: string }[];
Expand Down
57 changes: 31 additions & 26 deletions packages/web/src/app/(app)/layout.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import { ConnectAccountsCard } from "@/ee/features/sso/components/connectAccount
import { SidebarProvider } from "@/components/ui/sidebar";
import { CheckoutReturnHandler } from "@/ee/features/lighthouse/checkoutReturnHandler";
import { RoleProvider } from "@/features/auth/roleProvider";
import { HasLicenseProvider } from "@/ee/features/lighthouse/hasLicenseProvider";
import { tryGetLatestSourcebotTag } from "./components/banners/actions";

interface LayoutProps {
Expand DownExpand Up@@ -170,37 +171,41 @@ export default async function Layout(props: LayoutProps) {
: await __unsafePrisma.license.findUnique({ where: { orgId: org.id } });

const latestVersion = await tryGetLatestSourcebotTag({
timeoutMs: 3000
});
timeoutMs: 3000
});

return (
<RoleProvider role={role}>
<SyntaxGuideProvider>
<div className="fixed inset-0 flex bg-shell">
<SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
{sidebar}
<div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
<div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
<BannerSlot
role={role}
license={license}
offlineLicense={offlineLicense}
hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
hasPendingFirstSync={hasPendingFirstSync}
currentVersion={SOURCEBOT_VERSION}
latestVersion={latestVersion}
/>
<div className="flex-1 min-h-0 overflow-y-auto">
{children}
<HasLicenseProvider
hasLicense={offlineLicense !== null || license !== null}
>
<SyntaxGuideProvider>
<div className="fixed inset-0 flex bg-shell">
<SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
{sidebar}
<div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
<div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
<BannerSlot
role={role}
license={license}
offlineLicense={offlineLicense}
hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
hasPendingFirstSync={hasPendingFirstSync}
currentVersion={SOURCEBOT_VERSION}
latestVersion={latestVersion}
/>
<div className="flex-1 min-h-0 overflow-y-auto">
{children}
</div>
</div>
</div>
</div>
</SidebarProvider>
</div>
<SyntaxReferenceGuide />
<GitHubStarToast />
<CheckoutReturnHandler userEmail={session?.user.email} />
</SyntaxGuideProvider>
</SidebarProvider>
</div>
<SyntaxReferenceGuide />
<GitHubStarToast />
<CheckoutReturnHandler />
</SyntaxGuideProvider>
</HasLicenseProvider>
</RoleProvider>
)
}
2 changes: 1 addition & 1 deletion packages/web/src/app/onboard/components/trialStep.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ export function TrialStep({ stepIndex }: TrialStepProps) {
<CheckoutDisclosures
sessionEmail={sessionEmail}
onEmailChanged={setCurrentEmail}
showNoCreditCardRequired={isTrialEligible && !offers.trial.creditCardRequired}
isNoCreditCardRequiredMessageVisible={isTrialEligible && !offers.trial.creditCardRequired}
/>
<LoadingButton
variant="link"
Expand Down
8 changes: 8 additions & 0 deletions packages/web/src/ee/features/lighthouse/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,13 @@ export const createCheckoutSession = async ({
});
const quantity = Math.max(memberCount, 1);

const existingLicense = await prisma.license.findUnique({
where: { orgId: org.id },
});
const existingActivationCode = existingLicense
? decryptActivationCode(existingLicense.activationCode)
: undefined;

// Resolve the candidate against AUTH_URL so absolute paths, protocol-
// relative paths (`//evil.com`), and bare relative paths all get
// normalized through the URL parser. Reject anything that lands off-
Expand DownExpand Up@@ -210,6 +217,7 @@ export const createCheckoutSession = async ({
interval,
successUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}${successQuerySeparator}${stripeSuccessQuery}`,
cancelUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}`,
existingActivationCode,
});

if (isServiceError(result)) {
Expand Down
153 changes: 84 additions & 69 deletions packages/web/src/ee/features/lighthouse/checkoutDisclosures.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@ const emailFormSchema = z.object({
interface CheckoutDisclosuresProps {
sessionEmail: string;
onEmailChanged: (email: string) => void;
showNoCreditCardRequired?: boolean;
isEmailValidationMessageVisible?: boolean;
isNoCreditCardRequiredMessageVisible?: boolean;
}

export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCreditCardRequired }: CheckoutDisclosuresProps) => {
export const CheckoutDisclosures = ({
sessionEmail,
onEmailChanged,
isNoCreditCardRequiredMessageVisible = false,
isEmailValidationMessageVisible = true,
}: CheckoutDisclosuresProps) => {
const [isEditing, setIsEditing] = useState(false);

const form = useForm<z.infer<typeof emailFormSchema>>({
Expand DownExpand Up@@ -62,78 +68,87 @@ export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCredit
setIsEditing(false);
};

if (
!isNoCreditCardRequiredMessageVisible &&
!isEmailValidationMessageVisible
) {
return null;
}

return (
<div className="text-xs text-muted-foreground text-center space-y-1">
{sessionEmail && (
<div className="inline-flex flex-wrap items-center justify-center gap-x-2 gap-y-1">
{showNoCreditCardRequired && (
<>
<span>No credit card required</span>
<span aria-hidden="true" className="text-muted-foreground/50">·</span>
</>
{isNoCreditCardRequiredMessageVisible && (
<span>No credit card required</span>
)}
{(isNoCreditCardRequiredMessageVisible && isEmailValidationMessageVisible) && (
<span aria-hidden="true" className="text-muted-foreground/50">·</span>
)}
{isEmailValidationMessageVisible && (
<span className="inline-flex items-center gap-1.5">
<span>Your activation code will be sent to</span>
{isEditing ? (
<Form {...form}>
<FormField
control={form.control}
name="email"
render={({ field }) => (
<FormItem className="space-y-0">
<FormControl>
<input
{...field}
type="email"
autoComplete="off"
data-1p-ignore="true"
data-lpignore="true"
data-form-type="other"
data-bwignore="true"
onKeyDown={(e) => {
if (e.key === "Enter") {
e.preventDefault();
commit();
} else if (e.key === "Escape") {
revertAndExit();
}
}}
aria-invalid={!isValid}
className={cn(
"bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
!isValid && "text-destructive",
)}
style={{ fontWeight: 500 }}
/>
</FormControl>
</FormItem>
)}
/>
<button
type="button"
onClick={commit}
disabled={!isValid}
className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
aria-label="Save email (press Escape to cancel)"
title="Press Escape to cancel"
>
<Save className="h-3 w-3" />
</button>
</Form>
) : (
<>
<span className="font-medium text-foreground">{email}</span>
<button
type="button"
onClick={() => setIsEditing(true)}
className="text-muted-foreground hover:text-foreground"
aria-label="Edit email"
>
<Pencil className="h-3 w-3" />
</button>
</>
)}
</span>
)}
<span className="inline-flex items-center gap-1.5">
<span>Your activation code will be sent to</span>
{isEditing ? (
<Form {...form}>
<FormField
control={form.control}
name="email"
render={({ field }) => (
<FormItem className="space-y-0">
<FormControl>
<input
{...field}
type="email"
autoComplete="off"
data-1p-ignore="true"
data-lpignore="true"
data-form-type="other"
data-bwignore="true"
onKeyDown={(e) => {
if (e.key === "Enter") {
e.preventDefault();
commit();
} else if (e.key === "Escape") {
revertAndExit();
}
}}
aria-invalid={!isValid}
className={cn(
"bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
!isValid && "text-destructive",
)}
style={{ fontWeight: 500 }}
/>
</FormControl>
</FormItem>
)}
/>
<button
type="button"
onClick={commit}
disabled={!isValid}
className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
aria-label="Save email (press Escape to cancel)"
title="Press Escape to cancel"
>
<Save className="h-3 w-3" />
</button>
</Form>
) : (
<>
<span className="font-medium text-foreground">{email}</span>
<button
type="button"
onClick={() => setIsEditing(true)}
className="text-muted-foreground hover:text-foreground"
aria-label="Edit email"
>
<Pencil className="h-3 w-3" />
</button>
</>
)}
</span>
</div>
)}
</div>
Expand Down
8 changes: 2 additions & 6 deletions packages/web/src/ee/features/lighthouse/checkoutReturnHandler.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,21 +3,17 @@
import { useSearchParams } from "next/navigation";
import { LicenseActivactionDialog } from "./licenseActivactionDialog";

interface PostCheckoutHandlerProps {
userEmail?: string | null;
}

// Layout-mounted handler that drives the post-Stripe activation flow regardless
// of which page the user lands on after checkout. Detects `session_id` in the
// URL (set by Stripe's substitution of `{CHECKOUT_SESSION_ID}` in successUrl),
// and renders the claim + activate modal when present.
export function CheckoutReturnHandler({ userEmail }: PostCheckoutHandlerProps) {
export function CheckoutReturnHandler() {
const searchParams = useSearchParams();
const sessionId = searchParams.get("session_id");

if (!sessionId) {
return null;
}

return <LicenseActivactionDialog userEmail={userEmail} />;
return <LicenseActivactionDialog />;
}
16 changes: 16 additions & 0 deletions packages/web/src/ee/features/lighthouse/hasLicenseProvider.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'use client';

import { createContext, useContext } from "react";

const HasLicenseContext = createContext<boolean>(false);

interface HasLicenseProviderProps {
children: React.ReactNode;
hasLicense: boolean;
}

export const HasLicenseProvider = ({ children, hasLicense }: HasLicenseProviderProps) => (
<HasLicenseContext.Provider value={hasLicense}>{children}</HasLicenseContext.Provider>
);

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

Skip to content
[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable#1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 3 commits into

from

May 28, 2026

+196

−134

 Merged


[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable
#1239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a00b737

s


brendan-kellam May 28, 2026
875a0e0

feedback


brendan-kellam May 28, 2026
52db56f

Merge branch 'v5' into bkellam/existing-customer


brendan-kellam May 28, 2026

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


4 changes: 4 additions & 0 deletions
packages/web/src/app/(app)/components/banners/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
import { cookies } from 'next/headers';
import { DISMISS_COOKIE_PREFIX, type BannerId } from './types';
import { compareVersions, formatVersion, parseVersion } from "@sourcebot/shared/client";
import { createLogger } from "@sourcebot/shared";

const logger = createLogger("banner-actions");

// eslint-disable-next-line authz/require-auth-wrapper
export async function dismissBanner(id: BannerId) {
Expand DownExpand Up@@ -32,6 +35,7 @@ export async function tryGetLatestSourcebotTag({ timeoutMs }: { timeoutMs: numbe
 signal: AbortSignal.timeout(timeoutMs),
 });
 if (!response.ok) {
 logger.warn(`Failed to fetch Sourcebot version information. Status code: ${response.status}, status text: ${response.statusText}`);
 return null;
 }
 const data = (await response.json()) as { name: string }[];
Expand Down

57 changes: 31 additions & 26 deletions
packages/web/src/app/(app)/layout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import { ConnectAccountsCard } from "@/ee/features/sso/components/connectAccount
import { SidebarProvider } from "@/components/ui/sidebar";
import { CheckoutReturnHandler } from "@/ee/features/lighthouse/checkoutReturnHandler";
import { RoleProvider } from "@/features/auth/roleProvider";
import { HasLicenseProvider } from "@/ee/features/lighthouse/hasLicenseProvider";
import { tryGetLatestSourcebotTag } from "./components/banners/actions";

interface LayoutProps {
Expand DownExpand Up@@ -170,37 +171,41 @@ export default async function Layout(props: LayoutProps) {
 : await __unsafePrisma.license.findUnique({ where: { orgId: org.id } });

 const latestVersion = await tryGetLatestSourcebotTag({
timeoutMs: 3000
});
 timeoutMs: 3000
 });

 return (
 <RoleProvider role={role}>
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 <HasLicenseProvider
 hasLicense={offlineLicense !== null || license !== null}
 >
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 </div>
 </div>
 </div>
 </div>
 </SidebarProvider>
</div>
<SyntaxReferenceGuide />
<GitHubStarToast />
 <CheckoutReturnHandler userEmail={session?.user.email} />
 </SyntaxGuideProvider>
 </SidebarProvider>
 </div>
 <SyntaxReferenceGuide />
 <GitHubStarToast />
 <CheckoutReturnHandler />
 </SyntaxGuideProvider>
 </HasLicenseProvider>
 </RoleProvider>
 )
}

2 changes: 1 addition & 1 deletion
packages/web/src/app/onboard/components/trialStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ export function TrialStep({ stepIndex }: TrialStepProps) {
 <CheckoutDisclosures
 sessionEmail={sessionEmail}
 onEmailChanged={setCurrentEmail}
showNoCreditCardRequired={isTrialEligible && !offers.trial.creditCardRequired}
isNoCreditCardRequiredMessageVisible={isTrialEligible && !offers.trial.creditCardRequired}
 />
 <LoadingButton
 variant="link"
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/ee/features/lighthouse/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,13 @@ export const createCheckoutSession = async ({
 });
 const quantity = Math.max(memberCount, 1);

 const existingLicense = await prisma.license.findUnique({
 where: { orgId: org.id },
 });
 const existingActivationCode = existingLicense
 ? decryptActivationCode(existingLicense.activationCode)
 : undefined;

 // Resolve the candidate against AUTH_URL so absolute paths, protocol-
 // relative paths (`//evil.com`), and bare relative paths all get
 // normalized through the URL parser. Reject anything that lands off-
Expand DownExpand Up@@ -210,6 +217,7 @@ export const createCheckoutSession = async ({
 interval,
 successUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}${successQuerySeparator}${stripeSuccessQuery}`,
 cancelUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}`,
 existingActivationCode,
 });

 if (isServiceError(result)) {
Expand Down

153 changes: 84 additions & 69 deletions
packages/web/src/ee/features/lighthouse/checkoutDisclosures.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@ const emailFormSchema = z.object({
interface CheckoutDisclosuresProps {
 sessionEmail: string;
 onEmailChanged: (email: string) => void;
 showNoCreditCardRequired?: boolean;
 isEmailValidationMessageVisible?: boolean;
 isNoCreditCardRequiredMessageVisible?: boolean;
}

export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCreditCardRequired }: CheckoutDisclosuresProps) => {
export const CheckoutDisclosures = ({
 sessionEmail,
 onEmailChanged,
 isNoCreditCardRequiredMessageVisible = false,
 isEmailValidationMessageVisible = true,
}: CheckoutDisclosuresProps) => {
 const [isEditing, setIsEditing] = useState(false);

 const form = useForm<z.infer<typeof emailFormSchema>>({
Expand DownExpand Up@@ -62,78 +68,87 @@ export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCredit
 setIsEditing(false);
 };

 if (
 !isNoCreditCardRequiredMessageVisible &&
 !isEmailValidationMessageVisible
 ) {
 return null;
 }

 return (
 <div className="text-xs text-muted-foreground text-center space-y-1">
 {sessionEmail && (
 <div className="inline-flex flex-wrap items-center justify-center gap-x-2 gap-y-1">
 {showNoCreditCardRequired && (
 <>
 <span>No credit card required</span>
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 </>
 {isNoCreditCardRequiredMessageVisible && (
 <span>No credit card required</span>
 )}
 {(isNoCreditCardRequiredMessageVisible && isEmailValidationMessageVisible) && (
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 )}
 {isEmailValidationMessageVisible && (
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 )}
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 </div>
 )}
 </div>
Expand Down

8 changes: 2 additions & 6 deletions
packages/web/src/ee/features/lighthouse/checkoutReturnHandler.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,21 +3,17 @@
import { useSearchParams } from "next/navigation";
import { LicenseActivactionDialog } from "./licenseActivactionDialog";

interface PostCheckoutHandlerProps {
 userEmail?: string | null;
}

// Layout-mounted handler that drives the post-Stripe activation flow regardless
// of which page the user lands on after checkout. Detects `session_id` in the
// URL (set by Stripe's substitution of `{CHECKOUT_SESSION_ID}` in successUrl),
// and renders the claim + activate modal when present.
export function CheckoutReturnHandler({ userEmail }: PostCheckoutHandlerProps) {
export function CheckoutReturnHandler() {
 const searchParams = useSearchParams();
 const sessionId = searchParams.get("session_id");

 if (!sessionId) {
 return null;
 }

 return <LicenseActivactionDialog userEmail={userEmail} />;
 return <LicenseActivactionDialog />;
}

16 changes: 16 additions & 0 deletions
packages/web/src/ee/features/lighthouse/hasLicenseProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'use client';

import { createContext, useContext } from "react";

const HasLicenseContext = createContext<boolean>(false);

interface HasLicenseProviderProps {
 children: React.ReactNode;
 hasLicense: boolean;
}

export const HasLicenseProvider = ({ children, hasLicense }: HasLicenseProviderProps) => (
 <HasLicenseContext.Provider value={hasLicense}>{children}</HasLicenseContext.Provider>
);

export const useHasLicense = () => useContext(HasLicenseContext);
Loading
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
[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable#1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 3 commits into

from

May 28, 2026

+196

−134

 Merged


[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable
#1239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a00b737

s


brendan-kellam May 28, 2026
875a0e0

feedback


brendan-kellam May 28, 2026
52db56f

Merge branch 'v5' into bkellam/existing-customer


brendan-kellam May 28, 2026

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


4 changes: 4 additions & 0 deletions
packages/web/src/app/(app)/components/banners/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
import { cookies } from 'next/headers';
import { DISMISS_COOKIE_PREFIX, type BannerId } from './types';
import { compareVersions, formatVersion, parseVersion } from "@sourcebot/shared/client";
import { createLogger } from "@sourcebot/shared";

const logger = createLogger("banner-actions");

// eslint-disable-next-line authz/require-auth-wrapper
export async function dismissBanner(id: BannerId) {
Expand DownExpand Up@@ -32,6 +35,7 @@ export async function tryGetLatestSourcebotTag({ timeoutMs }: { timeoutMs: numbe
 signal: AbortSignal.timeout(timeoutMs),
 });
 if (!response.ok) {
 logger.warn(`Failed to fetch Sourcebot version information. Status code: ${response.status}, status text: ${response.statusText}`);
 return null;
 }
 const data = (await response.json()) as { name: string }[];
Expand Down

57 changes: 31 additions & 26 deletions
packages/web/src/app/(app)/layout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import { ConnectAccountsCard } from "@/ee/features/sso/components/connectAccount
import { SidebarProvider } from "@/components/ui/sidebar";
import { CheckoutReturnHandler } from "@/ee/features/lighthouse/checkoutReturnHandler";
import { RoleProvider } from "@/features/auth/roleProvider";
import { HasLicenseProvider } from "@/ee/features/lighthouse/hasLicenseProvider";
import { tryGetLatestSourcebotTag } from "./components/banners/actions";

interface LayoutProps {
Expand DownExpand Up@@ -170,37 +171,41 @@ export default async function Layout(props: LayoutProps) {
 : await __unsafePrisma.license.findUnique({ where: { orgId: org.id } });

 const latestVersion = await tryGetLatestSourcebotTag({
timeoutMs: 3000
});
 timeoutMs: 3000
 });

 return (
 <RoleProvider role={role}>
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 <HasLicenseProvider
 hasLicense={offlineLicense !== null || license !== null}
 >
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 </div>
 </div>
 </div>
 </div>
 </SidebarProvider>
</div>
<SyntaxReferenceGuide />
<GitHubStarToast />
 <CheckoutReturnHandler userEmail={session?.user.email} />
 </SyntaxGuideProvider>
 </SidebarProvider>
 </div>
 <SyntaxReferenceGuide />
 <GitHubStarToast />
 <CheckoutReturnHandler />
 </SyntaxGuideProvider>
 </HasLicenseProvider>
 </RoleProvider>
 )
}

2 changes: 1 addition & 1 deletion
packages/web/src/app/onboard/components/trialStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ export function TrialStep({ stepIndex }: TrialStepProps) {
 <CheckoutDisclosures
 sessionEmail={sessionEmail}
 onEmailChanged={setCurrentEmail}
showNoCreditCardRequired={isTrialEligible && !offers.trial.creditCardRequired}
isNoCreditCardRequiredMessageVisible={isTrialEligible && !offers.trial.creditCardRequired}
 />
 <LoadingButton
 variant="link"
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/ee/features/lighthouse/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,13 @@ export const createCheckoutSession = async ({
 });
 const quantity = Math.max(memberCount, 1);

 const existingLicense = await prisma.license.findUnique({
 where: { orgId: org.id },
 });
 const existingActivationCode = existingLicense
 ? decryptActivationCode(existingLicense.activationCode)
 : undefined;

 // Resolve the candidate against AUTH_URL so absolute paths, protocol-
 // relative paths (`//evil.com`), and bare relative paths all get
 // normalized through the URL parser. Reject anything that lands off-
Expand DownExpand Up@@ -210,6 +217,7 @@ export const createCheckoutSession = async ({
 interval,
 successUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}${successQuerySeparator}${stripeSuccessQuery}`,
 cancelUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}`,
 existingActivationCode,
 });

 if (isServiceError(result)) {
Expand Down

153 changes: 84 additions & 69 deletions
packages/web/src/ee/features/lighthouse/checkoutDisclosures.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@ const emailFormSchema = z.object({
interface CheckoutDisclosuresProps {
 sessionEmail: string;
 onEmailChanged: (email: string) => void;
 showNoCreditCardRequired?: boolean;
 isEmailValidationMessageVisible?: boolean;
 isNoCreditCardRequiredMessageVisible?: boolean;
}

export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCreditCardRequired }: CheckoutDisclosuresProps) => {
export const CheckoutDisclosures = ({
 sessionEmail,
 onEmailChanged,
 isNoCreditCardRequiredMessageVisible = false,
 isEmailValidationMessageVisible = true,
}: CheckoutDisclosuresProps) => {
 const [isEditing, setIsEditing] = useState(false);

 const form = useForm<z.infer<typeof emailFormSchema>>({
Expand DownExpand Up@@ -62,78 +68,87 @@ export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCredit
 setIsEditing(false);
 };

 if (
 !isNoCreditCardRequiredMessageVisible &&
 !isEmailValidationMessageVisible
 ) {
 return null;
 }

 return (
 <div className="text-xs text-muted-foreground text-center space-y-1">
 {sessionEmail && (
 <div className="inline-flex flex-wrap items-center justify-center gap-x-2 gap-y-1">
 {showNoCreditCardRequired && (
 <>
 <span>No credit card required</span>
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 </>
 {isNoCreditCardRequiredMessageVisible && (
 <span>No credit card required</span>
 )}
 {(isNoCreditCardRequiredMessageVisible && isEmailValidationMessageVisible) && (
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 )}
 {isEmailValidationMessageVisible && (
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 )}
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 </div>
 )}
 </div>
Expand Down

8 changes: 2 additions & 6 deletions
packages/web/src/ee/features/lighthouse/checkoutReturnHandler.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,21 +3,17 @@
import { useSearchParams } from "next/navigation";
import { LicenseActivactionDialog } from "./licenseActivactionDialog";

interface PostCheckoutHandlerProps {
 userEmail?: string | null;
}

// Layout-mounted handler that drives the post-Stripe activation flow regardless
// of which page the user lands on after checkout. Detects `session_id` in the
// URL (set by Stripe's substitution of `{CHECKOUT_SESSION_ID}` in successUrl),
// and renders the claim + activate modal when present.
export function CheckoutReturnHandler({ userEmail }: PostCheckoutHandlerProps) {
export function CheckoutReturnHandler() {
 const searchParams = useSearchParams();
 const sessionId = searchParams.get("session_id");

 if (!sessionId) {
 return null;
 }

 return <LicenseActivactionDialog userEmail={userEmail} />;
 return <LicenseActivactionDialog />;
}

16 changes: 16 additions & 0 deletions
packages/web/src/ee/features/lighthouse/hasLicenseProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'use client';

import { createContext, useContext } from "react";

const HasLicenseContext = createContext<boolean>(false);

interface HasLicenseProviderProps {
 children: React.ReactNode;
 hasLicense: boolean;
}

export const HasLicenseProvider = ({ children, hasLicense }: HasLicenseProviderProps) => (
 <HasLicenseContext.Provider value={hasLicense}>{children}</HasLicenseContext.Provider>
);

export const useHasLicense = () => useContext(HasLicenseContext);
Loading
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 > 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
[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable#1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 3 commits into

from

May 28, 2026

+196

−134

 Merged


[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable
#1239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a00b737

s


brendan-kellam May 28, 2026
875a0e0

feedback


brendan-kellam May 28, 2026
52db56f

Merge branch 'v5' into bkellam/existing-customer


brendan-kellam May 28, 2026

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


4 changes: 4 additions & 0 deletions
packages/web/src/app/(app)/components/banners/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
import { cookies } from 'next/headers';
import { DISMISS_COOKIE_PREFIX, type BannerId } from './types';
import { compareVersions, formatVersion, parseVersion } from "@sourcebot/shared/client";
import { createLogger } from "@sourcebot/shared";

const logger = createLogger("banner-actions");

// eslint-disable-next-line authz/require-auth-wrapper
export async function dismissBanner(id: BannerId) {
Expand DownExpand Up@@ -32,6 +35,7 @@ export async function tryGetLatestSourcebotTag({ timeoutMs }: { timeoutMs: numbe
 signal: AbortSignal.timeout(timeoutMs),
 });
 if (!response.ok) {
 logger.warn(`Failed to fetch Sourcebot version information. Status code: ${response.status}, status text: ${response.statusText}`);
 return null;
 }
 const data = (await response.json()) as { name: string }[];
Expand Down

57 changes: 31 additions & 26 deletions
packages/web/src/app/(app)/layout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import { ConnectAccountsCard } from "@/ee/features/sso/components/connectAccount
import { SidebarProvider } from "@/components/ui/sidebar";
import { CheckoutReturnHandler } from "@/ee/features/lighthouse/checkoutReturnHandler";
import { RoleProvider } from "@/features/auth/roleProvider";
import { HasLicenseProvider } from "@/ee/features/lighthouse/hasLicenseProvider";
import { tryGetLatestSourcebotTag } from "./components/banners/actions";

interface LayoutProps {
Expand DownExpand Up@@ -170,37 +171,41 @@ export default async function Layout(props: LayoutProps) {
 : await __unsafePrisma.license.findUnique({ where: { orgId: org.id } });

 const latestVersion = await tryGetLatestSourcebotTag({
timeoutMs: 3000
});
 timeoutMs: 3000
 });

 return (
 <RoleProvider role={role}>
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 <HasLicenseProvider
 hasLicense={offlineLicense !== null || license !== null}
 >
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 </div>
 </div>
 </div>
 </div>
 </SidebarProvider>
</div>
<SyntaxReferenceGuide />
<GitHubStarToast />
 <CheckoutReturnHandler userEmail={session?.user.email} />
 </SyntaxGuideProvider>
 </SidebarProvider>
 </div>
 <SyntaxReferenceGuide />
 <GitHubStarToast />
 <CheckoutReturnHandler />
 </SyntaxGuideProvider>
 </HasLicenseProvider>
 </RoleProvider>
 )
}

2 changes: 1 addition & 1 deletion
packages/web/src/app/onboard/components/trialStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ export function TrialStep({ stepIndex }: TrialStepProps) {
 <CheckoutDisclosures
 sessionEmail={sessionEmail}
 onEmailChanged={setCurrentEmail}
showNoCreditCardRequired={isTrialEligible && !offers.trial.creditCardRequired}
isNoCreditCardRequiredMessageVisible={isTrialEligible && !offers.trial.creditCardRequired}
 />
 <LoadingButton
 variant="link"
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/ee/features/lighthouse/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,13 @@ export const createCheckoutSession = async ({
 });
 const quantity = Math.max(memberCount, 1);

 const existingLicense = await prisma.license.findUnique({
 where: { orgId: org.id },
 });
 const existingActivationCode = existingLicense
 ? decryptActivationCode(existingLicense.activationCode)
 : undefined;

 // Resolve the candidate against AUTH_URL so absolute paths, protocol-
 // relative paths (`//evil.com`), and bare relative paths all get
 // normalized through the URL parser. Reject anything that lands off-
Expand DownExpand Up@@ -210,6 +217,7 @@ export const createCheckoutSession = async ({
 interval,
 successUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}${successQuerySeparator}${stripeSuccessQuery}`,
 cancelUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}`,
 existingActivationCode,
 });

 if (isServiceError(result)) {
Expand Down

153 changes: 84 additions & 69 deletions
packages/web/src/ee/features/lighthouse/checkoutDisclosures.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@ const emailFormSchema = z.object({
interface CheckoutDisclosuresProps {
 sessionEmail: string;
 onEmailChanged: (email: string) => void;
 showNoCreditCardRequired?: boolean;
 isEmailValidationMessageVisible?: boolean;
 isNoCreditCardRequiredMessageVisible?: boolean;
}

export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCreditCardRequired }: CheckoutDisclosuresProps) => {
export const CheckoutDisclosures = ({
 sessionEmail,
 onEmailChanged,
 isNoCreditCardRequiredMessageVisible = false,
 isEmailValidationMessageVisible = true,
}: CheckoutDisclosuresProps) => {
 const [isEditing, setIsEditing] = useState(false);

 const form = useForm<z.infer<typeof emailFormSchema>>({
Expand DownExpand Up@@ -62,78 +68,87 @@ export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCredit
 setIsEditing(false);
 };

 if (
 !isNoCreditCardRequiredMessageVisible &&
 !isEmailValidationMessageVisible
 ) {
 return null;
 }

 return (
 <div className="text-xs text-muted-foreground text-center space-y-1">
 {sessionEmail && (
 <div className="inline-flex flex-wrap items-center justify-center gap-x-2 gap-y-1">
 {showNoCreditCardRequired && (
 <>
 <span>No credit card required</span>
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 </>
 {isNoCreditCardRequiredMessageVisible && (
 <span>No credit card required</span>
 )}
 {(isNoCreditCardRequiredMessageVisible && isEmailValidationMessageVisible) && (
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 )}
 {isEmailValidationMessageVisible && (
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 )}
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 </div>
 )}
 </div>
Expand Down

8 changes: 2 additions & 6 deletions
packages/web/src/ee/features/lighthouse/checkoutReturnHandler.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,21 +3,17 @@
import { useSearchParams } from "next/navigation";
import { LicenseActivactionDialog } from "./licenseActivactionDialog";

interface PostCheckoutHandlerProps {
 userEmail?: string | null;
}

// Layout-mounted handler that drives the post-Stripe activation flow regardless
// of which page the user lands on after checkout. Detects `session_id` in the
// URL (set by Stripe's substitution of `{CHECKOUT_SESSION_ID}` in successUrl),
// and renders the claim + activate modal when present.
export function CheckoutReturnHandler({ userEmail }: PostCheckoutHandlerProps) {
export function CheckoutReturnHandler() {
 const searchParams = useSearchParams();
 const sessionId = searchParams.get("session_id");

 if (!sessionId) {
 return null;
 }

 return <LicenseActivactionDialog userEmail={userEmail} />;
 return <LicenseActivactionDialog />;
}

16 changes: 16 additions & 0 deletions
packages/web/src/ee/features/lighthouse/hasLicenseProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'use client';

import { createContext, useContext } from "react";

const HasLicenseContext = createContext<boolean>(false);

interface HasLicenseProviderProps {
 children: React.ReactNode;
 hasLicense: boolean;
}

export const HasLicenseProvider = ({ children, hasLicense }: HasLicenseProviderProps) => (
 <HasLicenseContext.Provider value={hasLicense}>{children}</HasLicenseContext.Provider>
);

export const useHasLicense = () => useContext(HasLicenseContext);
Loading
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
[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable#1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 3 commits into

from

May 28, 2026

+196

−134

 Merged


[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable
#1239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a00b737

s


brendan-kellam May 28, 2026
875a0e0

feedback


brendan-kellam May 28, 2026
52db56f

Merge branch 'v5' into bkellam/existing-customer


brendan-kellam May 28, 2026

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


4 changes: 4 additions & 0 deletions
packages/web/src/app/(app)/components/banners/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
import { cookies } from 'next/headers';
import { DISMISS_COOKIE_PREFIX, type BannerId } from './types';
import { compareVersions, formatVersion, parseVersion } from "@sourcebot/shared/client";
import { createLogger } from "@sourcebot/shared";

const logger = createLogger("banner-actions");

// eslint-disable-next-line authz/require-auth-wrapper
export async function dismissBanner(id: BannerId) {
Expand DownExpand Up@@ -32,6 +35,7 @@ export async function tryGetLatestSourcebotTag({ timeoutMs }: { timeoutMs: numbe
 signal: AbortSignal.timeout(timeoutMs),
 });
 if (!response.ok) {
 logger.warn(`Failed to fetch Sourcebot version information. Status code: ${response.status}, status text: ${response.statusText}`);
 return null;
 }
 const data = (await response.json()) as { name: string }[];
Expand Down

57 changes: 31 additions & 26 deletions
packages/web/src/app/(app)/layout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import { ConnectAccountsCard } from "@/ee/features/sso/components/connectAccount
import { SidebarProvider } from "@/components/ui/sidebar";
import { CheckoutReturnHandler } from "@/ee/features/lighthouse/checkoutReturnHandler";
import { RoleProvider } from "@/features/auth/roleProvider";
import { HasLicenseProvider } from "@/ee/features/lighthouse/hasLicenseProvider";
import { tryGetLatestSourcebotTag } from "./components/banners/actions";

interface LayoutProps {
Expand DownExpand Up@@ -170,37 +171,41 @@ export default async function Layout(props: LayoutProps) {
 : await __unsafePrisma.license.findUnique({ where: { orgId: org.id } });

 const latestVersion = await tryGetLatestSourcebotTag({
timeoutMs: 3000
});
 timeoutMs: 3000
 });

 return (
 <RoleProvider role={role}>
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 <HasLicenseProvider
 hasLicense={offlineLicense !== null || license !== null}
 >
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 </div>
 </div>
 </div>
 </div>
 </SidebarProvider>
</div>
<SyntaxReferenceGuide />
<GitHubStarToast />
 <CheckoutReturnHandler userEmail={session?.user.email} />
 </SyntaxGuideProvider>
 </SidebarProvider>
 </div>
 <SyntaxReferenceGuide />
 <GitHubStarToast />
 <CheckoutReturnHandler />
 </SyntaxGuideProvider>
 </HasLicenseProvider>
 </RoleProvider>
 )
}

2 changes: 1 addition & 1 deletion
packages/web/src/app/onboard/components/trialStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ export function TrialStep({ stepIndex }: TrialStepProps) {
 <CheckoutDisclosures
 sessionEmail={sessionEmail}
 onEmailChanged={setCurrentEmail}
showNoCreditCardRequired={isTrialEligible && !offers.trial.creditCardRequired}
isNoCreditCardRequiredMessageVisible={isTrialEligible && !offers.trial.creditCardRequired}
 />
 <LoadingButton
 variant="link"
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/ee/features/lighthouse/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,13 @@ export const createCheckoutSession = async ({
 });
 const quantity = Math.max(memberCount, 1);

 const existingLicense = await prisma.license.findUnique({
 where: { orgId: org.id },
 });
 const existingActivationCode = existingLicense
 ? decryptActivationCode(existingLicense.activationCode)
 : undefined;

 // Resolve the candidate against AUTH_URL so absolute paths, protocol-
 // relative paths (`//evil.com`), and bare relative paths all get
 // normalized through the URL parser. Reject anything that lands off-
Expand DownExpand Up@@ -210,6 +217,7 @@ export const createCheckoutSession = async ({
 interval,
 successUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}${successQuerySeparator}${stripeSuccessQuery}`,
 cancelUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}`,
 existingActivationCode,
 });

 if (isServiceError(result)) {
Expand Down

153 changes: 84 additions & 69 deletions
packages/web/src/ee/features/lighthouse/checkoutDisclosures.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@ const emailFormSchema = z.object({
interface CheckoutDisclosuresProps {
 sessionEmail: string;
 onEmailChanged: (email: string) => void;
 showNoCreditCardRequired?: boolean;
 isEmailValidationMessageVisible?: boolean;
 isNoCreditCardRequiredMessageVisible?: boolean;
}

export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCreditCardRequired }: CheckoutDisclosuresProps) => {
export const CheckoutDisclosures = ({
 sessionEmail,
 onEmailChanged,
 isNoCreditCardRequiredMessageVisible = false,
 isEmailValidationMessageVisible = true,
}: CheckoutDisclosuresProps) => {
 const [isEditing, setIsEditing] = useState(false);

 const form = useForm<z.infer<typeof emailFormSchema>>({
Expand DownExpand Up@@ -62,78 +68,87 @@ export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCredit
 setIsEditing(false);
 };

 if (
 !isNoCreditCardRequiredMessageVisible &&
 !isEmailValidationMessageVisible
 ) {
 return null;
 }

 return (
 <div className="text-xs text-muted-foreground text-center space-y-1">
 {sessionEmail && (
 <div className="inline-flex flex-wrap items-center justify-center gap-x-2 gap-y-1">
 {showNoCreditCardRequired && (
 <>
 <span>No credit card required</span>
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 </>
 {isNoCreditCardRequiredMessageVisible && (
 <span>No credit card required</span>
 )}
 {(isNoCreditCardRequiredMessageVisible && isEmailValidationMessageVisible) && (
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 )}
 {isEmailValidationMessageVisible && (
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 )}
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 </div>
 )}
 </div>
Expand Down

8 changes: 2 additions & 6 deletions
packages/web/src/ee/features/lighthouse/checkoutReturnHandler.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,21 +3,17 @@
import { useSearchParams } from "next/navigation";
import { LicenseActivactionDialog } from "./licenseActivactionDialog";

interface PostCheckoutHandlerProps {
 userEmail?: string | null;
}

// Layout-mounted handler that drives the post-Stripe activation flow regardless
// of which page the user lands on after checkout. Detects `session_id` in the
// URL (set by Stripe's substitution of `{CHECKOUT_SESSION_ID}` in successUrl),
// and renders the claim + activate modal when present.
export function CheckoutReturnHandler({ userEmail }: PostCheckoutHandlerProps) {
export function CheckoutReturnHandler() {
 const searchParams = useSearchParams();
 const sessionId = searchParams.get("session_id");

 if (!sessionId) {
 return null;
 }

 return <LicenseActivactionDialog userEmail={userEmail} />;
 return <LicenseActivactionDialog />;
}

16 changes: 16 additions & 0 deletions
packages/web/src/ee/features/lighthouse/hasLicenseProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'use client';

import { createContext, useContext } from "react";

const HasLicenseContext = createContext<boolean>(false);

interface HasLicenseProviderProps {
 children: React.ReactNode;
 hasLicense: boolean;
}

export const HasLicenseProvider = ({ children, hasLicense }: HasLicenseProviderProps) => (
 <HasLicenseContext.Provider value={hasLicense}>{children}</HasLicenseContext.Provider>
);

export const useHasLicense = () => useContext(HasLicenseContext);
Loading
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
[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable#1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 3 commits into

from

May 28, 2026

+196

−134

 Merged


[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable
#1239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a00b737

s


brendan-kellam May 28, 2026
875a0e0

feedback


brendan-kellam May 28, 2026
52db56f

Merge branch 'v5' into bkellam/existing-customer


brendan-kellam May 28, 2026

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


4 changes: 4 additions & 0 deletions
packages/web/src/app/(app)/components/banners/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
import { cookies } from 'next/headers';
import { DISMISS_COOKIE_PREFIX, type BannerId } from './types';
import { compareVersions, formatVersion, parseVersion } from "@sourcebot/shared/client";
import { createLogger } from "@sourcebot/shared";

const logger = createLogger("banner-actions");

// eslint-disable-next-line authz/require-auth-wrapper
export async function dismissBanner(id: BannerId) {
Expand DownExpand Up@@ -32,6 +35,7 @@ export async function tryGetLatestSourcebotTag({ timeoutMs }: { timeoutMs: numbe
 signal: AbortSignal.timeout(timeoutMs),
 });
 if (!response.ok) {
 logger.warn(`Failed to fetch Sourcebot version information. Status code: ${response.status}, status text: ${response.statusText}`);
 return null;
 }
 const data = (await response.json()) as { name: string }[];
Expand Down

57 changes: 31 additions & 26 deletions
packages/web/src/app/(app)/layout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import { ConnectAccountsCard } from "@/ee/features/sso/components/connectAccount
import { SidebarProvider } from "@/components/ui/sidebar";
import { CheckoutReturnHandler } from "@/ee/features/lighthouse/checkoutReturnHandler";
import { RoleProvider } from "@/features/auth/roleProvider";
import { HasLicenseProvider } from "@/ee/features/lighthouse/hasLicenseProvider";
import { tryGetLatestSourcebotTag } from "./components/banners/actions";

interface LayoutProps {
Expand DownExpand Up@@ -170,37 +171,41 @@ export default async function Layout(props: LayoutProps) {
 : await __unsafePrisma.license.findUnique({ where: { orgId: org.id } });

 const latestVersion = await tryGetLatestSourcebotTag({
timeoutMs: 3000
});
 timeoutMs: 3000
 });

 return (
 <RoleProvider role={role}>
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 <HasLicenseProvider
 hasLicense={offlineLicense !== null || license !== null}
 >
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 </div>
 </div>
 </div>
 </div>
 </SidebarProvider>
</div>
<SyntaxReferenceGuide />
<GitHubStarToast />
 <CheckoutReturnHandler userEmail={session?.user.email} />
 </SyntaxGuideProvider>
 </SidebarProvider>
 </div>
 <SyntaxReferenceGuide />
 <GitHubStarToast />
 <CheckoutReturnHandler />
 </SyntaxGuideProvider>
 </HasLicenseProvider>
 </RoleProvider>
 )
}

2 changes: 1 addition & 1 deletion
packages/web/src/app/onboard/components/trialStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ export function TrialStep({ stepIndex }: TrialStepProps) {
 <CheckoutDisclosures
 sessionEmail={sessionEmail}
 onEmailChanged={setCurrentEmail}
showNoCreditCardRequired={isTrialEligible && !offers.trial.creditCardRequired}
isNoCreditCardRequiredMessageVisible={isTrialEligible && !offers.trial.creditCardRequired}
 />
 <LoadingButton
 variant="link"
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/ee/features/lighthouse/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,13 @@ export const createCheckoutSession = async ({
 });
 const quantity = Math.max(memberCount, 1);

 const existingLicense = await prisma.license.findUnique({
 where: { orgId: org.id },
 });
 const existingActivationCode = existingLicense
 ? decryptActivationCode(existingLicense.activationCode)
 : undefined;

 // Resolve the candidate against AUTH_URL so absolute paths, protocol-
 // relative paths (`//evil.com`), and bare relative paths all get
 // normalized through the URL parser. Reject anything that lands off-
Expand DownExpand Up@@ -210,6 +217,7 @@ export const createCheckoutSession = async ({
 interval,
 successUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}${successQuerySeparator}${stripeSuccessQuery}`,
 cancelUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}`,
 existingActivationCode,
 });

 if (isServiceError(result)) {
Expand Down

153 changes: 84 additions & 69 deletions
packages/web/src/ee/features/lighthouse/checkoutDisclosures.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@ const emailFormSchema = z.object({
interface CheckoutDisclosuresProps {
 sessionEmail: string;
 onEmailChanged: (email: string) => void;
 showNoCreditCardRequired?: boolean;
 isEmailValidationMessageVisible?: boolean;
 isNoCreditCardRequiredMessageVisible?: boolean;
}

export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCreditCardRequired }: CheckoutDisclosuresProps) => {
export const CheckoutDisclosures = ({
 sessionEmail,
 onEmailChanged,
 isNoCreditCardRequiredMessageVisible = false,
 isEmailValidationMessageVisible = true,
}: CheckoutDisclosuresProps) => {
 const [isEditing, setIsEditing] = useState(false);

 const form = useForm<z.infer<typeof emailFormSchema>>({
Expand DownExpand Up@@ -62,78 +68,87 @@ export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCredit
 setIsEditing(false);
 };

 if (
 !isNoCreditCardRequiredMessageVisible &&
 !isEmailValidationMessageVisible
 ) {
 return null;
 }

 return (
 <div className="text-xs text-muted-foreground text-center space-y-1">
 {sessionEmail && (
 <div className="inline-flex flex-wrap items-center justify-center gap-x-2 gap-y-1">
 {showNoCreditCardRequired && (
 <>
 <span>No credit card required</span>
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 </>
 {isNoCreditCardRequiredMessageVisible && (
 <span>No credit card required</span>
 )}
 {(isNoCreditCardRequiredMessageVisible && isEmailValidationMessageVisible) && (
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 )}
 {isEmailValidationMessageVisible && (
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 )}
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 </div>
 )}
 </div>
Expand Down

8 changes: 2 additions & 6 deletions
packages/web/src/ee/features/lighthouse/checkoutReturnHandler.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,21 +3,17 @@
import { useSearchParams } from "next/navigation";
import { LicenseActivactionDialog } from "./licenseActivactionDialog";

interface PostCheckoutHandlerProps {
 userEmail?: string | null;
}

// Layout-mounted handler that drives the post-Stripe activation flow regardless
// of which page the user lands on after checkout. Detects `session_id` in the
// URL (set by Stripe's substitution of `{CHECKOUT_SESSION_ID}` in successUrl),
// and renders the claim + activate modal when present.
export function CheckoutReturnHandler({ userEmail }: PostCheckoutHandlerProps) {
export function CheckoutReturnHandler() {
 const searchParams = useSearchParams();
 const sessionId = searchParams.get("session_id");

 if (!sessionId) {
 return null;
 }

 return <LicenseActivactionDialog userEmail={userEmail} />;
 return <LicenseActivactionDialog />;
}

16 changes: 16 additions & 0 deletions
packages/web/src/ee/features/lighthouse/hasLicenseProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'use client';

import { createContext, useContext } from "react";

const HasLicenseContext = createContext<boolean>(false);

interface HasLicenseProviderProps {
 children: React.ReactNode;
 hasLicense: boolean;
}

export const HasLicenseProvider = ({ children, hasLicense }: HasLicenseProviderProps) => (
 <HasLicenseContext.Provider value={hasLicense}>{children}</HasLicenseContext.Provider>
);

export const useHasLicense = () => useContext(HasLicenseContext);
Loading
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
[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable#1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 3 commits into

from

May 28, 2026

+196

−134

 Merged


[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable
#1239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a00b737

s


brendan-kellam May 28, 2026
875a0e0

feedback


brendan-kellam May 28, 2026
52db56f

Merge branch 'v5' into bkellam/existing-customer


brendan-kellam May 28, 2026

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


4 changes: 4 additions & 0 deletions
packages/web/src/app/(app)/components/banners/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
import { cookies } from 'next/headers';
import { DISMISS_COOKIE_PREFIX, type BannerId } from './types';
import { compareVersions, formatVersion, parseVersion } from "@sourcebot/shared/client";
import { createLogger } from "@sourcebot/shared";

const logger = createLogger("banner-actions");

// eslint-disable-next-line authz/require-auth-wrapper
export async function dismissBanner(id: BannerId) {
Expand DownExpand Up@@ -32,6 +35,7 @@ export async function tryGetLatestSourcebotTag({ timeoutMs }: { timeoutMs: numbe
 signal: AbortSignal.timeout(timeoutMs),
 });
 if (!response.ok) {
 logger.warn(`Failed to fetch Sourcebot version information. Status code: ${response.status}, status text: ${response.statusText}`);
 return null;
 }
 const data = (await response.json()) as { name: string }[];
Expand Down

57 changes: 31 additions & 26 deletions
packages/web/src/app/(app)/layout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import { ConnectAccountsCard } from "@/ee/features/sso/components/connectAccount
import { SidebarProvider } from "@/components/ui/sidebar";
import { CheckoutReturnHandler } from "@/ee/features/lighthouse/checkoutReturnHandler";
import { RoleProvider } from "@/features/auth/roleProvider";
import { HasLicenseProvider } from "@/ee/features/lighthouse/hasLicenseProvider";
import { tryGetLatestSourcebotTag } from "./components/banners/actions";

interface LayoutProps {
Expand DownExpand Up@@ -170,37 +171,41 @@ export default async function Layout(props: LayoutProps) {
 : await __unsafePrisma.license.findUnique({ where: { orgId: org.id } });

 const latestVersion = await tryGetLatestSourcebotTag({
timeoutMs: 3000
});
 timeoutMs: 3000
 });

 return (
 <RoleProvider role={role}>
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 <HasLicenseProvider
 hasLicense={offlineLicense !== null || license !== null}
 >
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 </div>
 </div>
 </div>
 </div>
 </SidebarProvider>
</div>
<SyntaxReferenceGuide />
<GitHubStarToast />
 <CheckoutReturnHandler userEmail={session?.user.email} />
 </SyntaxGuideProvider>
 </SidebarProvider>
 </div>
 <SyntaxReferenceGuide />
 <GitHubStarToast />
 <CheckoutReturnHandler />
 </SyntaxGuideProvider>
 </HasLicenseProvider>
 </RoleProvider>
 )
}

2 changes: 1 addition & 1 deletion
packages/web/src/app/onboard/components/trialStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ export function TrialStep({ stepIndex }: TrialStepProps) {
 <CheckoutDisclosures
 sessionEmail={sessionEmail}
 onEmailChanged={setCurrentEmail}
showNoCreditCardRequired={isTrialEligible && !offers.trial.creditCardRequired}
isNoCreditCardRequiredMessageVisible={isTrialEligible && !offers.trial.creditCardRequired}
 />
 <LoadingButton
 variant="link"
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/ee/features/lighthouse/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,13 @@ export const createCheckoutSession = async ({
 });
 const quantity = Math.max(memberCount, 1);

 const existingLicense = await prisma.license.findUnique({
 where: { orgId: org.id },
 });
 const existingActivationCode = existingLicense
 ? decryptActivationCode(existingLicense.activationCode)
 : undefined;

 // Resolve the candidate against AUTH_URL so absolute paths, protocol-
 // relative paths (`//evil.com`), and bare relative paths all get
 // normalized through the URL parser. Reject anything that lands off-
Expand DownExpand Up@@ -210,6 +217,7 @@ export const createCheckoutSession = async ({
 interval,
 successUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}${successQuerySeparator}${stripeSuccessQuery}`,
 cancelUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}`,
 existingActivationCode,
 });

 if (isServiceError(result)) {
Expand Down

153 changes: 84 additions & 69 deletions
packages/web/src/ee/features/lighthouse/checkoutDisclosures.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@ const emailFormSchema = z.object({
interface CheckoutDisclosuresProps {
 sessionEmail: string;
 onEmailChanged: (email: string) => void;
 showNoCreditCardRequired?: boolean;
 isEmailValidationMessageVisible?: boolean;
 isNoCreditCardRequiredMessageVisible?: boolean;
}

export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCreditCardRequired }: CheckoutDisclosuresProps) => {
export const CheckoutDisclosures = ({
 sessionEmail,
 onEmailChanged,
 isNoCreditCardRequiredMessageVisible = false,
 isEmailValidationMessageVisible = true,
}: CheckoutDisclosuresProps) => {
 const [isEditing, setIsEditing] = useState(false);

 const form = useForm<z.infer<typeof emailFormSchema>>({
Expand DownExpand Up@@ -62,78 +68,87 @@ export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCredit
 setIsEditing(false);
 };

 if (
 !isNoCreditCardRequiredMessageVisible &&
 !isEmailValidationMessageVisible
 ) {
 return null;
 }

 return (
 <div className="text-xs text-muted-foreground text-center space-y-1">
 {sessionEmail && (
 <div className="inline-flex flex-wrap items-center justify-center gap-x-2 gap-y-1">
 {showNoCreditCardRequired && (
 <>
 <span>No credit card required</span>
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 </>
 {isNoCreditCardRequiredMessageVisible && (
 <span>No credit card required</span>
 )}
 {(isNoCreditCardRequiredMessageVisible && isEmailValidationMessageVisible) && (
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 )}
 {isEmailValidationMessageVisible && (
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 )}
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 </div>
 )}
 </div>
Expand Down

8 changes: 2 additions & 6 deletions
packages/web/src/ee/features/lighthouse/checkoutReturnHandler.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,21 +3,17 @@
import { useSearchParams } from "next/navigation";
import { LicenseActivactionDialog } from "./licenseActivactionDialog";

interface PostCheckoutHandlerProps {
 userEmail?: string | null;
}

// Layout-mounted handler that drives the post-Stripe activation flow regardless
// of which page the user lands on after checkout. Detects `session_id` in the
// URL (set by Stripe's substitution of `{CHECKOUT_SESSION_ID}` in successUrl),
// and renders the claim + activate modal when present.
export function CheckoutReturnHandler({ userEmail }: PostCheckoutHandlerProps) {
export function CheckoutReturnHandler() {
 const searchParams = useSearchParams();
 const sessionId = searchParams.get("session_id");

 if (!sessionId) {
 return null;
 }

 return <LicenseActivactionDialog userEmail={userEmail} />;
 return <LicenseActivactionDialog />;
}

16 changes: 16 additions & 0 deletions
packages/web/src/ee/features/lighthouse/hasLicenseProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'use client';

import { createContext, useContext } from "react";

const HasLicenseContext = createContext<boolean>(false);

interface HasLicenseProviderProps {
 children: React.ReactNode;
 hasLicense: boolean;
}

export const HasLicenseProvider = ({ children, hasLicense }: HasLicenseProviderProps) => (
 <HasLicenseContext.Provider value={hasLicense}>{children}</HasLicenseContext.Provider>
);

export const useHasLicense = () => useContext(HasLicenseContext);
Loading
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
[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable#1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 3 commits into

from

May 28, 2026

+196

−134

 Merged


[v5] chore(web): Use existing stripe customer id for checkout sessions when applicable
#1239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a00b737

s


brendan-kellam May 28, 2026
875a0e0

feedback


brendan-kellam May 28, 2026
52db56f

Merge branch 'v5' into bkellam/existing-customer


brendan-kellam May 28, 2026

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


4 changes: 4 additions & 0 deletions
packages/web/src/app/(app)/components/banners/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
import { cookies } from 'next/headers';
import { DISMISS_COOKIE_PREFIX, type BannerId } from './types';
import { compareVersions, formatVersion, parseVersion } from "@sourcebot/shared/client";
import { createLogger } from "@sourcebot/shared";

const logger = createLogger("banner-actions");

// eslint-disable-next-line authz/require-auth-wrapper
export async function dismissBanner(id: BannerId) {
Expand DownExpand Up@@ -32,6 +35,7 @@ export async function tryGetLatestSourcebotTag({ timeoutMs }: { timeoutMs: numbe
 signal: AbortSignal.timeout(timeoutMs),
 });
 if (!response.ok) {
 logger.warn(`Failed to fetch Sourcebot version information. Status code: ${response.status}, status text: ${response.statusText}`);
 return null;
 }
 const data = (await response.json()) as { name: string }[];
Expand Down

57 changes: 31 additions & 26 deletions
packages/web/src/app/(app)/layout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import { ConnectAccountsCard } from "@/ee/features/sso/components/connectAccount
import { SidebarProvider } from "@/components/ui/sidebar";
import { CheckoutReturnHandler } from "@/ee/features/lighthouse/checkoutReturnHandler";
import { RoleProvider } from "@/features/auth/roleProvider";
import { HasLicenseProvider } from "@/ee/features/lighthouse/hasLicenseProvider";
import { tryGetLatestSourcebotTag } from "./components/banners/actions";

interface LayoutProps {
Expand DownExpand Up@@ -170,37 +171,41 @@ export default async function Layout(props: LayoutProps) {
 : await __unsafePrisma.license.findUnique({ where: { orgId: org.id } });

 const latestVersion = await tryGetLatestSourcebotTag({
timeoutMs: 3000
});
 timeoutMs: 3000
 });

 return (
 <RoleProvider role={role}>
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 <HasLicenseProvider
 hasLicense={offlineLicense !== null || license !== null}
 >
 <SyntaxGuideProvider>
 <div className="fixed inset-0 flex bg-shell">
 <SidebarProvider defaultOpen={cookieStore.get("sidebar_state")?.value !== "false"}>
 {sidebar}
 <div className="flex-1 min-h-0 flex flex-col pt-2 pb-2 pr-2 pl-2 md:pl-0">
 <div className="flex-1 min-h-0 bg-background flex flex-col border border-[#e6e6e6] dark:border-[#1d1d1f] rounded-xl overflow-hidden">
 <BannerSlot
 role={role}
 license={license}
 offlineLicense={offlineLicense}
 hasPermissionSyncEntitlement={hasPermissionSyncEntitlement}
 hasPendingFirstSync={hasPendingFirstSync}
 currentVersion={SOURCEBOT_VERSION}
 latestVersion={latestVersion}
 />
 <div className="flex-1 min-h-0 overflow-y-auto">
 {children}
 </div>
 </div>
 </div>
 </div>
 </SidebarProvider>
</div>
<SyntaxReferenceGuide />
<GitHubStarToast />
 <CheckoutReturnHandler userEmail={session?.user.email} />
 </SyntaxGuideProvider>
 </SidebarProvider>
 </div>
 <SyntaxReferenceGuide />
 <GitHubStarToast />
 <CheckoutReturnHandler />
 </SyntaxGuideProvider>
 </HasLicenseProvider>
 </RoleProvider>
 )
}

2 changes: 1 addition & 1 deletion
packages/web/src/app/onboard/components/trialStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ export function TrialStep({ stepIndex }: TrialStepProps) {
 <CheckoutDisclosures
 sessionEmail={sessionEmail}
 onEmailChanged={setCurrentEmail}
showNoCreditCardRequired={isTrialEligible && !offers.trial.creditCardRequired}
isNoCreditCardRequiredMessageVisible={isTrialEligible && !offers.trial.creditCardRequired}
 />
 <LoadingButton
 variant="link"
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/ee/features/lighthouse/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,6 +157,13 @@ export const createCheckoutSession = async ({
 });
 const quantity = Math.max(memberCount, 1);

 const existingLicense = await prisma.license.findUnique({
 where: { orgId: org.id },
 });
 const existingActivationCode = existingLicense
 ? decryptActivationCode(existingLicense.activationCode)
 : undefined;

 // Resolve the candidate against AUTH_URL so absolute paths, protocol-
 // relative paths (`//evil.com`), and bare relative paths all get
 // normalized through the URL parser. Reject anything that lands off-
Expand DownExpand Up@@ -210,6 +217,7 @@ export const createCheckoutSession = async ({
 interval,
 successUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}${successQuerySeparator}${stripeSuccessQuery}`,
 cancelUrl: `${env.AUTH_URL}${returnPathname}${returnSearch}`,
 existingActivationCode,
 });

 if (isServiceError(result)) {
Expand Down

153 changes: 84 additions & 69 deletions
packages/web/src/ee/features/lighthouse/checkoutDisclosures.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@ const emailFormSchema = z.object({
interface CheckoutDisclosuresProps {
 sessionEmail: string;
 onEmailChanged: (email: string) => void;
 showNoCreditCardRequired?: boolean;
 isEmailValidationMessageVisible?: boolean;
 isNoCreditCardRequiredMessageVisible?: boolean;
}

export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCreditCardRequired }: CheckoutDisclosuresProps) => {
export const CheckoutDisclosures = ({
 sessionEmail,
 onEmailChanged,
 isNoCreditCardRequiredMessageVisible = false,
 isEmailValidationMessageVisible = true,
}: CheckoutDisclosuresProps) => {
 const [isEditing, setIsEditing] = useState(false);

 const form = useForm<z.infer<typeof emailFormSchema>>({
Expand DownExpand Up@@ -62,78 +68,87 @@ export const CheckoutDisclosures = ({ sessionEmail, onEmailChanged, showNoCredit
 setIsEditing(false);
 };

 if (
 !isNoCreditCardRequiredMessageVisible &&
 !isEmailValidationMessageVisible
 ) {
 return null;
 }

 return (
 <div className="text-xs text-muted-foreground text-center space-y-1">
 {sessionEmail && (
 <div className="inline-flex flex-wrap items-center justify-center gap-x-2 gap-y-1">
 {showNoCreditCardRequired && (
 <>
 <span>No credit card required</span>
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 </>
 {isNoCreditCardRequiredMessageVisible && (
 <span>No credit card required</span>
 )}
 {(isNoCreditCardRequiredMessageVisible && isEmailValidationMessageVisible) && (
 <span aria-hidden="true" className="text-muted-foreground/50">·</span>
 )}
 {isEmailValidationMessageVisible && (
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 )}
 <span className="inline-flex items-center gap-1.5">
 <span>Your activation code will be sent to</span>
 {isEditing ? (
 <Form {...form}>
 <FormField
 control={form.control}
 name="email"
 render={({ field }) => (
 <FormItem className="space-y-0">
 <FormControl>
 <input
 {...field}
 type="email"
 autoComplete="off"
 data-1p-ignore="true"
 data-lpignore="true"
 data-form-type="other"
 data-bwignore="true"
 onKeyDown={(e) => {
 if (e.key === "Enter") {
 e.preventDefault();
 commit();
 } else if (e.key === "Escape") {
 revertAndExit();
 }
 }}
 aria-invalid={!isValid}
 className={cn(
 "bg-transparent border-none outline-none p-0 m-0 font-medium text-foreground [font:inherit] [letter-spacing:inherit] [field-sizing:content] min-w-[8ch]",
 !isValid && "text-destructive",
 )}
 style={{ fontWeight: 500 }}
 />
 </FormControl>
 </FormItem>
 )}
 />
 <button
 type="button"
 onClick={commit}
 disabled={!isValid}
 className="text-muted-foreground hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
 aria-label="Save email (press Escape to cancel)"
 title="Press Escape to cancel"
 >
 <Save className="h-3 w-3" />
 </button>
 </Form>
 ) : (
 <>
 <span className="font-medium text-foreground">{email}</span>
 <button
 type="button"
 onClick={() => setIsEditing(true)}
 className="text-muted-foreground hover:text-foreground"
 aria-label="Edit email"
 >
 <Pencil className="h-3 w-3" />
 </button>
 </>
 )}
 </span>
 </div>
 )}
 </div>
Expand Down

8 changes: 2 additions & 6 deletions
packages/web/src/ee/features/lighthouse/checkoutReturnHandler.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,21 +3,17 @@
import { useSearchParams } from "next/navigation";
import { LicenseActivactionDialog } from "./licenseActivactionDialog";

interface PostCheckoutHandlerProps {
 userEmail?: string | null;
}

// Layout-mounted handler that drives the post-Stripe activation flow regardless
// of which page the user lands on after checkout. Detects `session_id` in the
// URL (set by Stripe's substitution of `{CHECKOUT_SESSION_ID}` in successUrl),
// and renders the claim + activate modal when present.
export function CheckoutReturnHandler({ userEmail }: PostCheckoutHandlerProps) {
export function CheckoutReturnHandler() {
 const searchParams = useSearchParams();
 const sessionId = searchParams.get("session_id");

 if (!sessionId) {
 return null;
 }

 return <LicenseActivactionDialog userEmail={userEmail} />;
 return <LicenseActivactionDialog />;
}

16 changes: 16 additions & 0 deletions
packages/web/src/ee/features/lighthouse/hasLicenseProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'use client';

import { createContext, useContext } from "react";

const HasLicenseContext = createContext<boolean>(false);

interface HasLicenseProviderProps {
 children: React.ReactNode;
 hasLicense: boolean;
}

export const HasLicenseProvider = ({ children, hasLicense }: HasLicenseProviderProps) => (
 <HasLicenseContext.Provider value={hasLicense}>{children}</HasLicenseContext.Provider>
);

export const useHasLicense = () => useContext(HasLicenseContext);
Loading
Loading