mirror of
https://github.com/yusufipk/OpenFrame.git
synced 2026-09-11 09:36:08 +00:00
fix(billing): prevent duplicate subscriptions and make webhook sync authoritative
A Stripe customer can own several subscriptions. Two defects let that happen
and corrupt the user's billing state:
1. Checkout allowed a fresh subscription whenever the user was not ACTIVE/
TRIALING, so a PAST_DUE user started a brand-new subscription (Stripe
Checkout always creates one) instead of recovering the existing one.
Add hasRecoverableSubscription() (ACTIVE/TRIALING/PAST_DUE/UNPAID/
INCOMPLETE); block checkout and route these users to the billing portal
('Update Payment Method') both in the API guard and the settings UI.
2. Subscription webhooks trusted the event's single subscription, so an old
subscription's deletion could clobber a newer active one (marking the user
CANCELED / No access). Every subscription event now re-derives state from
the full set of the customer's Stripe subscriptions via
syncStripeCustomerSubscriptions() + selectAuthoritativeSubscription(),
making the sync order-independent and self-healing.
This commit is contained in:
@@ -53,6 +53,7 @@ interface BillingOverview {
|
||||
status: string;
|
||||
label: string;
|
||||
hasActiveSubscription: boolean;
|
||||
hasRecoverableSubscription: boolean;
|
||||
hasActiveTrial: boolean;
|
||||
hasBillingAccess: boolean;
|
||||
isTrialEligible: boolean;
|
||||
@@ -400,6 +401,14 @@ export default function SettingsPage({ billingOnly = false }: { billingOnly?: bo
|
||||
</Badge>
|
||||
</div>
|
||||
|
||||
{billing.subscription.hasRecoverableSubscription &&
|
||||
!billing.subscription.hasActiveSubscription ? (
|
||||
<p className="rounded-md border border-destructive/30 bg-destructive/10 px-3 py-2 text-sm font-medium text-destructive">
|
||||
Your latest payment didn't go through. Update your payment method to keep
|
||||
your subscription — starting a new one would create a duplicate.
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
{billing.subscription.hasActiveTrial &&
|
||||
billing.subscription.trialEndsAt &&
|
||||
hasScheduledCancellation ? (
|
||||
@@ -444,7 +453,7 @@ export default function SettingsPage({ billingOnly = false }: { billingOnly?: bo
|
||||
) : null}
|
||||
|
||||
<div className="flex flex-col sm:flex-row gap-3">
|
||||
{billing.subscription.hasActiveSubscription && billing.portalAvailable ? (
|
||||
{billing.subscription.hasRecoverableSubscription && billing.portalAvailable ? (
|
||||
<Button
|
||||
onClick={() => handleBillingRedirect('/api/billing/portal')}
|
||||
disabled={billingAction !== null}
|
||||
@@ -454,8 +463,10 @@ export default function SettingsPage({ billingOnly = false }: { billingOnly?: bo
|
||||
<Loader2 className="h-4 w-4 mr-2 animate-spin" />
|
||||
Opening Portal...
|
||||
</>
|
||||
) : (
|
||||
) : billing.subscription.hasActiveSubscription ? (
|
||||
'Manage Subscription'
|
||||
) : (
|
||||
'Update Payment Method'
|
||||
)}
|
||||
</Button>
|
||||
) : (
|
||||
|
||||
@@ -46,8 +46,15 @@ export async function POST(request: NextRequest) {
|
||||
}
|
||||
|
||||
const checkoutState = await getStripeCheckoutState(session.user.id);
|
||||
if (checkoutState.hasActiveSubscription) {
|
||||
return apiErrors.badRequest('An active subscription already exists for this account');
|
||||
// Block a fresh checkout whenever the customer already has a live subscription
|
||||
// (active/trialing OR a recoverable one like past_due/unpaid/incomplete).
|
||||
// Stripe Checkout in subscription mode always creates a NEW subscription, so
|
||||
// letting a past_due user through here duplicates their subscription instead
|
||||
// of recovering it. They should manage the existing one via the billing portal.
|
||||
if (checkoutState.hasRecoverableSubscription) {
|
||||
return apiErrors.badRequest(
|
||||
'A subscription already exists for this account. Manage it from the billing portal.'
|
||||
);
|
||||
}
|
||||
|
||||
const stripe = getStripe();
|
||||
|
||||
@@ -19,12 +19,13 @@ export async function GET() {
|
||||
isEnabled,
|
||||
isConfigured,
|
||||
status: !isEnabled ? 'disabled' : isStripeConfigured() ? 'ready' : 'misconfigured',
|
||||
checkoutAvailable: isStripeConfigured() && !billing.subscription.hasActiveSubscription,
|
||||
checkoutAvailable: isStripeConfigured() && !billing.subscription.hasRecoverableSubscription,
|
||||
portalAvailable: isStripeConfigured() && Boolean(billing.subscription.stripeCustomerId),
|
||||
subscription: {
|
||||
status: billing.subscription.status,
|
||||
label: billing.subscription.label,
|
||||
hasActiveSubscription: billing.subscription.hasActiveSubscription,
|
||||
hasRecoverableSubscription: billing.subscription.hasRecoverableSubscription,
|
||||
hasActiveTrial: billing.subscription.hasActiveTrial,
|
||||
hasBillingAccess: billing.subscription.hasBillingAccess,
|
||||
isTrialEligible: billing.subscription.isTrialEligible,
|
||||
|
||||
@@ -1,28 +1,16 @@
|
||||
import { NextRequest } from 'next/server';
|
||||
import type Stripe from 'stripe';
|
||||
import { markSubscriptionCanceledByCustomerId, syncStripeSubscriptionToUser } from '@/lib/billing';
|
||||
import { syncStripeCustomerSubscriptions } from '@/lib/billing';
|
||||
import { getStripe, getStripeWebhookSecret } from '@/lib/stripe';
|
||||
import { logError } from '@/lib/logger';
|
||||
|
||||
export const runtime = 'nodejs';
|
||||
|
||||
async function handleSubscriptionDeleted(subscription: Stripe.Subscription) {
|
||||
const customerId =
|
||||
typeof subscription.customer === 'string' ? subscription.customer : subscription.customer.id;
|
||||
|
||||
const currentPeriodEnd =
|
||||
'current_period_end' in subscription && typeof subscription.current_period_end === 'number'
|
||||
? new Date(subscription.current_period_end * 1000)
|
||||
: null;
|
||||
const endedAt =
|
||||
'ended_at' in subscription && typeof subscription.ended_at === 'number'
|
||||
? new Date(subscription.ended_at * 1000)
|
||||
: currentPeriodEnd;
|
||||
|
||||
await markSubscriptionCanceledByCustomerId(customerId, {
|
||||
currentPeriodEnd,
|
||||
endedAt,
|
||||
});
|
||||
function getCustomerId(
|
||||
customer: string | Stripe.Customer | Stripe.DeletedCustomer | null
|
||||
): string | null {
|
||||
if (!customer) return null;
|
||||
return typeof customer === 'string' ? customer : customer.id;
|
||||
}
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
@@ -43,30 +31,28 @@ export async function POST(request: NextRequest) {
|
||||
}
|
||||
|
||||
try {
|
||||
const stripe = getStripe();
|
||||
|
||||
// Every subscription-related event re-derives the user's state from the
|
||||
// full set of the customer's Stripe subscriptions, so a stale event (e.g.
|
||||
// an old subscription being deleted) can never clobber a newer active one.
|
||||
switch (event.type) {
|
||||
case 'checkout.session.completed': {
|
||||
const session = event.data.object as Stripe.Checkout.Session;
|
||||
if (session.mode === 'subscription' && session.subscription) {
|
||||
const subscriptionId =
|
||||
typeof session.subscription === 'string'
|
||||
? session.subscription
|
||||
: session.subscription.id;
|
||||
const subscription = await stripe.subscriptions.retrieve(subscriptionId);
|
||||
await syncStripeSubscriptionToUser(subscription);
|
||||
if (session.mode === 'subscription') {
|
||||
const customerId = getCustomerId(session.customer);
|
||||
if (customerId) {
|
||||
await syncStripeCustomerSubscriptions(customerId);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'customer.subscription.created':
|
||||
case 'customer.subscription.updated': {
|
||||
const subscription = event.data.object as Stripe.Subscription;
|
||||
await syncStripeSubscriptionToUser(subscription);
|
||||
break;
|
||||
}
|
||||
case 'customer.subscription.updated':
|
||||
case 'customer.subscription.deleted': {
|
||||
const subscription = event.data.object as Stripe.Subscription;
|
||||
await handleSubscriptionDeleted(subscription);
|
||||
const customerId = getCustomerId(subscription.customer);
|
||||
if (customerId) {
|
||||
await syncStripeCustomerSubscriptions(customerId);
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user