@umituz/react-native-subscription 2.14.53 → 2.14.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.53",
+  "version": "2.14.55",
   "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/paywall/components/PaywallContainer.tsx

@@ -0,0 +1,105 @@
+/**
+ * PaywallContainer Component
+ * Package-driven paywall that encapsulates all logic
+ * Main app only needs to add this ONE component
+ */
+
+import React, { useCallback } from "react";
+import type { PurchasesPackage } from "react-native-purchases";
+import { usePaywallVisibility } from "../../../presentation/hooks/usePaywallVisibility";
+import { useSubscriptionPackages } from "../../../revenuecat/presentation/hooks/useSubscriptionPackages";
+import { usePurchasePackage } from "../../../revenuecat/presentation/hooks/usePurchasePackage";
+import { useRestorePurchase } from "../../../revenuecat/presentation/hooks/useRestorePurchase";
+import { PaywallModal } from "./PaywallModal";
+import type { PaywallContainerProps } from "./PaywallContainer.types";
+
+declare const __DEV__: boolean;
+
+export const PaywallContainer: React.FC<PaywallContainerProps> = ({
+  userId,
+  translations,
+  mode = "subscription",
+  legalUrls,
+  features,
+  heroImage,
+  bestValueIdentifier,
+  creditsLabel,
+  onPurchaseSuccess,
+  onPurchaseError,
+}) => {
+  const { showPaywall, closePaywall } = usePaywallVisibility();
+  const { data: packages = [], isLoading } = useSubscriptionPackages(userId ?? undefined);
+  const { mutateAsync: purchasePackage } = usePurchasePackage(userId ?? undefined);
+  const { mutateAsync: restorePurchases } = useRestorePurchase(userId ?? undefined);
+
+  const handlePurchase = useCallback(
+    async (pkg: PurchasesPackage) => {
+      try {
+        if (__DEV__) {
+          console.log("[PaywallContainer] Purchase started:", pkg.identifier);
+        }
+        const result = await purchasePackage(pkg);
+        if (result.success) {
+          if (__DEV__) {
+            console.log("[PaywallContainer] Purchase successful");
+          }
+          onPurchaseSuccess?.();
+          closePaywall();
+        }
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (__DEV__) {
+          console.error("[PaywallContainer] Purchase failed:", message);
+        }
+        onPurchaseError?.(message);
+      }
+    },
+    [purchasePackage, closePaywall, onPurchaseSuccess, onPurchaseError],
+  );
+
+  const handleRestore = useCallback(async () => {
+    try {
+      if (__DEV__) {
+        console.log("[PaywallContainer] Restore started");
+      }
+      const result = await restorePurchases();
+      if (result.success) {
+        if (__DEV__) {
+          console.log("[PaywallContainer] Restore successful");
+        }
+        onPurchaseSuccess?.();
+        closePaywall();
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (__DEV__) {
+        console.error("[PaywallContainer] Restore failed:", message);
+      }
+      onPurchaseError?.(message);
+    }
+  }, [restorePurchases, closePaywall, onPurchaseSuccess, onPurchaseError]);
+
+  if (!showPaywall) {
+    return null;
+  }
+
+  return (
+    <PaywallModal
+      visible={showPaywall}
+      onClose={closePaywall}
+      mode={mode}
+      translations={translations}
+      subscriptionPackages={packages}
+      isLoading={isLoading}
+      legalUrls={legalUrls}
+      features={features ? [...features] : undefined}
+      heroImage={heroImage}
+      bestValueIdentifier={bestValueIdentifier}
+      creditsLabel={creditsLabel}
+      onSubscriptionPurchase={handlePurchase}
+      onRestore={handleRestore}
+    />
+  );
+};
+
+PaywallContainer.displayName = "PaywallContainer";

package/src/domains/paywall/components/PaywallContainer.types.ts

@@ -0,0 +1,30 @@
+/**
+ * PaywallContainer Types
+ * Minimal props for package-driven paywall rendering
+ */
+
+import type { PaywallMode, PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "../entities";
+import type { ImageSourcePropType } from "react-native";
+
+export interface PaywallContainerProps {
+  /** User ID for subscription management */
+  readonly userId: string | null;
+  /** Paywall translations - no defaults, must be provided */
+  readonly translations: PaywallTranslations;
+  /** Paywall mode - subscription, credits, or hybrid */
+  readonly mode?: PaywallMode;
+  /** Legal URLs for privacy and terms */
+  readonly legalUrls?: PaywallLegalUrls;
+  /** Feature list to display */
+  readonly features?: readonly SubscriptionFeature[];
+  /** Hero image for paywall header */
+  readonly heroImage?: ImageSourcePropType;
+  /** Best value package identifier for badge */
+  readonly bestValueIdentifier?: string;
+  /** Credits label text */
+  readonly creditsLabel?: string;
+  /** Callback when purchase succeeds */
+  readonly onPurchaseSuccess?: () => void;
+  /** Callback when purchase fails */
+  readonly onPurchaseError?: (error: string) => void;
+}

package/src/domains/paywall/components/index.ts

@@ -2,6 +2,9 @@
  * Paywall Components Index
  */
 
+export { PaywallContainer } from "./PaywallContainer";
+export type { PaywallContainerProps } from "./PaywallContainer.types";
+
 export { PaywallModal } from "./PaywallModal";
 export type { PaywallModalProps } from "./PaywallModal";
 

package/src/index.ts

@@ -80,6 +80,8 @@ export {
 // =============================================================================
 
 export {
+  PaywallContainer,
+  type PaywallContainerProps,
   PaywallModal,
   type PaywallModalProps,
   PaywallHeader,

package/src/infrastructure/services/SubscriptionInitializer.ts

@@ -41,9 +41,6 @@ const waitForAuthState = async (
 
   // If user already available, return immediately
   if (auth.currentUser) {
-    if (__DEV__) {
-      console.log("[Subscription] User already available:", auth.currentUser.uid);
-    }
     return auth.currentUser.uid;
   }
 
@@ -51,22 +48,12 @@ const waitForAuthState = async (
   return new Promise<string | undefined>((resolve) => {
     const unsubscribe = auth.onAuthStateChanged((user) => {
       unsubscribe();
-      if (__DEV__) {
-        console.log("[Subscription] Auth state ready:", {
-          hasUser: !!user,
-          userId: user?.uid ?? "anonymous",
-          isAnonymous: user?.isAnonymous ?? true,
-        });
-      }
       resolve(user?.uid || undefined);
     });
 
     // Timeout fallback - don't wait forever
     setTimeout(() => {
       unsubscribe();
-      if (__DEV__) {
-        console.log("[Subscription] Auth state timeout, proceeding with anonymous");
-      }
       resolve(undefined);
     }, timeoutMs);
   });
@@ -110,12 +97,6 @@ export const initializeSubscription = async (
   // Wait for auth state to get correct user ID
   const initialUserId = await waitForAuthState(getFirebaseAuth, authStateTimeoutMs);
 
-  if (__DEV__) {
-    console.log("[Subscription] Initializing with user:", {
-      userId: initialUserId ?? "will use anonymous",
-    });
-  }
-
   const initPromise = SubscriptionManager.initialize(initialUserId);
   const timeoutPromise = new Promise<boolean>((_, reject) =>
     setTimeout(
@@ -134,8 +115,4 @@ export const initializeSubscription = async (
     },
     showAuthModal,
   });
-
-  if (__DEV__) {
-    console.log("[Subscription] Initialized successfully");
-  }
 };

package/src/presentation/hooks/useAuthAwarePurchase.ts

@@ -22,9 +22,6 @@ let globalAuthProvider: PurchaseAuthProvider | null = null;
  */
 export const configureAuthProvider = (provider: PurchaseAuthProvider): void => {
     globalAuthProvider = provider;
-    if (__DEV__) {
-        console.log("[useAuthAwarePurchase] Auth provider configured");
-    }
 };
 
 export interface UseAuthAwarePurchaseResult {

package/src/presentation/hooks/usePremium.ts

@@ -54,10 +54,6 @@ export interface UsePremiumResult {
  * ```
  */
 export const usePremium = (userId?: string): UsePremiumResult => {
-  if (__DEV__) {
-    console.log('[DEBUG usePremium] Hook called', { userId: userId || 'ANONYMOUS' });
-  }
-
   // Fetch real subscription status from RevenueCat
   const { isPremium: subscriptionActive, isLoading: statusLoading } =
     useSubscriptionStatus({
@@ -75,17 +71,6 @@ export const usePremium = (userId?: string): UsePremiumResult => {
   const { data: packages = [], isLoading: packagesLoading } =
     useSubscriptionPackages(userId);
 
-  if (__DEV__) {
-    console.log('[DEBUG usePremium] State', {
-      userId: userId || 'ANONYMOUS',
-      packagesCount: packages?.length || 0,
-      packagesLoading,
-      creditsLoading,
-      statusLoading,
-      isPremium: subscriptionActive,
-    });
-  }
-
   // Purchase and restore mutations
   const purchaseMutation = usePurchasePackage(userId);
   const restoreMutation = useRestorePurchase(userId);

package/src/presentation/hooks/useSubscriptionStatus.ts

@@ -46,17 +46,7 @@ export const useSubscriptionStatus = ({
         return { isPremium: false, expirationDate: null };
       }
 
-      const status = await SubscriptionManager.checkPremiumStatus();
-
-      if (__DEV__) {
-        console.log("[useSubscriptionStatus] Status from RevenueCat", {
-          userId,
-          isPremium: status.isPremium,
-          expirationDate: status.expirationDate,
-        });
-      }
-
-      return status;
+      return SubscriptionManager.checkPremiumStatus();
     },
     enabled: enabled && !!userId && SubscriptionManager.isInitializedForUser(userId),
     staleTime: 30 * 1000,

package/src/revenuecat/infrastructure/managers/SubscriptionManager.ts

@@ -33,52 +33,28 @@ class SubscriptionManagerImpl {
     if (config.getAnonymousUserId) {
       this.userIdProvider.configure(config.getAnonymousUserId);
     }
-
-    if (__DEV__) {
-      console.log('[DEBUG SubscriptionManager] Configured:', {
-        entitlementId: config.config.entitlementIdentifier,
-      });
-    }
   }
 
   private ensureConfigured(): void {
     if (!this.managerConfig || !this.packageHandler) {
-      const error = new Error("SubscriptionManager not configured");
-      if (__DEV__) {
-        console.error('[DEBUG SubscriptionManager] Not configured:', {
-          hasConfig: !!this.managerConfig,
-          hasHandler: !!this.packageHandler,
-        });
-      }
-      throw error;
+      throw new Error("SubscriptionManager not configured");
     }
   }
 
   private async performInitialization(userId: string): Promise<boolean> {
     this.ensureConfigured();
 
-    try {
-      await initializeRevenueCatService(this.managerConfig!.config);
-      this.serviceInstance = getRevenueCatService();
+    await initializeRevenueCatService(this.managerConfig!.config);
+    this.serviceInstance = getRevenueCatService();
 
-      if (!this.serviceInstance) {
-        return false;
-      }
+    if (!this.serviceInstance) {
+      return false;
+    }
 
-      this.packageHandler!.setService(this.serviceInstance);
+    this.packageHandler!.setService(this.serviceInstance);
 
-      // Don't pass apiKey - let resolveApiKey decide based on environment (Expo Go = test store key)
-      const result = await this.serviceInstance.initialize(userId);
-      return result.success;
-    } catch (error) {
-      if (__DEV__) {
-        console.error('[DEBUG SubscriptionManager] Initialization failed:', {
-          error,
-          userId,
-        });
-      }
-      throw error;
-    }
+    const result = await this.serviceInstance.initialize(userId);
+    return result.success;
   }
 
   async initialize(userId?: string): Promise<boolean> {
@@ -116,27 +92,11 @@ class SubscriptionManagerImpl {
 
   async getPackages(): Promise<PurchasesPackage[]> {
     this.ensureConfigured();
-    if (__DEV__) {
-      console.log('[DEBUG SubscriptionManager] getPackages called', {
-        hasServiceInstance: !!this.serviceInstance,
-        hasPackageHandler: !!this.packageHandler,
-      });
-    }
     if (!this.serviceInstance) {
-      if (__DEV__) {
-        console.log('[DEBUG SubscriptionManager] Creating service instance...');
-      }
       this.serviceInstance = getRevenueCatService();
       this.packageHandler!.setService(this.serviceInstance);
     }
-    const packages = await this.packageHandler!.fetchPackages();
-    if (__DEV__) {
-      console.log('[DEBUG SubscriptionManager] fetchPackages returned', {
-        count: packages.length,
-        packages: packages.map(p => ({ id: p.identifier, type: p.packageType })),
-      });
-    }
-    return packages;
+    return this.packageHandler!.fetchPackages();
   }
 
   async purchasePackage(pkg: PurchasesPackage): Promise<boolean> {
@@ -178,5 +138,4 @@ class SubscriptionManagerImpl {
 
 export const SubscriptionManager = new SubscriptionManagerImpl();
 
-// Re-export types
 export type { PremiumStatus };

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

@@ -31,35 +31,15 @@ export function shouldUseTestStore(config: RevenueCatConfig): boolean {
 export function resolveApiKey(config: RevenueCatConfig): string | null {
   const useTestStore = shouldUseTestStore(config);
 
-  if (__DEV__) {
-    console.log('[DEBUG ApiKeyResolver] resolveApiKey called', {
-      useTestStore,
-      hasTestStoreKey: !!config.testStoreKey,
-      hasApiKey: !!config.apiKey,
-      testStoreKeyPrefix: config.testStoreKey ? config.testStoreKey.substring(0, 10) + '...' : 'null',
-      apiKeyPrefix: config.apiKey ? config.apiKey.substring(0, 10) + '...' : 'null',
-    });
-  }
-
   if (useTestStore) {
-    if (__DEV__) {
-      console.log('[DEBUG ApiKeyResolver] Using Test Store key');
-    }
     return config.testStoreKey ?? null;
   }
 
   const key = config.apiKey;
 
   if (!key || key === "" || key.includes("YOUR_")) {
-    if (__DEV__) {
-      console.log('[DEBUG ApiKeyResolver] No valid production API key');
-    }
     return null;
   }
 
-  if (__DEV__) {
-    console.log('[DEBUG ApiKeyResolver] Using production API key');
-  }
-
   return key;
 }

package/src/revenuecat/presentation/hooks/useSubscriptionPackages.ts

@@ -18,73 +18,25 @@ import {
 export const useSubscriptionPackages = (userId: string | undefined) => {
   const isConfigured = SubscriptionManager.isConfigured();
 
-  if (__DEV__) {
-    console.log('[DEBUG useSubscriptionPackages] Hook called', {
-      userId: userId || 'ANONYMOUS',
-      isConfigured,
-    });
-  }
-
   return useQuery({
     queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, userId ?? "anonymous"] as const,
     queryFn: async () => {
-      if (__DEV__) {
-        console.log('[DEBUG useSubscriptionPackages] QueryFn executing...', { userId: userId || 'ANONYMOUS' });
-      }
-
       // Initialize if needed (works for both authenticated and anonymous users)
-      try {
-        if (userId) {
-          if (!SubscriptionManager.isInitializedForUser(userId)) {
-            if (__DEV__) {
-              console.log('[DEBUG useSubscriptionPackages] Initializing for user:', userId);
-            }
-            await SubscriptionManager.initialize(userId);
-          } else {
-            if (__DEV__) {
-              console.log('[DEBUG useSubscriptionPackages] Already initialized for user:', userId);
-            }
-          }
-        } else {
-          if (!SubscriptionManager.isInitialized()) {
-            if (__DEV__) {
-              console.log('[DEBUG useSubscriptionPackages] Initializing for ANONYMOUS user');
-            }
-            await SubscriptionManager.initialize(undefined);
-          } else {
-            if (__DEV__) {
-              console.log('[DEBUG useSubscriptionPackages] Already initialized for ANONYMOUS');
-            }
-          }
+      if (userId) {
+        if (!SubscriptionManager.isInitializedForUser(userId)) {
+          await SubscriptionManager.initialize(userId);
         }
-      } catch (error) {
-        if (__DEV__) {
-          console.error('[DEBUG useSubscriptionPackages] Initialization failed:', error);
+      } else {
+        if (!SubscriptionManager.isInitialized()) {
+          await SubscriptionManager.initialize(undefined);
         }
-        throw error;
-      }
-
-      if (__DEV__) {
-        console.log('[DEBUG useSubscriptionPackages] Calling getPackages...');
-      }
-
-      const packages = await SubscriptionManager.getPackages();
-
-      if (__DEV__) {
-        console.log('[DEBUG useSubscriptionPackages] Got packages', {
-          count: packages.length,
-          packages: packages.map(p => ({
-            id: p.identifier,
-            type: p.packageType,
-          })),
-        });
       }
 
-      return packages;
+      return SubscriptionManager.getPackages();
     },
     staleTime: STALE_TIME,
     gcTime: GC_TIME,
-    enabled: isConfigured, // Only enabled when SubscriptionManager is configured
-    refetchOnMount: true, // Respects staleTime - refetches only if data is stale
+    enabled: isConfigured,
+    refetchOnMount: true,
   });
 };