@umituz/react-native-subscription 2.35.15 → 2.35.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.35.15",
+  "version": "2.35.17",
   "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/config/utils/planSelectors.ts

@@ -32,7 +32,11 @@ export const getCreditLimitForPlan = (
     planId: string
 ): number => {
     const plan = getPlanById(config, planId);
-    return plan?.credits ?? 0;
+    if (!plan) {
+
+        return 0;
+    }
+    return plan.credits;
 };
 
 export const determinePlanFromCredits = (

package/src/domains/credits/presentation/useCredits.ts

@@ -2,6 +2,8 @@ import { useQuery, useQueryClient } from "@umituz/react-native-design-system";
 import { useCallback, useMemo, useEffect } from "react";
 import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
+import { NO_CACHE_QUERY_CONFIG } from "../../../shared/infrastructure/react-query/queryConfig";
+import { usePreviousUserCleanup } from "../../../shared/infrastructure/react-query/hooks/usePreviousUserCleanup";
 import {
   getCreditsRepository,
   getCreditsConfig,
@@ -44,15 +46,14 @@ export const useCredits = (): UseCreditsResult => {
       return result.data ?? null;
     },
     enabled: queryEnabled,
-    gcTime: 10 * 60 * 1000,
-    staleTime: 30 * 1000,
-    refetchOnMount: true,
-    refetchOnWindowFocus: false,
-    refetchOnReconnect: true,
+    ...NO_CACHE_QUERY_CONFIG,
   });
 
   const queryClient = useQueryClient();
 
+  // Clean up previous user's cache on logout/user switch
+  usePreviousUserCleanup(userId, queryClient, creditsQueryKeys.user);
+
   useEffect(() => {
     if (!isAuthenticated(userId)) return undefined;
 

package/src/domains/paywall/hooks/usePaywallActions.ts

@@ -7,8 +7,6 @@ import type { PurchasesPackage } from "react-native-purchases";
 import { usePurchaseLoadingStore } from "../../subscription/presentation/stores";
 import type { PurchaseSource } from "../../subscription/core/SubscriptionConstants";
 
-declare const __DEV__: boolean;
-
 export interface UsePaywallActionsParams {
   packages?: PurchasesPackage[];
   onPurchase?: (pkg: PurchasesPackage) => Promise<void | boolean>;
@@ -54,35 +52,18 @@ export function usePaywallActions({
   });
 
   const handlePurchase = useCallback(async () => {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[usePaywallActions] handlePurchase called", {
-        selectedPlanId,
-        hasOnPurchase: !!onPurchaseRef.current,
-        isProcessing,
-        packagesCount: packages.length,
-      });
-    }
 
     if (!selectedPlanId) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.warn("[usePaywallActions] ❌ No plan selected");
-      }
       return;
     }
 
     if (!onPurchaseRef.current) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.error("[usePaywallActions] ❌ No onPurchase callback provided");
-      }
       const err = new Error("Purchase handler not configured");
       onPurchaseErrorRef.current?.(err);
       return;
     }
 
     if (isProcessing) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.warn("[usePaywallActions] ⚠️ Already processing, ignoring duplicate request");
-      }
       return;
     }
 
@@ -100,117 +81,56 @@ export function usePaywallActions({
       return;
     }
 
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[usePaywallActions] ✅ Starting purchase", {
-        productId: pkg.product.identifier,
-        title: pkg.product.title,
-      });
-    }
-
     setIsLocalProcessing(true);
     startPurchase(selectedPlanId, "manual");
 
     try {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[usePaywallActions] 🚀 Calling onPurchase callback");
-      }
 
       const success = await onPurchaseRef.current(pkg);
 
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[usePaywallActions] 📦 Purchase result:", { success, type: typeof success });
-      }
-
       if (success === true) {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.log("[usePaywallActions] ✅ Purchase successful, calling success callbacks");
-        }
         onPurchaseSuccessRef.current?.();
         onCloseRef.current?.();
       } else if (success === false) {
         if (typeof __DEV__ !== "undefined" && __DEV__) {
           console.warn("[usePaywallActions] ⚠️ Purchase returned false (user cancelled or failed)");
         }
-      } else {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.error("[usePaywallActions] ❌ Purchase returned unexpected value:", success);
-        }
       }
+      // else: success is undefined/null - no action needed
     } catch (error) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.error("[usePaywallActions] ❌ Purchase error:", error);
-      }
       const err = error instanceof Error ? error : new Error(String(error));
       onPurchaseErrorRef.current?.(err);
     } finally {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[usePaywallActions] 🏁 Purchase completed, cleaning up");
-      }
       setIsLocalProcessing(false);
       endPurchase(selectedPlanId);
     }
   }, [selectedPlanId, packages, isProcessing, startPurchase, endPurchase]);
 
   const handleRestore = useCallback(async () => {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[usePaywallActions] handleRestore called", {
-        hasOnRestore: !!onRestoreRef.current,
-        isProcessing,
-      });
-    }
 
     if (!onRestoreRef.current) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.error("[usePaywallActions] ❌ No onRestore callback provided");
-      }
       const err = new Error("Restore handler not configured");
       onPurchaseErrorRef.current?.(err);
       return;
     }
 
     if (isProcessing) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.warn("[usePaywallActions] ⚠️ Already processing, ignoring restore request");
-      }
       return;
     }
 
     setIsLocalProcessing(true);
     try {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[usePaywallActions] 🚀 Calling onRestore callback");
-      }
 
       const success = await onRestoreRef.current();
 
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[usePaywallActions] 📦 Restore result:", { success, type: typeof success });
-      }
-
       if (success === true) {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.log("[usePaywallActions] ✅ Restore successful");
-        }
         onPurchaseSuccessRef.current?.();
-      } else if (success === false) {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.warn("[usePaywallActions] ⚠️ Restore returned false");
-        }
-      } else {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.error("[usePaywallActions] ❌ Restore returned unexpected value:", success);
-        }
       }
+      // else: success is false/undefined - restore failed or user cancelled, no action needed
     } catch (error) {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.error("[usePaywallActions] ❌ Restore error:", error);
-      }
       const err = error instanceof Error ? error : new Error(String(error));
       onPurchaseErrorRef.current?.(err);
     } finally {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[usePaywallActions] 🏁 Restore completed");
-      }
       setIsLocalProcessing(false);
     }
   }, [isProcessing]);

package/src/domains/revenuecat/core/customerInfoHelpers.ts

@@ -0,0 +1,21 @@
+/**
+ * Customer Info Helper Functions
+ * Utilities for extracting data from RevenueCat CustomerInfo objects
+ */
+
+import type { CustomerInfo } from "react-native-purchases";
+
+/**
+ * Extracts active entitlement IDs from CustomerInfo
+ * Useful for logging and debugging
+ *
+ * @param customerInfo - RevenueCat CustomerInfo object
+ * @returns Array of active entitlement IDs
+ *
+ * @example
+ * const activeIds = getActiveEntitlementIds(customerInfo);
+ * console.log("Active entitlements:", activeIds); // ["premium", "pro_features"]
+ */
+export function getActiveEntitlementIds(customerInfo: CustomerInfo): string[] {
+  return Object.keys(customerInfo.entitlements.active);
+}

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

@@ -1,7 +1,5 @@
 import type { FirebaseAuthLike } from "./SubscriptionInitializerTypes";
 
-declare const __DEV__: boolean;
-
 /**
  * Gets the current user ID from Firebase auth.
  * Returns undefined for anonymous users to let RevenueCat generate its own anonymous ID.
@@ -9,17 +7,11 @@ declare const __DEV__: boolean;
 export const getCurrentUserId = (getAuth: () => FirebaseAuthLike | null): string | undefined => {
   const auth = getAuth();
   if (!auth) {
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[SubscriptionAuthListener] No auth available');
-    }
     return undefined;
   }
 
   const user = auth.currentUser;
   if (!user) {
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[SubscriptionAuthListener] No current user');
-    }
     return undefined;
   }
 
@@ -30,10 +22,6 @@ export const getCurrentUserId = (getAuth: () => FirebaseAuthLike | null): string
     return undefined;
   }
 
-  if (typeof __DEV__ !== 'undefined' && __DEV__) {
-    console.log('[SubscriptionAuthListener] Authenticated user:', user.uid);
-  }
-
   return user.uid;
 };
 
@@ -48,16 +36,9 @@ export const setupAuthStateListener = (
 ): (() => void) | null => {
   const auth = getAuth();
   if (!auth) {
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[SubscriptionAuthListener] Cannot setup listener - no auth available');
-    }
     return null;
   }
 
-  if (typeof __DEV__ !== 'undefined' && __DEV__) {
-    console.log('[SubscriptionAuthListener] Setting up auth state listener');
-  }
-
   return auth.onAuthStateChanged((user) => {
     const userId = (user && !user.isAnonymous) ? user.uid : undefined;
 

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

@@ -43,7 +43,7 @@ export class SubscriptionSyncProcessor {
 
   async processRenewal(userId: string, productId: string, newExpirationDate: string, customerInfo: CustomerInfo) {
     const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
-    revenueCatData.expirationDate = newExpirationDate || revenueCatData.expirationDate;
+    revenueCatData.expirationDate = newExpirationDate ?? revenueCatData.expirationDate;
     const purchaseId = generateRenewalId(revenueCatData.originalTransactionId, productId, newExpirationDate);
 
     const creditsUserId = await this.getCreditsUserId(userId);

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

@@ -2,8 +2,6 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { getCurrentUserId, setupAuthStateListener } from "../SubscriptionAuthListener";
 import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
 
-declare const __DEV__: boolean;
-
 export async function startBackgroundInitialization(config: SubscriptionInitConfig): Promise<() => void> {
   const initializeInBackground = async (revenueCatUserId?: string): Promise<void> => {
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
@@ -17,10 +15,6 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
     throw new Error("Firebase auth is not available");
   }
 
-  if (typeof __DEV__ !== 'undefined' && __DEV__) {
-    console.log('[BackgroundInitializer] Starting background initialization');
-  }
-
   const initialRevenueCatUserId = getCurrentUserId(() => auth);
 
   if (typeof __DEV__ !== 'undefined' && __DEV__) {
@@ -35,8 +29,8 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
     }
     try {
       await initializeInBackground(newRevenueCatUserId);
-    } catch (error) {
-      console.error('[BackgroundInitializer] Failed to reinitialize on auth change', { userId: newRevenueCatUserId, error });
+    } catch (_error) {
+      // Background re-initialization errors are non-critical, already logged by SubscriptionManager
     }
   });
 

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

@@ -4,8 +4,8 @@ import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
 export function getApiKey(config: SubscriptionInitConfig): string {
   const { apiKey, apiKeyIos, apiKeyAndroid } = config;
   const key = Platform.OS === 'ios'
-    ? (apiKeyIos || apiKey)
-    : (apiKeyAndroid || apiKey);
+    ? (apiKeyIos ?? apiKey)
+    : (apiKeyAndroid ?? apiKey);
 
   if (!key) {
     throw new Error('API key required');

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

@@ -3,6 +3,8 @@ import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionM
 import { configureAuthProvider } from "../../presentation/useAuthAwarePurchase";
 import { SubscriptionSyncService } from "../SubscriptionSyncService";
 import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
+import type { CustomerInfo } from "react-native-purchases";
+import type { PackageType } from "../../../revenuecat/core/types/RevenueCatTypes";
 
 export function configureServices(config: SubscriptionInitConfig, apiKey: string): SubscriptionSyncService {
   const { entitlementId, credits, creditPackages, getFirebaseAuth, showAuthModal, onCreditsUpdated, getAnonymousUserId } = config;
@@ -23,9 +25,27 @@ export function configureServices(config: SubscriptionInitConfig, apiKey: string
       apiKey,
       entitlementIdentifier: entitlementId,
       consumableProductIdentifiers: [creditPackages.identifierPattern],
-      onPurchaseCompleted: (u: string, p: string, c: any, s: any, pkgType: any) => syncService.handlePurchase(u, p, c, s, pkgType),
-      onRenewalDetected: (u: string, p: string, expires: string, c: any) => syncService.handleRenewal(u, p, expires, c),
-      onPremiumStatusChanged: (u: string, isP: boolean, pId: any, exp: any, willR: any, pt: any) => syncService.handlePremiumStatusChanged(u, isP, pId, exp, willR, pt),
+      onPurchaseCompleted: (
+        u: string,
+        p: string,
+        c: CustomerInfo,
+        s?: string,
+        pkgType?: PackageType | null
+      ) => syncService.handlePurchase(u, p, c, s as any, pkgType),
+      onRenewalDetected: (
+        u: string,
+        p: string,
+        expires: string,
+        c: CustomerInfo
+      ) => syncService.handleRenewal(u, p, expires, c),
+      onPremiumStatusChanged: (
+        u: string,
+        isP: boolean,
+        pId?: string,
+        exp?: string,
+        willR?: boolean,
+        pt?: string
+      ) => syncService.handlePremiumStatusChanged(u, isP, pId, exp, willR, pt as any),
       onCreditsUpdated,
     },
     apiKey,

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

@@ -6,8 +6,6 @@ import { emitCreditsUpdated } from "./syncEventEmitter";
 import { generateInitSyncId, generateStatusSyncId } from "./syncIdGenerators";
 import { NO_SUBSCRIPTION_PRODUCT_ID, DEFAULT_FREE_USER_DATA } from "./syncConstants";
 
-declare const __DEV__: boolean;
-
 export const handleExpiredSubscription = async (userId: string): Promise<void> => {
   await getCreditsRepository().syncExpiredStatus(userId);
   emitCreditsUpdated(userId);
@@ -34,16 +32,6 @@ export const handlePremiumStatusSync = async (
   willRenew: boolean,
   periodType: PeriodType | null
 ): Promise<void> => {
-  if (typeof __DEV__ !== "undefined" && __DEV__) {
-    console.log("[StatusChangeHandlers] handlePremiumStatusSync called:", {
-      userId,
-      isPremium,
-      productId,
-      expiresAt,
-      willRenew,
-      periodType,
-    });
-  }
 
   const revenueCatData: RevenueCatData = {
     expirationDate: expiresAt,
@@ -60,16 +48,6 @@ export const handlePremiumStatusSync = async (
 
   const statusSyncId = generateStatusSyncId(userId, isPremium);
 
-  if (typeof __DEV__ !== "undefined" && __DEV__) {
-    console.log("[StatusChangeHandlers] Calling initializeCredits with:", {
-      userId,
-      statusSyncId,
-      productId,
-      source: PURCHASE_SOURCE.SETTINGS,
-      type: PURCHASE_TYPE.INITIAL,
-    });
-  }
-
   await getCreditsRepository().initializeCredits(
     userId,
     statusSyncId,
@@ -79,13 +57,5 @@ export const handlePremiumStatusSync = async (
     PURCHASE_TYPE.INITIAL
   );
 
-  if (typeof __DEV__ !== "undefined" && __DEV__) {
-    console.log("[StatusChangeHandlers] initializeCredits completed, emitting credits updated event");
-  }
-
   emitCreditsUpdated(userId);
-
-  if (typeof __DEV__ !== "undefined" && __DEV__) {
-    console.log("[StatusChangeHandlers] ✅ handlePremiumStatusSync completed successfully");
-  }
 };

package/src/domains/subscription/constants/thresholds.ts

@@ -0,0 +1,10 @@
+/**
+ * Subscription Threshold Constants
+ * Centralized threshold values for subscription UI logic
+ */
+
+/**
+ * Number of days before expiration to show warnings
+ * Used across subscription UI components for consistency
+ */
+export const EXPIRATION_WARNING_THRESHOLD_DAYS = 7;

package/src/domains/subscription/infrastructure/handlers/PurchaseStatusResolver.ts

@@ -32,15 +32,15 @@ export class PurchaseStatusResolver {
         expirationDate: toDate(entitlement.expirationDate),
         willRenew: entitlement.willRenew ?? false,
         productIdentifier,
-        originalPurchaseDate: toDate(entitlement.originalPurchaseDate) ?? null,
-        latestPurchaseDate: toDate(entitlement.latestPurchaseDate) ?? null,
+        originalPurchaseDate: toDate(entitlement.originalPurchaseDate),
+        latestPurchaseDate: toDate(entitlement.latestPurchaseDate),
         billingIssuesDetected: entitlement.billingIssueDetectedAt !== null && entitlement.billingIssueDetectedAt !== undefined,
         isSandbox: entitlement.isSandbox ?? false,
         periodType: entitlement.periodType ?? null,
         packageType: detectedPackageType,
         store: null,
         gracePeriodExpiresDate: null,
-        unsubscribeDetectedAt: toDate(entitlement.unsubscribeDetectedAt) ?? null,
+        unsubscribeDetectedAt: toDate(entitlement.unsubscribeDetectedAt),
       };
     }
 

package/src/domains/subscription/infrastructure/handlers/package-operations/PackageFetcher.ts

@@ -1,8 +1,6 @@
 import type { PurchasesPackage } from "react-native-purchases";
 import type { IRevenueCatService } from "../../../../../shared/application/ports/IRevenueCatService";
 
-declare const __DEV__: boolean;
-
 export async function fetchPackages(
   service: IRevenueCatService
 ): Promise<PurchasesPackage[]> {
@@ -13,26 +11,12 @@ export async function fetchPackages(
   try {
     const offering = await service.fetchOfferings();
 
-    if (__DEV__) {
-      console.log('[PackageHandler] fetchOfferings result:', {
-        hasOffering: !!offering,
-        offeringId: offering?.identifier,
-        packagesCount: offering?.availablePackages?.length,
-      });
-    }
-
     if (!offering) {
-      if (__DEV__) {
-        console.warn('[PackageHandler] No offering returned, returning empty array');
-      }
       return [];
     }
 
     const packages = offering.availablePackages;
     if (!packages || packages.length === 0) {
-      if (__DEV__) {
-        console.warn('[PackageHandler] Offering has no packages, returning empty array');
-      }
       return [];
     }
 
@@ -45,9 +29,6 @@ export async function fetchPackages(
 
     return packages;
   } catch (error) {
-    if (__DEV__) {
-      console.error('[PackageHandler] Error fetching packages:', error);
-    }
     throw new Error(
       `Failed to fetch subscription packages. ${
         error instanceof Error ? error.message : "Unknown error"

package/src/domains/subscription/infrastructure/hooks/customer-info/useCustomerInfo.ts

@@ -45,7 +45,7 @@ export function useCustomerInfo(): UseCustomerInfoResult {
         listenerRef.current = null;
       }
     };
-  }, [fetchCustomerInfo]);
+  }, [fetchCustomerInfo]); // fetchCustomerInfo is stable (empty deps), included for lint
 
   return {
     customerInfo,

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

@@ -6,6 +6,7 @@
 import { useMutation, useQueryClient } from "@umituz/react-native-design-system";
 import { SubscriptionManager } from '../../infrastructure/managers/SubscriptionManager';
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
+import { requireAuthentication } from "../../utils/authGuards";
 
 /**
  * Initialize subscription with RevenueCat
@@ -15,10 +16,7 @@ export const useInitializeSubscription = (userId: string | undefined) => {
 
   return useMutation({
     mutationFn: async () => {
-      if (!userId) {
-        throw new Error("User not authenticated");
-      }
-
+      requireAuthentication(userId);
       return SubscriptionManager.initialize(userId);
     },
     onSuccess: () => {

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

@@ -29,17 +29,27 @@ export const usePaywallFlow = (options: UsePaywallFlowOptions = {}): UsePaywallF
 
   // Load persisted state
   useEffect(() => {
+    let isMounted = true;
+
     const loadPersistedState = async () => {
       try {
         const value = await getString(PAYWALL_SHOWN_KEY, '');
-        setPaywallShown(value === 'true');
+        if (isMounted) {
+          setPaywallShown(value === 'true');
+        }
       } catch (error) {
         console.error('[usePaywallFlow] Failed to load paywall state', error);
-        setPaywallShown(false); // Safe default
+        if (isMounted) {
+          setPaywallShown(false); // Safe default
+        }
       }
     };
 
     loadPersistedState();
+
+    return () => {
+      isMounted = false;
+    };
   }, [getString]);
 
   const closePostOnboardingPaywall = useCallback(async (_isPremium: boolean) => {