@umituz/react-native-subscription 2.31.24 → 2.31.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.31.24",
+  "version": "2.31.26",
   "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/infrastructure/handlers/PackageHandler.ts

@@ -8,6 +8,8 @@ import type { IRevenueCatService } from "../../../../shared/application/ports/IR
 import { getPremiumEntitlement } from "../../../revenuecat/core/types";
 import { PurchaseStatusResolver, type PremiumStatus } from "./PurchaseStatusResolver";
 
+declare const __DEV__: boolean;
+
 export interface RestoreResultInfo {
   success: boolean;
   productId: string | null;
@@ -31,19 +33,41 @@ export class PackageHandler {
     try {
       const offering = await this.service.fetchOfferings();
 
+      if (__DEV__) {
+        console.log('[PackageHandler] fetchOfferings result:', {
+          hasOffering: !!offering,
+          offeringId: offering?.identifier,
+          packagesCount: offering?.availablePackages?.length,
+        });
+      }
+
       if (!offering) {
-        // Return empty array instead of throwing - allows graceful degradation
+        if (__DEV__) {
+          console.warn('[PackageHandler] No offering returned, returning empty array');
+        }
         return [];
       }
 
       const packages = offering.availablePackages;
       if (!packages || packages.length === 0) {
-        // Return empty array instead of throwing - allows graceful degradation
+        if (__DEV__) {
+          console.warn('[PackageHandler] Offering has no packages, returning empty array');
+        }
         return [];
       }
 
+      if (__DEV__) {
+        console.log('[PackageHandler] Returning packages:', {
+          count: packages.length,
+          packageIds: packages.map(p => p.product.identifier),
+        });
+      }
+
       return packages;
     } catch (error) {
+      if (__DEV__) {
+        console.error('[PackageHandler] Error fetching packages:', error);
+      }
       throw new Error(
         `Failed to fetch subscription packages. ${
           error instanceof Error ? error.message : "Unknown error"

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

@@ -4,7 +4,8 @@
  * Auth info automatically read from @umituz/react-native-auth
  */
 
-import { useQuery } from "@umituz/react-native-design-system";
+import { useQuery, useQueryClient } from "@umituz/react-native-design-system";
+import { useEffect, useRef } from "react";
 import {
   useAuthStore,
   selectUserId,
@@ -22,11 +23,12 @@ import {
 export const useSubscriptionPackages = () => {
   const userId = useAuthStore(selectUserId);
   const isConfigured = SubscriptionManager.isConfigured();
+  const queryClient = useQueryClient();
+  const prevUserIdRef = useRef(userId);
 
-  return useQuery({
+  const query = useQuery({
     queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, userId ?? "anonymous"] as const,
     queryFn: async () => {
-      // Initialize if needed (works for both authenticated and anonymous users)
       if (userId) {
         if (!SubscriptionManager.isInitializedForUser(userId)) {
           await SubscriptionManager.initialize(userId);
@@ -46,4 +48,27 @@ export const useSubscriptionPackages = () => {
     refetchOnWindowFocus: false,
     refetchOnReconnect: true,
   });
+
+  useEffect(() => {
+    const prevUserId = prevUserIdRef.current;
+    prevUserIdRef.current = userId;
+
+    if (prevUserId !== userId) {
+      if (prevUserId) {
+        queryClient.removeQueries({
+          queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, prevUserId],
+        });
+      } else {
+        queryClient.removeQueries({
+          queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, "anonymous"],
+        });
+      }
+
+      queryClient.invalidateQueries({
+        queryKey: [...SUBSCRIPTION_QUERY_KEYS.packages, userId ?? "anonymous"],
+      });
+    }
+  }, [userId, queryClient]);
+
+  return query;
 };

package/src/domains/subscription/infrastructure/services/OfferingsFetcher.ts

@@ -4,22 +4,52 @@ export interface OfferingsFetcherDeps {
   isInitialized: () => boolean;
 }
 
+declare const __DEV__: boolean;
+
 export async function fetchOfferings(deps: OfferingsFetcherDeps): Promise<PurchasesOffering | null> {
   if (!deps.isInitialized()) return null;
   try {
     const offerings = await Purchases.getOfferings();
 
+    if (__DEV__) {
+      console.log('[OfferingsFetcher] Offerings received:', {
+        hasCurrent: !!offerings.current,
+        currentId: offerings.current?.identifier,
+        allOfferingsCount: Object.keys(offerings.all).length,
+        allOfferingIds: Object.keys(offerings.all),
+      });
+    }
+
     if (offerings.current) {
+      if (__DEV__) {
+        console.log('[OfferingsFetcher] Using current offering:', {
+          id: offerings.current.identifier,
+          packagesCount: offerings.current.availablePackages.length,
+        });
+      }
       return offerings.current;
     }
 
     const allOfferings = Object.values(offerings.all);
     if (allOfferings.length > 0) {
+      if (__DEV__) {
+        console.log('[OfferingsFetcher] No current offering, using first from all:', {
+          id: allOfferings[0].identifier,
+          packagesCount: allOfferings[0].availablePackages.length,
+        });
+      }
       return allOfferings[0];
     }
 
+    if (__DEV__) {
+      console.warn('[OfferingsFetcher] No offerings available!');
+    }
+
     return null;
   } catch (error) {
+    if (__DEV__) {
+      console.error('[OfferingsFetcher] Error:', error);
+    }
     throw new Error(`Failed to fetch offerings: ${error instanceof Error ? error.message : "Unknown error"}`);
   }
 }

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

@@ -15,8 +15,9 @@ export const subscriptionStatusQueryKeys = {
 export const useSubscriptionStatus = (): SubscriptionStatusResult => {
   const userId = useAuthStore(selectUserId);
   const queryClient = useQueryClient();
+  const isConfigured = SubscriptionManager.isConfigured();
 
-  const queryEnabled = isAuthenticated(userId) && SubscriptionManager.isInitializedForUser(userId);
+  const queryEnabled = isAuthenticated(userId) && isConfigured;
 
   const { data, status, error, refetch } = useQuery({
     queryKey: subscriptionStatusQueryKeys.user(userId),
@@ -25,6 +26,10 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
         return null;
       }
 
+      if (!SubscriptionManager.isInitializedForUser(userId)) {
+        await SubscriptionManager.initialize(userId);
+      }
+
       try {
         const result = await SubscriptionManager.checkPremiumStatus();
         return result;