@umituz/react-native-subscription 2.17.4 → 2.17.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.17.4",
+  "version": "2.17.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/presentation/hooks/useCompletePendingPurchase.ts

@@ -92,33 +92,10 @@ export function useCompletePendingPurchase({
     }
   }, [userId, purchasePackage, clearPendingPurchase, closePaywall, onPurchaseSuccess, onPurchaseError]);
 
-  // Auto-complete when user transitions from anonymous to authenticated
+  // Track auth state for reference (no auto-trigger - caller must explicitly call completePendingPurchase)
   useEffect(() => {
-    const wasAnonymous = wasAnonymousRef.current;
-    const isNowAuthenticated = userId && !isAnonymous;
     wasAnonymousRef.current = isAnonymous;
-
-    if (__DEV__) {
-      console.log("[CompletePendingPurchase] Auth state check:", {
-        wasAnonymous,
-        isNowAuthenticated,
-        hasPending: pendingPurchaseControl.hasPending(),
-        pendingId: pendingPurchaseControl.get().package?.product.identifier,
-      });
-    }
-
-    // Only trigger if user just authenticated AND there's a pending purchase
-    if (wasAnonymous && isNowAuthenticated && pendingPurchaseControl.hasPending()) {
-      if (__DEV__) {
-        console.log("[CompletePendingPurchase] Auth completed, auto-completing purchase");
-      }
-
-      // Execute in next microtask to ensure React state updates are flushed
-      queueMicrotask(() => {
-        completePendingPurchase();
-      });
-    }
-  }, [userId, isAnonymous, completePendingPurchase]);
+  }, [isAnonymous]);
 
   return {
     completePendingPurchase,

package/src/revenuecat/presentation/hooks/usePurchasePackage.ts

@@ -10,11 +10,39 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { creditsQueryKeys } from "../../../presentation/hooks/useCredits";
 
+declare const __DEV__: boolean;
+
 export interface PurchaseResult {
   success: boolean;
   productId: string;
 }
 
+/**
+ * Global purchase lock to prevent double purchases
+ */
+let purchaseInProgress = false;
+let purchaseProductId: string | null = null;
+
+export const purchaseLock = {
+  isLocked: () => purchaseInProgress,
+  getProductId: () => purchaseProductId,
+  acquire: (productId: string): boolean => {
+    if (purchaseInProgress) {
+      if (__DEV__) {
+        console.log('[PurchaseLock] Already in progress:', purchaseProductId);
+      }
+      return false;
+    }
+    purchaseInProgress = true;
+    purchaseProductId = productId;
+    return true;
+  },
+  release: () => {
+    purchaseInProgress = false;
+    purchaseProductId = null;
+  },
+};
+
 /**
  * Purchase a subscription package
  * Credits are initialized by CustomerInfoListener when entitlement becomes active
@@ -30,6 +58,14 @@ export const usePurchasePackage = (userId: string | undefined) => {
 
       const productId = pkg.product.identifier;
 
+      // Check and acquire purchase lock
+      if (!purchaseLock.acquire(productId)) {
+        if (__DEV__) {
+          console.log('[DEBUG usePurchasePackage] Skipping - purchase already in progress');
+        }
+        return { success: false, productId };
+      }
+
       if (__DEV__) {
         console.log('[DEBUG usePurchasePackage] Starting purchase:', {
           packageId: pkg.identifier,
@@ -38,27 +74,31 @@ export const usePurchasePackage = (userId: string | undefined) => {
         });
       }
 
-      const success = await SubscriptionManager.purchasePackage(pkg);
+      try {
+        const success = await SubscriptionManager.purchasePackage(pkg);
 
-      if (success) {
-        if (__DEV__) {
-          console.log('[DEBUG usePurchasePackage] Purchase successful:', {
-            packageId: pkg.identifier,
-            productId,
-            userId,
-          });
+        if (success) {
+          if (__DEV__) {
+            console.log('[DEBUG usePurchasePackage] Purchase successful:', {
+              packageId: pkg.identifier,
+              productId,
+              userId,
+            });
+          }
+          // Credits will be initialized by CustomerInfoListener
+        } else {
+          if (__DEV__) {
+            console.log('[DEBUG usePurchasePackage] Purchase failed:', {
+              packageId: pkg.identifier,
+              userId,
+            });
+          }
         }
-        // Credits will be initialized by CustomerInfoListener
-      } else {
-        if (__DEV__) {
-          console.log('[DEBUG usePurchasePackage] Purchase failed:', {
-            packageId: pkg.identifier,
-            userId,
-          });
-        }
-      }
 
-      return { success, productId };
+        return { success, productId };
+      } finally {
+        purchaseLock.release();
+      }
     },
     onSuccess: (result) => {
       if (result.success) {