@umituz/react-native-subscription 2.22.9 → 2.22.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.22.9",
+  "version": "2.22.10",
   "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/infrastructure/mappers/CreditsMapper.ts

@@ -1,20 +1,22 @@
 import type { UserCredits, SubscriptionStatus } from "../../domain/entities/Credits";
 import type { UserCreditsDocumentRead } from "../models/UserCreditsDocument";
 
-/** Maps Firestore document to domain entity */
+/** Maps Firestore document to domain entity with expiration validation */
 export class CreditsMapper {
   static toEntity(doc: UserCreditsDocumentRead): UserCredits {
-    // Determine status from document or derive from isPremium/expirationDate
-    const status = doc.status ?? CreditsMapper.deriveStatus(doc);
+    const expirationDate = doc.expirationDate?.toDate?.() ?? null;
+
+    // Validate isPremium against expirationDate (real-time check)
+    const { isPremium, status } = CreditsMapper.validateSubscription(doc, expirationDate);
 
     return {
-      // Core subscription
-      isPremium: doc.isPremium ?? false,
+      // Core subscription (validated)
+      isPremium,
       status,
 
       // Dates
       purchasedAt: doc.purchasedAt?.toDate?.() ?? null,
-      expirationDate: doc.expirationDate?.toDate?.() ?? null,
+      expirationDate,
       lastUpdatedAt: doc.lastUpdatedAt?.toDate?.() ?? null,
 
       // RevenueCat details
@@ -35,14 +37,33 @@ export class CreditsMapper {
     };
   }
 
-  /** Derive status from isPremium and expirationDate for backward compatibility */
-  private static deriveStatus(doc: UserCreditsDocumentRead): SubscriptionStatus {
-    if (!doc.isPremium && !doc.expirationDate) return "free";
-    if (doc.isPremium) return "active";
-    if (doc.expirationDate) {
-      const expDate = doc.expirationDate.toDate?.();
-      if (expDate && expDate < new Date()) return "expired";
+  /** Validate subscription status against expirationDate */
+  private static validateSubscription(
+    doc: UserCreditsDocumentRead,
+    expirationDate: Date | null
+  ): { isPremium: boolean; status: SubscriptionStatus } {
+    const docIsPremium = doc.isPremium ?? false;
+
+    // No expiration date = lifetime or free
+    if (!expirationDate) {
+      return {
+        isPremium: docIsPremium,
+        status: docIsPremium ? "active" : "free",
+      };
+    }
+
+    // Check if subscription has expired
+    const isExpired = expirationDate < new Date();
+
+    if (isExpired) {
+      // Subscription expired - override document's isPremium
+      return { isPremium: false, status: "expired" };
     }
-    return "free";
+
+    // Subscription still active
+    return {
+      isPremium: docIsPremium,
+      status: docIsPremium ? "active" : "free",
+    };
   }
 }

package/src/infrastructure/repositories/CreditsRepository.ts

@@ -129,6 +129,25 @@ export class CreditsRepository extends BaseRepository {
     const res = await this.getCredits(userId);
     return !!(res.success && res.data && res.data.credits >= cost);
   }
+
+  /** Sync expired subscription status to Firestore (background) */
+  async syncExpiredStatus(userId: string): Promise<void> {
+    const db = getFirestore();
+    if (!db) return;
+
+    try {
+      const ref = this.getRef(db, userId);
+      const { updateDoc } = await import("firebase/firestore");
+      await updateDoc(ref, {
+        isPremium: false,
+        status: "expired",
+        lastUpdatedAt: serverTimestamp(),
+      });
+      if (__DEV__) console.log("[CreditsRepository] Synced expired status for:", userId.slice(0, 8));
+    } catch (e) {
+      if (__DEV__) console.error("[CreditsRepository] Sync expired failed:", e);
+    }
+  }
 }
 
 export const createCreditsRepository = (c: CreditsConfig) => new CreditsRepository(c);

package/src/presentation/hooks/useCredits.ts

@@ -88,15 +88,22 @@ export const useCredits = ({
         if (__DEV__) console.error("[useCredits] Query failed:", result.error?.message);
         throw new Error(result.error?.message || "Failed to fetch credits");
       }
-      if (__DEV__) console.log("[useCredits] Query success:", { hasData: !!result.data, credits: result.data?.credits });
+
+      // Background sync: If mapper detected expired status, sync to Firestore
+      if (result.data?.status === "expired") {
+        if (__DEV__) console.log("[useCredits] Detected expired subscription, syncing...");
+        repository.syncExpiredStatus(userId).catch(() => {});
+      }
+
+      if (__DEV__) console.log("[useCredits] Query success:", { hasData: !!result.data, credits: result.data?.credits, status: result.data?.status });
       return result.data || null;
     },
     enabled: queryEnabled,
     staleTime,
     gcTime,
-    refetchOnMount: true, // Refetch when component mounts
-    refetchOnWindowFocus: true, // Refetch when app becomes active
-    refetchOnReconnect: true, // Refetch when network reconnects
+    refetchOnMount: true,
+    refetchOnWindowFocus: true,
+    refetchOnReconnect: true,
   });
 
   const credits = data ?? null;