Skip to content

Revamp Trial Subscription Flow with Stripe SetupIntent, Legacy Support, and Webhook Fixes #161

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
Ashad001 merged 3 commits into from
Jun 24, 2025
Merged

Revamp Trial Subscription Flow with Stripe SetupIntent, Legacy Support, and Webhook Fixes #161

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
d9c2ae4
cls
Ashad001 Jun 23, 2025
68e51b2
Bug Fixes
Ashad001 Jun 24, 2025
4ff29f4
corrupt user id bug fix
Ashad001 Jun 24, 2025
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
6 changes: 3 additions & 3 deletions auto-analyst-frontend/app/account/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,10 +653,10 @@ export default function AccountPage() {
<div className="grid grid-cols-1 md:grid-cols-2 gap-6 mt-4">
<Button
className="w-full bg-[#FF7F7F] hover:bg-[#FF6666] text-white"
onClick={() => router.push('/pricing')}
>
onClick={() => router.push('/pricing')}
>
{getCurrentSubscriptionStatus() === 'active' || getCurrentSubscriptionStatus() === 'canceling' ? 'Change Plan' : 'Upgrade Now'}
</Button>
</Button>

<Button
onClick={refreshUserData}
Expand Down
84 changes: 13 additions & 71 deletions auto-analyst-frontend/app/api/checkout-sessions/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,11 @@ export async function POST(request: NextRequest) {
}
}

// Calculate trial end date using centralized config
const trialEndTimestamp = TrialUtils.getTrialEndTimestamp()

// Create subscription with trial period instead of PaymentIntent
const subscriptionParams: Stripe.SubscriptionCreateParams = {
// CHANGED: Create only a setup intent for payment method collection
// Do NOT create subscription until user confirms payment
const setupIntent = await stripe.setupIntents.create({
customer: customerId,
items: [{ price: priceId }],
trial_end: trialEndTimestamp,
expand: ['latest_invoice.payment_intent'],
payment_behavior: 'default_incomplete', // Ensure we get a setup intent for trial
payment_settings: {
save_default_payment_method: 'on_subscription', // Save payment method for after trial
},
usage: 'off_session',
metadata: {
userId: userId || 'anonymous',
planName,
Expand All @@ -108,69 +100,19 @@ export async function POST(request: NextRequest) {
isTrial: 'true',
trialEndDate: TrialUtils.getTrialEndDate(),
...(promoCode && { promoCode }),
...(couponId && { couponId }),
},
}

// Apply discount if coupon is valid
if (couponId) {
subscriptionParams.coupon = couponId
}

// Create subscription with trial
const subscription = await stripe.subscriptions.create(subscriptionParams)

if (!subscription?.latest_invoice) {
return NextResponse.json({ message: 'Failed to create trial subscription' }, { status: 500 })
}

// For trials, the latest_invoice should have $0 amount but still need payment method
const invoice = subscription.latest_invoice as Stripe.Invoice
const paymentIntent = invoice.payment_intent as Stripe.PaymentIntent

// If there's a payment intent, update its metadata for webhook handling
if (paymentIntent && paymentIntent.id) {
await stripe.paymentIntents.update(paymentIntent.id, {
metadata: {
userId: userId || 'anonymous',
isTrial: 'true',
planName,
interval,
subscription_id: subscription.id,
},
})
}

// If no payment intent, create a setup intent for payment method collection
let clientSecret = paymentIntent?.client_secret
let paymentIntentId = paymentIntent?.id

if (!clientSecret && subscription.status === 'trialing') {
// Create a setup intent to collect payment method for trial
const setupIntent = await stripe.setupIntents.create({
customer: customerId,
usage: 'off_session',
metadata: {
subscription_id: subscription.id,
is_trial_setup: 'true',
userId: userId || 'anonymous',
isTrial: 'true',
planName,
interval,
},
})
clientSecret = setupIntent.client_secret
paymentIntentId = setupIntent.id
}
})

return NextResponse.json({
subscriptionId: subscription.id,
clientSecret: clientSecret,
paymentIntentId: paymentIntentId,
setupIntent: !paymentIntent ? paymentIntentId : null,
setupIntentId: setupIntent.id,
clientSecret: setupIntent.client_secret,
customerId: customerId,
discountApplied: !!couponId,
trialEnd: subscription.trial_end,
invoiceAmount: invoice.amount_due, // Should be 0 for trial
isTrialSetup: !paymentIntent,
isTrialSetup: true,
planName,
interval,
priceId,
...(couponId && { couponId })
})
} catch (error) {
Expand Down
11 changes: 10 additions & 1 deletion auto-analyst-frontend/app/api/trial/cancel/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,16 @@ export async function POST(request: NextRequest) {
const stripeSubscriptionId = subscriptionData.stripeSubscriptionId as string

if (!stripeSubscriptionId) {
return NextResponse.json({ error: 'No subscription found for trial' }, { status: 400 })
return NextResponse.json({ error: 'No subscription found' }, { status: 400 })
}

// Validate that we have a proper Subscription ID (not Payment Intent)
if (!stripeSubscriptionId.startsWith('sub_')) {
console.error(`Invalid subscription ID format for user ${userId}: ${stripeSubscriptionId}`)
return NextResponse.json({
error: 'Invalid subscription data. Please contact support for assistance.',
code: 'INVALID_SUBSCRIPTION_FORMAT'
}, { status: 400 })
}

let stripeSubscription = null
Expand Down
187 changes: 99 additions & 88 deletions auto-analyst-frontend/app/api/trial/start/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from 'next/server'
import { getToken } from 'next-auth/jwt'
import Stripe from 'stripe'
import redis, { creditUtils, KEYS } from '@/lib/redis'
import { CreditConfig, TrialUtils } from '@/lib/credits-config'
import { TrialUtils, CreditConfig } from '@/lib/credits-config'

export const dynamic = 'force-dynamic'

Expand All @@ -27,94 +27,103 @@ export async function POST(request: NextRequest) {

const userId = token.sub
const body = await request.json()
const { subscriptionId, planName, interval, amount } = body

if (!subscriptionId || !planName) {
return NextResponse.json({ error: 'Subscription ID and plan name are required' }, { status: 400 })
// Handle both setupIntentId (new flow) and legacy parameters
const { setupIntentId, subscriptionId, paymentIntentId, planName, interval, amount } = body

// Check if user already has an active trial/subscription first
const existingSubscription = await redis.hgetall(KEYS.USER_SUBSCRIPTION(userId))
if (existingSubscription && ['trialing', 'active'].includes(existingSubscription.status as string)) {
// Return success if already processed to avoid duplicate processing
return NextResponse.json({
success: true,
alreadyProcessed: true,
subscriptionId: existingSubscription.stripeSubscriptionId || subscriptionId,
message: 'Trial already active',
subscription: existingSubscription,
credits: {
total: TrialUtils.getTrialCredits(),
used: parseInt(existingSubscription.creditsUsed as string || '0'),
remaining: TrialUtils.getTrialCredits() - parseInt(existingSubscription.creditsUsed as string || '0')
}
})
}

// CRITICAL: Verify subscription status in Stripe before granting trial access
try {
const subscription = await stripe.subscriptions.retrieve(subscriptionId)

// Check if subscription is valid and active/trialing
if (!subscription || !['trialing', 'active'].includes(subscription.status)) {
console.log(`Trial access denied for user ${userId}: subscription status is ${subscription?.status || 'not found'}`)
return NextResponse.json({
error: 'Subscription is not active or trialing. Trial access denied.',
subscriptionStatus: subscription?.status || 'not found'
}, { status: 400 })
}

// For trialing subscriptions, verify payment method is attached (more lenient for test mode)
if (subscription.status === 'trialing') {
// Check if subscription has a default payment method
const hasSubscriptionPaymentMethod = subscription.default_payment_method != null

// Check customer's default payment method as fallback
let hasCustomerPaymentMethod = false
if (!hasSubscriptionPaymentMethod) {
const customer = await stripe.customers.retrieve(subscription.customer as string)
if (typeof customer !== 'string' && !customer.deleted) {
hasCustomerPaymentMethod = !!(
customer.default_source ||
customer.invoice_settings?.default_payment_method
)
}
}

// Check for successful setup intents as final fallback
let hasSuccessfulSetup = false
if (!hasSubscriptionPaymentMethod && !hasCustomerPaymentMethod) {
const setupIntents = await stripe.setupIntents.list({
customer: subscription.customer as string,
limit: 5,
})

hasSuccessfulSetup = setupIntents.data.some(si =>
si.status === 'succeeded' &&
(si.metadata?.subscription_id === subscriptionId || si.metadata?.is_trial_setup === 'true')
)
}

// Check if we're in test mode for more lenient validation
const isTestMode = process.env.STRIPE_SECRET_KEY?.includes('sk_test_') || false
const allowTestModeTrials = isTestMode && subscription.status === 'trialing'

// Allow trial if any payment method is found OR if in test mode with valid trialing subscription
if (!hasSubscriptionPaymentMethod && !hasCustomerPaymentMethod && !hasSuccessfulSetup && !allowTestModeTrials) {
console.log(`Trial access denied for user ${userId}: no payment method found`)
console.log(`Subscription payment method: ${hasSubscriptionPaymentMethod}`)
console.log(`Customer payment method: ${hasCustomerPaymentMethod}`)
console.log(`Setup intent: ${hasSuccessfulSetup}`)
console.log(`Test mode allowed: ${allowTestModeTrials}`)

return NextResponse.json({
error: 'Payment method setup required. Please complete payment method verification.',
requiresSetup: true,
debug: {
subscriptionPaymentMethod: hasSubscriptionPaymentMethod,
customerPaymentMethod: hasCustomerPaymentMethod,
setupIntentSuccess: hasSuccessfulSetup,
testModeAllowed: allowTestModeTrials,
isTestMode: isTestMode
}
}, { status: 400 })
}

if (allowTestModeTrials && !hasSubscriptionPaymentMethod && !hasCustomerPaymentMethod && !hasSuccessfulSetup) {
console.log(`Allowing trial for user ${userId} in test mode despite no payment method found`)
} else {
console.log(`Payment method verified for user ${userId}`)
}
}

console.log(`Subscription verified for user ${userId}: status=${subscription.status}`)
} catch (stripeError: any) {
console.error('Error verifying subscription:', stripeError)
// If we have a subscriptionId but no setupIntentId, this might be a re-call from success page
if (subscriptionId && !setupIntentId) {
return NextResponse.json({
error: 'Trial was already processed successfully. Please check your account page.',
alreadyProcessed: true
}, { status: 400 })
}

// NEW FLOW: Require setupIntentId for proper payment method verification
if (!setupIntentId) {
return NextResponse.json({ error: 'Setup Intent ID is required for trial signup' }, { status: 400 })
}

// Verify the setup intent is successful
const setupIntent = await stripe.setupIntents.retrieve(setupIntentId)

if (setupIntent.status !== 'succeeded') {
return NextResponse.json({
error: 'Payment method setup not completed. Please complete payment method verification.',
setupStatus: setupIntent.status
}, { status: 400 })
}

// Extract metadata from setup intent
const metadata = setupIntent.metadata
if (!metadata) {
return NextResponse.json({ error: 'Missing setup intent metadata' }, { status: 400 })
}

const priceId = metadata.priceId
const customerId = setupIntent.customer as string
const couponId = metadata.couponId

if (!priceId || !customerId) {
return NextResponse.json({ error: 'Missing required payment information' }, { status: 400 })
}

// Store customer mapping for webhooks
await redis.set(`stripe:customer:${customerId}`, String(userId))

// NOW create the subscription (after payment method is confirmed)
const trialEndTimestamp = TrialUtils.getTrialEndTimestamp()

const subscriptionParams: Stripe.SubscriptionCreateParams = {
customer: customerId,
items: [{ price: priceId }],
trial_end: trialEndTimestamp,
expand: ['latest_invoice.payment_intent'],
payment_behavior: 'default_incomplete',
payment_settings: {
save_default_payment_method: 'on_subscription',
},
metadata: {
userId: userId || 'anonymous',
planName: metadata.planName || planName || 'Standard',
interval: metadata.interval || interval || 'month',
priceId,
isTrial: 'true',
trialEndDate: TrialUtils.getTrialEndDate(),
createdFromSetupIntent: setupIntentId,
},
}

// Apply discount if coupon is valid
if (couponId) {
subscriptionParams.coupon = couponId
}

// Create subscription with trial
const subscription = await stripe.subscriptions.create(subscriptionParams)

if (subscription.status !== 'trialing') {
return NextResponse.json({
error: 'Unable to verify subscription status. Please try again.',
stripeError: stripeError.message
error: 'Failed to create trial subscription',
subscriptionStatus: subscription.status
}, { status: 500 })
}

Expand All @@ -137,12 +146,13 @@ export async function POST(request: NextRequest) {
trialEndDate: trialEndDate,
creditResetDate: creditResetDate.toISOString().split('T')[0], // Store reset date
lastUpdated: now.toISOString(),
stripeSubscriptionId: subscriptionId, // Store subscription ID instead of payment intent
stripeCustomerId: customerId,
stripeSubscriptionId: subscription.id, // Store actual subscription ID
willChargeOn: trialEndDate
}

// Initialize trial credits (500 credits immediately) with custom reset date
await creditUtils.initializeTrialCredits(userId, subscriptionId, trialEndDate)
await creditUtils.initializeTrialCredits(userId, subscription.id, trialEndDate)

// Set custom credit reset date (1 month from checkout)
await redis.hset(KEYS.USER_CREDITS(userId), {
Expand All @@ -152,10 +162,11 @@ export async function POST(request: NextRequest) {
// Store subscription data in Redis
await redis.hset(KEYS.USER_SUBSCRIPTION(userId), subscriptionData)

console.log(`Started trial for user ${userId} with subscription ${subscriptionId}`)
console.log(`Started trial for user ${userId} with subscription ${subscription.id}`)

return NextResponse.json({
success: true,
subscriptionId: subscription.id,
subscription: subscriptionData,
credits: {
total: TrialUtils.getTrialCredits(),
Expand Down
Loading
Loading