@umituz/react-native-subscription 2.37.58 → 2.37.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.58",
+  "version": "2.37.60",
   "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/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/subscription/application/initializer/ServiceConfigurator.ts

@@ -68,6 +68,10 @@ export function configureServices(config: SubscriptionInitConfig, apiKey: string
       const u = auth.currentUser;
       return !!(u && !u.isAnonymous);
     },
+    hasFirebaseUser: () => {
+      const auth = getFirebaseAuth();
+      return !!(auth?.currentUser);
+    },
     showAuthModal,
   });
 

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}`);

package/src/domains/subscription/infrastructure/utils/authPurchaseState.ts

@@ -3,6 +3,7 @@ import type { PurchaseSource } from "../../core/SubscriptionConstants";
 
 export interface PurchaseAuthProvider {
   isAuthenticated: () => boolean;
+  hasFirebaseUser: () => boolean;
   showAuthModal: () => void;
 }
 

package/src/domains/subscription/presentation/useAuthAwarePurchase.ts

@@ -54,10 +54,10 @@ export const useAuthAwarePurchase = (
     const authProvider = authPurchaseStateManager.getProvider();
     if (!authProvider) return;
 
-    const isAuth = authProvider.isAuthenticated();
+    const hasUser = authProvider.hasFirebaseUser();
     const hasSavedPurchase = !!authPurchaseStateManager.getSavedPurchase();
 
-    if (isAuth && hasSavedPurchase && !isExecutingSavedRef.current) {
+    if (hasUser && hasSavedPurchase && !isExecutingSavedRef.current) {
       isExecutingSavedRef.current = true;
       executeSavedPurchase().finally(() => {
         isExecutingSavedRef.current = false;
@@ -73,9 +73,7 @@ export const useAuthAwarePurchase = (
         return false;
       }
 
-      const isAuth = authProvider.isAuthenticated();
-
-      if (!isAuth) {
+      if (!authProvider.hasFirebaseUser()) {
         authPurchaseStateManager.savePurchase(pkg, source || params?.source || "settings");
         authProvider.showAuthModal();
         return false;
@@ -95,7 +93,7 @@ export const useAuthAwarePurchase = (
       return false;
     }
 
-    if (!authProvider.isAuthenticated()) {
+    if (!authProvider.hasFirebaseUser()) {
       authProvider.showAuthModal();
       return false;
     }