@umituz/react-native-subscription 2.37.106 → 2.37.108

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.106",
+  "version": "2.37.108",
   "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/hooks/usePaywallActions.ts

@@ -1,6 +1,6 @@
 import { useState, useCallback, useRef } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
-import { usePurchaseLoadingStore } from "../../subscription/presentation/stores";
+import { usePurchaseLoadingStore } from "../../subscription/presentation/stores/purchaseLoadingStore";
 import type { PurchaseSource } from "../../subscription/core/SubscriptionConstants";
 
 interface UsePaywallActionsParams {

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

@@ -1,5 +1,4 @@
 import type { InitializeResult } from "../../../../shared/application/ports/IRevenueCatService";
-import { resolveApiKey } from "../utils/ApiKeyResolver";
 import type { InitializerDeps } from "./RevenueCatInitializer.types";
 import { FAILED_INITIALIZATION_RESULT, CONFIGURATION_RETRY_DELAY_MS, MAX_INIT_RETRIES } from "./initializerConstants";
 import { configState } from "./ConfigurationStateManager";
@@ -40,7 +39,7 @@ export async function initializeSDK(
     return initializeSDK(deps, userId, apiKey, configStartRetryCount);
   }
 
-  const key = apiKey || resolveApiKey(deps.config);
+  const key = apiKey || deps.config.apiKey || null;
   if (!key) {
     return FAILED_INITIALIZATION_RESULT;
   }

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

@@ -1,12 +1,10 @@
 import Purchases, { type CustomerInfo, type PurchasesOfferings } from "react-native-purchases";
-import { doc, setDoc } from "firebase/firestore";
 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";
 import { ANONYMOUS_CACHE_KEY, type PeriodType } from "../../../subscription/core/SubscriptionConstants";
-import { requireFirestore } from "../../../../shared/infrastructure/firestore";
 
 declare const __DEV__: boolean;
 
@@ -39,17 +37,6 @@ function isAnonymousId(userId: string): boolean {
   return userId.startsWith('$RCAnonymous') || userId.startsWith('device_');
 }
 
-async function syncRevenueCatIdToProfile(firebaseUserId: string, revenueCatUserId: string): Promise<void> {
-  try {
-    const db = requireFirestore();
-    const userRef = doc(db, "users", firebaseUserId);
-    await setDoc(userRef, { revenueCatUserId }, { merge: true });
-  } catch (error) {
-    // Non-fatal: profile update failure should not block SDK initialization
-    console.warn('[UserSwitchHandler] Failed to sync RevenueCat ID to profile:', error instanceof Error ? error.message : String(error));
-  }
-}
-
 export async function handleUserSwitch(
   deps: InitializerDeps,
   userId: string
@@ -119,11 +106,6 @@ async function performUserSwitch(
     deps.setCurrentUserId(normalizedUserId || undefined);
     const offerings = await fetchOfferingsSafe();
 
-    if (normalizedUserId) {
-      const rcId = await Purchases.getAppUserID();
-      void syncRevenueCatIdToProfile(normalizedUserId, rcId);
-    }
-
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
       console.log('[UserSwitchHandler] User switch completed successfully');
     }
@@ -184,13 +166,8 @@ export async function handleInitialConfiguration(
       fetchOfferingsSafe(),
     ]);
 
-    const currentUserId = await Purchases.getAppUserID();
-
-    if (normalizedUserId) {
-      void syncRevenueCatIdToProfile(normalizedUserId, currentUserId);
-    }
-
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
+      const currentUserId = await Purchases.getAppUserID();
       console.log('[UserSwitchHandler] Initial configuration completed:', {
         revenueCatUserId: currentUserId,
         activeEntitlements: Object.keys(customerInfo.entitlements.active),

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

@@ -39,6 +39,10 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
   return {
     expirationDate: entitlement.expirationDate ?? null,
     willRenew: entitlement.willRenew ?? null,
+    // Maps SDK's `storeTransactionId` (current transaction ID from Apple/Google)
+    // to our domain's `originalTransactionId`. Used as dedup key in processedTransactions.
+    // Note: The SDK does not expose `original_store_transaction_id` (the first purchase's
+    // ID that stays constant across renewals) — only available via server-side webhooks.
     originalTransactionId: subscription?.storeTransactionId ?? null,
     periodType: validatePeriodType(entitlement.periodType),
     packageType: null,

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

@@ -1,7 +1,7 @@
 import type { PurchasesPackage } from "react-native-purchases";
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
 import type { PackageHandler } from "../handlers/PackageHandler";
-import { SubscriptionInternalState } from "./SubscriptionInternalState";
+import { InitializationCache } from "../utils/InitializationCache";
 import { ensureServiceAvailable, getCurrentUserIdOrThrow } from "./subscriptionManagerUtils";
 import type { SubscriptionManagerConfig, PremiumStatus, RestoreResultInfo } from "./SubscriptionManager.types";
 import { createPackageHandler } from "./packageHandlerFactory";
@@ -14,7 +14,7 @@ import { ANONYMOUS_CACHE_KEY } from "../../core/SubscriptionConstants";
 class SubscriptionManagerImpl {
   private managerConfig: SubscriptionManagerConfig | null = null;
   private serviceInstance: IRevenueCatService | null = null;
-  private state = new SubscriptionInternalState();
+  private initCache = new InitializationCache();
   private packageHandler: PackageHandler | null = null;
 
   configure(config: SubscriptionManagerConfig): void {
@@ -45,7 +45,7 @@ class SubscriptionManagerImpl {
     }
 
     const cacheKey = actualUserId || ANONYMOUS_CACHE_KEY;
-    const { shouldInit, existingPromise } = this.state.initCache.tryAcquireInitialization(cacheKey);
+    const { shouldInit, existingPromise } = this.initCache.tryAcquireInitialization(cacheKey);
 
     if (!shouldInit && existingPromise) {
       if (typeof __DEV__ !== 'undefined' && __DEV__) {
@@ -59,7 +59,7 @@ class SubscriptionManagerImpl {
 
     const realUserId = actualUserId || null;
     const promise = this.performInitialization(actualUserId);
-    this.state.initCache.setPromise(promise, cacheKey, realUserId);
+    this.initCache.setPromise(promise, cacheKey, realUserId);
     return promise;
   }
 
@@ -87,7 +87,7 @@ class SubscriptionManagerImpl {
   }
 
   isInitializedForUser = (userId: string): boolean =>
-    !!(this.serviceInstance?.isInitialized() && this.state.initCache.getCurrentUserId() === userId);
+    !!(this.serviceInstance?.isInitialized() && this.initCache.getCurrentUserId() === userId);
 
   async getPackages(): Promise<PurchasesPackage[]> {
     this.ensureConfigured();
@@ -109,7 +109,7 @@ class SubscriptionManagerImpl {
       });
     }
     this.ensurePackageHandlerInitialized();
-    const resolvedUserId = explicitUserId || getCurrentUserIdOrThrow(this.state);
+    const resolvedUserId = explicitUserId || getCurrentUserIdOrThrow(this.initCache);
     const result = await purchasePackageOperation(pkg, this.managerConfig, resolvedUserId, this.packageHandler!);
     return result;
   }
@@ -120,7 +120,7 @@ class SubscriptionManagerImpl {
         await this.initialize(explicitUserId);
     }
     this.ensurePackageHandlerInitialized();
-    const resolvedUserId = explicitUserId || getCurrentUserIdOrThrow(this.state);
+    const resolvedUserId = explicitUserId || getCurrentUserIdOrThrow(this.initCache);
     return restoreOperation(this.managerConfig, resolvedUserId, this.packageHandler!);
   }
 
@@ -133,7 +133,7 @@ class SubscriptionManagerImpl {
 
   async reset(): Promise<void> {
     await this.serviceInstance?.reset();
-    this.state.reset();
+    this.initCache.reset();
     this.serviceInstance = null;
     this.packageHandler = null;
     initializationState.reset();

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

@@ -1,14 +1,10 @@
 import type { RevenueCatConfig } from "../../../revenuecat/core/types";
 import type { PremiumStatus } from "../handlers/PurchaseStatusResolver";
+import type { RestoreResultInfo } from "../handlers/package-operations/types";
 
 export interface SubscriptionManagerConfig {
   config: RevenueCatConfig;
   apiKey: string;
 }
 
-export type { PremiumStatus };
-
-export interface RestoreResultInfo {
-  success: boolean;
-  productId: string | null;
-}
+export type { PremiumStatus, RestoreResultInfo };

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

@@ -1,7 +1,6 @@
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
 import type { PackageHandler } from "../handlers/PackageHandler";
 import type { PremiumStatus } from "./SubscriptionManager.types";
-import { ERROR_MESSAGES } from "./managerConstants";
 
 export const checkPremiumStatusFromService = async (
   service: IRevenueCatService,
@@ -10,7 +9,7 @@ export const checkPremiumStatusFromService = async (
   const customerInfo = await service.getCustomerInfo();
 
   if (!customerInfo) {
-    throw new Error(ERROR_MESSAGES.CUSTOMER_INFO_NOT_AVAILABLE);
+    throw new Error("Customer info not available");
   }
 
   return packageHandler.checkPremiumStatusFromInfo(customerInfo);

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

@@ -1,7 +1,7 @@
 import type { SubscriptionManagerConfig } from "./SubscriptionManager.types";
-
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
-import { SubscriptionInternalState } from "./SubscriptionInternalState";
+import { getRevenueCatService } from "../services/revenueCatServiceInstance";
+import type { InitializationCache } from "../utils/InitializationCache";
 
 export function ensureConfigured(config: SubscriptionManagerConfig | null): void {
     if (!config) {
@@ -9,8 +9,8 @@ export function ensureConfigured(config: SubscriptionManagerConfig | null): void
     }
 }
 
-export function getCurrentUserIdOrThrow(state: SubscriptionInternalState): string {
-    const userId = state.initCache.getCurrentUserId();
+export function getCurrentUserIdOrThrow(initCache: InitializationCache): string {
+    const userId = initCache.getCurrentUserId();
     if (userId == null) {
         throw new Error("SubscriptionManager not initialized - no current user ID available");
     }
@@ -24,7 +24,6 @@ export function getOrCreateService(
         return currentInstance;
     }
 
-    const { getRevenueCatService } = require("../services/revenueCatServiceInstance");
     const serviceInstance = getRevenueCatService();
 
     if (!serviceInstance) {

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

@@ -2,7 +2,6 @@ import Purchases from "react-native-purchases";
 import type { PurchasesOffering, PurchasesPackage, CustomerInfo } from "react-native-purchases";
 import type { IRevenueCatService, InitializeResult, PurchaseResult, RestoreResult } from "../../../../shared/application/ports/IRevenueCatService";
 import type { RevenueCatConfig } from "../../../revenuecat/core/types";
-import { resolveApiKey } from "../../../revenuecat/infrastructure/utils/ApiKeyResolver";
 import { initializeSDK } from "../../../revenuecat/infrastructure/services/RevenueCatInitializer";
 import { fetchOfferings } from "./OfferingsFetcher";
 import { handlePurchase } from "./PurchaseHandler";
@@ -19,7 +18,7 @@ export class RevenueCatService implements IRevenueCatService {
         this.listenerManager = new CustomerInfoListenerManager();
     }
 
-    getRevenueCatKey = (): string | null => resolveApiKey(this.stateManager.getConfig());
+    getRevenueCatKey = (): string | null => this.stateManager.getConfig().apiKey || null;
 
     isInitialized = (): boolean => this.stateManager.isInitialized();
 

package/src/domains/subscription/presentation/screens/SubscriptionDetailScreen.tsx

@@ -1,9 +1,13 @@
 import React, { useMemo, useState, useCallback } from "react";
 import { StyleSheet, View, Pressable, Alert } from "react-native";
+import Purchases from "react-native-purchases";
 import { AtomicIcon, AtomicText } from "@umituz/react-native-design-system/atoms";
 import { NavigationHeader } from "@umituz/react-native-design-system/molecules";
 import { useAppDesignTokens } from "@umituz/react-native-design-system/theme";
+import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
 import { ScreenLayout } from "../../../../shared/presentation";
+import { getCreditsRepository } from "../../../credits/infrastructure/CreditsRepositoryManager";
+import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../../shared/infrastructure/SubscriptionEventBus";
 import { SubscriptionHeader } from "./components/SubscriptionHeader";
 import { CreditsList } from "./components/CreditsList";
 import { UpgradePrompt } from "./components/UpgradePrompt";
@@ -109,9 +113,6 @@ const DevTestPanel: React.FC<{ statusType: string }> = ({ statusType }) => {
   }, [loading]);
 
   const handleCancel = useCallback(() => run("Cancel", async () => {
-    const { useAuthStore, selectUserId } = require("@umituz/react-native-auth");
-    const { getCreditsRepository } = require("../../../credits/infrastructure/CreditsRepositoryManager");
-    const { subscriptionEventBus, SUBSCRIPTION_EVENTS } = require("../../../../shared/infrastructure/SubscriptionEventBus");
     const userId = selectUserId(useAuthStore.getState());
     if (!userId) throw new Error("No userId found");
     await getCreditsRepository().syncExpiredStatus(userId);
@@ -119,7 +120,6 @@ const DevTestPanel: React.FC<{ statusType: string }> = ({ statusType }) => {
   }), [run]);
 
   const handleRestore = useCallback(() => run("Restore", async () => {
-    const Purchases = require("react-native-purchases").default;
     await Purchases.restorePurchases();
   }), [run]);
 

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

@@ -5,9 +5,10 @@ import { useAppDesignTokens } from "@umituz/react-native-design-system/theme";
 import { PremiumStatusBadge } from "../../components/details/PremiumStatusBadge";
 import type { SubscriptionHeaderProps } from "./SubscriptionHeader.types";
 import { createSubscriptionHeaderStyles } from "./SubscriptionHeader.styles";
-import { EXPIRATION_WARNING_THRESHOLD_DAYS as EXPIRING_SOON_THRESHOLD_DAYS } from "../../../constants/thresholds";
 import { SubscriptionHeaderContent } from "./SubscriptionHeaderContent";
 
+const EXPIRING_SOON_THRESHOLD_DAYS = 7;
+
 export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
   statusType,
   showExpirationDate,

package/src/domains/subscription/utils/expirationHelpers.ts

@@ -1,4 +1,4 @@
-import { EXPIRATION_WARNING_THRESHOLD_DAYS } from '../constants/thresholds';
+const EXPIRATION_WARNING_THRESHOLD_DAYS = 7;
 
 export function shouldHighlightExpiration(daysRemaining: number | null | undefined): boolean {
   return daysRemaining !== null && daysRemaining !== undefined && daysRemaining > 0 && daysRemaining <= EXPIRATION_WARNING_THRESHOLD_DAYS;

package/src/domains/wallet/presentation/hooks/useTransactionHistory.ts

@@ -6,7 +6,7 @@ import type {
   CreditLog,
   TransactionRepositoryConfig,
 } from "../../domain/types/transaction.types";
-import { TransactionRepository } from "../../infrastructure/repositories/transaction";
+import { TransactionRepository } from "../../infrastructure/repositories/transaction/TransactionRepository";
 
 const transactionQueryKeys = {
   all: ["transactions"] as const,

package/src/index.ts

@@ -37,7 +37,7 @@ export {
 // Presentation Layer - Hooks
 export { useAuthAwarePurchase } from "./domains/subscription/presentation/useAuthAwarePurchase";
 export { useCredits } from "./domains/credits/presentation/useCredits";
-export { useDeductCredit } from "./domains/credits/presentation/deduct-credit";
+export { useDeductCredit } from "./domains/credits/presentation/deduct-credit/useDeductCredit";
 export { useFeatureGate } from "./domains/subscription/presentation/useFeatureGate";
 export { usePaywallVisibility, paywallControl } from "./domains/subscription/presentation/usePaywallVisibility";
 export { usePremium } from "./domains/subscription/presentation/usePremium";
@@ -94,11 +94,13 @@ export {
   createSubscriptionInitModule,
   cleanupSubscriptionModule,
   type SubscriptionInitModuleConfig,
-} from './init';
+} from './init/createSubscriptionInitModule';
 
 // Wallet Domain
 export {
   WalletScreen as WalletScreenContainer,
-  type WalletScreenProps,
-  type WalletScreenTranslations,
-} from './domains/wallet';
+} from './domains/wallet/presentation/screens/WalletScreen';
+export type {
+  WalletScreenProps,
+  WalletScreenTranslations,
+} from './domains/wallet/presentation/screens/WalletScreen.types';

package/src/domains/credits/presentation/deduct-credit/index.ts

@@ -1 +0,0 @@
-export { useDeductCredit } from "./useDeductCredit";

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

@@ -1,5 +0,0 @@
-import type { RevenueCatConfig } from '../../core/types';
-
-export function resolveApiKey(config: RevenueCatConfig): string | null {
-  return config.apiKey || null;
-}

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

@@ -1 +0,0 @@
-export const EXPIRATION_WARNING_THRESHOLD_DAYS = 7;

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

@@ -1,9 +0,0 @@
-import { InitializationCache } from "../utils/InitializationCache";
-
-export class SubscriptionInternalState {
-  public initCache = new InitializationCache();
-
-  reset() {
-    this.initCache.reset();
-  }
-}

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

@@ -1,3 +0,0 @@
-export const ERROR_MESSAGES = {
-  CUSTOMER_INFO_NOT_AVAILABLE: "Customer info not available",
-} as const;

package/src/domains/subscription/presentation/stores/index.ts

@@ -1,4 +0,0 @@
-export {
-  usePurchaseLoadingStore,
-  selectIsPurchasing,
-} from "./purchaseLoadingStore";

package/src/domains/wallet/index.ts

@@ -1,8 +0,0 @@
-export {
-  WalletScreen,
-} from "./presentation/screens/WalletScreen";
-
-export type {
-  WalletScreenProps,
-  WalletScreenTranslations,
-} from "./presentation/screens/WalletScreen.types";

package/src/domains/wallet/infrastructure/repositories/transaction/index.ts

@@ -1 +0,0 @@
-export { TransactionRepository } from "./TransactionRepository";

package/src/init/index.ts

@@ -1,5 +0,0 @@
-export {
-  createSubscriptionInitModule,
-  cleanupSubscriptionModule,
-  type SubscriptionInitModuleConfig,
-} from './createSubscriptionInitModule';