@umituz/react-native-subscription 2.15.2 → 2.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.15.2",
+  "version": "2.15.3",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/revenuecat/infrastructure/handlers/PackageHandler.ts

@@ -6,6 +6,7 @@
 import type { PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService } from "../../application/ports/IRevenueCatService";
 import { getPremiumEntitlement } from "../../domain/types/RevenueCatTypes";
+import { getExpirationDate } from "../utils/ExpirationDateCalculator";
 
 export interface PremiumStatus {
   isPremium: boolean;
@@ -114,22 +115,57 @@ export class PackageHandler {
   }
 
   checkPremiumStatusFromInfo(customerInfo: CustomerInfo): PremiumStatus {
-    const entitlement = getPremiumEntitlement(
+    // First, check active entitlements (standard case)
+    const activeEntitlement = getPremiumEntitlement(
       customerInfo,
       this.entitlementId
     );
 
-    if (entitlement) {
+    if (activeEntitlement) {
+      const adjustedExpiration = getExpirationDate(activeEntitlement);
       return {
         isPremium: true,
-        expirationDate: entitlement.expirationDate
-          ? new Date(entitlement.expirationDate)
-          : null,
+        expirationDate: adjustedExpiration ? new Date(adjustedExpiration) : null,
       };
     }
 
+    // Edge case: Check all entitlements (including expired ones)
+    // This handles the bug where RevenueCat hasn't updated the expiration date yet
+    const allEntitlements = customerInfo.entitlements.all[this.entitlementId];
+
+    if (allEntitlements) {
+      const entitlementData = {
+        identifier: allEntitlements.identifier,
+        productIdentifier: allEntitlements.productIdentifier,
+        isSandbox: allEntitlements.isSandbox,
+        willRenew: allEntitlements.willRenew,
+        periodType: allEntitlements.periodType,
+        latestPurchaseDate: allEntitlements.latestPurchaseDate,
+        originalPurchaseDate: allEntitlements.originalPurchaseDate,
+        expirationDate: allEntitlements.expirationDate,
+        unsubscribeDetectedAt: allEntitlements.unsubscribeDetectedAt,
+        billingIssueDetectedAt: allEntitlements.billingIssueDetectedAt,
+      };
+
+      // Get adjusted expiration date
+      const adjustedExpiration = getExpirationDate(entitlementData);
+
+      if (adjustedExpiration) {
+        const expirationDate = new Date(adjustedExpiration);
+        const now = new Date();
+
+        // If adjusted expiration is in the future, user is premium
+        if (expirationDate > now) {
+          return {
+            isPremium: true,
+            expirationDate,
+          };
+        }
+      }
+    }
+
     return {
-      isPremium: !!customerInfo.entitlements.active[this.entitlementId],
+      isPremium: false,
       expirationDate: null,
     };
   }

package/src/revenuecat/infrastructure/utils/ExpirationDateCalculator.ts

@@ -1,9 +1,63 @@
 /**
  * Expiration Date Calculator
- * Handles RevenueCat expiration date extraction
+ * Handles RevenueCat expiration date extraction with edge case handling
  */
 
 import type { RevenueCatEntitlement } from '../../domain/types/RevenueCatTypes';
+import { detectPackageType, type SubscriptionPackageType } from '../../../utils/packageTypeDetector';
+
+/**
+ * Add subscription period to a date
+ */
+function addSubscriptionPeriod(date: Date, packageType: SubscriptionPackageType): Date {
+  const newDate = new Date(date);
+
+  switch (packageType) {
+    case 'weekly':
+      newDate.setDate(newDate.getDate() + 7);
+      break;
+    case 'monthly':
+      newDate.setDate(newDate.getDate() + 30);
+      break;
+    case 'yearly':
+      newDate.setDate(newDate.getDate() + 365);
+      break;
+    default:
+      // Unknown type, default to monthly
+      newDate.setDate(newDate.getDate() + 30);
+      break;
+  }
+
+  return newDate;
+}
+
+/**
+ * Adjust expiration date if it equals current date
+ *
+ * RevenueCat sometimes returns expiration date equal to purchase date
+ * immediately after purchase. This causes false "expired" status.
+ *
+ * Solution: If expiration date is today or in the past, add the subscription
+ * period (weekly/monthly/yearly) to prevent false expiration.
+ */
+function adjustExpirationDate(
+  expirationDate: string,
+  productIdentifier: string
+): string {
+  const expDate = new Date(expirationDate);
+  const now = new Date();
+
+  // If expiration is in the future, no adjustment needed
+  if (expDate > now) {
+    return expirationDate;
+  }
+
+  // If expiration is today or past, add subscription period
+  const packageType = detectPackageType(productIdentifier);
+  const adjustedDate = addSubscriptionPeriod(expDate, packageType);
+
+  return adjustedDate.toISOString();
+}
 
 export function getExpirationDate(
   entitlement: RevenueCatEntitlement | null
@@ -16,5 +70,9 @@ export function getExpirationDate(
     return null;
   }
 
-  return new Date(entitlement.expirationDate).toISOString();
+  // Apply edge case fix for same-day expirations
+  return adjustExpirationDate(
+    entitlement.expirationDate,
+    entitlement.productIdentifier
+  );
 }