@umituz/react-native-subscription 2.37.31 → 2.37.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.31",
+  "version": "2.37.33",
   "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/revenuecat/infrastructure/services/userSwitchHandler.ts

@@ -29,7 +29,7 @@ async function fetchOfferingsSafe(): Promise<any> {
 }
 
 function normalizeUserId(userId: string): string | null {
-  return (userId && userId.length > 0) ? userId : null;
+  return (userId && userId.length > 0 && userId !== "__anonymous__") ? userId : null;
 }
 
 function isAnonymousId(userId: string): boolean {

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

@@ -17,9 +17,8 @@ export const getCurrentUserId = (getAuth: () => FirebaseAuthLike | null): string
 
   if (user.isAnonymous) {
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[SubscriptionAuthListener] Anonymous user - returning undefined (RevenueCat will use its own ID)');
+      console.log(`[SubscriptionAuthListener] Anonymous user - using Firebase anonymous UID: ${user.uid}`);
     }
-    return undefined;
   }
 
   return user.uid;
@@ -40,13 +39,13 @@ export const setupAuthStateListener = (
   }
 
   return auth.onAuthStateChanged((user) => {
-    const userId = (user && !user.isAnonymous) ? user.uid : undefined;
+    const userId = user ? user.uid : undefined;
 
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
       console.log('[SubscriptionAuthListener] 🔔 Auth state changed:', {
         hasUser: !!user,
         isAnonymous: user?.isAnonymous,
-        userId: userId || '(undefined - anonymous)',
+        userId: userId || '(undefined - no user)',
       });
     }
 

package/src/domains/subscription/infrastructure/hooks/usePurchasePackage.ts

@@ -48,10 +48,11 @@ export const usePurchasePackage = () => {
 
       const productId = pkg.product.identifier;
       if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[Purchase] Calling SubscriptionManager.purchasePackage()");
+        console.log(`[Purchase] Initializing and purchasing. User: ${userId}`);
       }
 
-      const success = await SubscriptionManager.purchasePackage(pkg);
+      await SubscriptionManager.initialize(userId);
+      const success = await SubscriptionManager.purchasePackage(pkg, userId);
 
       return { success, productId };
     },

package/src/domains/subscription/infrastructure/hooks/useRestorePurchase.ts

@@ -10,7 +10,6 @@ import { useAlert } from "@umituz/react-native-design-system";
 import {
   useAuthStore,
   selectUserId,
-  selectIsAnonymous,
 } from "@umituz/react-native-auth";
 import { SubscriptionManager } from "../../infrastructure/managers/SubscriptionManager";
 import { SUBSCRIPTION_QUERY_KEYS } from "./subscriptionQueryKeys";
@@ -30,7 +29,6 @@ interface RestoreResult {
  */
 export const useRestorePurchase = () => {
   const userId = useAuthStore(selectUserId);
-  const isAnonymous = useAuthStore(selectIsAnonymous);
   const queryClient = useQueryClient();
   const { showSuccess, showInfo, showError } = useAlert();
 
@@ -40,11 +38,8 @@ export const useRestorePurchase = () => {
         throw new Error("User not authenticated");
       }
 
-      if (isAnonymous) {
-        throw new Error("Anonymous users cannot restore purchases");
-      }
-
-      const result = await SubscriptionManager.restore();
+      await SubscriptionManager.initialize(userId);
+      const result = await SubscriptionManager.restore(userId);
       return result;
     },
     onSuccess: (result) => {

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

@@ -2,7 +2,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 { ensureServiceAvailable } from "./subscriptionManagerUtils";
+import { ensureServiceAvailable, getCurrentUserIdOrThrow } from "./subscriptionManagerUtils";
 import type { SubscriptionManagerConfig, PremiumStatus, RestoreResultInfo } from "./SubscriptionManager.types";
 import { createPackageHandler } from "./packageHandlerFactory";
 import { checkPremiumStatusFromService } from "./premiumStatusChecker";
@@ -100,17 +100,25 @@ class SubscriptionManagerImpl {
     return getPackagesOperation(this.managerConfig, this.serviceInstance, this.packageHandler!);
   }
 
-  async purchasePackage(pkg: PurchasesPackage): Promise<boolean> {
+  async purchasePackage(pkg: PurchasesPackage, explicitUserId?: string): Promise<boolean> {
     this.ensureConfigured();
+    if (explicitUserId) {
+        await this.initialize(explicitUserId);
+    }
     this.ensurePackageHandlerInitialized();
-    const result = await purchasePackageOperation(pkg, this.managerConfig, this.state, this.packageHandler!);
+    const resolvedUserId = explicitUserId || getCurrentUserIdOrThrow(this.state);
+    const result = await purchasePackageOperation(pkg, this.managerConfig, resolvedUserId, this.packageHandler!);
     return result;
   }
 
-  async restore(): Promise<RestoreResultInfo> {
+  async restore(explicitUserId?: string): Promise<RestoreResultInfo> {
     this.ensureConfigured();
+    if (explicitUserId) {
+        await this.initialize(explicitUserId);
+    }
     this.ensurePackageHandlerInitialized();
-    return restoreOperation(this.managerConfig, this.state, this.packageHandler!);
+    const resolvedUserId = explicitUserId || getCurrentUserIdOrThrow(this.state);
+    return restoreOperation(this.managerConfig, resolvedUserId, this.packageHandler!);
   }
 
   async checkPremiumStatus(): Promise<PremiumStatus> {

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

@@ -2,8 +2,7 @@ import type { PurchasesPackage } from "react-native-purchases";
 import type { IRevenueCatService } from "../../../../shared/application/ports/IRevenueCatService";
 import type { PackageHandler } from "../handlers/PackageHandler";
 import type { RestoreResultInfo } from "./SubscriptionManager.types";
-import { SubscriptionInternalState } from "./SubscriptionInternalState";
-import { ensureConfigured, getCurrentUserIdOrThrow, getOrCreateService } from "./subscriptionManagerUtils";
+import { ensureConfigured, getOrCreateService } from "./subscriptionManagerUtils";
 import type { SubscriptionManagerConfig } from "./SubscriptionManager.types";
 
 export const getPackagesOperation = async (
@@ -19,21 +18,19 @@ export const getPackagesOperation = async (
 export const purchasePackageOperation = async (
   pkg: PurchasesPackage,
   managerConfig: SubscriptionManagerConfig | null,
-  state: SubscriptionInternalState,
+  userId: string,
   packageHandler: PackageHandler
 ): Promise<boolean> => {
   ensureConfigured(managerConfig);
-  const userId = getCurrentUserIdOrThrow(state);
   const result = await packageHandler.purchase(pkg, userId);
   return result;
 };
 
 export const restoreOperation = async (
   managerConfig: SubscriptionManagerConfig | null,
-  state: SubscriptionInternalState,
+  userId: string,
   packageHandler: PackageHandler
 ): Promise<RestoreResultInfo> => {
   ensureConfigured(managerConfig);
-  const userId = getCurrentUserIdOrThrow(state);
   return packageHandler.restore(userId);
 };