Skip to content

Add Legacy Cancellation Support and Fix Stripe Webhook Verification for App Router #162

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

Add Legacy Cancellation Support and Fix Stripe Webhook Verification for App Router #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf3836f
Webhook Bug Fix
Ashad001 Jun 24, 2025
aa0a1c9
fix: add legacy subscription cancellation support and fix Stripe webh…
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
102 changes: 56 additions & 46 deletions 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 @@ -34,53 +34,62 @@ export async function POST(request: NextRequest) {
}

const stripeSubscriptionId = subscriptionData.stripeSubscriptionId as string
const isLegacyUser = !stripeSubscriptionId || !stripeSubscriptionId.startsWith('sub_')

if (!stripeSubscriptionId) {
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 })
// For legacy users, we'll skip Stripe API calls and just update Redis
if (isLegacyUser) {
console.log(`Legacy user ${userId} canceling - using Redis-only flow`)
} else {
// Validate that we have a proper Subscription ID for new users
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
try {
// First get the current subscription from Stripe
stripeSubscription = await stripe.subscriptions.retrieve(stripeSubscriptionId)

if (stripeSubscription.status === 'trialing') {
// Cancel the subscription immediately for trials
await stripe.subscriptions.cancel(stripeSubscriptionId, {
prorate: false // Don't prorate since it's a trial cancellation
})
console.log(`Canceled trial subscription ${stripeSubscriptionId} for user ${userId}`)
} else if (stripeSubscription.status === 'active') {
// For active subscriptions, cancel at period end
await stripe.subscriptions.update(stripeSubscriptionId, {
cancel_at_period_end: true
})
console.log(`Scheduled cancellation for subscription ${stripeSubscriptionId} for user ${userId}`)
} else {
console.log(`Subscription ${stripeSubscriptionId} already in status: ${stripeSubscription.status}`)
}
} catch (stripeError: any) {
console.error('Error canceling subscription in Stripe:', stripeError)
// For trials, we still want to proceed with local cleanup even if Stripe fails
if (subscriptionData.status !== 'trialing') {
return NextResponse.json({ error: 'Failed to cancel subscription in Stripe' }, { status: 500 })

// Only make Stripe API calls for new users with proper subscription IDs
if (!isLegacyUser) {
try {
// First get the current subscription from Stripe
stripeSubscription = await stripe.subscriptions.retrieve(stripeSubscriptionId)

if (stripeSubscription.status === 'trialing') {
// Cancel the subscription immediately for trials
await stripe.subscriptions.cancel(stripeSubscriptionId, {
prorate: false // Don't prorate since it's a trial cancellation
})
console.log(`Canceled trial subscription ${stripeSubscriptionId} for user ${userId}`)
} else if (stripeSubscription.status === 'active') {
// For active subscriptions, cancel at period end
await stripe.subscriptions.update(stripeSubscriptionId, {
cancel_at_period_end: true
})
console.log(`Scheduled cancellation for subscription ${stripeSubscriptionId} for user ${userId}`)
} else {
console.log(`Subscription ${stripeSubscriptionId} already in status: ${stripeSubscription.status}`)
}
} catch (stripeError: any) {
console.error('Error canceling subscription in Stripe:', stripeError)
// For trials, we still want to proceed with local cleanup even if Stripe fails
if (subscriptionData.status !== 'trialing') {
return NextResponse.json({ error: 'Failed to cancel subscription in Stripe' }, { status: 500 })
}
}
} else {
console.log(`Legacy user ${userId} - skipping Stripe API calls, updating Redis only`)
}

const now = new Date()
const isTrial = subscriptionData.status === 'trialing'
const isLegacyActive = isLegacyUser && subscriptionData.status === 'active'

if (isTrial) {
// For trial cancellations: Immediate access removal
if (isTrial || isLegacyActive) {
// For trial cancellations OR legacy user cancellations: Immediate access removal
await creditUtils.setZeroCredits(userId)

await redis.hset(KEYS.USER_CREDITS(userId), {
Expand All @@ -90,7 +99,8 @@ export async function POST(request: NextRequest) {
lastUpdate: now.toISOString(),
downgradedAt: now.toISOString(),
canceledAt: now.toISOString(),
trialCanceled: 'true' // Mark this as a genuine trial cancellation
trialCanceled: isTrial ? 'true' : 'false',
legacyCanceled: isLegacyActive ? 'true' : 'false'
})

// Update subscription to canceled status immediately
Expand All @@ -100,11 +110,11 @@ export async function POST(request: NextRequest) {
canceledAt: now.toISOString(),
lastUpdated: now.toISOString(),
subscriptionCanceled: 'true',
trialEndDate: '',
trialStartDate: ''
trialEndDate: isTrial ? '' : subscriptionData.trialEndDate || '',
trialStartDate: isTrial ? '' : subscriptionData.trialStartDate || ''
})

console.log(`Trial canceled for user ${userId}, access removed immediately`)
console.log(`${isTrial ? 'Trial' : 'Legacy subscription'} canceled for user ${userId}, access removed immediately`)
} else {
// For post-trial cancellations: Maintain access until period end
// Don't change credits - let them keep access until billing cycle ends
Expand All @@ -127,11 +137,11 @@ export async function POST(request: NextRequest) {

return NextResponse.json({
success: true,
message: isTrial
? 'Trial canceled successfully. Your subscription was canceled and access has been removed.'
message: (isTrial || isLegacyActive)
? `${isTrial ? 'Trial' : 'Subscription'} canceled successfully. Your subscription was canceled and access has been removed.`
: 'Subscription scheduled for cancellation at the end of the current billing period.',
subscription: subscriptionData,
credits: isTrial ? {
credits: (isTrial || isLegacyActive) ? {
total: 0,
used: 0,
remaining: 0
Expand All @@ -140,8 +150,8 @@ export async function POST(request: NextRequest) {
used: parseInt(subscriptionData.used as string || '0'),
remaining: Math.max(0, parseInt(subscriptionData.total as string || '0') - parseInt(subscriptionData.used as string || '0'))
},
stripeStatus: stripeSubscription?.status || 'unknown',
willCancelAt: !isTrial && stripeSubscription?.current_period_end
stripeStatus: stripeSubscription?.status || (isLegacyUser ? 'legacy' : 'unknown'),
willCancelAt: !(isTrial || isLegacyActive) && stripeSubscription?.current_period_end
? new Date(stripeSubscription.current_period_end * 1000).toISOString()
: undefined
})
Expand Down
68 changes: 46 additions & 22 deletions auto-analyst-frontend/app/api/user/cancel-subscription/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,50 +31,74 @@ export async function POST(request: NextRequest) {
// Get current subscription data from Redis
const subscriptionData = await redis.hgetall(KEYS.USER_SUBSCRIPTION(userId))

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

const stripeSubscriptionId = subscriptionData.stripeSubscriptionId as string
const isLegacyUser = !stripeSubscriptionId || !stripeSubscriptionId.startsWith('sub_')

// For legacy users, we'll skip Stripe API calls and just update Redis
if (isLegacyUser) {
console.log(`Legacy user ${userId} canceling - using Redis-only flow`)
}

try {
// Cancel the subscription in Stripe
// Using cancel_at_period_end: true to let the user keep access until the end of their current billing period
const canceledSubscription = await stripe.subscriptions.update(stripeSubscriptionId, {
cancel_at_period_end: true,
})
let canceledSubscription = null

// Only make Stripe API calls for new users with proper subscription IDs
if (!isLegacyUser) {
// Cancel the subscription in Stripe
// Using cancel_at_period_end: true to let the user keep access until the end of their current billing period
canceledSubscription = await stripe.subscriptions.update(stripeSubscriptionId, {
cancel_at_period_end: true,
})
console.log(`Scheduled Stripe cancellation for subscription ${stripeSubscriptionId} for user ${userId}`)
} else {
console.log(`Legacy user ${userId} - skipping Stripe API calls, updating Redis only`)
}

// Update the subscription data in Redis with cancellation info
// Update the subscription data in Redis with cancellation info (for both legacy and new users)
const now = new Date()
await redis.hset(KEYS.USER_SUBSCRIPTION(userId), {
status: 'canceling', // 'canceling' means it will end at period end
status: isLegacyUser ? 'canceled' : 'canceling', // Legacy users get immediate cancellation
canceledAt: now.toISOString(),
lastUpdated: now.toISOString(),
// Add a flag to indicate this is pending cancellation and should get free credits next reset
pendingDowngrade: 'true',
nextPlanType: 'FREE'
nextPlanType: 'STANDARD' // Changed from FREE to STANDARD since no more free plan
})

// Get current credit data
const creditData = await redis.hgetall(KEYS.USER_CREDITS(userId))
if (creditData && creditData.resetDate) {
// Mark the credits to be reset to 0 on next reset (since no more Free plan)
// Handle credits based on user type
if (isLegacyUser) {
// Legacy users: Set credits to 0 immediately
await redis.hset(KEYS.USER_CREDITS(userId), {
nextTotalCredits: '0', // No credits after cancellation
pendingDowngrade: 'true',
lastUpdate: new Date().toISOString()
total: '0',
used: '0',
resetDate: '',
lastUpdate: now.toISOString(),
downgradedAt: now.toISOString(),
canceledAt: now.toISOString()
})
} else {
// New users: Mark for downgrade at period end
const creditData = await redis.hgetall(KEYS.USER_CREDITS(userId))
if (creditData && creditData.resetDate) {
await redis.hset(KEYS.USER_CREDITS(userId), {
nextTotalCredits: '0', // No credits after cancellation
pendingDowngrade: 'true',
lastUpdate: now.toISOString()
})
}
}

// Send cancellation confirmation email
// This would be implemented in a real application

return NextResponse.json({
success: true,
message: 'Subscription will be canceled at the end of the current billing period',
message: isLegacyUser
? 'Subscription canceled successfully. Your access has been removed.'
: 'Subscription will be canceled at the end of the current billing period',
subscription: {
...subscriptionData,
status: 'canceling',
status: isLegacyUser ? 'canceled' : 'canceling',
canceledAt: now.toISOString(),
}
})
Expand Down
Loading