@umituz/react-native-subscription 2.37.59 → 2.37.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.59",
+  "version": "2.37.61",
   "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/credits/application/creditOperationUtils.ts

@@ -73,5 +73,6 @@ export function buildCreditsData({
     ...(billingIssueTimestamp && { billingIssueDetectedAt: billingIssueTimestamp }),
     ...(metadata.store && { store: metadata.store }),
     ...(metadata.ownershipType && { ownershipType: metadata.ownershipType }),
+    ...(metadata.revenueCatUserId && { revenueCatUserId: metadata.revenueCatUserId }),
   };
 }

package/src/domains/credits/infrastructure/operations/CreditsInitializer.ts

@@ -70,6 +70,7 @@ export async function initializeCreditsWithRetry(params: InitializeCreditsParams
           billingIssueDetectedAt: revenueCatData.billingIssueDetectedAt,
           store: revenueCatData.store,
           ownershipType: revenueCatData.ownershipType,
+          revenueCatUserId: revenueCatData.revenueCatUserId,
           type,
         }
       );

package/src/domains/credits/presentation/useCredits.ts

@@ -1,6 +1,6 @@
 import { useQuery, useQueryClient } from "@umituz/react-native-design-system";
 import { useCallback, useMemo, useEffect } from "react";
-import { useAuthStore, selectUserId, selectIsAnonymous } from "@umituz/react-native-auth";
+import { useAuthStore, selectUserId } from "@umituz/react-native-auth";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
 import { NO_CACHE_QUERY_CONFIG } from "../../../shared/infrastructure/react-query/queryConfig";
 import { usePreviousUserCleanup } from "../../../shared/infrastructure/react-query/hooks/usePreviousUserCleanup";
@@ -10,7 +10,7 @@ import {
   isCreditsRepositoryConfigured,
 } from "../infrastructure/CreditsRepositoryManager";
 import { calculateSafePercentage, canAffordAmount } from "../utils/creditValidation";
-import { isRegisteredUser } from "../../subscription/utils/authGuards";
+import { isAuthenticated } from "../../subscription/utils/authGuards";
 import { creditsQueryKeys } from "./creditsQueryKeys";
 import type { UseCreditsResult, CreditsLoadStatus } from "./useCredits.types";
 
@@ -26,17 +26,16 @@ const deriveLoadStatus = (
 
 export const useCredits = (): UseCreditsResult => {
   const userId = useAuthStore(selectUserId);
-  const isAnonymous = useAuthStore(selectIsAnonymous);
   const isConfigured = isCreditsRepositoryConfigured();
 
   const config = isConfigured ? getCreditsConfig() : null;
-  const isUserRegistered = isRegisteredUser(userId, isAnonymous);
-  const queryEnabled = isUserRegistered && isConfigured;
+  const hasUser = isAuthenticated(userId);
+  const queryEnabled = hasUser && isConfigured;
 
   const { data, status, error, refetch } = useQuery({
     queryKey: creditsQueryKeys.user(userId),
     queryFn: async () => {
-      if (!isUserRegistered || !isConfigured) return null;
+      if (!hasUser || !isConfigured) return null;
 
       const repository = getCreditsRepository();
       const result = await repository.getCredits(userId);
@@ -56,7 +55,7 @@ export const useCredits = (): UseCreditsResult => {
   usePreviousUserCleanup(userId, queryClient, creditsQueryKeys.user);
 
   useEffect(() => {
-    if (!isUserRegistered) return undefined;
+    if (!hasUser) return undefined;
 
     const unsubscribe = subscriptionEventBus.on(SUBSCRIPTION_EVENTS.CREDITS_UPDATED, (updatedUserId) => {
       if (updatedUserId === userId) {
@@ -65,7 +64,7 @@ export const useCredits = (): UseCreditsResult => {
     });
 
     return unsubscribe;
-  }, [userId, isUserRegistered, queryClient]);
+  }, [userId, hasUser, queryClient]);
 
   const credits = data ?? null;
 

package/src/domains/revenuecat/core/types/RevenueCatData.ts

@@ -11,4 +11,5 @@ export interface RevenueCatData {
   billingIssueDetectedAt: string | null;
   store: Store | null;
   ownershipType: OwnershipType | null;
+  revenueCatUserId?: string | null;
 }

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

@@ -1,10 +1,12 @@
 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 type { PeriodType } from "../../../subscription/core/SubscriptionConstants";
+import { requireFirestore } from "../../../../shared/infrastructure/firestore";
 
 const ANONYMOUS_CACHE_KEY = '__anonymous__';
 
@@ -39,6 +41,16 @@ 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 {
+    // Non-fatal: profile update failure should not block SDK initialization
+  }
+}
+
 export async function handleUserSwitch(
   deps: InitializerDeps,
   userId: string
@@ -108,6 +120,11 @@ 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');
     }
@@ -170,6 +187,10 @@ export async function handleInitialConfiguration(
 
     const currentUserId = await Purchases.getAppUserID();
 
+    if (normalizedUserId) {
+      void syncRevenueCatIdToProfile(normalizedUserId, currentUserId);
+    }
+
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
       console.log('[UserSwitchHandler] ✅ Initial configuration completed:', {
         revenueCatUserId: currentUserId,

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

@@ -41,6 +41,7 @@ export interface InitializeCreditsMetadata {
   billingIssueDetectedAt: string | null;
   store: Store | null;
   ownershipType: OwnershipType | null;
+  revenueCatUserId?: string | null;
 }
 
 export interface InitializationResult {

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

@@ -1,4 +1,5 @@
 import type { CustomerInfo } from "react-native-purchases";
+import Purchases from "react-native-purchases";
 import type { PeriodType, PurchaseSource } from "../core/SubscriptionConstants";
 import { PURCHASE_SOURCE, PURCHASE_TYPE } from "../core/SubscriptionConstants";
 import { getCreditsRepository } from "../../credits/infrastructure/CreditsRepositoryManager";
@@ -14,6 +15,14 @@ export class SubscriptionSyncProcessor {
     private getAnonymousUserId: () => Promise<string>
   ) {}
 
+  private async getRevenueCatAppUserId(): Promise<string | null> {
+    try {
+      return await Purchases.getAppUserID();
+    } catch {
+      return null;
+    }
+  }
+
   private async getCreditsUserId(revenueCatUserId: string): Promise<string> {
     if (!revenueCatUserId || revenueCatUserId.trim().length === 0) {
       const anonymousId = await this.getAnonymousUserId();
@@ -28,6 +37,7 @@ export class SubscriptionSyncProcessor {
   async processPurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource, packageType?: PackageType | null) {
     const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
     revenueCatData.packageType = packageType ?? null;
+    revenueCatData.revenueCatUserId = await this.getRevenueCatAppUserId();
     const purchaseId = generatePurchaseId(revenueCatData.originalTransactionId, productId);
 
     const creditsUserId = await this.getCreditsUserId(userId);
@@ -47,6 +57,7 @@ export class SubscriptionSyncProcessor {
   async processRenewal(userId: string, productId: string, newExpirationDate: string, customerInfo: CustomerInfo) {
     const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
     revenueCatData.expirationDate = newExpirationDate ?? revenueCatData.expirationDate;
+    revenueCatData.revenueCatUserId = await this.getRevenueCatAppUserId();
     const purchaseId = generateRenewalId(revenueCatData.originalTransactionId, productId, newExpirationDate);
 
     const creditsUserId = await this.getCreditsUserId(userId);

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

@@ -4,7 +4,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";
@@ -19,7 +18,6 @@ interface PurchaseMutationResult {
 
 export const usePurchasePackage = () => {
   const userId = useAuthStore(selectUserId);
-  const isAnonymous = useAuthStore(selectIsAnonymous);
   const queryClient = useQueryClient();
   const { showSuccess, showError } = useAlert();
 
@@ -29,10 +27,6 @@ export const usePurchasePackage = () => {
         throw new Error("User not authenticated");
       }
 
-      if (isAnonymous) {
-        throw new Error("Anonymous users cannot purchase subscriptions");
-      }
-
       const productId = pkg.product.identifier;
       if (typeof __DEV__ !== "undefined" && __DEV__) {
         console.log(`[Purchase] Initializing and purchasing. User: ${userId}`);