feat(billing): scaffold dual Stripe account support (EE default)

cloudflare_workers/api/index.ts

@@ -89,7 +89,7 @@ import { app as on_version_update } from '../../supabase/functions/_backend/trig
 import { app as pluginNotifications } from '../../supabase/functions/_backend/triggers/plugin_notifications.ts'
 import { app as queue_consumer } from '../../supabase/functions/_backend/triggers/queue_consumer.ts'
 import { app as send_email } from '../../supabase/functions/_backend/triggers/send_email.ts'
-import { app as stripe_event } from '../../supabase/functions/_backend/triggers/stripe_event.ts'
+import { app as stripe_event, appUs as stripe_event_us } from '../../supabase/functions/_backend/triggers/stripe_event.ts'
 import { app as webhook_delivery } from '../../supabase/functions/_backend/triggers/webhook_delivery.ts'
 import { app as webhook_dispatcher } from '../../supabase/functions/_backend/triggers/webhook_dispatcher.ts'
 import { BRES, createAllCatch, createHono } from '../../supabase/functions/_backend/utils/hono.ts'
@@ -211,6 +211,7 @@ appTriggers.route('/on_version_delete', on_version_delete)
 appTriggers.route('/on_manifest_create', on_manifest_create)
 appTriggers.route('/on_deploy_history_create', on_deploy_history_create)
 appTriggers.route('/stripe_event', stripe_event)
+appTriggers.route('/stripe_event_us', stripe_event_us)
 appTriggers.route('/on_organization_create', on_organization_create)
 appTriggers.route('/cron_stat_app', cron_stat_app)
 appTriggers.route('/cron_stat_org', cron_stat_org)

read_replicate/schema_replicate.catalog.json

@@ -1789,6 +1789,16 @@
       "position": 26,
       "table": "stripe_info",
       "type": "boolean"
+    },
+    {
+      "default": "'ee'::text",
+      "generated": "",
+      "identity": "",
+      "name": "billing_account",
+      "notNull": true,
+      "position": 27,
+      "table": "stripe_info",
+      "type": "text"
     }
   ],
   "constraints": [
@@ -2023,6 +2033,13 @@
       "type": "u",
       "valid": true
     },
+    {
+      "definition": "CHECK (billing_account = ANY (ARRAY['ee'::text, 'us'::text]))",
+      "name": "stripe_info_billing_account_check",
+      "table": "stripe_info",
+      "type": "c",
+      "valid": true
+    },
     {
       "definition": "PRIMARY KEY (customer_id)",
       "name": "stripe_info_pkey",

read_replicate/schema_replicate.sql

@@ -442,7 +442,9 @@ CREATE TABLE public.stripe_info (
     last_stripe_event_at timestamp with time zone,
     past_due_at timestamp with time zone,
     churn_reason text,
-    is_above_plan boolean
+    is_above_plan boolean,
+    billing_account text DEFAULT 'ee'::text NOT NULL,
+    CONSTRAINT stripe_info_billing_account_check CHECK ((billing_account = ANY (ARRAY['ee'::text, 'us'::text])))
 );
 
 ALTER TABLE ONLY public.stripe_info REPLICA IDENTITY FULL;

scripts/backfill_retention_metrics.ts

@@ -1224,19 +1224,20 @@ async function claimProcessedEventsPg(client: PgClient, movements: BackfillReven
 
     const values: string[] = []
     const placeholders = chunk.map((movement, index) => {
-      const offset = index * 3
-      values.push(movement.event_id, movement.customer_id, movement.date_id)
-      return `($${offset + 1}, $${offset + 2}, $${offset + 3})`
+      const offset = index * 4
+      values.push(movement.event_id, movement.customer_id, movement.date_id, 'ee')
+      return `($${offset + 1}, $${offset + 2}, $${offset + 3}, $${offset + 4})`
     })
 
     const { rows } = await client.query<{ event_id: string }>(`
       INSERT INTO public.processed_stripe_events (
         event_id,
         customer_id,
-        date_id
+        date_id,
+        billing_account
       )
       VALUES ${placeholders.join(', ')}
-      ON CONFLICT (event_id) DO NOTHING
+      ON CONFLICT (billing_account, event_id) DO NOTHING
       RETURNING event_id
     `, values)
 

src/pages/settings/organization/Plans.vue

@@ -141,7 +141,7 @@ const isTrial = computed(() => currentOrganization?.value ? (!currentOrganizatio
 const isCreditsOnly = computed(() => isCreditsOnlyOrg(currentOrganization?.value))
 
 async function prefetchStripeCheckoutUrl(plan: Database['public']['Tables']['plans']['Row'], isYear: boolean) {
-  if (!plan.stripe_id)
+  if (!plan.name)
     return
   const supabase = useSupabase()
   const session = await supabase.auth.getSession()
@@ -155,7 +155,7 @@ async function prefetchStripeCheckoutUrl(plan: Database['public']['Tables']['pla
   try {
     const resp = await invokeCapgoApi('private/stripe_checkout', {
       body: JSON.stringify({
-        priceId: plan.stripe_id,
+        planName: plan.name,
         successUrl,
         cancelUrl,
         recurrence: isYear ? 'year' : 'month',
@@ -252,7 +252,7 @@ async function openChangePlan(plan: Database['public']['Tables']['plans']['Row']
       }
     }
     else {
-      const didOpenCheckout = await openCheckout(plan.stripe_id, `${globalThis.location.href}?success=1`, `${globalThis.location.href}?cancel=1`, checkoutIsYearly, currentOrganization?.value?.gid ?? '')
+      const didOpenCheckout = await openCheckout(plan.name, `${globalThis.location.href}?success=1`, `${globalThis.location.href}?cancel=1`, checkoutIsYearly, currentOrganization?.value?.gid ?? '')
       if (didOpenCheckout)
         trackPlanCheckoutStarted(plan, checkoutIsYearly, 'direct')
     }

src/services/stripe.ts

@@ -149,7 +149,7 @@ export async function getAffonsoReferral() {
   }
 }
 
-export async function openCheckout(priceId: string, successUrl: string, cancelUrl: string, isYear: boolean, orgId: string) {
+export async function openCheckout(planName: string, successUrl: string, cancelUrl: string, isYear: boolean, orgId: string) {
   //   console.log('openCheckout')
   const supabase = useSupabase()
   const session = await supabase.auth.getSession()
@@ -160,7 +160,7 @@ export async function openCheckout(priceId: string, successUrl: string, cancelUr
   try {
     const resp = await invokeCapgoApi('private/stripe_checkout', {
       body: JSON.stringify({
-        priceId,
+        planName,
         successUrl,
         cancelUrl,
         recurrence: isYear ? 'year' : 'month',

src/types/supabase.types.ts

@@ -2686,6 +2686,7 @@ export type Database = {
           build_time_unit: number
           created_at: string
           credit_id: string
+          credit_id_us: string | null
           description: string
           id: string
           market_desc: string | null
@@ -2696,15 +2697,19 @@ export type Database = {
           price_m_id: string
           price_y: number
           price_y_id: string
+          price_m_id_us: string | null
+          price_y_id_us: string | null
           storage: number
           stripe_id: string
+          stripe_id_us: string | null
           updated_at: string
         }
         Insert: {
           bandwidth: number
           build_time_unit?: number
           created_at?: string
           credit_id: string
+          credit_id_us?: string | null
           description?: string
           id?: string
           market_desc?: string | null
@@ -2713,17 +2718,21 @@ export type Database = {
           native_build_concurrency?: number
           price_m?: number
           price_m_id: string
+          price_m_id_us?: string | null
           price_y?: number
           price_y_id: string
+          price_y_id_us?: string | null
           storage: number
           stripe_id?: string
+          stripe_id_us?: string | null
           updated_at?: string
         }
         Update: {
           bandwidth?: number
           build_time_unit?: number
           created_at?: string
           credit_id?: string
+          credit_id_us?: string | null
           description?: string
           id?: string
           market_desc?: string | null
@@ -2732,10 +2741,13 @@ export type Database = {
           native_build_concurrency?: number
           price_m?: number
           price_m_id?: string
+          price_m_id_us?: string | null
           price_y?: number
           price_y_id?: string
+          price_y_id_us?: string | null
           storage?: number
           stripe_id?: string
+          stripe_id_us?: string | null
           updated_at?: string
         }
         Relationships: []
@@ -2766,18 +2778,21 @@ export type Database = {
       }
       processed_stripe_events: {
         Row: {
+          billing_account: string
           created_at: string
           customer_id: string
           date_id: string
           event_id: string
         }
         Insert: {
+          billing_account?: string
           created_at?: string
           customer_id: string
           date_id: string
           event_id: string
         }
         Update: {
+          billing_account?: string
           created_at?: string
           customer_id?: string
           date_id?: string
@@ -3091,6 +3106,7 @@ export type Database = {
           created_at: string
           customer_country: string | null
           customer_id: string
+          billing_account: string
           id: number
           is_above_plan: boolean | null
           is_good_plan: boolean | null
@@ -3119,6 +3135,7 @@ export type Database = {
           created_at?: string
           customer_country?: string | null
           customer_id: string
+          billing_account?: string
           id?: number
           is_above_plan?: boolean | null
           is_good_plan?: boolean | null
@@ -3147,6 +3164,7 @@ export type Database = {
           created_at?: string
           customer_country?: string | null
           customer_id?: string
+          billing_account?: string
           id?: number
           is_above_plan?: boolean | null
           is_good_plan?: boolean | null

supabase/functions/.env.example

@@ -19,9 +19,14 @@ CF_ACCOUNT_ANALYTICS_ID=***
 CF_ANALYTICS_TOKEN=***
 # To ignore apps that can be used with the API
 LIMITED_APPS=[{"id": "***.**.**", "ignore": 1}]
-# Stripe
+# Stripe (EE account — existing production billing)
 STRIPE_WEBHOOK_SECRET=test
 STRIPE_SECRET_KEY=test
+# Optional US Stripe account scaffolding (leave unset until US billing is enabled)
+# STRIPE_SECRET_KEY_US=
+# STRIPE_WEBHOOK_SECRET_US=
+# New org billing account default: ee (unset = ee). Requires US secrets when set to us.
+# STRIPE_NEW_CUSTOMERS_ACCOUNT=ee
 # Sentry if omitted, errors will not be sent
 SENTRY_DSN=
 # Bento to connect email service and send marketing and transactional emails

supabase/functions/_backend/private/credits.ts

@@ -14,6 +14,7 @@ import { getClaimsFromJWT, middlewareAuth } from '../utils/hono_jwt.ts'
 import { cloudlog, cloudlogErr } from '../utils/logging.ts'
 import { checkPermission } from '../utils/rbac.ts'
 import { createOneTimeCheckout, getCreditCheckoutDetails, getStripe, isStripeEmulatorEnabled } from '../utils/stripe.ts'
+import { normalizeBillingAccount, planProductIdOrFilter, resolveBillingAccount, resolvePlanCreditId } from '../utils/stripe_billing_account.ts'
 import { supabaseAdmin, supabaseClient } from '../utils/supabase.ts'
 import { getEnv } from '../utils/utils.ts'
 
@@ -234,7 +235,7 @@ async function getCreditTopUpProductId(c: AppContext, customerId: string, token:
   const supabase = supabaseClient(c, token)
   const { data: stripeInfo, error: stripeInfoError } = await supabase
     .from('stripe_info')
-    .select('product_id')
+    .select('product_id, billing_account')
     .eq('customer_id', customerId)
     .single()
 
@@ -259,13 +260,15 @@ async function getCreditTopUpProductId(c: AppContext, customerId: string, token:
     return { productId }
   }
 
+  const account = normalizeBillingAccount(stripeInfo.billing_account)
   const { data: plan, error: planError } = await supabase
     .from('plans')
-    .select('credit_id, name')
-    .eq('stripe_id', stripeInfo.product_id)
+    .select('credit_id, credit_id_us, name')
+    .or(planProductIdOrFilter(stripeInfo.product_id))
     .single()
 
-  if (planError || !plan?.credit_id) {
+  const creditId = plan ? resolvePlanCreditId(plan, account) : null
+  if (planError || !creditId) {
     cloudlogErr({
       requestId: c.get('requestId'),
       message: 'credit_top_up_product_missing',
@@ -286,7 +289,7 @@ async function getCreditTopUpProductId(c: AppContext, customerId: string, token:
     return { productId }
   }
 
-  return { productId: plan.credit_id }
+  return { productId: creditId }
 }
 
 async function resolveOrgStripeContext(c: AppContext, orgId: string) {
@@ -593,7 +596,8 @@ app.post('/complete-top-up', middlewareAuth, async (c) => {
   const { customerId, token } = await resolveOrgStripeContext(c, body.orgId)
   const supabase = supabaseClient(c, token)
 
-  const stripe = getStripe(c)
+  const account = await resolveBillingAccount(c, customerId)
+  const stripe = getStripe(c, account)
   const session = await resolveCheckoutSession(c, stripe, supabase, body.orgId, customerId, body.sessionId)
   const resolvedSessionId = session.id
 
@@ -609,7 +613,7 @@ app.post('/complete-top-up', middlewareAuth, async (c) => {
   const { productId } = await getCreditTopUpProductId(c, customerId, token)
   const paymentIntentId = getCheckoutSessionPaymentIntentId(session)
 
-  const { creditQuantity, itemsSummary } = await getCreditCheckoutDetails(c, session, productId)
+  const { creditQuantity, itemsSummary } = await getCreditCheckoutDetails(c, session, productId, customerId)
 
   if (creditQuantity <= 0)
     throw simpleError('credit_product_not_found', 'Checkout session does not include the credit product')

supabase/functions/_backend/private/stripe_checkout.ts

@@ -5,11 +5,13 @@ import { middlewareAuth } from '../utils/hono_jwt.ts'
 import { cloudlog } from '../utils/logging.ts'
 import { checkPermission } from '../utils/rbac.ts'
 import { createCheckout } from '../utils/stripe.ts'
-import { supabaseClient } from '../utils/supabase.ts'
+import { resolveBillingAccount, resolvePlanProductId } from '../utils/stripe_billing_account.ts'
+import { supabaseAdmin, supabaseClient } from '../utils/supabase.ts'
 import { getEnv } from '../utils/utils.ts'
 
 interface CheckoutData {
-  priceId: string
+  priceId?: string
+  planName?: string
   clientReferenceId?: string
   recurrence: 'month' | 'year'
   attributionId?: string
@@ -25,6 +27,27 @@ export const app = new Hono<MiddlewareKeyVariables>()
 
 app.use('/', useCors)
 
+async function resolveCheckoutPlanProductId(c: Parameters<typeof createCheckout>[0], customerId: string, body: CheckoutData) {
+  if (body.planName) {
+    const account = await resolveBillingAccount(c, customerId)
+    const { data: plan, error } = await supabaseAdmin(c)
+      .from('plans')
+      .select('stripe_id, stripe_id_us, name')
+      .eq('name', body.planName)
+      .single()
+
+    if (error || !plan)
+      throw simpleError('invalid_plan', 'Invalid plan', { planName: body.planName })
+
+    return resolvePlanProductId(plan, account)
+  }
+
+  if (body.priceId)
+    return body.priceId
+
+  throw simpleError('no_plan_provided', 'No plan provided')
+}
+
 app.post('/', middlewareAuth, async (c) => {
   const body = await parseBody<CheckoutData>(c)
   cloudlog({ requestId: c.get('requestId'), message: 'post stripe checkout body', body })
@@ -58,8 +81,10 @@ app.post('/', middlewareAuth, async (c) => {
   if (!await checkPermission(c, 'org.update_billing', { orgId: body.orgId }))
     throw simpleError('not_authorize', 'Not authorize')
 
+  const planProductId = await resolveCheckoutPlanProductId(c, org.customer_id, body)
+
   cloudlog({ requestId: c.get('requestId'), message: 'user', org })
-  const checkout = await createCheckout(c, org.customer_id, body.recurrence ?? 'month', body.priceId ?? 'price_1KkINoGH46eYKnWwwEi97h1B', body.successUrl ?? `${getEnv(c, 'WEBAPP_URL')}/app/usage`, body.cancelUrl ?? `${getEnv(c, 'WEBAPP_URL')}/app/usage`, body.clientReferenceId, body.attributionId, {
+  const checkout = await createCheckout(c, org.customer_id, body.recurrence ?? 'month', planProductId, body.successUrl ?? `${getEnv(c, 'WEBAPP_URL')}/app/usage`, body.cancelUrl ?? `${getEnv(c, 'WEBAPP_URL')}/app/usage`, body.clientReferenceId, body.attributionId, {
     visitorId: body.datafastVisitorId,
     sessionId: body.datafastSessionId,
   }, body.affonsoReferral)