react-native-iap 9.0.0-beta2 → 9.0.0-beta5

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)
@@ -386,10 +388,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 +421,7 @@ class RNIapModule(
                 return@ensureConnection
             }
             var productParams = BillingFlowParams.ProductDetailsParams.newBuilder().setProductDetails(selectedSku)
-            if (selectedOfferIndex != null && (
+            if (selectedOfferIndex > -1 && (
                 selectedSku.subscriptionOfferDetails?.size
                     ?: 0
                 ) > selectedOfferIndex

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/package.json

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

package/src/iap.js

@@ -148,13 +148,15 @@ var fillProductsAdditionalData = function (products) { return __awaiter(void 0,
 export var getProducts = function (skus) {
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
+            var products;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, getIosModule()
-                            .getItems(skus)
-                            .filter(function (item) { return skus.includes(item.productId); })
-                            .filter(function (item) { return item.type === 'iap'; })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4 /*yield*/, getIosModule().getItems(skus)];
+                    case 1:
+                        products = _a.sent();
+                        return [2 /*return*/, products.filter(function (item) {
+                                return skus.includes(item.productId) && item.type === 'iap';
+                            })];
                 }
             });
         }); },
@@ -179,13 +181,15 @@ export var getProducts = function (skus) {
 export var getSubscriptions = function (skus) {
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
+            var subscriptions;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, getIosModule()
-                            .getItems(skus)
-                            .filter(function (item) { return skus.includes(item.productId); })
-                            .filter(function (item) { return item.type === 'subs'; })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4 /*yield*/, getIosModule().getItems(skus)];
+                    case 1:
+                        subscriptions = _a.sent();
+                        return [2 /*return*/, subscriptions.filter(function (item) {
+                                return skus.includes(item.productId) && item.type === 'subs';
+                            })];
                 }
             });
         }); },
@@ -306,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

@@ -62,28 +62,6 @@ export interface ProductPurchase {
     developerPayloadAndroid?: string;
     obfuscatedAccountIdAndroid?: string;
     obfuscatedProfileIdAndroid?: string;
-    title?: string;
-    description?: string;
-    productType?: string;
-    name?: string;
-    oneTimePurchaseOfferDetails?: {
-        priceCurrencyCode?: string;
-        formattedPrice?: string;
-        priceAmountMicros?: string;
-    }[];
-    subscriptionOfferDetails?: {
-        offerToken?: string[];
-        pricingPhases: {
-            pricingPhaseList: {
-                formattedPrice?: string;
-                priceCurrencyCode?: string;
-                billingPeriod?: string;
-                billingCycleCount?: number;
-                priceAmountMicros?: string;
-                recurrenceMode?: number;
-            };
-        };
-    }[];
     userIdAmazon?: string;
     userMarketplaceAmazon?: string;
     userJsonAmazon?: string;
@@ -136,6 +114,26 @@ export interface Subscription extends ProductCommon {
     introductoryPricePeriodAndroid?: string;
     subscriptionPeriodAndroid?: string;
     freeTrialPeriodAndroid?: string;
+    productType?: string;
+    name?: string;
+    oneTimePurchaseOfferDetails?: {
+        priceCurrencyCode?: string;
+        formattedPrice?: string;
+        priceAmountMicros?: string;
+    }[];
+    subscriptionOfferDetails?: {
+        offerToken?: string[];
+        pricingPhases: {
+            pricingPhaseList: {
+                formattedPrice?: string;
+                priceCurrencyCode?: string;
+                billingPeriod?: string;
+                billingCycleCount?: number;
+                priceAmountMicros?: string;
+                recurrenceMode?: number;
+            };
+        };
+    }[];
 }
 export interface RequestPurchase {
     sku: string;