improvement(billng): team upgrade + session management

Author: icecrasher321

apps/sim/lib/auth/auth.ts

@@ -2184,8 +2184,26 @@ export const auth = betterAuth({
                   status: subscription.status,
                 })
 
-                const resolvedSubscription =
-                  await ensureOrganizationForTeamSubscription(subscription)
+                let resolvedSubscription = subscription
+                try {
+                  resolvedSubscription = await ensureOrganizationForTeamSubscription(subscription)
+                } catch (orgError) {
+                  // Critical: Log detailed error for manual investigation
+                  // This can happen if user joined another org between checkout start and completion
+                  logger.error(
+                    '[onSubscriptionComplete] Failed to ensure organization for team subscription',
+                    {
+                      subscriptionId: subscription.id,
+                      referenceId: subscription.referenceId,
+                      plan: subscription.plan,
+                      error: orgError instanceof Error ? orgError.message : String(orgError),
+                      stack: orgError instanceof Error ? orgError.stack : undefined,
+                    }
+                  )
+                  // Re-throw to signal webhook failure - Stripe will retry
+                  // This ensures we don't leave subscriptions in broken state silently
+                  throw orgError
+                }
 
                 await handleSubscriptionCreated(resolvedSubscription)
 
@@ -2206,8 +2224,23 @@ export const auth = betterAuth({
                   plan: subscription.plan,
                 })
 
-                const resolvedSubscription =
-                  await ensureOrganizationForTeamSubscription(subscription)
+                let resolvedSubscription = subscription
+                try {
+                  resolvedSubscription = await ensureOrganizationForTeamSubscription(subscription)
+                } catch (orgError) {
+                  // Log but don't throw - subscription updates should still process other logic
+                  // The subscription may have been created with user ID if org creation failed initially
+                  logger.error(
+                    '[onSubscriptionUpdate] Failed to ensure organization for team subscription',
+                    {
+                      subscriptionId: subscription.id,
+                      referenceId: subscription.referenceId,
+                      plan: subscription.plan,
+                      error: orgError instanceof Error ? orgError.message : String(orgError),
+                    }
+                  )
+                  // Continue with original subscription - don't block other updates
+                }
 
                 try {
                   await syncSubscriptionUsageLimits(resolvedSubscription)

apps/sim/lib/billing/organization.ts

@@ -1,5 +1,11 @@
 import { db } from '@sim/db'
-import * as schema from '@sim/db/schema'
+import {
+  member,
+  organization,
+  session,
+  subscription as subscriptionTable,
+  user,
+} from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { getPlanPricing } from '@/lib/billing/core/billing'
@@ -20,16 +26,16 @@ type SubscriptionData = {
  */
 async function getUserOwnedOrganization(userId: string): Promise<string | null> {
   const existingMemberships = await db
-    .select({ organizationId: schema.member.organizationId })
-    .from(schema.member)
-    .where(and(eq(schema.member.userId, userId), eq(schema.member.role, 'owner')))
+    .select({ organizationId: member.organizationId })
+    .from(member)
+    .where(and(eq(member.userId, userId), eq(member.role, 'owner')))
     .limit(1)
 
   if (existingMemberships.length > 0) {
     const [existingOrg] = await db
-      .select({ id: schema.organization.id })
-      .from(schema.organization)
-      .where(eq(schema.organization.id, existingMemberships[0].organizationId))
+      .select({ id: organization.id })
+      .from(organization)
+      .where(eq(organization.id, existingMemberships[0].organizationId))
       .limit(1)
 
     return existingOrg?.id || null
@@ -40,6 +46,8 @@ async function getUserOwnedOrganization(userId: string): Promise<string | null>
 
 /**
  * Create a new organization and add user as owner
+ * Uses transaction to ensure org + member are created atomically
+ * Also updates user's active sessions to set the new org as active
  */
 async function createOrganizationWithOwner(
   userId: string,
@@ -49,31 +57,36 @@ async function createOrganizationWithOwner(
 ): Promise<string> {
   const orgId = `org_${crypto.randomUUID()}`
 
-  const [newOrg] = await db
-    .insert(schema.organization)
-    .values({
+  await db.transaction(async (tx) => {
+    await tx.insert(organization).values({
       id: orgId,
       name: organizationName,
       slug: organizationSlug,
       metadata,
     })
-    .returning({ id: schema.organization.id })
-
-  // Add user as owner/admin of the organization
-  await db.insert(schema.member).values({
-    id: crypto.randomUUID(),
-    userId: userId,
-    organizationId: newOrg.id,
-    role: 'owner',
+
+    await tx.insert(member).values({
+      id: crypto.randomUUID(),
+      userId: userId,
+      organizationId: orgId,
+      role: 'owner',
+    })
   })
 
+  const updatedSessions = await db
+    .update(session)
+    .set({ activeOrganizationId: orgId })
+    .where(eq(session.userId, userId))
+    .returning({ id: session.id })
+
   logger.info('Created organization with owner', {
     userId,
-    organizationId: newOrg.id,
+    organizationId: orgId,
     organizationName,
+    sessionsUpdated: updatedSessions.length,
   })
 
-  return newOrg.id
+  return orgId
 }
 
 export async function createOrganizationForTeamPlan(
@@ -132,12 +145,12 @@ export async function ensureOrganizationForTeamSubscription(
 
   const existingMembership = await db
     .select({
-      id: schema.member.id,
-      organizationId: schema.member.organizationId,
-      role: schema.member.role,
+      id: member.id,
+      organizationId: member.organizationId,
+      role: member.role,
     })
-    .from(schema.member)
-    .where(eq(schema.member.userId, userId))
+    .from(member)
+    .where(eq(member.userId, userId))
     .limit(1)
 
   if (existingMembership.length > 0) {
@@ -149,9 +162,14 @@ export async function ensureOrganizationForTeamSubscription(
       })
 
       await db
-        .update(schema.subscription)
+        .update(subscriptionTable)
         .set({ referenceId: membership.organizationId })
-        .where(eq(schema.subscription.id, subscription.id))
+        .where(eq(subscriptionTable.id, subscription.id))
+
+      await db
+        .update(session)
+        .set({ activeOrganizationId: membership.organizationId })
+        .where(eq(session.userId, userId))
 
       return { ...subscription, referenceId: membership.organizationId }
     }
@@ -165,9 +183,9 @@ export async function ensureOrganizationForTeamSubscription(
   }
 
   const [userData] = await db
-    .select({ name: schema.user.name, email: schema.user.email })
-    .from(schema.user)
-    .where(eq(schema.user.id, userId))
+    .select({ name: user.name, email: user.email })
+    .from(user)
+    .where(eq(user.id, userId))
     .limit(1)
 
   const orgId = await createOrganizationForTeamPlan(
@@ -177,9 +195,9 @@ export async function ensureOrganizationForTeamSubscription(
   )
 
   await db
-    .update(schema.subscription)
+    .update(subscriptionTable)
     .set({ referenceId: orgId })
-    .where(eq(schema.subscription.id, subscription.id))
+    .where(eq(subscriptionTable.id, subscription.id))
 
   logger.info('Created organization and updated subscription referenceId', {
     subscriptionId: subscription.id,
@@ -204,9 +222,9 @@ export async function syncSubscriptionUsageLimits(subscription: SubscriptionData
 
     // Check if this is a user or organization subscription
     const users = await db
-      .select({ id: schema.user.id })
-      .from(schema.user)
-      .where(eq(schema.user.id, subscription.referenceId))
+      .select({ id: user.id })
+      .from(user)
+      .where(eq(user.id, subscription.referenceId))
       .limit(1)
 
     if (users.length > 0) {
@@ -230,9 +248,9 @@ export async function syncSubscriptionUsageLimits(subscription: SubscriptionData
 
         // Only set if not already set or if updating to a higher value based on seats
         const orgData = await db
-          .select({ orgUsageLimit: schema.organization.orgUsageLimit })
-          .from(schema.organization)
-          .where(eq(schema.organization.id, organizationId))
+          .select({ orgUsageLimit: organization.orgUsageLimit })
+          .from(organization)
+          .where(eq(organization.id, organizationId))
           .limit(1)
 
         const currentLimit =
@@ -243,12 +261,12 @@ export async function syncSubscriptionUsageLimits(subscription: SubscriptionData
         // Update if no limit set, or if new seat-based minimum is higher
         if (currentLimit < orgLimit) {
           await db
-            .update(schema.organization)
+            .update(organization)
             .set({
               orgUsageLimit: orgLimit.toFixed(2),
               updatedAt: new Date(),
             })
-            .where(eq(schema.organization.id, organizationId))
+            .where(eq(organization.id, organizationId))
 
           logger.info('Set organization usage limit for team plan', {
             organizationId,
@@ -262,9 +280,9 @@ export async function syncSubscriptionUsageLimits(subscription: SubscriptionData
 
       // Sync usage limits for all members
       const members = await db
-        .select({ userId: schema.member.userId })
-        .from(schema.member)
-        .where(eq(schema.member.organizationId, organizationId))
+        .select({ userId: member.userId })
+        .from(member)
+        .where(eq(member.organizationId, organizationId))
 
       if (members.length > 0) {
         for (const member of members) {