@umituz/react-native-subscription 2.14.15 → 2.14.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.15",
+  "version": "2.14.16",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -51,7 +51,8 @@
     "@types/react": "~19.1.10",
     "@typescript-eslint/eslint-plugin": "^8.50.1",
     "@typescript-eslint/parser": "^8.50.1",
-    "@umituz/react-native-auth": "^2.7.3",
+    "@umituz/react-native-auth": "*",
+    "@umituz/react-native-storage": "*",
     "@umituz/react-native-design-system": "*",
     "@umituz/react-native-firebase": "*",
     "@umituz/react-native-legal": "*",

package/src/index.ts

@@ -317,6 +317,13 @@ export {
   type UsePremiumResult,
 } from "./presentation/hooks/usePremium";
 
+export {
+  useSubscriptionStatus,
+  subscriptionStatusQueryKeys,
+  type SubscriptionStatusResult,
+  type UseSubscriptionStatusParams,
+} from "./presentation/hooks/useSubscriptionStatus";
+
 export {
   usePaywallOperations,
   type UsePaywallOperationsProps,

package/src/presentation/hooks/usePremium.ts

@@ -2,12 +2,16 @@
  * usePremium Hook
  * Complete subscription management for 100+ apps
  * Works for both authenticated and anonymous users
+ *
+ * IMPORTANT: isPremium is based on actual RevenueCat subscription status,
+ * NOT on whether credits document exists.
  */
 
 import { useCallback } from 'react';
 import type { PurchasesPackage } from 'react-native-purchases';
 import type { UserCredits } from '../../domain/entities/Credits';
 import { useCredits } from './useCredits';
+import { useSubscriptionStatus } from './useSubscriptionStatus';
 import {
   useSubscriptionPackages,
   usePurchasePackage,
@@ -54,6 +58,13 @@ export const usePremium = (userId?: string): UsePremiumResult => {
     console.log('[DEBUG usePremium] Hook called', { userId: userId || 'ANONYMOUS' });
   }
 
+  // Fetch real subscription status from RevenueCat
+  const { isPremium: subscriptionActive, isLoading: statusLoading } =
+    useSubscriptionStatus({
+      userId,
+      enabled: !!userId,
+    });
+
   // Fetch user credits (server state)
   const { credits, isLoading: creditsLoading } = useCredits({
     userId,
@@ -70,7 +81,8 @@ export const usePremium = (userId?: string): UsePremiumResult => {
       packagesCount: packages?.length || 0,
       packagesLoading,
       creditsLoading,
-      isPremium: credits !== null,
+      statusLoading,
+      isPremium: subscriptionActive,
     });
   }
 
@@ -82,8 +94,8 @@ export const usePremium = (userId?: string): UsePremiumResult => {
   const { showPaywall, setShowPaywall, closePaywall, openPaywall } =
     usePaywallVisibility();
 
-  // Premium status = has credits
-  const isPremium = credits !== null;
+  // Premium status = actual subscription status from RevenueCat
+  const isPremium = subscriptionActive;
 
   // Purchase handler with proper error handling
   const handlePurchase = useCallback(
@@ -117,6 +129,7 @@ export const usePremium = (userId?: string): UsePremiumResult => {
   return {
     isPremium,
     isLoading:
+      statusLoading ||
       creditsLoading ||
       packagesLoading ||
       purchaseMutation.isPending ||

package/src/presentation/hooks/useSubscriptionStatus.ts

@@ -0,0 +1,73 @@
+/**
+ * useSubscriptionStatus Hook
+ *
+ * TanStack Query hook for checking real subscription status from RevenueCat.
+ * This provides the actual premium status based on entitlements, not credits.
+ */
+
+import { useQuery } from "@tanstack/react-query";
+import { SubscriptionManager } from "../../revenuecat/infrastructure/managers/SubscriptionManager";
+
+declare const __DEV__: boolean;
+
+export const subscriptionStatusQueryKeys = {
+  all: ["subscriptionStatus"] as const,
+  user: (userId: string) => ["subscriptionStatus", userId] as const,
+};
+
+export interface SubscriptionStatusResult {
+  isPremium: boolean;
+  expirationDate: Date | null;
+  isLoading: boolean;
+  error: Error | null;
+  refetch: () => void;
+}
+
+export interface UseSubscriptionStatusParams {
+  userId: string | undefined;
+  enabled?: boolean;
+}
+
+/**
+ * Check real subscription status from RevenueCat
+ *
+ * @param userId - User ID
+ * @param enabled - Whether to enable the query
+ * @returns Subscription status with isPremium flag
+ */
+export const useSubscriptionStatus = ({
+  userId,
+  enabled = true,
+}: UseSubscriptionStatusParams): SubscriptionStatusResult => {
+  const { data, isLoading, error, refetch } = useQuery({
+    queryKey: subscriptionStatusQueryKeys.user(userId ?? ""),
+    queryFn: async () => {
+      if (!userId) {
+        return { isPremium: false, expirationDate: null };
+      }
+
+      const status = await SubscriptionManager.checkPremiumStatus();
+
+      if (__DEV__) {
+        console.log("[useSubscriptionStatus] Status from RevenueCat", {
+          userId,
+          isPremium: status.isPremium,
+          expirationDate: status.expirationDate,
+        });
+      }
+
+      return status;
+    },
+    enabled: enabled && !!userId && SubscriptionManager.isInitialized(),
+    staleTime: 30 * 1000,
+    gcTime: 5 * 60 * 1000,
+  });
+
+  return {
+    isPremium: data?.isPremium ?? false,
+    expirationDate: data?.expirationDate ?? null,
+    isLoading,
+    error: error as Error | null,
+    refetch,
+  };
+};