fix(revenuecat): handle entitlement grace periods, guard one-of body params

Author: waleedlatif1

apps/sim/tools/revenuecat/defer_google_subscription.ts

@@ -60,9 +60,12 @@ export const revenuecatDeferGoogleSubscriptionTool: ToolConfig<
       'Content-Type': 'application/json',
     }),
     body: (params) => {
+      if (params.extendByDays === undefined && params.expiryTimeMs === undefined) {
+        throw new Error('Provide either extendByDays or expiryTimeMs to defer a subscription')
+      }
       const body: Record<string, unknown> = {}
-      if (params.extendByDays !== undefined) body.extend_by_days = params.extendByDays
       if (params.expiryTimeMs !== undefined) body.expiry_time_ms = params.expiryTimeMs
+      else if (params.extendByDays !== undefined) body.extend_by_days = params.extendByDays
       return body
     },
   },

apps/sim/tools/revenuecat/get_customer.ts

@@ -47,8 +47,14 @@ export const revenuecatGetCustomerTool: ToolConfig<GetCustomerParams, CustomerRe
 
     const now = requestDate ? new Date(requestDate).getTime() : Date.now()
     const activeEntitlements = Object.values(entitlements).filter((e: unknown) => {
-      const expires = (e as Record<string, unknown>).expires_date as string | null | undefined
-      return !expires || new Date(expires).getTime() > now
+      const ent = e as Record<string, unknown>
+      if (typeof ent.is_active === 'boolean') return ent.is_active
+      const expires = ent.expires_date as string | null | undefined
+      const grace = ent.grace_period_expires_date as string | null | undefined
+      if (!expires) return true
+      if (new Date(expires).getTime() > now) return true
+      if (grace && new Date(grace).getTime() > now) return true
+      return false
     }).length
     const activeSubscriptions = Object.keys(subscriptions).length
 

apps/sim/tools/revenuecat/grant_entitlement.ts

@@ -62,9 +62,12 @@ export const revenuecatGrantEntitlementTool: ToolConfig<
       'Content-Type': 'application/json',
     }),
     body: (params) => {
+      if (!params.duration && params.endTimeMs === undefined) {
+        throw new Error('Provide either duration or endTimeMs to grant a promotional entitlement')
+      }
       const body: Record<string, unknown> = {}
-      if (params.duration) body.duration = params.duration
       if (params.endTimeMs !== undefined) body.end_time_ms = params.endTimeMs
+      else if (params.duration) body.duration = params.duration
       if (params.startTimeMs !== undefined) body.start_time_ms = params.startTimeMs
       return body
     },