@umituz/react-native-subscription 3.1.10 → 3.1.11

package/src/domains/revenuecat/infrastructure/services/userSwitchHandler.ts

@@ -1,240 +1,22 @@
-import Purchases, { type CustomerInfo, type PurchasesOfferings } from "react-native-purchases";
-import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
-import type { InitializerDeps } from "./RevenueCatInitializer.types";
-import { FAILED_INITIALIZATION_RESULT } from "./initializerConstants";
-import { UserSwitchMutex } from "./UserSwitchMutex";
-import { getPremiumEntitlement } from "../../core/types/RevenueCatTypes";
-import { ANONYMOUS_CACHE_KEY, type PeriodType } from "../../../subscription/core/SubscriptionConstants";
-
-declare const __DEV__: boolean;
-
-function buildSuccessResult(deps: InitializerDeps, customerInfo: CustomerInfo, offerings: PurchasesOfferings | null): InitializeResult {
-  const isPremium = !!customerInfo.entitlements.active[deps.config.entitlementIdentifier];
-  return { success: true, offering: offerings?.current ?? null, isPremium };
-}
-
 /**
- * Fetch offerings separately - non-fatal if it fails.
- * Empty offerings (no products configured in RevenueCat dashboard) should NOT
- * block SDK initialization. The SDK is still usable for premium checks, purchases, etc.
+ * User Switch Handler
+ *
+ * Main entry point for user switch operations.
+ * Exports functions from split modules for better organization.
  */
-async function fetchOfferingsSafe(): Promise<PurchasesOfferings | null> {
-  try {
-    return await Purchases.getOfferings();
-  } catch (error) {
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.warn('[UserSwitchHandler] Offerings fetch failed (non-fatal):', error);
-    }
-    return null;
-  }
-}
-
-function normalizeUserId(userId: string): string | null {
-  return (userId && userId.length > 0 && userId !== ANONYMOUS_CACHE_KEY) ? userId : null;
-}
-
-function isAnonymousId(userId: string): boolean {
-  return userId.startsWith('$RCAnonymous') || userId.startsWith('device_');
-}
-
-export async function handleUserSwitch(
-  deps: InitializerDeps,
-  userId: string
-): Promise<InitializeResult> {
-  const mutexKey = userId || ANONYMOUS_CACHE_KEY;
-
-  // Acquire mutex to prevent concurrent Purchases.logIn() calls
-  const { shouldProceed, existingPromise } = await UserSwitchMutex.acquire(mutexKey);
-
-  if (!shouldProceed && existingPromise) {
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchHandler] Using result from active switch operation');
-    }
-    return existingPromise as Promise<InitializeResult>;
-  }
-
-  const switchOperation = performUserSwitch(deps, userId);
-  UserSwitchMutex.setPromise(switchOperation);
-  return switchOperation;
-}
-
-async function performUserSwitch(
-  deps: InitializerDeps,
-  userId: string
-): Promise<InitializeResult> {
-  try {
-    const currentAppUserId = await Purchases.getAppUserID();
-    const normalizedUserId = normalizeUserId(userId);
-    const normalizedCurrentUserId = isAnonymousId(currentAppUserId) ? null : currentAppUserId;
-
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchHandler] handleUserSwitch:', {
-        providedUserId: userId,
-        normalizedUserId: normalizedUserId || '(null - anonymous)',
-        currentAppUserId,
-        normalizedCurrentUserId: normalizedCurrentUserId || '(null - anonymous)',
-        needsSwitch: normalizedCurrentUserId !== normalizedUserId,
-      });
-    }
-
-    let customerInfo;
-
-    if (normalizedCurrentUserId !== normalizedUserId) {
-      if (normalizedUserId) {
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.log('[UserSwitchHandler] Calling Purchases.logIn() to switch from anonymous to:', normalizedUserId);
-        }
-        const result = await Purchases.logIn(normalizedUserId!);
-        customerInfo = result.customerInfo;
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.log('[UserSwitchHandler] Purchases.logIn() successful, created:', result.created);
-        }
-      } else {
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.log('[UserSwitchHandler] User is anonymous, fetching customer info');
-        }
-        customerInfo = await Purchases.getCustomerInfo();
-      }
-    } else {
-      if (typeof __DEV__ !== 'undefined' && __DEV__) {
-        console.log('[UserSwitchHandler] No user switch needed, fetching current customer info');
-      }
-      customerInfo = await Purchases.getCustomerInfo();
-    }
-
-    deps.setInitialized(true);
-    deps.setCurrentUserId(normalizedUserId || undefined);
-    const offerings = await fetchOfferingsSafe();
-
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchHandler] User switch completed successfully');
-    }
-
-    return buildSuccessResult(deps, customerInfo, offerings);
-  } catch (error) {
-    let currentAppUserId = 'unknown';
-    try {
-      currentAppUserId = await Purchases.getAppUserID();
-    } catch {
-      // Ignore error in error handler
-    }
-
-    console.error('[UserSwitchHandler] Failed during user switch or fetch', {
-      userId,
-      currentAppUserId,
-      error
-    });
-    return FAILED_INITIALIZATION_RESULT;
-  }
-}
-
-export async function handleInitialConfiguration(
-  deps: InitializerDeps,
-  userId: string,
-  apiKey: string
-): Promise<InitializeResult> {
-  try {
-    const normalizedUserId = normalizeUserId(userId);
-
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchHandler] handleInitialConfiguration:', {
-        providedUserId: userId,
-        normalizedUserId: normalizedUserId || '(null - anonymous)',
-        apiKeyPrefix: apiKey.substring(0, 5) + '...',
-        isTestKey: apiKey.startsWith('test_'),
-      });
-    }
-
-    Purchases.setLogLevel(
-      (typeof __DEV__ !== 'undefined' && __DEV__)
-        ? Purchases.LOG_LEVEL.INFO
-        : Purchases.LOG_LEVEL.ERROR
-    );
-
-    await Purchases.configure({ apiKey, appUserID: normalizedUserId || undefined });
-    deps.setInitialized(true);
-    deps.setCurrentUserId(normalizedUserId || undefined);
-
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[UserSwitchHandler] Purchases.configure() successful');
-    }
-
-    // Fetch customer info (critical) and offerings (non-fatal) separately.
-    // Empty offerings should NOT block initialization - SDK is still usable.
-    const [customerInfo, offerings] = await Promise.all([
-      Purchases.getCustomerInfo(),
-      fetchOfferingsSafe(),
-    ]);
-
-    if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      const currentUserId = await Purchases.getAppUserID();
-      console.log('[UserSwitchHandler] Initial configuration completed:', {
-        revenueCatUserId: currentUserId,
-        activeEntitlements: Object.keys(customerInfo.entitlements.active),
-        offeringsCount: offerings?.all ? Object.keys(offerings.all).length : 0,
-      });
-    }
-
-    // Sync premium status via callback (if configured).
-    // Only when we have a real Firebase UID — skip for pre-auth anonymous state
-    // to avoid writing to Firestore with a RevenueCat-generated ID that doesn't
-    // match request.auth.uid.
-    if (deps.config.onPremiumStatusChanged && normalizedUserId) {
-      try {
-        const premiumEntitlement = getPremiumEntitlement(
-          customerInfo,
-          deps.config.entitlementIdentifier
-        );
-
-        if (premiumEntitlement) {
-          const subscription = customerInfo.subscriptionsByProductIdentifier?.[premiumEntitlement.productIdentifier];
-
-          await deps.config.onPremiumStatusChanged({
-            userId: normalizedUserId,
-            isPremium: true,
-            productId: premiumEntitlement.productIdentifier,
-            expirationDate: premiumEntitlement.expirationDate ?? null,
-            willRenew: premiumEntitlement.willRenew,
-            periodType: premiumEntitlement.periodType as PeriodType | undefined,
-            storeTransactionId: subscription?.storeTransactionId ?? undefined,
-            unsubscribeDetectedAt: premiumEntitlement.unsubscribeDetectedAt ?? null,
-            billingIssueDetectedAt: premiumEntitlement.billingIssueDetectedAt ?? null,
-            store: premiumEntitlement.store ?? null,
-            ownershipType: premiumEntitlement.ownershipType ?? null,
-          });
-        } else {
-          await deps.config.onPremiumStatusChanged({
-            userId: normalizedUserId,
-            isPremium: false,
-          });
-        }
-      } catch (error) {
-        // Log error but don't fail initialization
-        console.error('[UserSwitchHandler] Premium status sync callback failed:', error);
-      }
-    }
-
-    return buildSuccessResult(deps, customerInfo, offerings);
-  } catch (error) {
-    console.error('[UserSwitchHandler] SDK configuration failed', {
-      userId,
-      error
-    });
-    return FAILED_INITIALIZATION_RESULT;
-  }
-}
 
-export async function fetchCurrentUserData(deps: InitializerDeps): Promise<InitializeResult> {
-  try {
-    const [customerInfo, offerings] = await Promise.all([
-      Purchases.getCustomerInfo(),
-      fetchOfferingsSafe(),
-    ]);
-    return buildSuccessResult(deps, customerInfo, offerings);
-  } catch (error) {
-    console.error('[UserSwitchHandler] Failed to fetch customer info for initialized user', {
-      error
-    });
-    return FAILED_INITIALIZATION_RESULT;
-  }
-}
+export {
+  normalizeUserId,
+  isAnonymousId,
+  buildSuccessResult,
+  fetchOfferingsSafe,
+} from './userSwitchHelpers';
+
+export {
+  handleUserSwitch,
+} from './userSwitchCore';
+
+export {
+  handleInitialConfiguration,
+  fetchCurrentUserData,
+} from './userSwitchInitializer';

package/src/domains/revenuecat/infrastructure/services/userSwitchHelpers.ts

@@ -0,0 +1,55 @@
+/**
+ * User Switch Helper Functions
+ *
+ * Utility functions for user switch operations.
+ */
+
+import Purchases, { type CustomerInfo, type PurchasesOfferings } from "react-native-purchases";
+import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
+import type { InitializerDeps } from "./RevenueCatInitializer.types";
+import { ANONYMOUS_CACHE_KEY } from "../../../subscription/core/SubscriptionConstants";
+
+declare const __DEV__: boolean;
+
+/**
+ * Normalize user ID to null if empty or anonymous cache key.
+ */
+export function normalizeUserId(userId: string): string | null {
+  return (userId && userId.length > 0 && userId !== ANONYMOUS_CACHE_KEY) ? userId : null;
+}
+
+/**
+ * Check if the given user ID is an anonymous RevenueCat ID.
+ */
+export function isAnonymousId(userId: string): boolean {
+  return userId.startsWith('$RCAnonymous') || userId.startsWith('device_');
+}
+
+/**
+ * Build successful initialization result.
+ */
+export function buildSuccessResult(
+  deps: InitializerDeps,
+  customerInfo: CustomerInfo,
+  offerings: PurchasesOfferings | null
+): InitializeResult {
+  const isPremium = !!customerInfo.entitlements.active[deps.config.entitlementIdentifier];
+  return { success: true, offering: offerings?.current ?? null, isPremium };
+}
+
+/**
+ * Fetch offerings separately - non-fatal if it fails.
+ *
+ * Empty offerings (no products configured in RevenueCat dashboard) should NOT
+ * block SDK initialization. The SDK is still usable for premium checks, purchases, etc.
+ */
+export async function fetchOfferingsSafe(): Promise<PurchasesOfferings | null> {
+  try {
+    return await Purchases.getOfferings();
+  } catch (error) {
+    if (typeof __DEV__ !== 'undefined' && __DEV__) {
+      console.warn('[UserSwitchHelpers] Offerings fetch failed (non-fatal):', error);
+    }
+    return null;
+  }
+}

package/src/domains/revenuecat/infrastructure/services/userSwitchInitializer.ts

@@ -0,0 +1,143 @@
+/**
+ * User Switch Initializer
+ *
+ * Handles initial RevenueCat SDK configuration and user data fetching.
+ */
+
+import Purchases, { type CustomerInfo } from "react-native-purchases";
+import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
+import type { InitializerDeps } from "./RevenueCatInitializer.types";
+import { FAILED_INITIALIZATION_RESULT } from "./initializerConstants";
+import { getPremiumEntitlement } from "../../core/types/RevenueCatTypes";
+import type { PeriodType } from "../../../subscription/core/SubscriptionConstants";
+import {
+  normalizeUserId,
+  buildSuccessResult,
+  fetchOfferingsSafe,
+} from "./userSwitchHelpers";
+
+declare const __DEV__: boolean;
+
+/**
+ * Handle initial SDK configuration with API key and user ID.
+ */
+export async function handleInitialConfiguration(
+  deps: InitializerDeps,
+  userId: string,
+  apiKey: string
+): Promise<InitializeResult> {
+  try {
+    const normalizedUserId = normalizeUserId(userId);
+
+    if (typeof __DEV__ !== 'undefined' && __DEV__) {
+      console.log('[UserSwitchInitializer] handleInitialConfiguration:', {
+        providedUserId: userId,
+        normalizedUserId: normalizedUserId || '(null - anonymous)',
+        apiKeyPrefix: apiKey.substring(0, 5) + '...',
+        isTestKey: apiKey.startsWith('test_'),
+      });
+    }
+
+    Purchases.setLogLevel(
+      (typeof __DEV__ !== 'undefined' && __DEV__)
+        ? Purchases.LOG_LEVEL.INFO
+        : Purchases.LOG_LEVEL.ERROR
+    );
+
+    await Purchases.configure({ apiKey, appUserID: normalizedUserId || undefined });
+    deps.setInitialized(true);
+    deps.setCurrentUserId(normalizedUserId || undefined);
+
+    if (typeof __DEV__ !== 'undefined' && __DEV__) {
+      console.log('[UserSwitchInitializer] Purchases.configure() successful');
+    }
+
+    const [customerInfo, offerings] = await Promise.all([
+      Purchases.getCustomerInfo(),
+      fetchOfferingsSafe(),
+    ]);
+
+    if (typeof __DEV__ !== 'undefined' && __DEV__) {
+      const currentUserId = await Purchases.getAppUserID();
+      console.log('[UserSwitchInitializer] Initial configuration completed:', {
+        revenueCatUserId: currentUserId,
+        activeEntitlements: Object.keys(customerInfo.entitlements.active),
+        offeringsCount: offerings?.all ? Object.keys(offerings.all).length : 0,
+      });
+    }
+
+    await syncPremiumStatusIfConfigured(deps, normalizedUserId, customerInfo);
+
+    return buildSuccessResult(deps, customerInfo, offerings);
+  } catch (error) {
+    console.error('[UserSwitchInitializer] SDK configuration failed', {
+      userId,
+      error
+    });
+    return FAILED_INITIALIZATION_RESULT;
+  }
+}
+
+/**
+ * Fetch current user data without switching users.
+ */
+export async function fetchCurrentUserData(deps: InitializerDeps): Promise<InitializeResult> {
+  try {
+    const [customerInfo, offerings] = await Promise.all([
+      Purchases.getCustomerInfo(),
+      fetchOfferingsSafe(),
+    ]);
+    return buildSuccessResult(deps, customerInfo, offerings);
+  } catch (error) {
+    console.error('[UserSwitchInitializer] Failed to fetch customer info for initialized user', {
+      error
+    });
+    return FAILED_INITIALIZATION_RESULT;
+  }
+}
+
+/**
+ * Sync premium status to callback if configured.
+ * Only when we have a real Firebase UID — skip for pre-auth anonymous state.
+ */
+async function syncPremiumStatusIfConfigured(
+  deps: InitializerDeps,
+  normalizedUserId: string | null,
+  customerInfo: CustomerInfo
+): Promise<void> {
+  if (!deps.config.onPremiumStatusChanged || !normalizedUserId) {
+    return;
+  }
+
+  try {
+    const premiumEntitlement = getPremiumEntitlement(
+      customerInfo,
+      deps.config.entitlementIdentifier
+    );
+
+    if (premiumEntitlement) {
+      const subscription = customerInfo.subscriptionsByProductIdentifier?.[premiumEntitlement.productIdentifier];
+
+      await deps.config.onPremiumStatusChanged({
+        userId: normalizedUserId,
+        isPremium: true,
+        productId: premiumEntitlement.productIdentifier,
+        expirationDate: premiumEntitlement.expirationDate ?? null,
+        willRenew: premiumEntitlement.willRenew,
+        periodType: premiumEntitlement.periodType as PeriodType | undefined,
+        storeTransactionId: subscription?.storeTransactionId ?? undefined,
+        unsubscribeDetectedAt: premiumEntitlement.unsubscribeDetectedAt ?? null,
+        billingIssueDetectedAt: premiumEntitlement.billingIssueDetectedAt ?? null,
+        store: premiumEntitlement.store ?? null,
+        ownershipType: premiumEntitlement.ownershipType ?? null,
+      });
+    } else {
+      await deps.config.onPremiumStatusChanged({
+        userId: normalizedUserId,
+        isPremium: false,
+      });
+    }
+  } catch (error) {
+    console.error('[UserSwitchInitializer] Premium status sync callback failed:', error);
+  }
+}

package/src/domains/subscription/infrastructure/managers/SubscriptionManager.ts

@@ -29,6 +29,9 @@ class SubscriptionManagerImpl {
 
   private ensurePackageHandlerInitialized(): void {
     if (this.packageHandler) return;
+    if (!this.serviceInstance || !this.managerConfig) {
+      throw new Error('[SubscriptionManager] Cannot create package handler without service and config');
+    }
     this.packageHandler = createPackageHandler(this.serviceInstance, this.managerConfig);
   }
 
@@ -70,7 +73,7 @@ class SubscriptionManagerImpl {
       });
     }
 
-    const { service, success } = await performServiceInitialization(this.managerConfig!.config, userId);
+    const { service, success } = await performServiceInitialization(this.managerConfig.config, userId);
     this.serviceInstance = service ?? null;
     this.ensurePackageHandlerInitialized();
 
@@ -128,7 +131,7 @@ class SubscriptionManagerImpl {
     this.ensureConfigured();
     ensureServiceAvailable(this.serviceInstance);
     this.ensurePackageHandlerInitialized();
-    return checkPremiumStatusFromService(this.serviceInstance!, this.packageHandler!);
+    return checkPremiumStatusFromService(this.serviceInstance, this.packageHandler!);
   }
 
   async reset(): Promise<void> {
@@ -145,7 +148,7 @@ class SubscriptionManagerImpl {
 
   getEntitlementId(): string {
     this.ensureConfigured();
-    return this.managerConfig!.config.entitlementIdentifier;
+    return this.managerConfig.config.entitlementIdentifier;
   }
 }
 

package/src/domains/subscription/infrastructure/managers/initializationHandler.ts

@@ -9,6 +9,6 @@ export const performServiceInitialization = async (config: RevenueCatConfig, use
 
   ensureServiceAvailable(service);
 
-  const result = await service!.initialize(userId);
-  return { service: service!, success: result.success };
+  const result = await service.initialize(userId);
+  return { service, success: result.success };
 };

package/src/domains/subscription/infrastructure/managers/packageHandlerFactory.ts

@@ -11,7 +11,7 @@ export const createPackageHandler = (
   ensureConfigured(config);
 
   return new PackageHandler(
-    service!,
-    config!.config.entitlementIdentifier
+    service,
+    config.config.entitlementIdentifier
   );
 };

package/src/domains/subscription/infrastructure/managers/subscriptionManagerUtils.ts

@@ -3,7 +3,7 @@ import type { IRevenueCatService } from "../../../../shared/application/ports/IR
 import { getRevenueCatService } from "../services/revenueCatServiceInstance";
 import type { InitializationCache } from "../utils/InitializationCache";
 
-export function ensureConfigured(config: SubscriptionManagerConfig | null): void {
+export function ensureConfigured(config: SubscriptionManagerConfig | null): asserts config is SubscriptionManagerConfig {
     if (!config) {
         throw new Error("SubscriptionManager not configured");
     }
@@ -33,7 +33,7 @@ export function getOrCreateService(
     return serviceInstance;
 }
 
-export function ensureServiceAvailable(service: IRevenueCatService | null): void {
+export function ensureServiceAvailable(service: IRevenueCatService | null): asserts service is IRevenueCatService {
     if (!service) {
         throw new Error("Service instance not available");
     }

package/src/domains/subscription/presentation/components/ManagedSubscriptionFlow.logic.ts

@@ -0,0 +1,52 @@
+/**
+ * ManagedSubscriptionFlow - State Transition Logic
+ *
+ * Extracted state transition useEffect hooks for better separation.
+ */
+
+import { useEffect } from "react";
+import { useSubscriptionFlowStore, SubscriptionFlowStatus } from "../useSubscriptionFlow";
+
+interface UseStateTransitionsParams {
+  status: SubscriptionFlowStatus;
+  isPremium: boolean;
+  isSyncing: boolean;
+  showFeedback: boolean;
+}
+
+/**
+ * Hook containing all state transition logic.
+ * Extracted for better testability and separation of concerns.
+ */
+export function useStateTransitions({
+  status,
+  isPremium,
+  isSyncing,
+  showFeedback,
+}: UseStateTransitionsParams) {
+  const completePaywall = useSubscriptionFlowStore((s) => s.completePaywall);
+  const showPaywall = useSubscriptionFlowStore((s) => s.showPaywall);
+  const showFeedbackScreen = useSubscriptionFlowStore((s) => s.showFeedbackScreen);
+
+  // Transition from CHECK_PREMIUM to appropriate state
+  useEffect(() => {
+    if (status === SubscriptionFlowStatus.CHECK_PREMIUM && !isSyncing) {
+      const paywallShown = useSubscriptionFlowStore.getState().paywallShown;
+
+      if (isPremium) {
+        completePaywall(true);
+      } else if (!paywallShown) {
+        showPaywall();
+      } else {
+        completePaywall(false);
+      }
+    }
+  }, [status, isPremium, isSyncing, showPaywall, completePaywall]);
+
+  // Show feedback screen when ready
+  useEffect(() => {
+    if (status === SubscriptionFlowStatus.READY && showFeedback) {
+      showFeedbackScreen();
+    }
+  }, [status, showFeedback, showFeedbackScreen]);
+}