react-native-iap 9.0.0-beta5 → 9.0.0-beta6

package/android/src/play/java/com/dooboolab/RNIap/RNIapModule.kt

@@ -321,7 +321,10 @@ class RNIapModule(
                     for (i in purchases.indices) {
                         val purchase = purchases[i]
                         val item = WritableNativeMap()
-                        item.putString("productId", purchase.products[0]) // TODO: should be a list
+                        item.putString("productId", purchase.products[0])// kept for convenience/backward-compatibility. productIds has the complete list
+                        val products = Arguments.createArray()
+                        purchase.products.forEach { products.pushString(it) }
+                        item.putArray("productIds", products)
                         item.putString("transactionId", purchase.orderId)
                         item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                         item.putString("transactionReceipt", purchase.originalJson)
@@ -370,6 +373,9 @@ class RNIapModule(
                 purchaseHistoryRecordList?.forEach { purchase ->
                     val item = Arguments.createMap()
                     item.putString("productId", purchase.products[0])
+                    val products = Arguments.createArray()
+                    purchase.products.forEach { products.pushString(it) }
+                    item.putArray("productIds", products)
                     item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                     item.putString("transactionReceipt", purchase.originalJson)
                     item.putString("purchaseToken", purchase.purchaseToken)
@@ -442,14 +448,14 @@ class RNIapModule(
             if (obfuscatedProfileId != null) {
                 builder.setObfuscatedProfileId(obfuscatedProfileId)
             }
-            if (prorationMode != null && prorationMode != -1) {
+            if (prorationMode != -1) {
                 if (prorationMode
                     == BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE
                 ) {
                     subscriptionUpdateParamsBuilder.setReplaceProrationMode(
                         BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE
                     )
-                    if (type != BillingClient.SkuType.SUBS) {
+                    if (type != BillingClient.ProductType.SUBS) {
                         val debugMessage =
                             (
                                 "IMMEDIATE_AND_CHARGE_PRORATED_PRICE for proration mode only works in" +
@@ -561,6 +567,7 @@ class RNIapModule(
                     .getBillingResponseData(billingResult.responseCode)
                 map.putString("code", errorData[0])
                 map.putString("message", errorData[1])
+                map.putString("purchaseToken",purchaseToken)
                 promise.safeResolve(map)
             }
         }
@@ -586,6 +593,9 @@ class RNIapModule(
                 val item = Arguments.createMap()
                 val purchase = purchases[i]
                 item.putString("productId", purchase.products[0])
+                val products = Arguments.createArray()
+                purchase.products.forEach { products.pushString(it) }
+                item.putArray("productIds", products)
                 item.putString("transactionId", purchase.orderId)
                 item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                 item.putString("transactionReceipt", purchase.originalJson)

package/ios/RNIapIos.m

@@ -18,7 +18,6 @@ RCT_EXTERN_METHOD(getAvailableItems:
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(buyProduct:
                   (NSString*)sku
-                  appAccountToken:(NSString*)appAccountToken
                   andDangerouslyFinishTransactionAutomatically:(BOOL)andDangerouslyFinishTransactionAutomatically
                   applicationUsername:(NSString)applicationUsername
                   resolve:(RCTPromiseResolveBlock)resolve

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "9.0.0-beta5",
-  "packageManager": "yarn@3.2.0",
+  "version": "9.0.0-beta6",
   "description": "React Native In App Purchase Module.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/types/index.d.ts

@@ -37,6 +37,7 @@ export declare enum InstallSourceAndroid {
 export interface ProductCommon {
     type: 'subs' | 'sub' | 'inapp' | 'iap';
     productId: string;
+    productIds?: string[];
     title: string;
     description: string;
     price: string;
@@ -46,6 +47,7 @@ export interface ProductCommon {
 }
 export interface ProductPurchase {
     productId: string;
+    productIds?: string[];
     transactionId?: string;
     transactionDate: number;
     transactionReceipt: string;
@@ -142,12 +144,8 @@ export interface RequestPurchase {
     obfuscatedAccountIdAndroid: string | undefined;
     obfuscatedProfileIdAndroid: string | undefined;
 }
-export interface RequestSubscription {
-    sku: string;
-    andDangerouslyFinishTransactionAutomaticallyIOS: boolean;
+export interface RequestSubscription extends RequestPurchase {
     purchaseTokenAndroid: string | undefined;
     prorationModeAndroid: ProrationModesAndroid;
-    obfuscatedAccountIdAndroid: string | undefined;
-    obfuscatedProfileIdAndroid: string | undefined;
-    selectedOfferIndex?: number | undefined;
+    selectedOfferIndex: number | undefined;
 }