@umituz/react-native-subscription 2.14.60 → 2.14.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.60",
+  "version": "2.14.62",
   "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

@@ -20,6 +20,8 @@ export interface CreditsConfig {
   imageCreditLimit: number;
   /** When true, stores credits at users/{userId}/credits instead of {collectionName}/{userId} */
   useUserSubcollection?: boolean;
+  /** Credit amounts per product ID for consumable credit packages */
+  creditPackageAmounts?: Record<string, number>;
 }
 
 export interface CreditsResult<T = UserCredits> {

package/src/infrastructure/repositories/CreditsRepository.ts

@@ -25,6 +25,8 @@ import { initializeCreditsTransaction } from "../services/CreditsInitializer";
 import { detectPackageType } from "../../utils/packageTypeDetector";
 import { getCreditAllocation } from "../../utils/creditMapper";
 
+declare const __DEV__: boolean;
+
 export class CreditsRepository extends BaseRepository {
   private config: CreditsConfig;
 
@@ -35,7 +37,8 @@ export class CreditsRepository extends BaseRepository {
 
   private getCreditsDocRef(db: Firestore, userId: string) {
     if (this.config.useUserSubcollection) {
-      return doc(db, "users", userId, "credits", "data");
+      // Path: users/{userId} - credits stored directly on user document
+      return doc(db, "users", userId);
     }
     return doc(db, this.config.collectionName, userId);
   }
@@ -98,15 +101,31 @@ export class CreditsRepository extends BaseRepository {
       let configToUse = this.config;
 
       if (productId) {
-        const packageType = detectPackageType(productId);
-        const allocation = getCreditAllocation(packageType);
-
-        if (allocation) {
+        // First check credit package amounts (for consumable credit packages)
+        const creditPackageAmount = this.config.creditPackageAmounts?.[productId];
+
+        if (creditPackageAmount) {
+          // Credit package: use the configured amount
+          if (__DEV__) {
+            console.log("[CreditsRepository] Credit package detected:", { productId, amount: creditPackageAmount });
+          }
           configToUse = {
             ...this.config,
-            imageCreditLimit: allocation.imageCredits,
-            textCreditLimit: allocation.textCredits,
+            imageCreditLimit: creditPackageAmount,
+            textCreditLimit: creditPackageAmount,
           };
+        } else {
+          // Subscription package: use package type detection
+          const packageType = detectPackageType(productId);
+          const allocation = getCreditAllocation(packageType);
+
+          if (allocation) {
+            configToUse = {
+              ...this.config,
+              imageCreditLimit: allocation.imageCredits,
+              textCreditLimit: allocation.textCredits,
+            };
+          }
         }
       }
 

package/src/infrastructure/services/CreditsInitializer.ts

@@ -53,14 +53,17 @@ export async function initializeCreditsTransaction(
             processedPurchases = [...processedPurchases, purchaseId].slice(-10);
         }
 
-        transaction.set(creditsRef, {
+        const creditsData = {
             textCredits: newTextCredits,
             imageCredits: newImageCredits,
             purchasedAt,
             lastUpdatedAt: now,
             lastPurchaseAt: now,
             processedPurchases,
-        });
+        };
+
+        // Use merge:true to avoid overwriting other user fields
+        transaction.set(creditsRef, creditsData, { merge: true });
 
         return { textCredits: newTextCredits, imageCredits: newImageCredits };
     });

package/src/infrastructure/services/SubscriptionInitializer.ts

@@ -99,7 +99,12 @@ export const initializeSubscription = async (
     throw new Error("RevenueCat API key is required");
   }
 
-  configureCreditsRepository(credits);
+  // Merge credit package amounts into credits config
+  const creditsConfigWithPackages = {
+    ...credits,
+    creditPackageAmounts: creditPackages?.amounts,
+  };
+  configureCreditsRepository(creditsConfigWithPackages);
 
   // Build consumable product identifiers from credit package pattern
   const consumableIdentifiers: string[] = [];