@umituz/react-native-subscription 2.43.2 → 2.43.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.43.2",
+  "version": "2.43.4",
   "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/infrastructure/hooks/usePurchasePackage.ts

@@ -6,9 +6,9 @@ import {
   selectUserId,
 } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
-import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
 import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
+import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { getErrorMessage } from "../../../revenuecat/core/errors/RevenueCatErrorHandler";
 
 interface PurchaseMutationResult {
@@ -39,16 +39,12 @@ export const usePurchasePackage = () => {
     onSuccess: (result) => {
       if (result.success) {
         showSuccess("Purchase Successful", "Your subscription is now active!");
-        queryClient.invalidateQueries({
-          queryKey: SUBSCRIPTION_QUERY_KEYS.packages,
-        });
+
+        // Invalidate caches after successful purchase
+        queryClient.invalidateQueries({ queryKey: SUBSCRIPTION_QUERY_KEYS.packages });
         if (userId) {
-          queryClient.invalidateQueries({
-            queryKey: subscriptionStatusQueryKeys.user(userId),
-          });
-          queryClient.invalidateQueries({
-            queryKey: creditsQueryKeys.user(userId),
-          });
+          queryClient.invalidateQueries({ queryKey: subscriptionStatusQueryKeys.user(userId) });
+          queryClient.invalidateQueries({ queryKey: creditsQueryKeys.user(userId) });
         }
       } else {
         showError("Purchase Failed", "Unable to complete purchase. Please try again.");

package/src/domains/subscription/infrastructure/hooks/useRestorePurchase.ts

@@ -5,9 +5,9 @@ import {
   selectUserId,
 } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
-import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { subscriptionStatusQueryKeys } from "../../presentation/useSubscriptionStatus";
 import { creditsQueryKeys } from "../../../credits/presentation/creditsQueryKeys";
+import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
 import { getErrorMessage } from "../../../revenuecat/core/errors/RevenueCatErrorHandler";
 
 interface RestoreResult {
@@ -31,16 +31,11 @@ export const useRestorePurchase = () => {
     },
     onSuccess: (result) => {
       if (result.success) {
-        queryClient.invalidateQueries({
-          queryKey: SUBSCRIPTION_QUERY_KEYS.packages,
-        });
+        // Invalidate caches after successful restore
+        queryClient.invalidateQueries({ queryKey: SUBSCRIPTION_QUERY_KEYS.packages });
         if (userId) {
-          queryClient.invalidateQueries({
-            queryKey: subscriptionStatusQueryKeys.user(userId),
-          });
-          queryClient.invalidateQueries({
-            queryKey: creditsQueryKeys.user(userId),
-          });
+          queryClient.invalidateQueries({ queryKey: subscriptionStatusQueryKeys.user(userId) });
+          queryClient.invalidateQueries({ queryKey: creditsQueryKeys.user(userId) });
         }
 
         if (result.productId) {

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

@@ -1,50 +1,53 @@
-import type { MutableRefObject } from "react";
+import type { FeatureGateState } from "./hooks/useFeatureGateState";
 
-export const executeFeatureAction = (
+/**
+ * Executes a feature action with proper auth, subscription, and credit checks.
+ * Queues the action if waiting for auth completion or purchase flow.
+ *
+ * @param action - The action to execute when conditions are met
+ * @param isAuthenticated - Whether user is authenticated
+ * @param onShowAuthModal - Callback to show auth modal
+ * @param state - Feature gate state containing all refs and flags
+ * @returns true if action was executed immediately, false if queued/pending
+ */
+export function executeFeatureAction(
   action: () => void | Promise<void>,
   isAuthenticated: boolean,
   onShowAuthModal: (callback: () => void | Promise<void>) => void,
-  hasSubscriptionRef: MutableRefObject<boolean>,
-  creditBalanceRef: MutableRefObject<number>,
-  requiredCreditsRef: MutableRefObject<number>,
-  onShowPaywallRef: MutableRefObject<(requiredCredits?: number) => void>,
-  pendingActionRef: MutableRefObject<(() => void | Promise<void>) | null>,
-  isWaitingForAuthCreditsRef: MutableRefObject<boolean>,
-  isWaitingForPurchaseRef: MutableRefObject<boolean>,
-  isCreditsLoadedRef: MutableRefObject<boolean>
-): boolean => {
+  state: FeatureGateState
+): boolean {
 
   if (!isAuthenticated) {
     const postAuthAction = () => {
-      if (hasSubscriptionRef.current || creditBalanceRef.current >= requiredCreditsRef.current) {
+      if (state.hasSubscriptionRef.current || state.creditBalanceRef.current >= state.requiredCreditsRef.current) {
         action();
         return;
       }
 
-      if (isCreditsLoadedRef.current) {
-        pendingActionRef.current = action;
-        isWaitingForPurchaseRef.current = true;
-        onShowPaywallRef.current(requiredCreditsRef.current);
+      if (state.isCreditsLoadedRef.current) {
+        state.pendingActionRef.current = action;
+        state.isWaitingForPurchaseRef.current = true;
+        state.onShowPaywallRef.current(state.requiredCreditsRef.current);
         return;
       }
-      pendingActionRef.current = action;
-      isWaitingForAuthCreditsRef.current = true;
+      state.pendingActionRef.current = action;
+      state.isWaitingForAuthCreditsRef.current = true;
     };
     onShowAuthModal(postAuthAction);
     return false;
   }
 
-  if (hasSubscriptionRef.current) {
+  if (state.hasSubscriptionRef.current) {
     action();
     return true;
   }
 
-  if (creditBalanceRef.current < requiredCreditsRef.current) {
-    pendingActionRef.current = action;
-    isWaitingForPurchaseRef.current = true;
-    onShowPaywallRef.current(requiredCreditsRef.current);
+  if (state.creditBalanceRef.current < state.requiredCreditsRef.current) {
+    state.pendingActionRef.current = action;
+    state.isWaitingForPurchaseRef.current = true;
+    state.onShowPaywallRef.current(state.requiredCreditsRef.current);
     return false;
   }
   action();
   return true;
-};
+}

package/src/domains/subscription/presentation/hooks/useFeatureGateState.ts

@@ -0,0 +1,76 @@
+import { useRef } from "react";
+import type { UseFeatureGateParams } from "../useFeatureGate.types";
+
+/**
+ * Internal state management for useFeatureGate hook.
+ * Encapsulates all refs and state to reduce parameter passing.
+ */
+export interface FeatureGateState {
+  // Action queue
+  pendingActionRef: React.MutableRefObject<(() => void | Promise<void>) | null>;
+
+  // Previous values for change detection
+  prevCreditBalanceRef: React.MutableRefObject<number | undefined>;
+  prevHasSubscriptionRef: React.MutableRefObject<boolean>;
+
+  // Waiting flags for async operations
+  isWaitingForAuthCreditsRef: React.MutableRefObject<boolean>;
+  isWaitingForPurchaseRef: React.MutableRefObject<boolean>;
+
+  // Live refs (synced with current values)
+  creditBalanceRef: React.MutableRefObject<number>;
+  hasSubscriptionRef: React.MutableRefObject<boolean>;
+  onShowPaywallRef: React.MutableRefObject<(requiredCredits?: number) => void>;
+  requiredCreditsRef: React.MutableRefObject<number>;
+  isCreditsLoadedRef: React.MutableRefObject<boolean>;
+}
+
+/**
+ * Creates and initializes all refs for useFeatureGate.
+ * This encapsulates ref creation and initialization logic.
+ */
+export function useFeatureGateRefs(params: UseFeatureGateParams): FeatureGateState {
+  const {
+    creditBalance,
+    hasSubscription = false,
+    onShowPaywall,
+    requiredCredits = 1,
+    isCreditsLoaded = true,
+  } = params;
+
+  const pendingActionRef = useRef<(() => void | Promise<void>) | null>(null);
+  const prevCreditBalanceRef = useRef(creditBalance);
+  const prevHasSubscriptionRef = useRef(hasSubscription);
+  const isWaitingForAuthCreditsRef = useRef(false);
+  const isWaitingForPurchaseRef = useRef(false);
+
+  return {
+    pendingActionRef,
+    prevCreditBalanceRef,
+    prevHasSubscriptionRef,
+    isWaitingForAuthCreditsRef,
+    isWaitingForPurchaseRef,
+    creditBalanceRef: useRef(creditBalance),
+    hasSubscriptionRef: useRef(hasSubscription),
+    onShowPaywallRef: useRef(onShowPaywall),
+    requiredCreditsRef: useRef(requiredCredits),
+    isCreditsLoadedRef: useRef(isCreditsLoaded),
+  };
+}
+
+/**
+ * Updates live refs when their source values change.
+ * Call this in a useEffect or when values update.
+ */
+export function updateLiveRefs(
+  state: FeatureGateState,
+  params: Pick<UseFeatureGateParams, 'creditBalance' | 'hasSubscription' | 'onShowPaywall' | 'requiredCredits' | 'isCreditsLoaded'>
+): void {
+  const { creditBalance, hasSubscription, onShowPaywall, requiredCredits, isCreditsLoaded } = params;
+
+  state.creditBalanceRef.current = creditBalance;
+  state.hasSubscriptionRef.current = hasSubscription;
+  state.onShowPaywallRef.current = onShowPaywall;
+  state.requiredCreditsRef.current = requiredCredits;
+  state.isCreditsLoadedRef.current = isCreditsLoaded;
+}

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

@@ -3,6 +3,7 @@ import type { PurchasesPackage } from "react-native-purchases";
 import { usePremium } from "./usePremium";
 import type { PurchaseSource } from "../core/SubscriptionConstants";
 import { authPurchaseStateManager } from "../infrastructure/utils/authPurchaseState";
+import { requireAuthentication } from "./utils/authCheckUtils";
 
 export const configureAuthProvider = (provider: import("../infrastructure/utils/authPurchaseState").PurchaseAuthProvider): void => {
   authPurchaseStateManager.configure(provider);
@@ -26,6 +27,10 @@ interface UseAuthAwarePurchaseResult {
   executeSavedPurchase: () => Promise<boolean>;
 }
 
+/**
+ * Hook for purchase operations that handle authentication.
+ * Automatically saves pending purchases and shows auth modal when needed.
+ */
 export const useAuthAwarePurchase = (
   params?: UseAuthAwarePurchaseParams
 ): UseAuthAwarePurchaseResult => {
@@ -50,11 +55,10 @@ export const useAuthAwarePurchase = (
     }
   }, [purchasePackage]);
 
+  // Auto-execute saved purchase when user authenticates
   useEffect(() => {
     const authProvider = authPurchaseStateManager.getProvider();
-    if (!authProvider) return;
-
-    const hasUser = authProvider.hasFirebaseUser();
+    const hasUser = authProvider && authProvider.hasFirebaseUser();
     const hasSavedPurchase = !!authPurchaseStateManager.getSavedPurchase();
 
     if (hasUser && hasSavedPurchase && !isExecutingSavedRef.current) {
@@ -69,18 +73,14 @@ export const useAuthAwarePurchase = (
     async (pkg: PurchasesPackage, source?: PurchaseSource): Promise<boolean> => {
       const authProvider = authPurchaseStateManager.getProvider();
 
-      if (!authProvider) {
-        return false;
-      }
-
-      if (!authProvider.hasFirebaseUser()) {
+      if (!requireAuthentication(authProvider)) {
+        // User not authenticated, purchase saved and auth modal shown
         authPurchaseStateManager.savePurchase(pkg, source || params?.source || "settings");
-        authProvider.showAuthModal();
         return false;
       }
 
+      // User authenticated, proceed with purchase
       const result = await purchasePackage(pkg);
-
       return result;
     },
     [purchasePackage, params?.source]
@@ -89,17 +89,11 @@ export const useAuthAwarePurchase = (
   const handleRestore = useCallback(async (): Promise<boolean> => {
     const authProvider = authPurchaseStateManager.getProvider();
 
-    if (!authProvider) {
-      return false;
-    }
-
-    if (!authProvider.hasFirebaseUser()) {
-      authProvider.showAuthModal();
+    if (!requireAuthentication(authProvider)) {
       return false;
     }
 
     const result = await restorePurchase();
-
     return result;
   }, [restorePurchase]);
 

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

@@ -1,8 +1,8 @@
-import { useCallback, useRef, useEffect } from "react";
+import { useCallback, useEffect } from "react";
 import type { UseFeatureGateParams, UseFeatureGateResult } from "./useFeatureGate.types";
 import { DEFAULT_REQUIRED_CREDITS, canExecuteAuthAction, canExecutePurchaseAction } from "../application/featureGate/featureGateBusinessRules";
-import { useSyncedRefs } from "./featureGateRefs";
 import { executeFeatureAction } from "./featureGateActions";
+import { useFeatureGateRefs, updateLiveRefs } from "./hooks/useFeatureGateState";
 
 export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResult {
   const {
@@ -11,73 +11,64 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
     hasSubscription = false,
     creditBalance,
     requiredCredits = DEFAULT_REQUIRED_CREDITS,
-    onShowPaywall,
     isCreditsLoaded = true,
   } = params;
 
-  const pendingActionRef = useRef<(() => void | Promise<void>) | null>(null);
-  const prevCreditBalanceRef = useRef(creditBalance);
-  // Separate ref to track previous subscription state for canExecutePurchaseAction.
-  // NOTE: Must NOT use hasSubscriptionRef from useSyncedRefs here because useSyncedRefs
-  // effects run BEFORE this effect (React runs effects in definition order), so
-  // hasSubscriptionRef.current would already be the NEW value when we check it.
-  const prevHasSubscriptionRef = useRef(hasSubscription);
-  const isWaitingForPurchaseRef = useRef(false);
-  const isWaitingForAuthCreditsRef = useRef(false);
+  const state = useFeatureGateRefs(params);
 
-  const { creditBalanceRef, hasSubscriptionRef, onShowPaywallRef, requiredCreditsRef, isCreditsLoadedRef } = useSyncedRefs(creditBalance, hasSubscription, onShowPaywall, requiredCredits, isCreditsLoaded);
+  // Update live refs when params change
+  useEffect(() => {
+    updateLiveRefs(state, params);
+  });
 
+  // Handle post-auth credit loading and action execution
   useEffect(() => {
     const shouldExecute = canExecuteAuthAction(
-      isWaitingForAuthCreditsRef.current,
+      state.isWaitingForAuthCreditsRef.current,
       isCreditsLoaded,
-      !!pendingActionRef.current,
+      !!state.pendingActionRef.current,
       hasSubscription,
       creditBalance,
       requiredCredits
     );
 
     if (shouldExecute) {
-      isWaitingForAuthCreditsRef.current = false;
-      const action = pendingActionRef.current!;
-      pendingActionRef.current = null;
+      state.isWaitingForAuthCreditsRef.current = false;
+      const action = state.pendingActionRef.current!;
+      state.pendingActionRef.current = null;
       action();
       return;
     }
 
-    if (isWaitingForAuthCreditsRef.current && isCreditsLoaded && pendingActionRef.current) {
-      isWaitingForAuthCreditsRef.current = false;
-      isWaitingForPurchaseRef.current = true;
-      // Use ref to avoid unstable callback dependency
-      onShowPaywallRef.current(requiredCreditsRef.current);
+    if (state.isWaitingForAuthCreditsRef.current && isCreditsLoaded && state.pendingActionRef.current) {
+      state.isWaitingForAuthCreditsRef.current = false;
+      state.isWaitingForPurchaseRef.current = true;
+      state.onShowPaywallRef.current(state.requiredCreditsRef.current);
     }
-    // Removed onShowPaywall from dependencies - using ref instead
-  }, [isCreditsLoaded, creditBalance, hasSubscription, requiredCredits, onShowPaywallRef, requiredCreditsRef]);
+  }, [isCreditsLoaded, creditBalance, hasSubscription, requiredCredits, state]);
 
+  // Handle post-purchase action execution
   useEffect(() => {
-    // Use prevHasSubscriptionRef (updated AFTER check) not hasSubscriptionRef from useSyncedRefs
-    // (which is already updated to new value before this effect runs - race condition fix)
     const shouldExecute = canExecutePurchaseAction(
-      isWaitingForPurchaseRef.current,
+      state.isWaitingForPurchaseRef.current,
       creditBalance,
-      prevCreditBalanceRef.current ?? 0,
+      state.prevCreditBalanceRef.current ?? 0,
       hasSubscription,
-      prevHasSubscriptionRef.current,
-      !!pendingActionRef.current
+      state.prevHasSubscriptionRef.current,
+      !!state.pendingActionRef.current
     );
 
     if (shouldExecute) {
-      const action = pendingActionRef.current!;
-      pendingActionRef.current = null;
-      isWaitingForPurchaseRef.current = false;
+      const action = state.pendingActionRef.current!;
+      state.pendingActionRef.current = null;
+      state.isWaitingForPurchaseRef.current = false;
       action();
     }
 
-    // Update AFTER check so next render has correct "prev" values
-    prevCreditBalanceRef.current = creditBalance;
-    prevHasSubscriptionRef.current = hasSubscription;
-     
-  }, [creditBalance, hasSubscription]);
+    // Update prev refs AFTER check for next render
+    state.prevCreditBalanceRef.current = creditBalance;
+    state.prevHasSubscriptionRef.current = hasSubscription;
+  }, [creditBalance, hasSubscription, state]);
 
   const requireFeature = useCallback(
     (action: () => void | Promise<void>): boolean => {
@@ -85,17 +76,10 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
         action,
         isAuthenticated,
         onShowAuthModal,
-        hasSubscriptionRef,
-        creditBalanceRef,
-        requiredCreditsRef,
-        onShowPaywallRef,
-        pendingActionRef,
-        isWaitingForAuthCreditsRef,
-        isWaitingForPurchaseRef,
-        isCreditsLoadedRef
+        state
       );
     },
-    [isAuthenticated, onShowAuthModal, hasSubscriptionRef, creditBalanceRef, requiredCreditsRef, onShowPaywallRef, isCreditsLoadedRef]
+    [isAuthenticated, onShowAuthModal, state]
   );
 
   return {

package/src/domains/subscription/presentation/utils/authCheckUtils.ts

@@ -0,0 +1,42 @@
+/**
+ * Authentication check utilities for purchase flows.
+ * Extracted to reduce duplication in useAuthAwarePurchase.
+ */
+
+export interface PurchaseAuthProvider {
+  hasFirebaseUser: () => boolean;
+  showAuthModal: () => void;
+}
+
+/**
+ * Checks if auth provider is available and user is authenticated.
+ *
+ * @param authProvider - Auth provider from authPurchaseStateManager
+ * @returns true if user is authenticated, false otherwise
+ */
+export function isUserAuthenticated(authProvider: PurchaseAuthProvider | null): boolean {
+  if (!authProvider) {
+    return false;
+  }
+  return authProvider.hasFirebaseUser();
+}
+
+/**
+ * Ensures user is authenticated before proceeding with an action.
+ * If not authenticated, shows auth modal and returns false.
+ *
+ * @param authProvider - Auth provider from authPurchaseStateManager
+ * @returns true if authenticated, false if auth modal was shown
+ */
+export function requireAuthentication(authProvider: PurchaseAuthProvider | null): boolean {
+  if (!authProvider) {
+    return false;
+  }
+
+  if (!authProvider.hasFirebaseUser()) {
+    authProvider.showAuthModal();
+    return false;
+  }
+
+  return true;
+}