@umituz/react-native-subscription 2.27.34 → 2.27.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.34",
+  "version": "2.27.35",
   "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

@@ -20,9 +20,18 @@ export interface FirebaseAuthLike {
 export interface CreditPackageConfig { identifierPattern?: string; amounts?: Record<string, number>; }
 
 export interface SubscriptionInitConfig {
-  apiKey?: string; apiKeyIos?: string; apiKeyAndroid?: string; testStoreKey?: string; entitlementId: string; credits: CreditsConfig;
-  getAnonymousUserId: () => Promise<string>; getFirebaseAuth: () => FirebaseAuthLike | null; showAuthModal: () => void;
-  onCreditsUpdated?: (userId: string) => void; creditPackages?: CreditPackageConfig; timeoutMs?: number; authStateTimeoutMs?: number;
+  apiKey?: string;
+  apiKeyIos?: string;
+  apiKeyAndroid?: string;
+  entitlementId: string;
+  credits: CreditsConfig;
+  getAnonymousUserId: () => Promise<string>;
+  getFirebaseAuth: () => FirebaseAuthLike | null;
+  showAuthModal: () => void;
+  onCreditsUpdated?: (userId: string) => void;
+  creditPackages?: CreditPackageConfig;
+  timeoutMs?: number;
+  authStateTimeoutMs?: number;
 }
 
 const waitForAuthState = async (getAuth: () => FirebaseAuthLike | null, timeoutMs: number): Promise<string | undefined> => {
@@ -36,27 +45,14 @@ const waitForAuthState = async (getAuth: () => FirebaseAuthLike | null, timeoutM
 };
 
 export const initializeSubscription = async (config: SubscriptionInitConfig): Promise<void> => {
-  const { apiKey, apiKeyIos, apiKeyAndroid, testStoreKey, entitlementId, credits, getAnonymousUserId, getFirebaseAuth, showAuthModal, onCreditsUpdated, creditPackages, timeoutMs = 10000, authStateTimeoutMs = 2000 } = config;
+  const {
+    apiKey, apiKeyIos, apiKeyAndroid, entitlementId, credits,
+    getAnonymousUserId, getFirebaseAuth, showAuthModal,
+    onCreditsUpdated, creditPackages, timeoutMs = 10000, authStateTimeoutMs = 2000,
+  } = config;
 
-  if (__DEV__) {
-    console.log('[DEBUG initializeSubscription] Config received:', {
-      hasApiKey: !!apiKey,
-      hasApiKeyIos: !!apiKeyIos,
-      hasApiKeyAndroid: !!apiKeyAndroid,
-      hasTestStoreKey: !!testStoreKey,
-      apiKeyPrefix: apiKey?.substring(0, 10),
-      testStoreKeyPrefix: testStoreKey?.substring(0, 10),
-      platform: Platform.OS,
-    });
-  }
-
-  const key = Platform.OS === "ios" ? (apiKeyIos || apiKey || "") : (apiKeyAndroid || apiKey || "");
-
-  if (__DEV__) {
-    console.log('[DEBUG initializeSubscription] Resolved key:', key ? key.substring(0, 10) + '...' : 'empty');
-  }
-
-  if (!key) throw new Error("API key required");
+  const key = Platform.OS === 'ios' ? (apiKeyIos || apiKey || '') : (apiKeyAndroid || apiKey || '');
+  if (!key) throw new Error('API key required');
 
   configureCreditsRepository({ ...credits, creditPackageAmounts: creditPackages?.amounts });
 
@@ -205,21 +201,11 @@ export const initializeSubscription = async (config: SubscriptionInitConfig): Pr
     }
   };
 
-  if (__DEV__) {
-    console.log('[DEBUG initializeSubscription] Configuring SubscriptionManager with:', {
-      apiKeyPrefix: key.substring(0, 10),
-      hasTestStoreKey: !!testStoreKey,
-      testStoreKeyPrefix: testStoreKey?.substring(0, 10),
-      entitlementId,
-    });
-  }
-
   SubscriptionManager.configure({
     config: {
       apiKey: key,
-      testStoreKey,
       entitlementIdentifier: entitlementId,
-      consumableProductIdentifiers: [creditPackages?.identifierPattern || "credit"],
+      consumableProductIdentifiers: [creditPackages?.identifierPattern || 'credit'],
       onPurchaseCompleted: onPurchase,
       onRenewalDetected: onRenewal,
       onPremiumStatusChanged,

package/src/init/createSubscriptionInitModule.ts

@@ -1,76 +1,16 @@
-/**
- * Subscription Init Module Factory
- * Creates a ready-to-use InitModule for app initialization
- */
-
 import type { InitModule } from '@umituz/react-native-design-system';
 import { initializeSubscription, type SubscriptionInitConfig } from '../infrastructure/services/SubscriptionInitializer';
 
 declare const __DEV__: boolean;
 
 export interface SubscriptionInitModuleConfig extends Omit<SubscriptionInitConfig, 'apiKey'> {
-  /**
-   * RevenueCat API key getter function
-   * Returns the API key or undefined if not available
-   */
   getApiKey: () => string | undefined;
-
-  /**
-   * Optional RevenueCat test store key getter
-   */
-  getTestStoreKey?: () => string | undefined;
-
-  /**
-   * Whether this module is critical for app startup
-   * @default true
-   */
   critical?: boolean;
-
-  /**
-   * Module dependencies
-   * @default ["auth"]
-   */
   dependsOn?: string[];
 }
 
-/**
- * Creates a Subscription initialization module for use with createAppInitializer
- *
- * @example
- * ```typescript
- * import { createAppInitializer } from "@umituz/react-native-design-system";
- * import { createFirebaseInitModule } from "@umituz/react-native-firebase";
- * import { createAuthInitModule } from "@umituz/react-native-auth";
- * import { createSubscriptionInitModule } from "@umituz/react-native-subscription";
- *
- * export const initializeApp = createAppInitializer({
- *   modules: [
- *     createFirebaseInitModule(),
- *     createAuthInitModule({ userCollection: "users" }),
- *     createSubscriptionInitModule({
- *       getApiKey: () => getRevenueCatApiKey(),
- *       entitlementId: "premium",
- *       credits: {
- *         collectionName: "credits",
- *         creditLimit: 500,
- *         enableFreeCredits: true,
- *         freeCredits: 1,
- *       },
- *     }),
- *   ],
- * });
- * ```
- */
-export function createSubscriptionInitModule(
-  config: SubscriptionInitModuleConfig
-): InitModule {
-  const {
-    getApiKey,
-    getTestStoreKey,
-    critical = true,
-    dependsOn = ['auth'],
-    ...subscriptionConfig
-  } = config;
+export function createSubscriptionInitModule(config: SubscriptionInitModuleConfig): InitModule {
+  const { getApiKey, critical = true, dependsOn = ['auth'], ...subscriptionConfig } = config;
 
   return {
     name: 'subscription',
@@ -79,32 +19,16 @@ export function createSubscriptionInitModule(
     init: async () => {
       try {
         const apiKey = getApiKey();
-
         if (!apiKey) {
-          if (typeof __DEV__ !== 'undefined' && __DEV__) {
-            console.log('[createSubscriptionInitModule] No API key - skipping');
-          }
-          return true; // Not an error, just skip
-        }
-
-        const testStoreKey = getTestStoreKey?.();
-
-        await initializeSubscription({
-          apiKey,
-          testStoreKey,
-          ...subscriptionConfig,
-        });
-
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.log('[createSubscriptionInitModule] Subscription initialized');
+          if (__DEV__) console.log('[SubscriptionInit] No API key - skipping');
+          return true;
         }
 
+        await initializeSubscription({ apiKey, ...subscriptionConfig });
+        if (__DEV__) console.log('[SubscriptionInit] Initialized');
         return true;
       } catch (error) {
-        if (typeof __DEV__ !== 'undefined' && __DEV__) {
-          console.error('[createSubscriptionInitModule] Error:', error);
-        }
-        // Continue on error - subscription is not critical for app launch
+        if (__DEV__) console.error('[SubscriptionInit] Error:', error);
         return true;
       }
     },

package/src/revenuecat/domain/value-objects/RevenueCatConfig.ts

@@ -1,50 +1,34 @@
-/**
- * RevenueCat Configuration Value Object
- * Validates and stores RevenueCat configuration
- */
-
 import type { CustomerInfo } from "react-native-purchases";
 
 export interface RevenueCatConfig {
-  /** Primary API key - resolved by main app based on platform */
   apiKey?: string;
-  /** Test Store key for development/Expo Go testing */
-  testStoreKey?: string;
-  /** Entitlement identifier to check for premium status (REQUIRED - app specific) */
   entitlementIdentifier: string;
-  /** Product identifiers for consumable products (e.g., credits packages) */
   consumableProductIdentifiers?: string[];
-  /** Callback for premium status sync to database */
   onPremiumStatusChanged?: (
     userId: string,
     isPremium: boolean,
     productId?: string,
     expiresAt?: string,
     willRenew?: boolean,
-    /** RevenueCat period type: NORMAL, INTRO, or TRIAL */
     periodType?: "NORMAL" | "INTRO" | "TRIAL"
   ) => Promise<void> | void;
-  /** Callback for purchase completion */
   onPurchaseCompleted?: (
     userId: string,
     productId: string,
     customerInfo: CustomerInfo,
     source?: string
   ) => Promise<void> | void;
-  /** Callback for restore completion */
   onRestoreCompleted?: (
     userId: string,
     isPremium: boolean,
     customerInfo: CustomerInfo
   ) => Promise<void> | void;
-  /** Callback when subscription renewal is detected */
   onRenewalDetected?: (
     userId: string,
     productId: string,
     newExpirationDate: string,
     customerInfo: CustomerInfo
   ) => Promise<void> | void;
-  /** Callback when subscription plan changes (upgrade/downgrade) */
   onPlanChanged?: (
     userId: string,
     newProductId: string,
@@ -52,11 +36,5 @@ export interface RevenueCatConfig {
     isUpgrade: boolean,
     customerInfo: CustomerInfo
   ) => Promise<void> | void;
-  /** Callback after credits are successfully updated (for cache invalidation) */
   onCreditsUpdated?: (userId: string) => void;
 }
-
-export interface RevenueCatConfigRequired {
-  apiKey: string;
-}
-

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

@@ -1,26 +1,15 @@
-/**
- * Offerings Fetcher
- * Handles RevenueCat offerings retrieval
- */
-
 import Purchases, { type PurchasesOffering } from "react-native-purchases";
 
 export interface OfferingsFetcherDeps {
-    isInitialized: () => boolean;
-    isUsingTestStore: () => boolean;
+  isInitialized: () => boolean;
 }
 
-export async function fetchOfferings(
-    deps: OfferingsFetcherDeps
-): Promise<PurchasesOffering | null> {
-    if (!deps.isInitialized()) {
-        return null;
-    }
-
-    try {
-        const offerings = await Purchases.getOfferings();
-        return offerings.current;
-    } catch {
-        return null;
-    }
+export async function fetchOfferings(deps: OfferingsFetcherDeps): Promise<PurchasesOffering | null> {
+  if (!deps.isInitialized()) return null;
+  try {
+    const offerings = await Purchases.getOfferings();
+    return offerings.current;
+  } catch {
+    return null;
+  }
 }

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

@@ -1,183 +1,66 @@
-/**
- * Purchase Handler
- * Handles RevenueCat purchase operations for both subscriptions and consumables
- */
-
 import Purchases, { type PurchasesPackage } from "react-native-purchases";
 import type { PurchaseResult } from "../../application/ports/IRevenueCatService";
-import {
-    RevenueCatPurchaseError,
-    RevenueCatInitializationError,
-} from "../../domain/errors/RevenueCatError";
+import { RevenueCatPurchaseError, RevenueCatInitializationError } from "../../domain/errors/RevenueCatError";
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
-import {
-    isUserCancelledError,
-    getErrorMessage,
-} from "../../domain/types/RevenueCatTypes";
-import {
-    syncPremiumStatus,
-    notifyPurchaseCompleted,
-} from "../utils/PremiumStatusSyncer";
+import { isUserCancelledError, getErrorMessage } from "../../domain/types/RevenueCatTypes";
+import { syncPremiumStatus, notifyPurchaseCompleted } from "../utils/PremiumStatusSyncer";
 import { getSavedPurchase, clearSavedPurchase } from "../../../presentation/hooks/useAuthAwarePurchase";
 
+declare const __DEV__: boolean;
+
 export interface PurchaseHandlerDeps {
-    config: RevenueCatConfig;
-    isInitialized: () => boolean;
-    isUsingTestStore: () => boolean;
+  config: RevenueCatConfig;
+  isInitialized: () => boolean;
 }
 
-function isConsumableProduct(
-    pkg: PurchasesPackage,
-    consumableIds: string[]
-): boolean {
-    if (consumableIds.length === 0) return false;
-    const identifier = pkg.product.identifier.toLowerCase();
-    return consumableIds.some((id) => identifier.includes(id.toLowerCase()));
+function isConsumableProduct(pkg: PurchasesPackage, consumableIds: string[]): boolean {
+  if (consumableIds.length === 0) return false;
+  const identifier = pkg.product.identifier.toLowerCase();
+  return consumableIds.some((id) => identifier.includes(id.toLowerCase()));
 }
 
-/**
- * Handle package purchase - supports both subscriptions and consumables
- */
-declare const __DEV__: boolean;
-
 export async function handlePurchase(
-    deps: PurchaseHandlerDeps,
-    pkg: PurchasesPackage,
-    userId: string
+  deps: PurchaseHandlerDeps,
+  pkg: PurchasesPackage,
+  userId: string
 ): Promise<PurchaseResult> {
-    if (__DEV__) {
-        console.log('[DEBUG PurchaseHandler] handlePurchase called', {
-            productId: pkg.product.identifier,
-            userId,
-            isInitialized: deps.isInitialized(),
-        });
-    }
-
-    if (!deps.isInitialized()) {
-        if (__DEV__) {
-            console.log('[DEBUG PurchaseHandler] Not initialized, throwing error');
-        }
-        throw new RevenueCatInitializationError();
-    }
-
-    const consumableIds = deps.config.consumableProductIdentifiers || [];
-    const isConsumable = isConsumableProduct(pkg, consumableIds);
-    const entitlementIdentifier = deps.config.entitlementIdentifier;
-
-    try {
-        if (__DEV__) {
-            console.log('[DEBUG PurchaseHandler] Calling Purchases.purchasePackage...', {
-                productId: pkg.product.identifier,
-                packageIdentifier: pkg.identifier,
-                offeringIdentifier: pkg.offeringIdentifier,
-            });
-        }
-
-        const { customerInfo } = await Purchases.purchasePackage(pkg);
+  if (!deps.isInitialized()) throw new RevenueCatInitializationError();
 
-        if (__DEV__) {
-            console.log('[DEBUG PurchaseHandler] Purchase completed', {
-                productId: pkg.product.identifier,
-                activeEntitlements: Object.keys(customerInfo.entitlements.active),
-            });
-        }
+  const consumableIds = deps.config.consumableProductIdentifiers || [];
+  const isConsumable = isConsumableProduct(pkg, consumableIds);
+  const entitlementIdentifier = deps.config.entitlementIdentifier;
 
-        // Get purchase source from saved purchase
-        const savedPurchase = getSavedPurchase();
-        const source = savedPurchase?.source;
+  try {
+    if (__DEV__) console.log('[Purchase] Starting:', pkg.product.identifier);
 
-        if (isConsumable) {
-            if (__DEV__) {
-                console.log('[DEBUG PurchaseHandler] Consumable purchase SUCCESS', { source });
-            }
-            await notifyPurchaseCompleted(
-                deps.config,
-                userId,
-                pkg.product.identifier,
-                customerInfo,
-                source
-            );
-            // Clear pending purchase after successful purchase
-            clearSavedPurchase();
-            return {
-                success: true,
-                isPremium: false,
-                customerInfo,
-                isConsumable: true,
-                productId: pkg.product.identifier,
-            };
-        }
+    const { customerInfo } = await Purchases.purchasePackage(pkg);
+    const savedPurchase = getSavedPurchase();
+    const source = savedPurchase?.source;
 
-        const isPremium = !!customerInfo.entitlements.active[entitlementIdentifier];
-
-        if (__DEV__) {
-            console.log('[DEBUG PurchaseHandler] Checking premium status', {
-                entitlementIdentifier,
-                isPremium,
-                allEntitlements: customerInfo.entitlements.active,
-                source,
-            });
-        }
+    if (isConsumable) {
+      await notifyPurchaseCompleted(deps.config, userId, pkg.product.identifier, customerInfo, source);
+      clearSavedPurchase();
+      return { success: true, isPremium: false, customerInfo, isConsumable: true, productId: pkg.product.identifier };
+    }
 
-        if (isPremium) {
-            if (__DEV__) {
-                console.log('[DEBUG PurchaseHandler] Premium purchase SUCCESS', { source });
-            }
-            await syncPremiumStatus(deps.config, userId, customerInfo);
-            await notifyPurchaseCompleted(
-                deps.config,
-                userId,
-                pkg.product.identifier,
-                customerInfo,
-                source
-            );
-            // Clear pending purchase after successful purchase
-            clearSavedPurchase();
-            return { success: true, isPremium: true, customerInfo };
-        }
+    const isPremium = !!customerInfo.entitlements.active[entitlementIdentifier];
 
-        // In Preview API mode (Expo Go), purchases complete but entitlements aren't active
-        // Treat the purchase as successful for testing purposes
-        if (deps.isUsingTestStore()) {
-            if (__DEV__) {
-                console.log('[DEBUG PurchaseHandler] Test store purchase SUCCESS', { source });
-            }
-            await notifyPurchaseCompleted(
-                deps.config,
-                userId,
-                pkg.product.identifier,
-                customerInfo,
-                source
-            );
-            // Clear pending purchase after successful purchase
-            clearSavedPurchase();
-            return { success: true, isPremium: false, customerInfo };
-        }
+    if (isPremium) {
+      await syncPremiumStatus(deps.config, userId, customerInfo);
+      await notifyPurchaseCompleted(deps.config, userId, pkg.product.identifier, customerInfo, source);
+      clearSavedPurchase();
+      return { success: true, isPremium: true, customerInfo };
+    }
 
-        if (__DEV__) {
-            console.log('[DEBUG PurchaseHandler] Purchase FAILED - no entitlement');
-        }
-        throw new RevenueCatPurchaseError(
-            "Purchase completed but premium entitlement not active",
-            pkg.product.identifier
-        );
-    } catch (error) {
-        if (__DEV__) {
-            console.error('[DEBUG PurchaseHandler] Purchase error caught', {
-                error,
-                isUserCancelled: isUserCancelledError(error),
-            });
-        }
-        if (isUserCancelledError(error)) {
-            if (__DEV__) {
-                console.log('[DEBUG PurchaseHandler] User cancelled');
-            }
-            return { success: false, isPremium: false };
-        }
-        const errorMessage = getErrorMessage(error, "Purchase failed");
-        if (__DEV__) {
-            console.error('[DEBUG PurchaseHandler] Throwing error:', errorMessage);
-        }
-        throw new RevenueCatPurchaseError(errorMessage, pkg.product.identifier);
+    // Purchase completed but no entitlement - still notify (test store scenario)
+    await notifyPurchaseCompleted(deps.config, userId, pkg.product.identifier, customerInfo, source);
+    clearSavedPurchase();
+    return { success: true, isPremium: false, customerInfo };
+  } catch (error) {
+    if (isUserCancelledError(error)) {
+      return { success: false, isPremium: false };
     }
+    const errorMessage = getErrorMessage(error, "Purchase failed");
+    throw new RevenueCatPurchaseError(errorMessage, pkg.product.identifier);
+  }
 }

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

@@ -1,52 +1,29 @@
-/**
- * Restore Handler
- * Handles RevenueCat restore operations
- */
-
 import Purchases from "react-native-purchases";
 import type { RestoreResult } from "../../application/ports/IRevenueCatService";
-import {
-    RevenueCatRestoreError,
-    RevenueCatInitializationError,
-} from "../../domain/errors/RevenueCatError";
+import { RevenueCatRestoreError, RevenueCatInitializationError } from "../../domain/errors/RevenueCatError";
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
 import { getErrorMessage } from "../../domain/types/RevenueCatTypes";
-import {
-    syncPremiumStatus,
-    notifyRestoreCompleted,
-} from "../utils/PremiumStatusSyncer";
+import { syncPremiumStatus, notifyRestoreCompleted } from "../utils/PremiumStatusSyncer";
 
 export interface RestoreHandlerDeps {
-    config: RevenueCatConfig;
-    isInitialized: () => boolean;
-    isUsingTestStore: () => boolean;
+  config: RevenueCatConfig;
+  isInitialized: () => boolean;
 }
 
-/**
- * Handle restore purchases
- */
-export async function handleRestore(
-    deps: RestoreHandlerDeps,
-    userId: string
-): Promise<RestoreResult> {
-    if (!deps.isInitialized()) {
-        throw new RevenueCatInitializationError();
-    }
-
-    try {
-        const customerInfo = await Purchases.restorePurchases();
-        const entitlementIdentifier = deps.config.entitlementIdentifier;
-        const isPremium = !!customerInfo.entitlements.active[entitlementIdentifier];
+export async function handleRestore(deps: RestoreHandlerDeps, userId: string): Promise<RestoreResult> {
+  if (!deps.isInitialized()) throw new RevenueCatInitializationError();
 
-        if (isPremium) {
-            await syncPremiumStatus(deps.config, userId, customerInfo);
-        }
+  try {
+    const customerInfo = await Purchases.restorePurchases();
+    const isPremium = !!customerInfo.entitlements.active[deps.config.entitlementIdentifier];
 
-        await notifyRestoreCompleted(deps.config, userId, isPremium, customerInfo);
-
-        return { success: isPremium, isPremium, customerInfo };
-    } catch (error) {
-        const errorMessage = getErrorMessage(error, "Restore failed");
-        throw new RevenueCatRestoreError(errorMessage);
+    if (isPremium) {
+      await syncPremiumStatus(deps.config, userId, customerInfo);
     }
+    await notifyRestoreCompleted(deps.config, userId, isPremium, customerInfo);
+
+    return { success: isPremium, isPremium, customerInfo };
+  } catch (error) {
+    throw new RevenueCatRestoreError(getErrorMessage(error, "Restore failed"));
+  }
 }

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

@@ -1,186 +1,110 @@
-/**
- * RevenueCat Initializer
- * Handles SDK initialization logic
- */
-
 import Purchases, { LOG_LEVEL } from "react-native-purchases";
 import type { InitializeResult } from "../../application/ports/IRevenueCatService";
 import type { RevenueCatConfig } from "../../domain/value-objects/RevenueCatConfig";
-import { getErrorMessage } from "../../domain/types/RevenueCatTypes";
 import { resolveApiKey } from "../utils/ApiKeyResolver";
 
+declare const __DEV__: boolean;
+
 export interface InitializerDeps {
-    config: RevenueCatConfig;
-    isUsingTestStore: () => boolean;
-    isInitialized: () => boolean;
-    getCurrentUserId: () => string | null;
-    setInitialized: (value: boolean) => void;
-    setCurrentUserId: (userId: string) => void;
+  config: RevenueCatConfig;
+  isInitialized: () => boolean;
+  getCurrentUserId: () => string | null;
+  setInitialized: (value: boolean) => void;
+  setCurrentUserId: (userId: string) => void;
 }
 
 let isPurchasesConfigured = false;
 let isLogHandlerConfigured = false;
-// Mutex to prevent concurrent configuration
 let configurationInProgress = false;
 
 function configureLogHandler(): void {
-    if (isLogHandlerConfigured) return;
-
-    Purchases.setLogHandler((logLevel, message) => {
-        const isAppTransactionError =
-            message.includes("Purchase was cancelled") ||
-            message.includes("AppTransaction") ||
-            message.includes("Couldn't find previous transactions");
-
-        if (isAppTransactionError) {
-            return;
-        }
-
-        switch (logLevel) {
-            case LOG_LEVEL.ERROR:
-                break;
-            default:
-                break;
-        }
-    });
-
-    isLogHandlerConfigured = true;
+  if (isLogHandlerConfigured) return;
+  Purchases.setLogHandler((logLevel, message) => {
+    const ignoreMessages = ['Purchase was cancelled', 'AppTransaction', "Couldn't find previous transactions"];
+    if (ignoreMessages.some(m => message.includes(m))) return;
+    if (logLevel === LOG_LEVEL.ERROR && __DEV__) console.error('[RevenueCat]', message);
+  });
+  isLogHandlerConfigured = true;
 }
 
-function buildSuccessResult(
-    deps: InitializerDeps,
-    customerInfo: any,
-    offerings: any
-): InitializeResult {
-    const entitlementId = deps.config.entitlementIdentifier;
-    const hasPremium = !!customerInfo.entitlements.active[entitlementId];
-    return { success: true, offering: offerings.current, hasPremium };
+function buildSuccessResult(deps: InitializerDeps, customerInfo: any, offerings: any): InitializeResult {
+  const hasPremium = !!customerInfo.entitlements.active[deps.config.entitlementIdentifier];
+  return { success: true, offering: offerings.current, hasPremium };
 }
 
-declare const __DEV__: boolean;
-
 export async function initializeSDK(
-    deps: InitializerDeps,
-    userId: string,
-    apiKey?: string
+  deps: InitializerDeps,
+  userId: string,
+  apiKey?: string
 ): Promise<InitializeResult> {
-    if (__DEV__) {
-        console.log('[DEBUG RevenueCatInitializer] initializeSDK called', {
-            userId,
-            hasApiKey: !!apiKey,
-            isInitialized: deps.isInitialized(),
-            currentUserId: deps.getCurrentUserId(),
-            isPurchasesConfigured,
-        });
-    }
-    // Case 1: Already initialized with the same user ID
-    if (deps.isInitialized() && deps.getCurrentUserId() === userId) {
-        try {
-            const [customerInfo, offerings] = await Promise.all([
-                Purchases.getCustomerInfo(),
-                Purchases.getOfferings(),
-            ]);
-            return buildSuccessResult(deps, customerInfo, offerings);
-        } catch {
-            return { success: false, offering: null, hasPremium: false };
-        }
-    }
-
-    // Case 2: Already configured but different user or re-initializing
-    if (isPurchasesConfigured) {
-        try {
-            const currentAppUserId = await Purchases.getAppUserID();
-
-            let customerInfo;
-            if (currentAppUserId !== userId) {
-                const result = await Purchases.logIn(userId);
-                customerInfo = result.customerInfo;
-            } else {
-                customerInfo = await Purchases.getCustomerInfo();
-            }
-
-            deps.setInitialized(true);
-            deps.setCurrentUserId(userId);
-
-            const offerings = await Purchases.getOfferings();
-            return buildSuccessResult(deps, customerInfo, offerings);
-        } catch {
-            return { success: false, offering: null, hasPremium: false };
-        }
-    }
-
-    // Case 3: First time configuration
-    // Check mutex to prevent double configuration
-    if (configurationInProgress) {
-        // Wait a bit and retry - another thread is configuring
-        await new Promise(resolve => setTimeout(resolve, 100));
-        // After waiting, isPurchasesConfigured should be true
-        if (isPurchasesConfigured) {
-            return initializeSDK(deps, userId, apiKey);
-        }
-        return { success: false, offering: null, hasPremium: false };
+  if (deps.isInitialized() && deps.getCurrentUserId() === userId) {
+    try {
+      const [customerInfo, offerings] = await Promise.all([
+        Purchases.getCustomerInfo(),
+        Purchases.getOfferings(),
+      ]);
+      return buildSuccessResult(deps, customerInfo, offerings);
+    } catch {
+      return { success: false, offering: null, hasPremium: false };
     }
+  }
 
-    if (__DEV__) {
-        console.log('[DEBUG RevenueCatInitializer] Config received:', {
-            hasApiKey: !!deps.config.apiKey,
-            hasTestStoreKey: !!deps.config.testStoreKey,
-            apiKeyPrefix: deps.config.apiKey?.substring(0, 10),
-            testStoreKeyPrefix: deps.config.testStoreKey?.substring(0, 10),
-        });
+  if (isPurchasesConfigured) {
+    try {
+      const currentAppUserId = await Purchases.getAppUserID();
+      let customerInfo;
+      if (currentAppUserId !== userId) {
+        const result = await Purchases.logIn(userId);
+        customerInfo = result.customerInfo;
+      } else {
+        customerInfo = await Purchases.getCustomerInfo();
+      }
+      deps.setInitialized(true);
+      deps.setCurrentUserId(userId);
+      const offerings = await Purchases.getOfferings();
+      return buildSuccessResult(deps, customerInfo, offerings);
+    } catch {
+      return { success: false, offering: null, hasPremium: false };
     }
-
-    const key = apiKey || resolveApiKey(deps.config);
+  }
+
+  if (configurationInProgress) {
+    await new Promise(resolve => setTimeout(resolve, 100));
+    if (isPurchasesConfigured) return initializeSDK(deps, userId, apiKey);
+    return { success: false, offering: null, hasPremium: false };
+  }
+
+  const key = apiKey || resolveApiKey(deps.config);
+  if (!key) {
+    if (__DEV__) console.log('[RevenueCat] No API key');
+    return { success: false, offering: null, hasPremium: false };
+  }
+
+  configurationInProgress = true;
+  try {
+    configureLogHandler();
+    if (__DEV__) console.log('[RevenueCat] Configuring:', key.substring(0, 10) + '...');
+
+    await Purchases.configure({ apiKey: key, appUserID: userId });
+    isPurchasesConfigured = true;
+    deps.setInitialized(true);
+    deps.setCurrentUserId(userId);
+
+    const [customerInfo, offerings] = await Promise.all([
+      Purchases.getCustomerInfo(),
+      Purchases.getOfferings(),
+    ]);
 
     if (__DEV__) {
-        console.log('[DEBUG RevenueCatInitializer] Resolved key:', key ? key.substring(0, 10) + '...' : 'null');
-    }
-
-    if (!key) {
-        if (__DEV__) {
-            console.log('[DEBUG RevenueCatInitializer] No API key available, returning failure');
-        }
-        return { success: false, offering: null, hasPremium: false };
-    }
-
-    // Acquire mutex
-    configurationInProgress = true;
-
-    try {
-        configureLogHandler();
-
-        if (__DEV__) {
-            console.log('[DEBUG RevenueCatInitializer] Configuring Purchases SDK with userId:', userId);
-        }
-        await Purchases.configure({
-            apiKey: key,
-            appUserID: userId,
-        });
-        isPurchasesConfigured = true;
-        deps.setInitialized(true);
-        deps.setCurrentUserId(userId);
-
-        if (__DEV__) {
-            console.log('[DEBUG RevenueCatInitializer] Purchases configured, fetching customer info and offerings...');
-        }
-        const [customerInfo, offerings] = await Promise.all([
-            Purchases.getCustomerInfo(),
-            Purchases.getOfferings(),
-        ]);
-
-        if (__DEV__) {
-            console.log('[DEBUG RevenueCatInitializer] Init complete', {
-                hasOfferings: !!offerings.current,
-                offeringsIdentifier: offerings.current?.identifier,
-                packagesCount: offerings.current?.availablePackages?.length ?? 0,
-            });
-        }
-        return buildSuccessResult(deps, customerInfo, offerings);
-    } catch (error) {
-        getErrorMessage(error, "RevenueCat init failed");
-        return { success: false, offering: null, hasPremium: false };
-    } finally {
-        // Release mutex
-        configurationInProgress = false;
+      console.log('[RevenueCat] Initialized', {
+        packages: offerings.current?.availablePackages?.length ?? 0,
+      });
     }
+    return buildSuccessResult(deps, customerInfo, offerings);
+  } catch (error) {
+    if (__DEV__) console.error('[RevenueCat] Init failed:', error);
+    return { success: false, offering: null, hasPremium: false };
+  } finally {
+    configurationInProgress = false;
+  }
 }

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

@@ -41,10 +41,6 @@ export class RevenueCatService implements IRevenueCatService {
         return this.stateManager.isInitialized();
     }
 
-    isUsingTestStore(): boolean {
-        return this.stateManager.isUsingTestStore();
-    }
-
     getCurrentUserId(): string | null {
         return this.stateManager.getCurrentUserId();
     }
@@ -52,7 +48,6 @@ export class RevenueCatService implements IRevenueCatService {
     private getSDKParams() {
         return {
             config: this.stateManager.getConfig(),
-            isUsingTestStore: () => this.isUsingTestStore(),
             isInitialized: () => this.isInitialized(),
             getCurrentUserId: () => this.stateManager.getCurrentUserId(),
             setInitialized: (value: boolean) => this.stateManager.setInitialized(value),

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

@@ -1,32 +1,17 @@
-/**
- * Service State Manager
- * Manages RevenueCat service state
- */
-
 import type { RevenueCatConfig } from '../../domain/value-objects/RevenueCatConfig';
-import { isExpoGo, isDevelopment } from '../utils/ExpoGoDetector';
 
 export class ServiceStateManager {
-  private isInitializedFlag: boolean = false;
-  private usingTestStore: boolean = false;
+  private isInitializedFlag = false;
   private currentUserId: string | null = null;
   private config: RevenueCatConfig;
 
   constructor(config: RevenueCatConfig) {
     this.config = config;
-    this.usingTestStore = this.shouldUseTestStore();
-  }
-
-  private shouldUseTestStore(): boolean {
-    const testKey = this.config.testStoreKey;
-    return !!(testKey && (isExpoGo() || isDevelopment()));
   }
 
   setInitialized(value: boolean): void {
     this.isInitializedFlag = value;
-    if (!value) {
-      this.currentUserId = null;
-    }
+    if (!value) this.currentUserId = null;
   }
 
   isInitialized(): boolean {
@@ -41,16 +26,7 @@ export class ServiceStateManager {
     return this.currentUserId;
   }
 
-  isUsingTestStore(): boolean {
-    return this.usingTestStore;
-  }
-
   getConfig(): RevenueCatConfig {
     return this.config;
   }
-
-  updateConfig(config: RevenueCatConfig): void {
-    this.config = config;
-    this.usingTestStore = this.shouldUseTestStore();
-  }
 }

package/src/revenuecat/infrastructure/utils/ApiKeyResolver.ts

@@ -1,65 +1,5 @@
-/**
- * API Key Resolver
- * Resolves RevenueCat API key from configuration
- * NOTE: Main app is responsible for resolving platform-specific keys
- */
-
 import type { RevenueCatConfig } from '../../domain/value-objects/RevenueCatConfig';
-import { isTestStoreEnvironment } from "./ExpoGoDetector";
-
-declare const __DEV__: boolean;
-
-/**
- * Check if Test Store key should be used
- * CRITICAL: Never use test store in production builds
- * Uses Test Store in development environments (Expo Go, dev builds, simulators)
- */
-export function shouldUseTestStore(config: RevenueCatConfig): boolean {
-  const testKey = config.testStoreKey;
-
-  if (!testKey) {
-    return false;
-  }
-
-  return isTestStoreEnvironment();
-}
 
-/**
- * Get RevenueCat API key from config
- * Returns Test Store key in development environments (Expo Go, dev builds, simulators)
- * Returns production API key in production builds
- * Main app must provide resolved platform-specific apiKey in config
- */
 export function resolveApiKey(config: RevenueCatConfig): string | null {
-  const useTestStore = shouldUseTestStore(config);
-
-  if (__DEV__) {
-    console.log('[DEBUG resolveApiKey] called', {
-      useTestStore,
-      hasTestStoreKey: !!config.testStoreKey,
-      hasApiKey: !!config.apiKey,
-      apiKeyPrefix: config.apiKey?.substring(0, 10),
-    });
-  }
-
-  if (useTestStore) {
-    if (__DEV__) {
-      console.log('[DEBUG resolveApiKey] Using test store key');
-    }
-    return config.testStoreKey ?? null;
-  }
-
-  const key = config.apiKey;
-
-  if (!key || key === "" || key.includes("YOUR_")) {
-    if (__DEV__) {
-      console.log('[DEBUG resolveApiKey] No valid API key found');
-    }
-    return null;
-  }
-
-  if (__DEV__) {
-    console.log('[DEBUG resolveApiKey] Using production API key:', key.substring(0, 10) + '...');
-  }
-  return key;
+  return config.apiKey || null;
 }

package/src/revenuecat/infrastructure/utils/ExpoGoDetector.ts

@@ -1,58 +0,0 @@
-/**
- * Expo Go Detector
- * Detects runtime environment for RevenueCat configuration
- */
-
-import Constants from "expo-constants";
-
-/**
- * Check if running in Expo Go
- */
-export function isExpoGo(): boolean {
-  return Constants.executionEnvironment === "storeClient";
-}
-
-/**
- * Check if running in development mode
- * Uses multiple checks to ensure reliability in production builds
- */
-export function isDevelopment(): boolean {
-  // Check execution environment first - most reliable
-  const executionEnv = Constants.executionEnvironment;
-  const isBareBuild = executionEnv === "bare";
-  const isStoreBuild = executionEnv === "standalone";
-
-  // If it's a store/standalone build, it's NOT development
-  if (isStoreBuild) {
-    return false;
-  }
-
-  // For bare builds in production, check appOwnership
-  if (isBareBuild && Constants.appOwnership !== "expo") {
-    // This is a production bare build
-    return false;
-  }
-
-  // Fallback to __DEV__ only for actual development cases
-  return typeof __DEV__ !== "undefined" && __DEV__;
-}
-
-/**
- * Check if this is a production store build
- */
-export function isProductionBuild(): boolean {
-  const executionEnv = Constants.executionEnvironment;
-  return executionEnv === "standalone" || executionEnv === "bare";
-}
-
-/**
- * Check if Test Store should be used (Expo Go or development)
- * NEVER use Test Store in production builds
- */
-export function isTestStoreEnvironment(): boolean {
-  // Explicit check: never use test store in production
-  if (isProductionBuild() && !isExpoGo()) {
-    return false;
-  }
-  return isExpoGo() || isDevelopment();
-}