@umituz/react-native-subscription 2.14.22 → 2.14.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.22",
+  "version": "2.14.24",
   "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/infrastructure/services/SubscriptionInitializer.ts

@@ -9,19 +9,69 @@ import { configureCreditsRepository } from "../repositories/CreditsRepositoryPro
 import { SubscriptionManager } from "../../revenuecat/infrastructure/managers/SubscriptionManager";
 import { configureAuthProvider } from "../../presentation/hooks/useAuthAwarePurchase";
 
+export interface FirebaseAuthLike {
+  currentUser: { uid: string; isAnonymous: boolean } | null;
+  onAuthStateChanged: (callback: (user: { uid: string; isAnonymous: boolean } | null) => void) => () => void;
+}
+
 export interface SubscriptionInitConfig {
   apiKey: string;
   testStoreKey?: string;
   entitlementId: string;
   credits: CreditsConfig;
   getAnonymousUserId: () => Promise<string>;
-  getFirebaseAuth: () => { currentUser: { isAnonymous: boolean } | null } | null;
+  getFirebaseAuth: () => FirebaseAuthLike | null;
   showAuthModal: () => void;
   onCreditsUpdated?: (userId: string) => void;
   onCreditRenewal?: (userId: string, productId: string, renewalId: string) => Promise<void>;
   timeoutMs?: number;
+  authStateTimeoutMs?: number;
 }
 
+/**
+ * Wait for Firebase Auth state to be ready
+ * This prevents unnecessary logIn calls that trigger Apple Sign In dialog
+ */
+const waitForAuthState = async (
+  getFirebaseAuth: () => FirebaseAuthLike | null,
+  timeoutMs: number
+): Promise<string | undefined> => {
+  const auth = getFirebaseAuth();
+  if (!auth) return undefined;
+
+  // If user already available, return immediately
+  if (auth.currentUser) {
+    if (__DEV__) {
+      console.log("[Subscription] User already available:", auth.currentUser.uid);
+    }
+    return auth.currentUser.uid;
+  }
+
+  // Wait for auth state to settle
+  return new Promise<string | undefined>((resolve) => {
+    const unsubscribe = auth.onAuthStateChanged((user) => {
+      unsubscribe();
+      if (__DEV__) {
+        console.log("[Subscription] Auth state ready:", {
+          hasUser: !!user,
+          userId: user?.uid ?? "anonymous",
+          isAnonymous: user?.isAnonymous ?? true,
+        });
+      }
+      resolve(user?.uid || undefined);
+    });
+
+    // Timeout fallback - don't wait forever
+    setTimeout(() => {
+      unsubscribe();
+      if (__DEV__) {
+        console.log("[Subscription] Auth state timeout, proceeding with anonymous");
+      }
+      resolve(undefined);
+    }, timeoutMs);
+  });
+};
+
 export const initializeSubscription = async (
   config: SubscriptionInitConfig,
 ): Promise<void> => {
@@ -36,6 +86,7 @@ export const initializeSubscription = async (
     onCreditsUpdated,
     onCreditRenewal,
     timeoutMs = 10000,
+    authStateTimeoutMs = 2000,
   } = config;
 
   if (!apiKey) {
@@ -56,7 +107,16 @@ export const initializeSubscription = async (
     getAnonymousUserId,
   });
 
-  const initPromise = SubscriptionManager.initialize();
+  // Wait for auth state to get correct user ID
+  const initialUserId = await waitForAuthState(getFirebaseAuth, authStateTimeoutMs);
+
+  if (__DEV__) {
+    console.log("[Subscription] Initializing with user:", {
+      userId: initialUserId ?? "will use anonymous",
+    });
+  }
+
+  const initPromise = SubscriptionManager.initialize(initialUserId);
   const timeoutPromise = new Promise<boolean>((_, reject) =>
     setTimeout(
       () => reject(new Error("Subscription initialization timeout")),
@@ -76,7 +136,6 @@ export const initializeSubscription = async (
   });
 
   if (__DEV__) {
-     
     console.log("[Subscription] Initialized successfully");
   }
 };

package/src/revenuecat/infrastructure/services/RevenueCatInitializer.ts

@@ -117,7 +117,31 @@ export async function initializeSDK(
   // Case 2: Already configured but different user or re-initializing
   if (isPurchasesConfigured) {
     try {
-      const { customerInfo } = await Purchases.logIn(userId);
+      // Check if we're already logged in with this user ID
+      const currentAppUserId = await Purchases.getAppUserID();
+      
+      if (__DEV__) {
+        console.log('[DEBUG RevenueCatInitializer] Current app user ID check', {
+          currentAppUserId,
+          requestedUserId: userId,
+          needsLogin: currentAppUserId !== userId,
+        });
+      }
+
+      // Only call logIn if the user ID is different
+      let customerInfo;
+      if (currentAppUserId !== userId) {
+        if (__DEV__) {
+          console.log('[DEBUG RevenueCatInitializer] User ID changed, calling logIn');
+        }
+        const result = await Purchases.logIn(userId);
+        customerInfo = result.customerInfo;
+      } else {
+        if (__DEV__) {
+          console.log('[DEBUG RevenueCatInitializer] Already logged in with same user ID, skipping logIn');
+        }
+        customerInfo = await Purchases.getCustomerInfo();
+      }
 
       deps.setInitialized(true);
       deps.setCurrentUserId(userId);