harden further

Author: icecrasher321

apps/sim/lib/billing/client/types.ts

@@ -25,6 +25,9 @@ export interface SubscriptionData {
   isPro: boolean
   isTeam: boolean
   isEnterprise: boolean
+  /** True when the subscription's `referenceId` is an organization. */
+  isOrgScoped: boolean
+  organizationId: string | null
   plan: string
   status: string | null
   seats: number | null
@@ -59,6 +62,8 @@ export interface SubscriptionStore {
     isPro: boolean
     isTeam: boolean
     isEnterprise: boolean
+    isOrgScoped: boolean
+    organizationId: string | null
     isFree: boolean
     plan: string
     status: string | null

apps/sim/lib/billing/client/utils.ts

@@ -31,6 +31,8 @@ export function getSubscriptionStatus(
     isPro: subscriptionData?.isPro ?? false,
     isTeam: subscriptionData?.isTeam ?? false,
     isEnterprise: subscriptionData?.isEnterprise ?? false,
+    isOrgScoped: subscriptionData?.isOrgScoped ?? false,
+    organizationId: subscriptionData?.organizationId ?? null,
     isFree: !(subscriptionData?.isPaid ?? false),
     plan: subscriptionData?.plan ?? 'free',
     status: subscriptionData?.status ?? null,
@@ -45,7 +47,12 @@ export function getSubscriptionAccessState(
   const status = getSubscriptionStatus(subscriptionData)
   const billingBlocked = Boolean(subscriptionData?.billingBlocked)
   const hasUsablePaidAccess = hasUsableSubscriptionAccess(status.status, billingBlocked)
-  const hasUsableTeamAccess = hasUsablePaidAccess && (status.isTeam || status.isEnterprise)
+  // Team-management features (invitations, seats, roles) are available on
+  // any paid subscription attached to an organization — including `pro_*`
+  // plans that have been transferred to an org. Plan-name gating would
+  // miss those.
+  const hasUsableTeamAccess =
+    hasUsablePaidAccess && (status.isOrgScoped || status.isTeam || status.isEnterprise)
   const hasUsableEnterpriseAccess = hasUsablePaidAccess && status.isEnterprise
   const hasUsableMaxAccess =
     hasUsablePaidAccess && (getPlanTierCredits(status.plan) >= 25000 || isEnterprise(status.plan))