@umituz/react-native-subscription 2.37.40 → 2.37.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.40",
+  "version": "2.37.42",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -45,7 +45,6 @@
     "zustand": ">=5.0.0"
   },
   "devDependencies": {
-    "@expo/vector-icons": "^15.0.3",
     "@gorhom/bottom-sheet": "^5.2.8",
     "@react-native-async-storage/async-storage": "^2.2.0",
     "@react-native-community/datetimepicker": "^8.6.0",
@@ -105,6 +104,5 @@
     "src",
     "README.md",
     "LICENSE"
-  ],
-  "dependencies": {}
+  ]
 }

package/src/domains/credits/application/DeductCreditsCommand.ts

@@ -20,12 +20,13 @@ export async function deductCreditsOperation(
     };
   }
 
-  if (cost <= 0 || !Number.isFinite(cost)) {
+  const MAX_SINGLE_DEDUCTION = 10000;
+  if (cost <= 0 || !Number.isFinite(cost) || cost > MAX_SINGLE_DEDUCTION) {
     return {
       success: false,
       remainingCredits: null,
       error: {
-        message: 'Cost must be a positive finite number',
+        message: `Cost must be a positive finite number not exceeding ${MAX_SINGLE_DEDUCTION}`,
         code: 'INVALID_AMOUNT'
       }
     };
@@ -39,7 +40,8 @@ export async function deductCreditsOperation(
         throw new Error(CREDIT_ERROR_CODES.NO_CREDITS);
       }
 
-      const current = docSnap.data().credits as number;
+      const rawCredits = docSnap.data().credits;
+      const current = typeof rawCredits === "number" && Number.isFinite(rawCredits) ? rawCredits : 0;
       if (current < cost) {
         throw new Error(CREDIT_ERROR_CODES.CREDITS_EXHAUSTED);
       }

package/src/domains/subscription/application/SubscriptionSyncProcessor.ts

@@ -15,8 +15,12 @@ export class SubscriptionSyncProcessor {
   ) {}
 
   private async getCreditsUserId(revenueCatUserId: string): Promise<string> {
-    if (!revenueCatUserId || revenueCatUserId.length === 0) {
-      return this.getAnonymousUserId();
+    if (!revenueCatUserId || revenueCatUserId.trim().length === 0) {
+      const anonymousId = await this.getAnonymousUserId();
+      if (!anonymousId || anonymousId.trim().length === 0) {
+        throw new Error("[SubscriptionSyncProcessor] Cannot resolve credits userId: both revenueCatUserId and anonymousUserId are empty");
+      }
+      return anonymousId;
     }
     return revenueCatUserId;
   }

package/src/domains/subscription/infrastructure/utils/authPurchaseState.ts

@@ -10,9 +10,12 @@ interface SavedPurchaseState {
   pkg: PurchasesPackage;
   source: PurchaseSource;
   timestamp: number;
+  sessionId: string;
 }
 
-const SAVED_PURCHASE_EXPIRY_MS = 5 * 60 * 1000;
+const SAVED_PURCHASE_EXPIRY_MS = 2 * 60 * 1000;
+
+let currentSessionId = "";
 
 class AuthPurchaseStateManager {
   private authProvider: PurchaseAuthProvider | null = null;
@@ -26,11 +29,16 @@ class AuthPurchaseStateManager {
     return this.authProvider;
   }
 
+  setSessionId(sessionId: string): void {
+    currentSessionId = sessionId;
+  }
+
   savePurchase(pkg: PurchasesPackage, source: PurchaseSource): void {
     this.savedPurchaseState = {
       pkg,
       source,
       timestamp: Date.now(),
+      sessionId: currentSessionId,
     };
   }
 
@@ -39,6 +47,11 @@ class AuthPurchaseStateManager {
       return null;
     }
 
+    if (this.savedPurchaseState.sessionId !== currentSessionId) {
+      this.savedPurchaseState = null;
+      return null;
+    }
+
     const isExpired = Date.now() - this.savedPurchaseState.timestamp > SAVED_PURCHASE_EXPIRY_MS;
     if (isExpired) {
       this.savedPurchaseState = null;
@@ -55,9 +68,14 @@ class AuthPurchaseStateManager {
     this.savedPurchaseState = null;
   }
 
+  onUserChanged(): void {
+    this.savedPurchaseState = null;
+  }
+
   cleanup(): void {
     this.authProvider = null;
     this.savedPurchaseState = null;
+    currentSessionId = "";
   }
 }
 

package/src/domains/subscription/presentation/useAuthAwarePurchase.ts

@@ -38,11 +38,16 @@ export const useAuthAwarePurchase = (
       return false;
     }
 
-    const result = await purchasePackage(saved.pkg);
-    if (result) {
+    try {
+      const result = await purchasePackage(saved.pkg);
+      if (result) {
+        authPurchaseStateManager.clearSavedPurchase();
+      }
+      return result;
+    } catch {
       authPurchaseStateManager.clearSavedPurchase();
+      return false;
     }
-    return result;
   }, [purchasePackage]);
 
   useEffect(() => {
@@ -58,7 +63,7 @@ export const useAuthAwarePurchase = (
         isExecutingSavedRef.current = false;
       });
     }
-  });
+  }, [executeSavedPurchase]);
 
   const handlePurchase = useCallback(
     async (pkg: PurchasesPackage, source?: PurchaseSource): Promise<boolean> => {