@umituz/react-native-subscription 2.35.11 → 2.35.13

package/package.json

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

@@ -4,7 +4,6 @@ import { useSubscriptionPackages } from "../../subscription/infrastructure/hooks
 import { useRevenueCatTrialEligibility } from "../../subscription/infrastructure/hooks/useRevenueCatTrialEligibility";
 import { createCreditAmountsFromPackages } from "../../../utils/creditMapper";
 import { PaywallModal } from "./PaywallModal";
-import { usePaywallActions } from "../hooks/usePaywallActions";
 import { useAuthAwarePurchase } from "../../subscription/presentation/useAuthAwarePurchase";
 import { useTrialEligibilityCheck } from "../hooks/useTrialEligibilityCheck";
 import type { PaywallContainerProps } from "./PaywallContainer.types";
@@ -36,20 +35,9 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
 
   const { data: packages = [], isLoading } = useSubscriptionPackages();
   const { eligibilityMap, checkEligibility } = useRevenueCatTrialEligibility();
-  
-  const { handlePurchase: performPurchase, handleRestore: performRestore } = useAuthAwarePurchase({ 
-    source: purchaseSource 
-  });
 
-  const { handlePurchase, handleRestore } = usePaywallActions({
-    packages,
-    onPurchase: performPurchase,
-    onRestore: performRestore,
-    source: purchaseSource,
-    onPurchaseSuccess,
-    onPurchaseError,
-    onAuthRequired,
-    onClose: handleClose,
+  const { handlePurchase: performPurchase, handleRestore: performRestore } = useAuthAwarePurchase({
+    source: purchaseSource
   });
 
   const trialEligibility = useTrialEligibilityCheck({
@@ -60,7 +48,6 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
     trialConfig,
   });
 
-  // Compute credit amounts from packageAllocations if not provided directly
   const creditAmounts = useMemo(() => {
     if (providedCreditAmounts) return providedCreditAmounts;
     if (!packageAllocations || packages.length === 0) return undefined;
@@ -81,10 +68,14 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
       bestValueIdentifier={bestValueIdentifier}
       creditAmounts={creditAmounts}
       creditsLabel={creditsLabel}
-      onPurchase={handlePurchase}
-      onRestore={handleRestore}
+      onPurchase={performPurchase}
+      onRestore={performRestore}
       trialEligibility={trialEligibility}
       trialSubtitleText={trialConfig?.enabled ? trialConfig.trialText : undefined}
+      onPurchaseSuccess={onPurchaseSuccess}
+      onPurchaseError={onPurchaseError}
+      onAuthRequired={onAuthRequired}
+      source={purchaseSource}
     />
   );
 };

package/src/domains/paywall/components/PaywallModal.tsx

@@ -11,10 +11,19 @@ import { usePaywallActions } from "../hooks/usePaywallActions";
 import { PaywallModalProps } from "./PaywallModal.types";
 
 export const PaywallModal: React.FC<PaywallModalProps> = React.memo((props) => {
-  const { visible, onClose, translations, packages = [], features = [], legalUrls = {}, bestValueIdentifier, creditAmounts, creditsLabel, heroImage, onPurchase, onRestore, trialEligibility = {}, trialSubtitleText } = props;
+  const { visible, onClose, translations, packages = [], features = [], legalUrls = {}, bestValueIdentifier, creditAmounts, creditsLabel, heroImage, onPurchase, onRestore, trialEligibility = {}, trialSubtitleText, onPurchaseSuccess, onPurchaseError, onAuthRequired, source } = props;
   const tokens = useAppDesignTokens();
   const insets = useSafeAreaInsets();
-  const { selectedPlanId, setSelectedPlanId, isProcessing, handlePurchase, handleRestore, resetState } = usePaywallActions({ packages, onPurchase, onRestore });
+  const { selectedPlanId, setSelectedPlanId, isProcessing, handlePurchase, handleRestore, resetState } = usePaywallActions({
+    packages,
+    onPurchase,
+    onRestore,
+    source,
+    onPurchaseSuccess,
+    onPurchaseError,
+    onAuthRequired,
+    onClose
+  });
 
   useEffect(() => {
     if (!visible) resetState();

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

@@ -1,6 +1,7 @@
 import type { ImageSourcePropType } from "react-native";
 import type { PurchasesPackage } from "react-native-purchases";
 import type { SubscriptionFeature, PaywallTranslations, PaywallLegalUrls } from "../entities/types";
+import type { PurchaseSource } from "../../subscription/core/SubscriptionConstants";
 
 export interface TrialEligibilityInfo {
   eligible: boolean;
@@ -22,4 +23,8 @@ export interface PaywallModalProps {
   onRestore?: () => Promise<void | boolean>;
   trialEligibility?: Record<string, TrialEligibilityInfo>;
   trialSubtitleText?: string;
+  onPurchaseSuccess?: () => void;
+  onPurchaseError?: (error: Error | string) => void;
+  onAuthRequired?: () => void;
+  source?: PurchaseSource;
 }

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

@@ -52,37 +52,21 @@ export function usePaywallActions({
   });
 
   const handlePurchase = useCallback(async () => {
-    console.log('🔵 [usePaywallActions] handlePurchase called', {
-      selectedPlanId,
-      packagesCount: packages.length,
-      isProcessing,
-      hasOnPurchase: !!onPurchaseRef.current
-    });
-
-    const planId = selectedPlanId || (packages.length > 0 ? packages[0]?.product.identifier : null);
-
-    if (!planId || !onPurchaseRef.current || isProcessing) {
-        console.log('⚠️ [usePaywallActions] Purchase blocked', {
-          noPlanId: !planId,
-          noCallback: !onPurchaseRef.current,
-          isProcessing
-        });
-        if (!planId && onAuthRequiredRef.current) onAuthRequiredRef.current();
-        return;
+    if (!selectedPlanId || !onPurchaseRef.current || isProcessing) {
+      if (!selectedPlanId && onAuthRequiredRef.current) {
+        onAuthRequiredRef.current();
+      }
+      return;
     }
 
-    console.log('🟢 [usePaywallActions] Starting purchase', { planId });
     setIsLocalProcessing(true);
-    startPurchase(planId, "manual");
+    startPurchase(selectedPlanId, "manual");
 
     try {
-      const pkg = packages.find((p) => p.product.identifier === planId);
-      console.log('📦 [usePaywallActions] Package found:', !!pkg);
+      const pkg = packages.find((p) => p.product.identifier === selectedPlanId);
 
       if (pkg) {
-        console.log('🚀 [usePaywallActions] Calling onPurchase callback');
         const success = await onPurchaseRef.current(pkg);
-        console.log('✅ [usePaywallActions] onPurchase completed', { success });
 
         if (success !== false) {
           onPurchaseSuccessRef.current?.();
@@ -90,13 +74,11 @@ export function usePaywallActions({
         }
       }
     } catch (error) {
-      console.error('❌ [usePaywallActions] Purchase error:', error);
       const err = error instanceof Error ? error : new Error(String(error));
       onPurchaseErrorRef.current?.(err);
     } finally {
-      console.log('🏁 [usePaywallActions] Purchase flow finished');
       setIsLocalProcessing(false);
-      endPurchase(planId);
+      endPurchase(selectedPlanId);
     }
   }, [selectedPlanId, packages, isProcessing, startPurchase, endPurchase]);
 

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

@@ -24,14 +24,7 @@ export class PackageHandler {
   }
 
   async purchase(pkg: PurchasesPackage, userId: string): Promise<boolean> {
-    console.log('🔵 [PackageHandler] purchase called', {
-      productId: pkg.product.identifier,
-      userId
-    });
-
     const result = await executePurchase(this.service, pkg, userId);
-    console.log('✅ [PackageHandler] purchase completed', { result });
-
     return result;
   }
 

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

@@ -3,8 +3,6 @@ import { getPremiumEntitlement } from "../../../revenuecat/core/types";
 import { toDate } from "../../../../shared/utils/dateConverter";
 import { detectPackageType } from "../../../../utils/packageTypeDetector";
 
-declare const __DEV__: boolean;
-
 export interface PremiumStatus {
   isPremium: boolean;
   expirationDate: Date | null;
@@ -29,11 +27,6 @@ export class PurchaseStatusResolver {
       const productIdentifier = entitlement.productIdentifier ?? null;
       const detectedPackageType = productIdentifier ? detectPackageType(productIdentifier) : null;
 
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[PurchaseStatusResolver] productIdentifier:", productIdentifier);
-        console.log("[PurchaseStatusResolver] detectedPackageType:", detectedPackageType);
-      }
-
       return {
         isPremium: true,
         expirationDate: toDate(entitlement.expirationDate),

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

@@ -6,20 +6,10 @@ export async function executePurchase(
   pkg: PurchasesPackage,
   userId: string
 ): Promise<boolean> {
-  console.log('🔵 [executePurchase] Starting', {
-    productId: pkg.product.identifier,
-    userId,
-    isInitialized: service.isInitialized()
-  });
-
   if (!service.isInitialized()) {
-    console.error('❌ [executePurchase] Service not initialized!');
     throw new Error("Service not initialized");
   }
 
-  console.log('🚀 [executePurchase] Calling service.purchasePackage');
   const result = await service.purchasePackage(pkg, userId);
-  console.log('✅ [executePurchase] Completed', { success: result.success });
-
   return result.success;
 }

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

@@ -87,19 +87,9 @@ class SubscriptionManagerImpl {
   }
 
   async purchasePackage(pkg: PurchasesPackage): Promise<boolean> {
-    console.log('🔵 [SubscriptionManager] purchasePackage called', {
-      productId: pkg.product.identifier,
-      isConfigured: !!this.managerConfig,
-      hasPackageHandler: !!this.packageHandler
-    });
-
     this.ensureConfigured();
     this.ensurePackageHandlerInitialized();
-
-    console.log('🚀 [SubscriptionManager] Calling purchasePackageOperation');
     const result = await purchasePackageOperation(pkg, this.managerConfig, this.state, this.packageHandler!);
-    console.log('✅ [SubscriptionManager] purchasePackageOperation completed', { result });
-
     return result;
   }
 

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

@@ -22,17 +22,9 @@ export const purchasePackageOperation = async (
   state: SubscriptionInternalState,
   packageHandler: PackageHandler
 ): Promise<boolean> => {
-  console.log('🔵 [purchasePackageOperation] Starting', {
-    productId: pkg.product.identifier
-  });
-
   ensureConfigured(managerConfig);
   const userId = getCurrentUserIdOrThrow(state);
-
-  console.log('🚀 [purchasePackageOperation] Calling packageHandler.purchase', { userId });
   const result = await packageHandler.purchase(pkg, userId);
-  console.log('✅ [purchasePackageOperation] Completed', { result });
-
   return result;
 };
 

package/src/domains/subscription/infrastructure/services/PurchaseHandler.ts

@@ -16,38 +16,23 @@ export async function handlePurchase(
   pkg: PurchasesPackage,
   userId: string
 ): Promise<PurchaseResult> {
-  console.log('🔵 [PurchaseHandler] handlePurchase called', {
-    productId: pkg.product.identifier,
-    userId,
-    isInitialized: deps.isInitialized()
-  });
-
   validatePurchaseReady(deps.isInitialized());
 
   const consumableIds = deps.config.consumableProductIdentifiers || [];
   const isConsumable = isConsumableProduct(pkg, consumableIds);
 
-  console.log('📦 [PurchaseHandler] Product type', { isConsumable });
-
   try {
-    console.log('🚀 [PurchaseHandler] Calling executePurchase');
     const result = await executePurchase(deps.config, userId, pkg, isConsumable);
-    console.log('✅ [PurchaseHandler] executePurchase completed', { success: result.success });
     return result;
   } catch (error) {
-    console.error('❌ [PurchaseHandler] Purchase failed', { error });
-
     if (isUserCancelledError(error)) {
-      console.log('⚠️ [PurchaseHandler] User cancelled');
       return { success: false, isPremium: false, productId: pkg.product.identifier };
     }
 
     if (isAlreadyPurchasedError(error)) {
-      console.log('⚠️ [PurchaseHandler] Already purchased');
       return await handleAlreadyPurchasedError(deps, userId, pkg, error);
     }
 
-    console.error('❌ [PurchaseHandler] Unhandled error');
     return handlePurchaseError(error, pkg, userId);
   }
 }

package/src/domains/subscription/infrastructure/services/RevenueCatService.types.ts

@@ -60,15 +60,7 @@ export class RevenueCatService implements IRevenueCatService {
     }
 
     async purchasePackage(pkg: PurchasesPackage, userId: string): Promise<PurchaseResult> {
-        console.log('🔵 [RevenueCatService] purchasePackage called', {
-            productId: pkg.product.identifier,
-            userId,
-            isInitialized: this.isInitialized()
-        });
-
         const result = await handlePurchase(this.getSDKParams(), pkg, userId);
-        console.log('✅ [RevenueCatService] purchasePackage completed', { success: result.success });
-
         return result;
     }
 

package/src/domains/subscription/infrastructure/services/purchase/PurchaseExecutor.ts

@@ -77,26 +77,15 @@ export async function executePurchase(
   pkg: PurchasesPackage,
   isConsumable: boolean
 ): Promise<PurchaseResult> {
-  console.log('🔵 [PurchaseExecutor] executePurchase called', {
-    productId: pkg.product.identifier,
-    userId,
-    isConsumable,
-    packageType: pkg.packageType
-  });
-
-  console.log('🚀 [PurchaseExecutor] Calling Purchases.purchasePackage (RevenueCat SDK)');
   const { customerInfo } = await Purchases.purchasePackage(pkg);
-  console.log('✅ [PurchaseExecutor] Purchases.purchasePackage completed');
 
   const productId = pkg.product.identifier;
   const packageType = pkg.packageType ?? null;
 
   if (isConsumable) {
-    console.log('💰 [PurchaseExecutor] Processing as consumable purchase');
     return executeConsumablePurchase(config, userId, productId, customerInfo, packageType);
   }
 
-  console.log('📅 [PurchaseExecutor] Processing as subscription purchase');
   return executeSubscriptionPurchase(
     config,
     userId,

package/src/domains/subscription/presentation/screens/components/SubscriptionHeaderContent.tsx

@@ -4,8 +4,6 @@ import { DetailRow } from "../../components/details/DetailRow";
 import type { SubscriptionHeaderProps } from "./SubscriptionHeader.types";
 import { formatPackageTypeForDisplay } from "../../../../subscription/utils/packageTypeFormatter";
 
-declare const __DEV__: boolean;
-
 interface SubscriptionHeaderContentProps {
   isLifetime: boolean;
   showExpirationDate: boolean;
@@ -40,14 +38,8 @@ export const SubscriptionHeaderContent: React.FC<SubscriptionHeaderContentProps>
   latestPurchaseDate,
   billingIssuesDetected,
   isSandbox,
-}) => {
-  if (typeof __DEV__ !== 'undefined' && __DEV__) {
-    console.log('[SubscriptionHeaderContent] packageType:', packageType);
-    console.log('[SubscriptionHeaderContent] periodType:', periodType);
-  }
-
-  return (
-    <View style={styles.details}>
+}) => (
+  <View style={styles.details}>
     {isLifetime ? (
       <DetailRow
         label={translations.statusLabel}
@@ -145,5 +137,4 @@ export const SubscriptionHeaderContent: React.FC<SubscriptionHeaderContentProps>
       </>
     )}
   </View>
-  );
-};
+);

package/src/utils/packageTypeDetector.test.ts

@@ -1,70 +0,0 @@
-/**
- * Package Type Detector Tests
- * Test various product ID patterns
- */
-
-import { detectPackageType } from "./packageTypeDetector";
-import { PACKAGE_TYPE } from "../domains/subscription/core/SubscriptionConstants";
-
-// Test common product ID patterns
-const testCases = [
-  // Standard patterns
-  { id: "com.umituz.aibabyfacepredictor.weekly", expected: PACKAGE_TYPE.WEEKLY },
-  { id: "com.umituz.aibabyfacepredictor.monthly", expected: PACKAGE_TYPE.MONTHLY },
-  { id: "com.umituz.aibabyfacepredictor.yearly", expected: PACKAGE_TYPE.YEARLY },
-
-  // Test store patterns
-  { id: "com.umituz.aibabyfacepredictor.test.weekly", expected: PACKAGE_TYPE.WEEKLY },
-  { id: "com.umituz.aibabyfacepredictor.test.monthly", expected: PACKAGE_TYPE.MONTHLY },
-  { id: "com.umituz.aibabyfacepredictor.test.yearly", expected: PACKAGE_TYPE.YEARLY },
-
-  // Alternative naming
-  { id: "weekly_subscription", expected: PACKAGE_TYPE.WEEKLY },
-  { id: "monthly_subscription", expected: PACKAGE_TYPE.MONTHLY },
-  { id: "annual_subscription", expected: PACKAGE_TYPE.YEARLY },
-
-  // Edge cases
-  { id: "week_pass", expected: PACKAGE_TYPE.WEEKLY },
-  { id: "month_pass", expected: PACKAGE_TYPE.MONTHLY },
-  { id: "year_pass", expected: PACKAGE_TYPE.YEARLY },
-
-  // Should NOT match
-  { id: "credit_package", expected: PACKAGE_TYPE.UNKNOWN },
-  { id: "random_product", expected: PACKAGE_TYPE.UNKNOWN },
-];
-
-console.log("=== Package Type Detector Tests ===\n");
-
-let passed = 0;
-let failed = 0;
-
-testCases.forEach(({ id, expected }) => {
-  const result = detectPackageType(id);
-  const isPass = result === expected;
-
-  if (isPass) {
-    passed++;
-    console.log(`✅ PASS: "${id}" → ${result}`);
-  } else {
-    failed++;
-    console.log(`❌ FAIL: "${id}" → ${result} (expected: ${expected})`);
-  }
-});
-
-console.log(`\n=== Results: ${passed} passed, ${failed} failed ===`);
-
-// Test actual RevenueCat product IDs (if available)
-console.log("\n=== Test Your Actual Product IDs ===");
-console.log("Add your actual product IDs below to test:\n");
-
-const yourProductIds = [
-  // Add your actual product IDs here
-  // "com.yourapp.yourproduct.weekly",
-];
-
-if (yourProductIds.length > 0) {
-  yourProductIds.forEach(id => {
-    const result = detectPackageType(id);
-    console.log(`Product: "${id}" → Detected as: ${result}`);
-  });
-}