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
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 number Diff line number Diff 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 Down Expand 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 number Diff line number Diff 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 Down Expand 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 number Diff line number Diff 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 number Diff line number Diff 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 Down Expand 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 number Diff line number Diff 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 Down Expand 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 number Diff line number Diff 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 number Diff line number Diff 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