@umituz/react-native-subscription 2.22.6 → 2.22.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.22.6",
+  "version": "2.22.8",
   "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/domain/entities/Credits.ts

@@ -19,17 +19,34 @@ export type PurchaseSource =
 
 export type PurchaseType = "initial" | "renewal" | "upgrade" | "downgrade";
 
+export type SubscriptionStatus = "active" | "expired" | "canceled" | "free";
+
+/** Single Source of Truth for user subscription + credits data */
 export interface UserCredits {
+  // Core subscription
+  isPremium: boolean;
+  status: SubscriptionStatus;
+
+  // Dates
+  purchasedAt: Date | null;
+  expirationDate: Date | null;
+  lastUpdatedAt: Date | null;
+
+  // RevenueCat subscription details
+  willRenew: boolean;
+  productId?: string;
+  packageType?: "weekly" | "monthly" | "yearly" | "lifetime";
+  originalTransactionId?: string;
+
+  // Credits
   credits: number;
-  packageType?: "weekly" | "monthly" | "yearly";
   creditLimit?: number;
-  productId?: string;
+
+  // Metadata
   purchaseSource?: PurchaseSource;
   purchaseType?: PurchaseType;
   platform?: "ios" | "android";
   appVersion?: string;
-  purchasedAt: Date | null;
-  lastUpdatedAt: Date | null;
 }
 
 export interface CreditAllocation {

package/src/infrastructure/mappers/CreditsMapper.ts

@@ -1,27 +1,48 @@
-import type { UserCredits } from "../../domain/entities/Credits";
+import type { UserCredits, SubscriptionStatus } from "../../domain/entities/Credits";
 import type { UserCreditsDocumentRead } from "../models/UserCreditsDocument";
 
+/** Maps Firestore document to domain entity */
 export class CreditsMapper {
-  static toEntity(snapData: UserCreditsDocumentRead): UserCredits {
+  static toEntity(doc: UserCreditsDocumentRead): UserCredits {
+    // Determine status from document or derive from isPremium/expirationDate
+    const status = doc.status ?? CreditsMapper.deriveStatus(doc);
+
     return {
-      credits: snapData.credits,
-      packageType: snapData.packageType,
-      creditLimit: snapData.creditLimit,
-      productId: snapData.productId,
-      purchaseSource: snapData.purchaseSource,
-      purchaseType: snapData.purchaseType,
-      platform: snapData.platform,
-      appVersion: snapData.appVersion,
-      purchasedAt: snapData.purchasedAt?.toDate?.() || null,
-      lastUpdatedAt: snapData.lastUpdatedAt?.toDate?.() || null,
+      // Core subscription
+      isPremium: doc.isPremium ?? false,
+      status,
+
+      // Dates
+      purchasedAt: doc.purchasedAt?.toDate?.() ?? null,
+      expirationDate: doc.expirationDate?.toDate?.() ?? null,
+      lastUpdatedAt: doc.lastUpdatedAt?.toDate?.() ?? null,
+
+      // RevenueCat details
+      willRenew: doc.willRenew ?? false,
+      productId: doc.productId,
+      packageType: doc.packageType,
+      originalTransactionId: doc.originalTransactionId,
+
+      // Credits
+      credits: doc.credits,
+      creditLimit: doc.creditLimit,
+
+      // Metadata
+      purchaseSource: doc.purchaseSource,
+      purchaseType: doc.purchaseType,
+      platform: doc.platform,
+      appVersion: doc.appVersion,
     };
   }
 
-  static toFirestore(data: Partial<UserCredits>): Record<string, any> {
-    return {
-      credits: data.credits,
-      // Timestamps are usually handled by serverTimestamp() in repos, 
-      // but we can map them if needed.
-    };
+  /** 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";
+    }
+    return "free";
   }
 }

package/src/infrastructure/models/UserCreditsDocument.ts

@@ -1,4 +1,3 @@
-
 export interface FirestoreTimestamp {
     toDate: () => Date;
 }
@@ -13,9 +12,11 @@ export type PurchaseSource =
 
 export type PurchaseType = "initial" | "renewal" | "upgrade" | "downgrade";
 
+export type SubscriptionDocStatus = "active" | "expired" | "canceled" | "free";
+
 export interface PurchaseMetadata {
   productId: string;
-  packageType: "weekly" | "monthly" | "yearly";
+  packageType: "weekly" | "monthly" | "yearly" | "lifetime";
   creditLimit: number;
   source: PurchaseSource;
   type: PurchaseType;
@@ -24,19 +25,33 @@ export interface PurchaseMetadata {
   timestamp: FirestoreTimestamp;
 }
 
-// Document structure when READING from Firestore
+/** Single Source of Truth for user subscription data */
 export interface UserCreditsDocumentRead {
+    // Core subscription status
+    isPremium?: boolean;
+    status?: SubscriptionDocStatus;
+
+    // Dates (all from RevenueCat)
+    purchasedAt?: FirestoreTimestamp;
+    expirationDate?: FirestoreTimestamp;
+    lastUpdatedAt?: FirestoreTimestamp;
+    lastPurchaseAt?: FirestoreTimestamp;
+
+    // RevenueCat subscription details
+    willRenew?: boolean;
+    productId?: string;
+    packageType?: "weekly" | "monthly" | "yearly" | "lifetime";
+    originalTransactionId?: string;
+
+    // Credits
     credits: number;
-    packageType?: "weekly" | "monthly" | "yearly";
     creditLimit?: number;
-    productId?: string;
+
+    // Metadata
     purchaseSource?: PurchaseSource;
     purchaseType?: PurchaseType;
     platform?: "ios" | "android";
     appVersion?: string;
-    purchasedAt?: FirestoreTimestamp;
-    lastUpdatedAt?: FirestoreTimestamp;
-    lastPurchaseAt?: FirestoreTimestamp;
     processedPurchases?: string[];
     purchaseHistory?: PurchaseMetadata[];
 }

package/src/infrastructure/repositories/CreditsRepository.ts

@@ -14,12 +14,20 @@ import { getCreditAllocation } from "../../utils/creditMapper";
 
 import { CreditsMapper } from "../mappers/CreditsMapper";
 
+/** RevenueCat subscription data to save (Single Source of Truth) */
+export interface RevenueCatData {
+  expirationDate?: string | null;
+  willRenew?: boolean;
+  originalTransactionId?: string;
+  isPremium?: boolean;
+}
+
 export class CreditsRepository extends BaseRepository {
   constructor(private config: CreditsConfig) { super(); }
 
   private getRef(db: Firestore, userId: string) {
-    return this.config.useUserSubcollection 
-      ? doc(db, "users", userId, "credits", "balance") 
+    return this.config.useUserSubcollection
+      ? doc(db, "users", userId, "credits", "balance")
       : doc(db, this.config.collectionName, userId);
   }
 
@@ -51,7 +59,8 @@ export class CreditsRepository extends BaseRepository {
     userId: string,
     purchaseId?: string,
     productId?: string,
-    source?: PurchaseSource
+    source?: PurchaseSource,
+    revenueCatData?: RevenueCatData
   ): Promise<CreditsResult> {
     const db = getFirestore();
     if (!db) return { success: false, error: { message: "No DB", code: "INIT_ERR" } };
@@ -70,6 +79,11 @@ export class CreditsRepository extends BaseRepository {
       const metadata: InitializeCreditsMetadata = {
         productId,
         source,
+        // RevenueCat data for Single Source of Truth
+        expirationDate: revenueCatData?.expirationDate,
+        willRenew: revenueCatData?.willRenew,
+        originalTransactionId: revenueCatData?.originalTransactionId,
+        isPremium: revenueCatData?.isPremium,
       };
 
       const res = await initializeCreditsTransaction(

package/src/infrastructure/services/CreditsInitializer.ts

@@ -3,6 +3,7 @@ import Constants from "expo-constants";
 import {
     runTransaction,
     serverTimestamp,
+    Timestamp,
     type Firestore,
     type FieldValue,
     type Transaction,
@@ -14,6 +15,7 @@ import type {
   PurchaseSource,
   PurchaseType,
   PurchaseMetadata,
+  SubscriptionDocStatus,
 } from "../models/UserCreditsDocument";
 import { detectPackageType } from "../../utils/packageTypeDetector";
 import { getCreditAllocation } from "../../utils/creditMapper";
@@ -22,10 +24,16 @@ interface InitializationResult {
     credits: number;
 }
 
+/** RevenueCat data to save to Firestore (Single Source of Truth) */
 export interface InitializeCreditsMetadata {
   productId?: string;
   source?: PurchaseSource;
   type?: PurchaseType;
+  // RevenueCat subscription data
+  expirationDate?: string | null;
+  willRenew?: boolean;
+  originalTransactionId?: string;
+  isPremium?: boolean;
 }
 
 export async function initializeCreditsTransaction(
@@ -114,17 +122,41 @@ export async function initializeCreditsTransaction(
           ? [...(existing?.purchaseHistory || []), purchaseMetadata].slice(-10)
           : existing?.purchaseHistory;
 
-        // Build credits data, excluding undefined values (Firestore doesn't accept undefined)
+        // Determine subscription status
+        const isPremium = metadata?.isPremium ?? true;
+        const status: SubscriptionDocStatus = isPremium ? "active" : "expired";
+
+        // Build credits data (Single Source of Truth)
         const creditsData: Record<string, unknown> = {
+            // Core subscription
+            isPremium,
+            status,
+
+            // Credits
             credits: newCredits,
             creditLimit,
+
+            // Dates
             purchasedAt,
             lastUpdatedAt: now,
             lastPurchaseAt: now,
+
+            // Tracking
             processedPurchases,
         };
 
-        // Only add optional fields if they have values
+        // RevenueCat subscription data
+        if (metadata?.expirationDate) {
+            creditsData.expirationDate = Timestamp.fromDate(new Date(metadata.expirationDate));
+        }
+        if (metadata?.willRenew !== undefined) {
+            creditsData.willRenew = metadata.willRenew;
+        }
+        if (metadata?.originalTransactionId) {
+            creditsData.originalTransactionId = metadata.originalTransactionId;
+        }
+
+        // Package info
         if (packageType && packageType !== "unknown") {
             creditsData.packageType = packageType;
         }
@@ -133,6 +165,8 @@ export async function initializeCreditsTransaction(
             creditsData.platform = platform;
             creditsData.appVersion = appVersion;
         }
+
+        // Purchase metadata
         if (metadata?.source) {
             creditsData.purchaseSource = metadata.source;
         }

package/src/infrastructure/services/SubscriptionInitializer.ts

@@ -3,10 +3,12 @@
  */
 
 import { Platform } from "react-native";
+import type { CustomerInfo } from "react-native-purchases";
 import type { CreditsConfig } from "../../domain/entities/Credits";
 import { configureCreditsRepository, getCreditsRepository } from "../repositories/CreditsRepositoryProvider";
 import { SubscriptionManager } from "../../revenuecat/infrastructure/managers/SubscriptionManager";
 import { configureAuthProvider } from "../../presentation/hooks/useAuthAwarePurchase";
+import type { RevenueCatData } from "../repositories/CreditsRepository";
 
 export interface FirebaseAuthLike {
   currentUser: { uid: string; isAnonymous: boolean } | null;

package/src/presentation/hooks/useSubscriptionSettingsConfig.ts

@@ -61,11 +61,11 @@ export const useSubscriptionSettingsConfig = (
 
   // RevenueCat entitlement info - dynamically using configured entitlementId
   const entitlementId = SubscriptionManager.getEntitlementId() || "premium";
-  const premiumEntitlement = customerInfo?.entitlements.active[entitlementId];
+  const activeEntitlement = customerInfo?.entitlements.active[entitlementId];
+  const allEntitlement = customerInfo?.entitlements.all[entitlementId];
 
-  // Premium status: use customerInfo directly as it updates in real-time via listener
-  // This is the source of truth, subscriptionActive is just a backup
-  const isPremium = !!premiumEntitlement || subscriptionActive;
+  // Premium status: only active entitlements count as premium
+  const isPremium = !!activeEntitlement || subscriptionActive;
 
   const dynamicCreditLimit = useMemo(() => {
     const config = getCreditsConfig();
@@ -76,8 +76,8 @@ export const useSubscriptionSettingsConfig = (
     }
 
     // 2. FALLBACK: RevenueCat'ten detect et
-    if (premiumEntitlement?.productIdentifier) {
-      const packageType = detectPackageType(premiumEntitlement.productIdentifier);
+    if (activeEntitlement?.productIdentifier) {
+      const packageType = detectPackageType(activeEntitlement.productIdentifier);
       const allocation = getCreditAllocation(packageType, config.packageAllocations);
       if (allocation !== null) return allocation;
     }
@@ -92,19 +92,19 @@ export const useSubscriptionSettingsConfig = (
 
     // 4. FINAL FALLBACK: Config'den al
     return creditLimit ?? config.creditLimit;
-  }, [credits?.creditLimit, credits?.credits, premiumEntitlement?.productIdentifier, creditLimit]);
-
-  // Get expiration date directly from RevenueCat (source of truth)
-  const entitlementExpirationDate = premiumEntitlement?.expirationDate ?? null;
-
-  // Prefer CustomerInfo expiration (real-time) over cached status
-  const expiresAtIso = entitlementExpirationDate || (statusExpirationDate
-    ? statusExpirationDate.toISOString()
-    : null);
-
-
-
-  const willRenew = premiumEntitlement?.willRenew || false;
+  }, [credits?.creditLimit, credits?.credits, activeEntitlement?.productIdentifier, creditLimit]);
+
+  // Get expiration date with fallback chain (supports expired subscriptions)
+  // 1. Active entitlement (current subscription)
+  // 2. All entitlements (includes expired subscriptions)
+  // 3. latestExpirationDate from CustomerInfo
+  // 4. Status from Firestore
+  const expiresAtIso = activeEntitlement?.expirationDate
+    ?? allEntitlement?.expirationDate
+    ?? customerInfo?.latestExpirationDate
+    ?? (statusExpirationDate ? statusExpirationDate.toISOString() : null);
+
+  const willRenew = activeEntitlement?.willRenew || false;
   const purchasedAtIso = convertPurchasedAt(credits?.purchasedAt);
 
   // Formatted dates
@@ -129,6 +129,15 @@ export const useSubscriptionSettingsConfig = (
 
   const creditsArray = useCreditsArray(credits, dynamicCreditLimit, translations);
 
+  // Centralized display flags - single source of truth for UI visibility
+  const hasCredits = creditsArray.length > 0;
+  const display = useMemo(() => ({
+    showHeader: isPremium || hasCredits,
+    showCredits: hasCredits,
+    showUpgradePrompt: !isPremium && !hasCredits && !!upgradePrompt,
+    showExpirationDate: (isPremium || hasCredits) && !!expiresAtIso,
+  }), [isPremium, hasCredits, upgradePrompt, expiresAtIso]);
+
   // Build config
   const config = useMemo(
     (): SubscriptionSettingsConfig => ({
@@ -146,6 +155,7 @@ export const useSubscriptionSettingsConfig = (
       sectionConfig: {
         statusType,
         isPremium,
+        display,
         expirationDate: formattedExpirationDate,
         purchaseDate: formattedPurchaseDate,
         isLifetime: isPremium && !expiresAtIso,
@@ -175,6 +185,7 @@ export const useSubscriptionSettingsConfig = (
       translations,
       isPremium,
       statusType,
+      display,
       formattedExpirationDate,
       formattedPurchaseDate,
       expiresAtIso,
@@ -186,7 +197,5 @@ export const useSubscriptionSettingsConfig = (
     ]
   );
 
-
-
   return config;
 };

package/src/presentation/screens/SubscriptionDetailScreen.tsx

@@ -17,6 +17,7 @@ import { DevTestSection } from "./components/DevTestSection";
 import type { SubscriptionDetailScreenProps } from "../types/SubscriptionDetailTypes";
 
 export type {
+  SubscriptionDisplayFlags,
   SubscriptionDetailTranslations,
   SubscriptionDetailConfig,
   SubscriptionDetailScreenProps,
@@ -31,8 +32,7 @@ export const SubscriptionDetailScreen: React.FC<
   SubscriptionDetailScreenProps
 > = ({ config }) => {
   const tokens = useAppDesignTokens();
-  const showCredits = config.credits && config.credits.length > 0;
-  const showUpgradePrompt = !config.isPremium && config.upgradePrompt && !showCredits;
+  const { showHeader, showCredits, showUpgradePrompt, showExpirationDate } = config.display;
 
   const styles = useMemo(
     () =>
@@ -69,10 +69,10 @@ export const SubscriptionDetailScreen: React.FC<
       }
     >
       <View style={styles.cardsContainer}>
-        {config.isPremium && (
+        {showHeader && (
           <SubscriptionHeader
             statusType={config.statusType}
-            isPremium={config.isPremium}
+            showExpirationDate={showExpirationDate}
             isLifetime={config.isLifetime}
             expirationDate={config.expirationDate}
             purchaseDate={config.purchaseDate}

package/src/presentation/screens/components/SubscriptionHeader.tsx

@@ -12,7 +12,7 @@ import type { SubscriptionHeaderProps } from "../../types/SubscriptionDetailType
 
 export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
   statusType,
-  isPremium,
+  showExpirationDate,
   isLifetime,
   expirationDate,
   purchaseDate,
@@ -85,41 +85,39 @@ export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
         />
       </View>
 
-      {isPremium && (
-        <View style={styles.details}>
-          {isLifetime ? (
-            <DetailRow
-              label={translations.statusLabel}
-              value={translations.lifetimeLabel}
-              style={styles.row}
-              labelStyle={styles.label}
-              valueStyle={styles.value}
-            />
-          ) : (
-            <>
-              {expirationDate && (
-                <DetailRow
-                  label={translations.expiresLabel}
-                  value={expirationDate}
-                  highlight={showExpiring}
-                  style={styles.row}
-                  labelStyle={styles.label}
-                  valueStyle={styles.value}
-                />
-              )}
-              {purchaseDate && (
-                <DetailRow
-                  label={translations.purchasedLabel}
-                  value={purchaseDate}
-                  style={styles.row}
-                  labelStyle={styles.label}
-                  valueStyle={styles.value}
-                />
-              )}
-            </>
-          )}
-        </View>
-      )}
+      <View style={styles.details}>
+        {isLifetime ? (
+          <DetailRow
+            label={translations.statusLabel}
+            value={translations.lifetimeLabel}
+            style={styles.row}
+            labelStyle={styles.label}
+            valueStyle={styles.value}
+          />
+        ) : (
+          <>
+            {showExpirationDate && expirationDate && (
+              <DetailRow
+                label={translations.expiresLabel}
+                value={expirationDate}
+                highlight={showExpiring}
+                style={styles.row}
+                labelStyle={styles.label}
+                valueStyle={styles.value}
+              />
+            )}
+            {purchaseDate && (
+              <DetailRow
+                label={translations.purchasedLabel}
+                value={purchaseDate}
+                style={styles.row}
+                labelStyle={styles.label}
+                valueStyle={styles.value}
+              />
+            )}
+          </>
+        )}
+      </View>
     </View>
   );
 };

package/src/presentation/types/SubscriptionDetailTypes.ts

@@ -53,10 +53,19 @@ export interface UpgradePromptConfig {
   benefits?: UpgradeBenefit[];
 }
 
+/** Display flags - centralized UI visibility control */
+export interface SubscriptionDisplayFlags {
+  showHeader: boolean;
+  showCredits: boolean;
+  showUpgradePrompt: boolean;
+  showExpirationDate: boolean;
+}
+
 /** Configuration for subscription detail screen */
 export interface SubscriptionDetailConfig {
   statusType: SubscriptionStatusType;
   isPremium: boolean;
+  display: SubscriptionDisplayFlags;
   expirationDate?: string | null;
   purchaseDate?: string | null;
   isLifetime?: boolean;
@@ -78,7 +87,7 @@ export interface SubscriptionDetailScreenProps {
 /** Props for subscription header component */
 export interface SubscriptionHeaderProps {
   statusType: SubscriptionStatusType;
-  isPremium: boolean;
+  showExpirationDate: boolean;
   isLifetime?: boolean;
   expirationDate?: string | null;
   purchaseDate?: string | null;