Let users upgrade/downgrade from pricing page (linked from hitting limit in cli)

Author: jahooma

common/src/types/subscription.ts

@@ -2,6 +2,7 @@
  * Core subscription information for an active subscription.
  */
 export interface SubscriptionInfo {
+  id: string
   status: string
   billingPeriodEnd: string
   cancelAtPeriodEnd: boolean
@@ -64,4 +65,3 @@ export interface ActiveSubscriptionResponse {
  * Use `hasSubscription` to narrow the type.
  */
 export type SubscriptionResponse = NoSubscriptionResponse | ActiveSubscriptionResponse
-

web/src/app/api/user/billing-portal/_post.ts

@@ -13,20 +13,33 @@ export type Session = {
 
 export type GetSessionFn = () => Promise<Session>
 
-export type CreateBillingPortalSessionFn = (params: {
+export type BillingPortalFlowData = {
+  type: 'subscription_update'
+  subscription_update: {
+    subscription: string
+  }
+}
+
+export type CreateBillingPortalSessionParams = {
   customer: string
   return_url: string
-}) => Promise<{ url: string }>
+  flow_data?: BillingPortalFlowData
+}
+
+export type CreateBillingPortalSessionFn = (
+  params: CreateBillingPortalSessionParams
+) => Promise<{ url: string }>
 
 export type PostBillingPortalParams = {
   getSession: GetSessionFn
   createBillingPortalSession: CreateBillingPortalSessionFn
   logger: Logger
   returnUrl: string
+  flowData?: BillingPortalFlowData
 }
 
 export async function postBillingPortal(params: PostBillingPortalParams) {
-  const { getSession, createBillingPortalSession, logger, returnUrl } = params
+  const { getSession, createBillingPortalSession, logger, returnUrl, flowData } = params
 
   const session = await getSession()
   if (!session?.user?.id) {
@@ -42,10 +55,16 @@ export async function postBillingPortal(params: PostBillingPortalParams) {
   }
 
   try {
-    const portalSession = await createBillingPortalSession({
+    const portalParams: CreateBillingPortalSessionParams = {
       customer: stripeCustomerId,
       return_url: returnUrl,
-    })
+    }
+
+    if (flowData) {
+      portalParams.flow_data = flowData
+    }
+
+    const portalSession = await createBillingPortalSession(portalParams)
 
     return NextResponse.json({ url: portalSession.url })
   } catch (error) {

web/src/app/api/user/billing-portal/route.ts

@@ -2,17 +2,37 @@ import { env } from '@codebuff/internal/env'
 import { stripeServer } from '@codebuff/internal/util/stripe'
 import { getServerSession } from 'next-auth'
 
+import type { NextRequest } from 'next/server'
+
 import { authOptions } from '@/app/api/auth/[...nextauth]/auth-options'
 import { logger } from '@/util/logger'
 
 import { postBillingPortal } from './_post'
 
-export async function POST() {
+import type { BillingPortalFlowData } from './_post'
+
+export async function POST(req: NextRequest) {
+  // Parse optional subscriptionId from request body for deep-linking to subscription update
+  let flowData: BillingPortalFlowData | undefined
+  const body = await req.json().catch(() => null)
+  if (body?.subscriptionId) {
+    flowData = {
+      type: 'subscription_update',
+      subscription_update: {
+        subscription: body.subscriptionId,
+      },
+    }
+  }
+
+  // Determine return URL - use provided returnUrl or default to /pricing
+  const returnUrl = body?.returnUrl || `${env.NEXT_PUBLIC_CODEBUFF_APP_URL}/pricing`
+
   return postBillingPortal({
     getSession: () => getServerSession(authOptions),
     createBillingPortalSession: (params) =>
       stripeServer.billingPortal.sessions.create(params),
     logger,
-    returnUrl: `${env.NEXT_PUBLIC_CODEBUFF_APP_URL}/profile`,
+    returnUrl,
+    flowData,
   })
 }

web/src/app/api/user/subscription/route.ts

@@ -51,6 +51,7 @@ export async function GET() {
     hasSubscription: true,
     displayName: SUBSCRIPTION_DISPLAY_NAME,
     subscription: {
+      id: subscription.stripe_subscription_id,
       status: subscription.status,
       billingPeriodEnd: subscription.billing_period_end.toISOString(),
       cancelAtPeriodEnd: subscription.cancel_at_period_end,