@umituz/react-native-subscription 2.37.57 → 2.37.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.57",
+  "version": "2.37.59",
   "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/domains/subscription/application/initializer/BackgroundInitializer.ts

@@ -11,6 +11,7 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
   let retryTimer: ReturnType<typeof setTimeout> | null = null;
   let lastUserId: string | undefined = undefined;
   let lastInitSucceeded = false;
+  let isInitializing = false; // true while attemptInitWithRetry is awaited
 
   const initializeInBackground = async (revenueCatUserId?: string): Promise<void> => {
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
@@ -65,7 +66,7 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
       retryTimer = null;
     }
 
-    if (lastUserId === revenueCatUserId && lastInitSucceeded) {
+    if (lastUserId === revenueCatUserId && (lastInitSucceeded || isInitializing)) {
       if (typeof __DEV__ !== 'undefined' && __DEV__) {
         console.log('[BackgroundInitializer] UserId unchanged and init succeeded, skipping');
       }
@@ -83,7 +84,12 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
         lastInitSucceeded = false;
       }
 
-      void attemptInitWithRetry(revenueCatUserId);
+      isInitializing = true;
+      try {
+        await attemptInitWithRetry(revenueCatUserId);
+      } finally {
+        isInitializing = false;
+      }
     }, AUTH_STATE_DEBOUNCE_MS);
   };
 

package/src/domains/subscription/application/initializer/ServiceConfigurator.ts

@@ -68,6 +68,10 @@ export function configureServices(config: SubscriptionInitConfig, apiKey: string
       const u = auth.currentUser;
       return !!(u && !u.isAnonymous);
     },
+    hasFirebaseUser: () => {
+      const auth = getFirebaseAuth();
+      return !!(auth?.currentUser);
+    },
     showAuthModal,
   });
 

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

@@ -3,6 +3,7 @@ import type { PurchaseSource } from "../../core/SubscriptionConstants";
 
 export interface PurchaseAuthProvider {
   isAuthenticated: () => boolean;
+  hasFirebaseUser: () => boolean;
   showAuthModal: () => void;
 }
 

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

@@ -54,10 +54,10 @@ export const useAuthAwarePurchase = (
     const authProvider = authPurchaseStateManager.getProvider();
     if (!authProvider) return;
 
-    const isAuth = authProvider.isAuthenticated();
+    const hasUser = authProvider.hasFirebaseUser();
     const hasSavedPurchase = !!authPurchaseStateManager.getSavedPurchase();
 
-    if (isAuth && hasSavedPurchase && !isExecutingSavedRef.current) {
+    if (hasUser && hasSavedPurchase && !isExecutingSavedRef.current) {
       isExecutingSavedRef.current = true;
       executeSavedPurchase().finally(() => {
         isExecutingSavedRef.current = false;
@@ -73,9 +73,7 @@ export const useAuthAwarePurchase = (
         return false;
       }
 
-      const isAuth = authProvider.isAuthenticated();
-
-      if (!isAuth) {
+      if (!authProvider.hasFirebaseUser()) {
         authPurchaseStateManager.savePurchase(pkg, source || params?.source || "settings");
         authProvider.showAuthModal();
         return false;
@@ -95,7 +93,7 @@ export const useAuthAwarePurchase = (
       return false;
     }
 
-    if (!authProvider.isAuthenticated()) {
+    if (!authProvider.hasFirebaseUser()) {
       authProvider.showAuthModal();
       return false;
     }