react-native-iap 9.0.0-beta3 → 9.0.0-beta6

package/README.md

@@ -1,7 +1,8 @@
 # ![image](https://user-images.githubusercontent.com/27461460/75094417-20321b00-55ce-11ea-8de7-a1df42a4b7df.png)
 
 [![Version](http://img.shields.io/npm/v/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap)
-<!-- [![Next](https://img.shields.io/npm/v/react-native-iap/next.svg?style=flat-square)](https://npmjs.org/package/react-native-iap) -->
+[![Next Version](https://img.shields.io/npm/v/react-native-iap/next)](https://npmjs.org/package/react-native-iap)
+
 [![Download](http://img.shields.io/npm/dm/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap)
 [![CI](https://github.com/dooboolab/react-native-iap/actions/workflows/ci.yml/badge.svg)](https://github.com/dooboolab/react-native-iap/actions/workflows/ci.yml)
 [![document](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-document.yml/badge.svg)](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-document.yml)
@@ -20,7 +21,11 @@ Published in [website](https://react-native-iap.dooboolab.com).
 
 ## Announcement
 
-- Current module is ported to [expo-iap](https://www.npmjs.com/package/expo-iap) which share the same codebase but different environment. This is currently experimental but you can use it in expo managed workflow. The source code is maintained in branch [expo](https://github.com/dooboolab/react-native-iap/tree/expo).
+- Version `9.0.0` is currently in release candidate. The module migrates android sdk to [play billing library v5](https://qonversion.io/blog/google-play-billing-library-5-0) and iOS sdk to [storekit2](https://developer.apple.com/videos/play/wwdc2021/10114). Our core maintainer [andresesfm](https://github.com/andresesfm) is working hard on this. Please [fund the project](https://opencollective.com/react-native-iap) if you wish to support his effort. The fund goes to maintainers. To try the earlier version please use the `next` package.
+
+  ```
+  yarn add react-native-iap@next
+  ```
 
 - Version `8.0.0` has finally landed in Jan 28th. Since this is early release, please use it with caution 🚧. We recommend user to use `>=8.0.0` with react-native `>=0.65.1`. The `next` package is no longer updated until we organize the roadmap for `9.0.0`.
 

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

@@ -200,11 +200,13 @@ class RNIapModule(
             val skuList = ArrayList<QueryProductDetailsParams.Product>()
             for (i in 0 until skuArr.size()) {
                 if (skuArr.getType(i) == ReadableType.String) {
-                    val sku: String = skuArr.getString(i)
-                    skuList.add(
-                        QueryProductDetailsParams.Product.newBuilder().setProductId(sku)
-                            .setProductType(type).build()
-                    )
+                    val sku = skuArr.getString(i)
+                    sku?.let {
+                        skuList.add(
+                            QueryProductDetailsParams.Product.newBuilder().setProductId(sku)
+                                .setProductType(type).build()
+                        )
+                    }
                 }
             }
             val params = QueryProductDetailsParams.newBuilder().setProductList(skuList)
@@ -319,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)
@@ -368,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)
@@ -386,10 +394,10 @@ class RNIapModule(
         type: String,
         sku: String, // TODO: should this now be an array?
         purchaseToken: String?,
-        prorationMode: Int?,
+        prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
-        selectedOfferIndex: Int?, // New optional parameter in V5, TODO: should it be an array?
+        selectedOfferIndex: Int, // New optional parameter in V5, TODO: should it be an array?
         promise: Promise
     ) {
         val activity = currentActivity
@@ -419,7 +427,7 @@ class RNIapModule(
                 return@ensureConnection
             }
             var productParams = BillingFlowParams.ProductDetailsParams.newBuilder().setProductDetails(selectedSku)
-            if (selectedOfferIndex != null && (
+            if (selectedOfferIndex > -1 && (
                 selectedSku.subscriptionOfferDetails?.size
                     ?: 0
                 ) > selectedOfferIndex
@@ -440,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" +
@@ -559,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)
             }
         }
@@ -584,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/android/src/play/java/com/dooboolab/RNIap/RNIapModuleInterface.kt

@@ -20,10 +20,10 @@ interface RNIapModuleInterface {
         type: String,
         sku: String,
         purchaseToken: String?,
-        prorationMode: Int?,
+        prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
-        selectedOfferIndex: Int?, // New optional parameter in V5 (added to maintain interface consistency)
+        selectedOfferIndex: Int, // New optional parameter in V5 (added to maintain interface consistency)
         promise: Promise
     )
     fun acknowledgePurchase(

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

@@ -196,8 +196,10 @@ class RNIapModuleV4(
             val skuList = ArrayList<String>()
             for (i in 0 until skuArr.size()) {
                 if (skuArr.getType(i) == ReadableType.String) {
-                    val sku: String = skuArr.getString(i)
-                    skuList.add(sku)
+                    val sku = skuArr.getString(i)
+                    sku?.let {
+                        skuList.add(sku)
+                    }
                 }
             }
             val params = SkuDetailsParams.newBuilder()
@@ -361,10 +363,10 @@ class RNIapModuleV4(
         type: String,
         sku: String,
         purchaseToken: String?,
-        prorationMode: Int?,
+        prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
-        selectedOfferIndex: Int?, // New optional parameter in V5 (added to maintain interface consistency)
+        selectedOfferIndex: Int, // New optional parameter in V5 (added to maintain interface consistency)
         promise: Promise
     ) {
         val activity = currentActivity

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-beta3",
-  "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/iap.js

@@ -310,7 +310,7 @@ export var requestPurchase = function (_a) {
  * @returns {Promise<SubscriptionPurchase | null>} Promise resolves to null when using proratioModesAndroid=DEFERRED, and to a SubscriptionPurchase otherwise
  */
 export var requestSubscription = function (_a) {
-    var sku = _a.sku, _b = _a.andDangerouslyFinishTransactionAutomaticallyIOS, andDangerouslyFinishTransactionAutomaticallyIOS = _b === void 0 ? false : _b, _c = _a.purchaseTokenAndroid, purchaseTokenAndroid = _c === void 0 ? undefined : _c, _d = _a.prorationModeAndroid, prorationModeAndroid = _d === void 0 ? -1 : _d, _e = _a.obfuscatedAccountIdAndroid, obfuscatedAccountIdAndroid = _e === void 0 ? undefined : _e, _f = _a.obfuscatedProfileIdAndroid, obfuscatedProfileIdAndroid = _f === void 0 ? undefined : _f, _g = _a.selectedOfferIndex, selectedOfferIndex = _g === void 0 ? undefined : _g;
+    var sku = _a.sku, _b = _a.andDangerouslyFinishTransactionAutomaticallyIOS, andDangerouslyFinishTransactionAutomaticallyIOS = _b === void 0 ? false : _b, _c = _a.purchaseTokenAndroid, purchaseTokenAndroid = _c === void 0 ? undefined : _c, _d = _a.prorationModeAndroid, prorationModeAndroid = _d === void 0 ? -1 : _d, _e = _a.obfuscatedAccountIdAndroid, obfuscatedAccountIdAndroid = _e === void 0 ? undefined : _e, _f = _a.obfuscatedProfileIdAndroid, obfuscatedProfileIdAndroid = _f === void 0 ? undefined : _f, _g = _a.selectedOfferIndex, selectedOfferIndex = _g === void 0 ? -1 : _g;
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {

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;
 }