@umituz/react-native-subscription 2.35.3 → 2.35.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.35.3",
+  "version": "2.35.5",
   "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/subscription/application/SubscriptionSyncProcessor.ts

@@ -9,14 +9,26 @@ import { handleExpiredSubscription, handleFreeUserInitialization, handlePremiumS
 import { NO_SUBSCRIPTION_PRODUCT_ID } from "./syncConstants";
 
 export class SubscriptionSyncProcessor {
-  constructor(private entitlementId: string) {}
+  constructor(
+    private entitlementId: string,
+    private getAnonymousUserId: () => Promise<string>
+  ) {}
+
+  private async getCreditsUserId(revenueCatUserId: string): Promise<string> {
+    if (!revenueCatUserId || revenueCatUserId.length === 0) {
+      return this.getAnonymousUserId();
+    }
+    return revenueCatUserId;
+  }
 
   async processPurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource) {
     const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
     const purchaseId = generatePurchaseId(revenueCatData.originalTransactionId, productId);
 
+    const creditsUserId = await this.getCreditsUserId(userId);
+
     await getCreditsRepository().initializeCredits(
-      userId,
+      creditsUserId,
       purchaseId,
       productId,
       source ?? PURCHASE_SOURCE.SETTINGS,
@@ -24,7 +36,7 @@ export class SubscriptionSyncProcessor {
       PURCHASE_TYPE.INITIAL
     );
 
-    emitCreditsUpdated(userId);
+    emitCreditsUpdated(creditsUserId);
   }
 
   async processRenewal(userId: string, productId: string, newExpirationDate: string, customerInfo: CustomerInfo) {
@@ -32,8 +44,10 @@ export class SubscriptionSyncProcessor {
     revenueCatData.expirationDate = newExpirationDate || revenueCatData.expirationDate;
     const purchaseId = generateRenewalId(revenueCatData.originalTransactionId, productId, newExpirationDate);
 
+    const creditsUserId = await this.getCreditsUserId(userId);
+
     await getCreditsRepository().initializeCredits(
-      userId,
+      creditsUserId,
       purchaseId,
       productId,
       PURCHASE_SOURCE.RENEWAL,
@@ -41,7 +55,7 @@ export class SubscriptionSyncProcessor {
       PURCHASE_TYPE.RENEWAL
     );
 
-    emitCreditsUpdated(userId);
+    emitCreditsUpdated(creditsUserId);
   }
 
   async processStatusChange(
@@ -52,21 +66,23 @@ export class SubscriptionSyncProcessor {
     willRenew?: boolean,
     periodType?: PeriodType
   ) {
+    const creditsUserId = await this.getCreditsUserId(userId);
+
     // Expired subscription case
     if (!isPremium && productId) {
-      await handleExpiredSubscription(userId);
+      await handleExpiredSubscription(creditsUserId);
       return;
     }
 
     // Free user case
     if (!isPremium && !productId) {
-      await handleFreeUserInitialization(userId);
+      await handleFreeUserInitialization(creditsUserId);
       return;
     }
 
     // Premium user case
     await handlePremiumStatusSync(
-      userId,
+      creditsUserId,
       isPremium,
       productId ?? NO_SUBSCRIPTION_PRODUCT_ID,
       expiresAt ?? null,

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

@@ -6,8 +6,11 @@ import { SubscriptionSyncProcessor } from "./SubscriptionSyncProcessor";
 export class SubscriptionSyncService {
   private processor: SubscriptionSyncProcessor;
 
-  constructor(entitlementId: string) {
-    this.processor = new SubscriptionSyncProcessor(entitlementId);
+  constructor(
+    entitlementId: string,
+    getAnonymousUserId: () => Promise<string>
+  ) {
+    this.processor = new SubscriptionSyncProcessor(entitlementId, getAnonymousUserId);
   }
 
   async handlePurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource) {

package/src/domains/subscription/application/initializer/BackgroundInitializer.ts

@@ -5,11 +5,11 @@ import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
 declare const __DEV__: boolean;
 
 export async function startBackgroundInitialization(config: SubscriptionInitConfig): Promise<() => void> {
-  const initializeInBackground = async (userId?: string): Promise<void> => {
+  const initializeInBackground = async (revenueCatUserId?: string): Promise<void> => {
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[BackgroundInitializer] initializeInBackground called with userId:', userId || '(undefined - anonymous)');
+      console.log('[BackgroundInitializer] initializeInBackground called with userId:', revenueCatUserId || '(undefined - anonymous)');
     }
-    await SubscriptionManager.initialize(userId);
+    await SubscriptionManager.initialize(revenueCatUserId);
   };
 
   const auth = config.getFirebaseAuth();
@@ -21,22 +21,22 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
     console.log('[BackgroundInitializer] Starting background initialization');
   }
 
-  const initialUserId = getCurrentUserId(() => auth);
+  const initialRevenueCatUserId = getCurrentUserId(() => auth);
 
   if (typeof __DEV__ !== 'undefined' && __DEV__) {
-    console.log('[BackgroundInitializer] Initial userId:', initialUserId || '(undefined - anonymous)');
+    console.log('[BackgroundInitializer] Initial RevenueCat userId:', initialRevenueCatUserId || '(undefined - anonymous)');
   }
 
-  await initializeInBackground(initialUserId);
+  await initializeInBackground(initialRevenueCatUserId);
 
-  const unsubscribe = setupAuthStateListener(() => auth, async (newUserId) => {
+  const unsubscribe = setupAuthStateListener(() => auth, async (newRevenueCatUserId) => {
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[BackgroundInitializer] Auth state listener triggered, reinitializing with userId:', newUserId || '(undefined - anonymous)');
+      console.log('[BackgroundInitializer] Auth state listener triggered, reinitializing with userId:', newRevenueCatUserId || '(undefined - anonymous)');
     }
     try {
-      await initializeInBackground(newUserId);
+      await initializeInBackground(newRevenueCatUserId);
     } catch (error) {
-      console.error('[BackgroundInitializer] Failed to reinitialize on auth change', { userId: newUserId, error });
+      console.error('[BackgroundInitializer] Failed to reinitialize on auth change', { userId: newRevenueCatUserId, error });
     }
   });
 

package/src/domains/subscription/application/initializer/ServiceConfigurator.ts

@@ -5,7 +5,7 @@ import { SubscriptionSyncService } from "../SubscriptionSyncService";
 import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
 
 export function configureServices(config: SubscriptionInitConfig, apiKey: string): SubscriptionSyncService {
-  const { entitlementId, credits, creditPackages, getFirebaseAuth, showAuthModal, onCreditsUpdated } = config;
+  const { entitlementId, credits, creditPackages, getFirebaseAuth, showAuthModal, onCreditsUpdated, getAnonymousUserId } = config;
 
   if (!creditPackages) {
     throw new Error('[ServiceConfigurator] creditPackages configuration is required');
@@ -16,7 +16,7 @@ export function configureServices(config: SubscriptionInitConfig, apiKey: string
     creditPackageAmounts: creditPackages.amounts
   });
 
-  const syncService = new SubscriptionSyncService(entitlementId);
+  const syncService = new SubscriptionSyncService(entitlementId, getAnonymousUserId);
 
   SubscriptionManager.configure({
     config: {