@umituz/react-native-subscription 2.27.94 → 2.27.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.94",
+  "version": "2.27.96",
   "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/infrastructure/CreditsRepository.ts

@@ -12,6 +12,8 @@ import { CreditsMapper } from "../core/CreditsMapper";
 import type { RevenueCatData } from "../../subscription/core/RevenueCatData";
 import { DeductCreditsCommand } from "../application/DeductCreditsCommand";
 import { CreditLimitCalculator } from "../application/CreditLimitCalculator";
+import { PURCHASE_TYPE, type PurchaseType } from "../../subscription/core/SubscriptionConstants";
+import { updateDoc } from "firebase/firestore";
 
 export class CreditsRepository extends BaseRepository {
   private deductCommand: DeductCreditsCommand;
@@ -47,7 +49,8 @@ export class CreditsRepository extends BaseRepository {
     purchaseId: string,
     productId: string,
     source: PurchaseSource,
-    revenueCatData: RevenueCatData
+    revenueCatData: RevenueCatData,
+    type: PurchaseType = PURCHASE_TYPE.INITIAL
   ): Promise<CreditsResult> {
     const db = getFirestore();
     if (!db) {
@@ -70,6 +73,7 @@ export class CreditsRepository extends BaseRepository {
         originalTransactionId: revenueCatData.originalTransactionId,
         isPremium: revenueCatData.isPremium,
         periodType: revenueCatData.periodType,
+        type,
       }
     );
 
@@ -86,4 +90,27 @@ export class CreditsRepository extends BaseRepository {
   async deductCredit(userId: string, cost: number): Promise<DeductCreditsResult> {
     return this.deductCommand.execute(userId, cost);
   }
+
+  async hasCredits(userId: string, cost: number): Promise<boolean> {
+    const result = await this.getCredits(userId);
+    if (!result.success || !result.data) return false;
+    return result.data.credits >= cost;
+  }
+
+  async syncExpiredStatus(userId: string): Promise<void> {
+    const db = getFirestore();
+    if (!db) throw new Error("Firestore instance is not available");
+
+    const ref = this.getRef(db, userId);
+    await updateDoc(ref, {
+      isPremium: false,
+      status: "expired",
+      willRenew: false,
+      expirationDate: new Date().toISOString()
+    });
+  }
+}
+
+export function createCreditsRepository(config: CreditsConfig): CreditsRepository {
+  return new CreditsRepository(config);
 }

package/src/domains/subscription/application/SubscriptionInitializer.ts

@@ -92,7 +92,7 @@ export const initializeSubscription = async (config: SubscriptionInitConfig): Pr
     showAuthModal,
   });
 
-  const initializeInBackground = async (userId: string): Promise<void> => {
+  const initializeInBackground = async (userId?: string): Promise<void> => {
     await SubscriptionManager.initialize(userId);
     if (__DEV__) {
       console.log('[SubscriptionInitializer] Background init complete');

package/src/domains/subscription/application/SubscriptionSyncService.ts

@@ -1,6 +1,6 @@
 import type { CustomerInfo } from "react-native-purchases";
 import type { RevenueCatData } from "../core/RevenueCatData";
-import { type PeriodType, type PurchaseSource } from "../core/SubscriptionConstants";
+import { type PeriodType, type PurchaseSource, PURCHASE_SOURCE, PURCHASE_TYPE } from "../core/SubscriptionConstants";
 import { getCreditsRepository } from "../../credits/infrastructure/CreditsRepositoryProvider";
 import { extractRevenueCatData } from "./SubscriptionSyncUtils";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
@@ -19,7 +19,14 @@ export class SubscriptionSyncService {
         ? `purchase_${revenueCatData.originalTransactionId}`
         : `purchase_${productId}_${Date.now()}`;
 
-      await getCreditsRepository().initializeCredits(userId, purchaseId, productId, source, revenueCatData);
+      await getCreditsRepository().initializeCredits(
+        userId, 
+        purchaseId, 
+        productId, 
+        source ?? PURCHASE_SOURCE.SETTINGS, // Default to settings if source unknown
+        revenueCatData,
+        PURCHASE_TYPE.INITIAL // Default to INITIAL
+      );
       
       // Notify listeners via Event Bus
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.CREDITS_UPDATED, userId);
@@ -37,7 +44,14 @@ export class SubscriptionSyncService {
         ? `renewal_${revenueCatData.originalTransactionId}_${newExpirationDate}`
         : `renewal_${productId}_${Date.now()}`;
 
-      await getCreditsRepository().initializeCredits(userId, purchaseId, productId, "renewal", revenueCatData);
+      await getCreditsRepository().initializeCredits(
+        userId, 
+        purchaseId, 
+        productId, 
+        PURCHASE_SOURCE.RENEWAL, 
+        revenueCatData,
+        PURCHASE_TYPE.RENEWAL
+      );
       
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.CREDITS_UPDATED, userId);
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.RENEWAL_DETECTED, { userId, productId });
@@ -61,14 +75,27 @@ export class SubscriptionSyncService {
         return;
       }
 
+      // If productId is missing, we can't initialize credits fully, 
+      // but if isPremium is true, we should have it.
+      // Fallback to 'unknown' if missing, but this might throw in CreditLimitCalculator.
+      const validProductId = productId ?? 'unknown_product';
+
       const revenueCatData: RevenueCatData = { 
         expirationDate: expiresAt ?? null, 
         willRenew: willRenew ?? false, 
         isPremium, 
-        periodType 
+        periodType: periodType ?? null, // Fix undefined vs null
+        originalTransactionId: null // Initialize with null as we might not have it here
       };
       
-      await getCreditsRepository().initializeCredits(userId, `status_sync_${Date.now()}`, productId, "settings", revenueCatData);
+      await getCreditsRepository().initializeCredits(
+        userId, 
+        `status_sync_${Date.now()}`, 
+        validProductId, 
+        PURCHASE_SOURCE.SETTINGS, 
+        revenueCatData,
+        PURCHASE_TYPE.INITIAL // Status sync treated as Initial or Update
+      );
       
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.CREDITS_UPDATED, userId);
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.PREMIUM_STATUS_CHANGED, { userId, isPremium });

package/src/domains/subscription/application/SubscriptionSyncUtils.ts

@@ -12,7 +12,7 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
     willRenew: entitlement?.willRenew ?? false,
     // Use latestPurchaseDate if originalPurchaseDate is missing, or a combine id
     originalTransactionId: entitlement?.originalPurchaseDate || customerInfo.firstSeen, 
-    periodType: entitlement?.periodType as PeriodType | undefined,
+    periodType: (entitlement?.periodType as PeriodType) ?? null,
     isPremium: !!customerInfo.entitlements.active[entitlementId],
   };
 };

package/src/domains/subscription/core/RevenueCatData.ts

@@ -5,10 +5,10 @@ import type { PeriodType } from "./SubscriptionStatus";
  * Used across the subscription package for storing RevenueCat data in Firestore
  */
 export interface RevenueCatData {
-  expirationDate?: string | null;
-  willRenew?: boolean;
-  originalTransactionId?: string;
-  isPremium?: boolean;
+  expirationDate: string | null;
+  willRenew: boolean | null;
+  originalTransactionId: string | null;
+  isPremium: boolean;
   /** RevenueCat period type: NORMAL, INTRO, or TRIAL */
-  periodType?: PeriodType;
+  periodType: PeriodType | null;
 }

package/src/domains/subscription/infrastructure/managers/SubscriptionManager.ts

@@ -53,10 +53,11 @@ class SubscriptionManagerImpl {
     }
   }
 
-  async initialize(userId: string): Promise<boolean> {
+  async initialize(userId?: string): Promise<boolean> {
     this.ensureConfigured();
 
-    const { shouldInit, existingPromise } = this.state.initCache.tryAcquireInitialization(userId);
+    const actualUserId = userId ?? (await this.managerConfig!.getAnonymousUserId());
+    const { shouldInit, existingPromise } = this.state.initCache.tryAcquireInitialization(actualUserId);
 
     if (!shouldInit && existingPromise) {
       return existingPromise;
@@ -71,11 +72,11 @@ class SubscriptionManagerImpl {
         }
 
         this.ensurePackageHandlerInitialized();
-        const result = await this.serviceInstance.initialize(userId);
+        const result = await this.serviceInstance.initialize(actualUserId);
         return result.success;
     })();
 
-    this.state.initCache.setPromise(promise, userId);
+    this.state.initCache.setPromise(promise, actualUserId);
     return promise;
   }
 

package/src/domains/subscription/presentation/useSubscriptionSettingsConfig.utils.ts

@@ -44,7 +44,7 @@ export function getSubscriptionStatusType(
   isPremium: boolean,
   willRenew?: boolean,
   expiresAt?: string | null,
-  periodType?: PeriodType
+  periodType?: PeriodType | null
 ): SubscriptionStatusType {
   const isExpired = expiresAt ? new Date(expiresAt) < new Date() : false;
 
@@ -52,6 +52,6 @@ export function getSubscriptionStatusType(
     isPremium,
     willRenew,
     isExpired,
-    periodType,
+    periodType: periodType ?? undefined,
   });
 }

package/src/types/i18next.d.ts

@@ -0,0 +1,2 @@
+declare module 'i18next';
+declare module 'react-i18next';