@umituz/react-native-subscription 2.15.4 → 2.15.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.15.4",
+  "version": "2.15.6",
   "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/config/SandboxDurationConfig.ts

@@ -0,0 +1,23 @@
+/**
+ * Subscription Duration Configuration
+ * Production subscription durations by package type
+ */
+
+import type { SubscriptionPackageType } from '../../../utils/packageTypeDetector';
+
+/**
+ * Subscription durations in days
+ */
+export const SUBSCRIPTION_DURATIONS: Record<SubscriptionPackageType, number> = {
+  weekly: 7,
+  monthly: 30,
+  yearly: 365,
+  unknown: 30,
+};
+
+/**
+ * Get subscription duration in days for a package type
+ */
+export function getProductionDurationDays(packageType: SubscriptionPackageType): number {
+  return SUBSCRIPTION_DURATIONS[packageType] ?? SUBSCRIPTION_DURATIONS.unknown;
+}

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

@@ -1,109 +1,49 @@
 /**
  * Expiration Date Calculator
- * Handles RevenueCat expiration date extraction with edge case handling
- * Includes sandbox-to-production date conversion for better testing UX
+ * Handles RevenueCat expiration date edge case
+ *
+ * Problem: RevenueCat sometimes returns expiration date = purchase date
+ * Solution: If same day, add subscription period based on package type
  */
 
 import type { RevenueCatEntitlement } from '../../domain/types/RevenueCatTypes';
-import { detectPackageType, type SubscriptionPackageType } from '../../../utils/packageTypeDetector';
-
-/**
- * Add production subscription period to a date
- */
-function addProductionPeriod(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:
-      newDate.setDate(newDate.getDate() + 30);
-      break;
-  }
-
-  return newDate;
-}
+import { detectPackageType } from '../../../utils/packageTypeDetector';
+import { addProductionPeriod } from './SandboxDurationConverter';
 
 /**
- * Convert sandbox expiration to production-equivalent expiration
- *
- * Apple Sandbox durations:
- * - Weekly: 3 minutes → 7 days
- * - Monthly: 5 minutes → 30 days
- * - Yearly: 1 hour → 365 days
- *
- * For better testing UX, we calculate what the expiration would be in production
- * based on the latest purchase date.
+ * Check if two dates are on the same day
  */
-function convertSandboxToProduction(
-  latestPurchaseDate: string | null,
-  productIdentifier: string
-): string {
-  const purchaseDate = latestPurchaseDate
-    ? new Date(latestPurchaseDate)
-    : new Date();
-
-  const packageType = detectPackageType(productIdentifier);
-  const productionExpiration = addProductionPeriod(purchaseDate, packageType);
-
-  return productionExpiration.toISOString();
+function isSameDay(date1: Date, date2: Date): boolean {
+  return (
+    date1.getFullYear() === date2.getFullYear() &&
+    date1.getMonth() === date2.getMonth() &&
+    date1.getDate() === date2.getDate()
+  );
 }
 
 /**
- * Adjust expiration date for edge cases
+ * Get expiration date from entitlement
  *
- * Handles two scenarios:
- * 1. Sandbox mode: Convert to production-equivalent dates for better UX
- * 2. Same-day expiration bug: Add period if expiration is in the past
+ * Handles edge case: If expiration date equals purchase date (same day),
+ * calculates correct expiration by adding subscription period.
  */
-function adjustExpirationDate(
-  expirationDate: string,
-  productIdentifier: string,
-  isSandbox: boolean,
-  latestPurchaseDate: string | null
-): string {
-  // In sandbox mode, show production-equivalent expiration for better testing UX
-  if (isSandbox && __DEV__) {
-    return convertSandboxToProduction(latestPurchaseDate, productIdentifier);
-  }
-
-  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 = addProductionPeriod(expDate, packageType);
-
-  return adjustedDate.toISOString();
-}
-
 export function getExpirationDate(
   entitlement: RevenueCatEntitlement | null
 ): string | null {
-  if (!entitlement) {
+  if (!entitlement?.expirationDate) {
     return null;
   }
 
-  if (!entitlement.expirationDate) {
-    return null;
+  const expDate = new Date(entitlement.expirationDate);
+  const purchaseDate = entitlement.latestPurchaseDate
+    ? new Date(entitlement.latestPurchaseDate)
+    : null;
+
+  // Only adjust if expiration equals purchase date (same day bug)
+  if (purchaseDate && isSameDay(expDate, purchaseDate)) {
+    const packageType = detectPackageType(entitlement.productIdentifier);
+    return addProductionPeriod(purchaseDate, packageType).toISOString();
   }
 
-  return adjustExpirationDate(
-    entitlement.expirationDate,
-    entitlement.productIdentifier,
-    entitlement.isSandbox ?? false,
-    entitlement.latestPurchaseDate ?? null
-  );
+  return entitlement.expirationDate;
 }

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

@@ -0,0 +1,20 @@
+/**
+ * Subscription Duration Utilities
+ * Calculates subscription period based on package type
+ */
+
+import type { SubscriptionPackageType } from '../../../utils/packageTypeDetector';
+import { getProductionDurationDays } from '../config/SandboxDurationConfig';
+
+/**
+ * Add subscription period to a date based on package type
+ */
+export function addProductionPeriod(
+  date: Date,
+  packageType: SubscriptionPackageType
+): Date {
+  const newDate = new Date(date);
+  const daysToAdd = getProductionDurationDays(packageType);
+  newDate.setDate(newDate.getDate() + daysToAdd);
+  return newDate;
+}