@umituz/react-native-subscription 2.15.5 → 2.15.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.15.5",
+  "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

@@ -1,26 +1,14 @@
 /**
- * Sandbox Duration Configuration
- * Apple Sandbox subscription durations vs Production durations
- *
- * @see https://developer.apple.com/documentation/storekit/in-app_purchase/testing_in-app_purchases_with_sandbox
+ * Subscription Duration Configuration
+ * Production subscription durations by package type
  */
 
 import type { SubscriptionPackageType } from '../../../utils/packageTypeDetector';
 
 /**
- * Apple Sandbox subscription durations in minutes
+ * Subscription durations in days
  */
-export const SANDBOX_DURATIONS: Record<SubscriptionPackageType, number> = {
-  weekly: 3,
-  monthly: 5,
-  yearly: 60,
-  unknown: 5,
-};
-
-/**
- * Production subscription durations in days
- */
-export const PRODUCTION_DURATIONS: Record<SubscriptionPackageType, number> = {
+export const SUBSCRIPTION_DURATIONS: Record<SubscriptionPackageType, number> = {
   weekly: 7,
   monthly: 30,
   yearly: 365,
@@ -28,15 +16,8 @@ export const PRODUCTION_DURATIONS: Record<SubscriptionPackageType, number> = {
 };
 
 /**
- * Get production duration in days for a package type
+ * Get subscription duration in days for a package type
  */
 export function getProductionDurationDays(packageType: SubscriptionPackageType): number {
-  return PRODUCTION_DURATIONS[packageType] ?? PRODUCTION_DURATIONS.unknown;
-}
-
-/**
- * Get sandbox duration in minutes for a package type
- */
-export function getSandboxDurationMinutes(packageType: SubscriptionPackageType): number {
-  return SANDBOX_DURATIONS[packageType] ?? SANDBOX_DURATIONS.unknown;
+  return SUBSCRIPTION_DURATIONS[packageType] ?? SUBSCRIPTION_DURATIONS.unknown;
 }

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

@@ -1,21 +1,31 @@
 /**
  * Expiration Date Calculator
- * Main entry point for calculating subscription expiration dates
+ * 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 {
-  shouldConvertSandbox,
-  convertToProductionExpiration,
-  adjustPastExpiration,
-} from './SandboxDurationConverter';
+import { detectPackageType } from '../../../utils/packageTypeDetector';
+import { addProductionPeriod } from './SandboxDurationConverter';
+
+/**
+ * Check if two dates are on the same day
+ */
+function isSameDay(date1: Date, date2: Date): boolean {
+  return (
+    date1.getFullYear() === date2.getFullYear() &&
+    date1.getMonth() === date2.getMonth() &&
+    date1.getDate() === date2.getDate()
+  );
+}
 
 /**
- * Get adjusted expiration date from entitlement
+ * Get expiration date from entitlement
  *
- * Handles:
- * 1. Sandbox mode: Converts to production-equivalent dates for better UX
- * 2. Past expiration: Adds subscription 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.
  */
 export function getExpirationDate(
   entitlement: RevenueCatEntitlement | null
@@ -24,14 +34,16 @@ export function getExpirationDate(
     return null;
   }
 
-  const { expirationDate, productIdentifier, isSandbox, latestPurchaseDate } = entitlement;
+  const expDate = new Date(entitlement.expirationDate);
+  const purchaseDate = entitlement.latestPurchaseDate
+    ? new Date(entitlement.latestPurchaseDate)
+    : null;
 
-  if (shouldConvertSandbox(isSandbox)) {
-    return convertToProductionExpiration(latestPurchaseDate, productIdentifier);
+  // 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();
   }
 
-  const expDate = new Date(expirationDate);
-  const adjustedDate = adjustPastExpiration(expDate, productIdentifier);
-
-  return adjustedDate.toISOString();
+  return entitlement.expirationDate;
 }

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

@@ -1,13 +1,13 @@
 /**
- * Sandbox Duration Converter
- * Converts Apple Sandbox subscription durations to production-equivalent dates
+ * Subscription Duration Utilities
+ * Calculates subscription period based on package type
  */
 
-import { detectPackageType, type SubscriptionPackageType } from '../../../utils/packageTypeDetector';
+import type { SubscriptionPackageType } from '../../../utils/packageTypeDetector';
 import { getProductionDurationDays } from '../config/SandboxDurationConfig';
 
 /**
- * Add production period to a date based on package type
+ * Add subscription period to a date based on package type
  */
 export function addProductionPeriod(
   date: Date,
@@ -18,51 +18,3 @@ export function addProductionPeriod(
   newDate.setDate(newDate.getDate() + daysToAdd);
   return newDate;
 }
-
-/**
- * Check if sandbox conversion should be applied
- * Only applies in DEV mode with sandbox flag
- */
-export function shouldConvertSandbox(isSandbox: boolean): boolean {
-  return isSandbox && __DEV__;
-}
-
-/**
- * Convert sandbox expiration to production-equivalent expiration
- *
- * In Apple Sandbox:
- * - Weekly subscriptions expire in 3 minutes
- * - Monthly subscriptions expire in 5 minutes
- * - Yearly subscriptions expire in 1 hour
- *
- * For better testing UX, we calculate the production-equivalent expiration
- * based on the purchase date + production duration.
- */
-export function convertToProductionExpiration(
-  purchaseDate: string | null,
-  productIdentifier: string
-): string {
-  const basePurchaseDate = purchaseDate ? new Date(purchaseDate) : new Date();
-  const packageType = detectPackageType(productIdentifier);
-  const productionExpiration = addProductionPeriod(basePurchaseDate, packageType);
-
-  return productionExpiration.toISOString();
-}
-
-/**
- * Adjust expiration date if it's in the past
- * Adds subscription period to prevent false expiration
- */
-export function adjustPastExpiration(
-  expirationDate: Date,
-  productIdentifier: string
-): Date {
-  const now = new Date();
-
-  if (expirationDate > now) {
-    return expirationDate;
-  }
-
-  const packageType = detectPackageType(productIdentifier);
-  return addProductionPeriod(expirationDate, packageType);
-}