fix(billing): apply AWS Marketplace review fixes

Keep License Updated events for unknown licenses queued until AWS describes
them, so a renewal cannot be lost. Tell the team when the event reaches a
license already taken, and when a repeat take changes the contact details.
Give the cancel instruction its required operationId, and only when an
organization holds the license.

Show account-registered licenses on organization billing, and stop offering
plans on the upgrade page to anyone billed through AWS. Delete the expired
and inactive claim states, which no reachable row can produce.

Author: waleedlatif1

apps/sim/app/marketplace/aws/aws-marketplace-onboarding.tsx

@@ -134,7 +134,7 @@ export function AwsMarketplaceOnboarding({
         <InviteStatusCard
           type='login'
           title='Set up your AWS Marketplace subscription'
-          description='Sign in to Sim to link this subscription to your organization.'
+          description='Sign in or create an account to set up this subscription.'
           details={supportContact}
           actions={[
             ...(registrationDisabled
@@ -199,18 +199,13 @@ export function AwsMarketplaceOnboarding({
   }
 
   const claim = claimQuery.data
-  if (claim.status === 'missing' || claim.status === 'expired' || claim.status === 'inactive') {
-    const title = {
-      missing: 'No subscription to set up',
-      expired: 'Setup link expired',
-      inactive: 'No active subscription found',
-    }[claim.status]
+  if (claim.status === 'missing') {
     return (
       <InviteLayout>
         <InviteStatusCard
-          type='error'
-          title={title}
-          description={RESTART_FROM_AWS}
+          type='warning'
+          title='No setup in progress'
+          description={`${RESTART_FROM_AWS} If you already finished setup, we will contact you ${AWS_MARKETPLACE_SETUP_TURNAROUND}.`}
           details={supportContact}
           actions={[returnHome]}
         />

apps/sim/app/workspace/[workspaceId]/settings/components/billing/billing.tsx

@@ -53,7 +53,7 @@ import { SettingsQueryErrorState } from '@/app/workspace/[workspaceId]/settings/
 import { SettingsPanel } from '@/app/workspace/[workspaceId]/settings/components/settings-panel'
 import { RESOURCE_ROW_ARROW_CLASSES } from '@/app/workspace/[workspaceId]/settings/components/settings-resource-row'
 import { SettingsSection } from '@/app/workspace/[workspaceId]/settings/components/settings-section/settings-section'
-import { useAwsMarketplaceLicenses } from '@/hooks/queries/aws-marketplace'
+import { useAwsMarketplaceBilling } from '@/hooks/queries/aws-marketplace'
 import {
   useBillingUsageNotifications,
   useUpdateGeneralSetting,
@@ -135,10 +135,7 @@ export function Billing({ scope, organizationId, creditUsageHref }: BillingProps
     enabled: !isOrganizationScope,
   })
   const billingOrganizationId = isOrganizationScope ? (organizationId ?? null) : null
-  const { data: marketplaceLicenses } = useAwsMarketplaceLicenses(billingOrganizationId)
-  const billedThroughMarketplace = marketplaceLicenses?.some(
-    (license) => license.status !== 'inactive'
-  )
+  const { billedThroughMarketplace } = useAwsMarketplaceBilling(billingOrganizationId)
 
   const {
     data: organizationBillingData,
@@ -459,7 +456,9 @@ export function Billing({ scope, organizationId, creditUsageHref }: BillingProps
       : `Organization ${planName} plan`
     : `Personal ${planName} plan`
   const priceText = billedThroughMarketplace
-    ? 'Billed through AWS Marketplace'
+    ? subscription.isFree
+      ? 'AWS Marketplace setup in progress'
+      : 'Billed through AWS Marketplace'
     : organizationSubscriptionState === 'free'
       ? 'No active organization subscription'
       : organizationSubscriptionState === 'lapsed'
@@ -669,6 +668,12 @@ export function Billing({ scope, organizationId, creditUsageHref }: BillingProps
       )}
 
       <AwsMarketplaceSubscriptionSection organizationId={billingOrganizationId} />
+      {isOrganizationScope && (
+        <AwsMarketplaceSubscriptionSection
+          organizationId={null}
+          label='AWS Marketplace subscription on your account'
+        />
+      )}
 
       {!subscription.isFree && invoices.length > 0 && (
         <SettingsSection label='Invoices'>

apps/sim/app/workspace/[workspaceId]/settings/components/billing/components/aws-marketplace-subscription-section/aws-marketplace-subscription-section.tsx

@@ -15,16 +15,18 @@ const STATUS_BADGES = {
 interface AwsMarketplaceSubscriptionSectionProps {
   /** Null reads the licenses registered to the viewer's own account. */
   organizationId: string | null
+  label?: string
 }
 
 /** Read-only: AWS requires buyers to see their subscription status in the product. */
 export function AwsMarketplaceSubscriptionSection({
   organizationId,
+  label = 'AWS Marketplace subscription',
 }: AwsMarketplaceSubscriptionSectionProps) {
   const { data: licenses, error, isFetching, refetch } = useAwsMarketplaceLicenses(organizationId)
   if (error && !licenses) {
     return (
-      <SettingsSection label='AWS Marketplace subscription'>
+      <SettingsSection label={label}>
         <SettingsQueryErrorState
           variant='inline'
           error={error}
@@ -38,7 +40,7 @@ export function AwsMarketplaceSubscriptionSection({
   if (!licenses?.length) return null
 
   return (
-    <SettingsSection label='AWS Marketplace subscription'>
+    <SettingsSection label={label}>
       <div className='flex flex-col gap-6'>
         {licenses.map((license) => {
           const badge = STATUS_BADGES[license.status]

apps/sim/app/workspace/[workspaceId]/upgrade/hooks/use-upgrade-state.ts

@@ -9,6 +9,7 @@ import type { WorkspaceHostContext } from '@/lib/api/contracts/workspaces'
 import { useSubscriptionUpgrade } from '@/lib/billing/client/upgrade'
 import { CREDIT_TIERS } from '@/lib/billing/constants'
 import { getPlanTierCredits, isEnterprise, isFree, isPro, isTeam } from '@/lib/billing/plan-helpers'
+import { useAwsMarketplaceBilling } from '@/hooks/queries/aws-marketplace'
 import { invalidateWorkspaceUsage } from '@/hooks/queries/utils/invalidate-usage'
 import { subscriptionKeys } from '@/hooks/queries/utils/subscription-keys'
 import { workspaceHostKeys } from '@/hooks/queries/workspace-host'
@@ -38,6 +39,7 @@ export interface UpgradeState {
     status: string
   }
   showUpgradePlans: boolean
+  billedThroughMarketplace: boolean
   proTier: { credits: number; dollars: number; name: string }
   maxTier: { credits: number; dollars: number; name: string }
   isOnPro: boolean
@@ -65,6 +67,7 @@ export function useUpgradeState({
   const { handleUpgrade } = useSubscriptionUpgrade()
   const queryClient = useQueryClient()
   const { ownerBilling } = hostContext
+  const marketplace = useAwsMarketplaceBilling(hostContext.hostOrganizationId ?? null)
   const [isAnnual, setIsAnnual] = useState(
     !ownerBilling.isPaid || ownerBilling.billingInterval === 'year'
   )
@@ -197,7 +200,9 @@ export function useUpgradeState({
     isAnnual,
     setIsAnnual,
     subscription,
-    showUpgradePlans: !subscription.isEnterprise,
+    showUpgradePlans:
+      !subscription.isEnterprise && !marketplace.isPending && !marketplace.billedThroughMarketplace,
+    billedThroughMarketplace: marketplace.billedThroughMarketplace,
     proTier: PRO_TIER,
     maxTier: MAX_TIER,
     isOnPro,

apps/sim/app/workspace/[workspaceId]/upgrade/upgrade.tsx

@@ -85,10 +85,12 @@ export function Upgrade({ workspaceId }: UpgradeProps) {
     return null
   }
 
-  if (!canManageBilling) {
-    const description = hostContext.hostOrganizationId
-      ? `Plans for ${hostContext.workspace.name} are managed by its organization administrators. Contact an organization admin to change this workspace’s plan.`
-      : `Only the owner of ${hostContext.workspace.name} can change this workspace’s plan.`
+  if (!canManageBilling || state.billedThroughMarketplace) {
+    const description = canManageBilling
+      ? 'Your subscription is billed through AWS Marketplace, so plans can’t be changed here.'
+      : hostContext.hostOrganizationId
+        ? `Plans for ${hostContext.workspace.name} are managed by its organization administrators. Contact an organization admin to change this workspace’s plan.`
+        : `Only the owner of ${hostContext.workspace.name} can change this workspace’s plan.`
 
     return (
       <div className='flex h-full flex-col bg-[var(--bg)]'>

apps/sim/hooks/queries/aws-marketplace.ts

@@ -67,6 +67,22 @@ export function useSaveAwsMarketplaceClaimContact() {
   })
 }
 
+/**
+ * Whether AWS Marketplace bills this organization or the viewer's own account: a pending or active
+ * license on either. Pending until both reads settle.
+ */
+export function useAwsMarketplaceBilling(organizationId: string | null) {
+  const organizationLicenses = useAwsMarketplaceLicenses(organizationId)
+  const accountLicenses = useAwsMarketplaceLicenses(null)
+  return {
+    isPending: organizationLicenses.isPending || accountLicenses.isPending,
+    billedThroughMarketplace: [
+      ...(organizationLicenses.data ?? []),
+      ...(accountLicenses.data ?? []),
+    ].some((license) => license.status !== 'inactive'),
+  }
+}
+
 /** The Marketplace subscriptions an organization holds, or with null the viewer's own account. */
 export function useAwsMarketplaceLicenses(organizationId: string | null) {
   return useQuery({

apps/sim/lib/api/contracts/aws-marketplace.ts

@@ -46,10 +46,8 @@ const claimedLicenseSchema = awsMarketplaceLicenseSchema.extend({
 })
 
 const awsMarketplaceClaimSchema = z.discriminatedUnion('status', [
-  /** This browser holds no claim, or one already used. */
+  /** No open claim: none in this browser, or it was used, expired, or cleared by a lapse. */
   z.object({ status: z.literal('missing') }),
-  z.object({ status: z.literal('expired') }),
-  z.object({ status: z.literal('inactive') }),
   /** AWS has returned no entitlement yet; the buyer can leave contact details meanwhile. */
   z.object({ status: z.literal('pending'), license: claimedLicenseSchema }),
   z.object({

apps/sim/lib/billing/aws-marketplace/application/use-cases.ts

@@ -42,15 +42,13 @@ const SUBSCRIPTION_UNCONFIRMED =
   'AWS is still confirming your subscription. Try again in a few minutes.'
 
 /**
- * Under the row lock: a newer verification than this request's wins, so a license a newer read
- * says is not active cannot be taken.
+ * Under the row lock, after the claim is rechecked: a newer read that still says pending wins over
+ * this request's. A newer read that says inactive already cleared the claim.
  */
 function requireNotOverruled(locked: AwsMarketplaceLicenseRecord, verifiedAt: Date): void {
-  if (isNewerRead(locked, verifiedAt) || locked.status === 'active') return
-  throw new OrchestrationError(
-    'conflict',
-    locked.status === 'pending' ? SUBSCRIPTION_UNCONFIRMED : NO_ACTIVE_SUBSCRIPTION
-  )
+  if (locked.status === 'pending' && !isNewerRead(locked, verifiedAt)) {
+    throw new OrchestrationError('conflict', SUBSCRIPTION_UNCONFIRMED)
+  }
 }
 
 const CLAIM_NOT_FOUND =
@@ -120,9 +118,7 @@ export const readAwsMarketplaceClaim: OperationUseCase<
     requireProductCode()
     if (!input.claimToken) return { status: 'missing' }
     const license = await findLicenseByClaimHash(hashClaimToken(input.claimToken))
-    if (!license) return { status: 'missing' }
-    if (!isClaimOpen(license, new Date())) return { status: 'expired' }
-    if (license.status === 'inactive') return { status: 'inactive' }
+    if (!license || !isClaimOpen(license, new Date())) return { status: 'missing' }
     if (license.status === 'pending') {
       return { status: 'pending', license: claimedLicenseView(license) }
     }