react-native-iap 9.0.0-rc.1 → 9.0.0-rc.4

package/android/src/amazon/java/com/dooboolab/RNIap/RNIapAmazonModule.kt

@@ -69,12 +69,7 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun buyItemByType(
-        type: String?,
         sku: String?,
-        purchaseToken: String?,
-        prorationMode: Int?,
-        obfuscatedAccountId: String?,
-        obfuscatedProfileId: String?,
         promise: Promise
     ) {
         DoobooUtils.instance.addPromiseForKey(PROMISE_BUY_ITEM, promise)

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

@@ -87,7 +87,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-     fun initConnection(promise: Promise) {
+    fun initConnection(promise: Promise) {
         if (googleApiAvailability.isGooglePlayServicesAvailable(reactContext)
             != ConnectionResult.SUCCESS
         ) {
@@ -108,13 +108,13 @@ class RNIapModule(
             billingClientCache = it
             it.startConnection(
                 object : BillingClientStateListener {
-                     override fun onBillingSetupFinished(billingResult: BillingResult) {
+                    override fun onBillingSetupFinished(billingResult: BillingResult) {
                         if (!isValidResult(billingResult, promise)) return
 
                         promise.safeResolve(true)
                     }
 
-                     override fun onBillingServiceDisconnected() {
+                    override fun onBillingServiceDisconnected() {
                         Log.i(TAG, "Billing service disconnected")
                     }
                 }
@@ -123,7 +123,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-     fun endConnection(promise: Promise) {
+    fun endConnection(promise: Promise) {
         billingClientCache?.endConnection()
         billingClientCache = null
         promise.safeResolve(true)
@@ -160,7 +160,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-     fun flushFailedPurchasesCachedAsPending(promise: Promise) {
+    fun flushFailedPurchasesCachedAsPending(promise: Promise) {
         ensureConnection(
             promise
         ) { billingClient ->
@@ -193,15 +193,14 @@ class RNIapModule(
     }
 
     @ReactMethod
-     fun getItemsByType(type: String, skuArr: ReadableArray, promise: Promise) {
+    fun getItemsByType(type: String, skuArr: ReadableArray, promise: Promise) {
         ensureConnection(
             promise
         ) { billingClient ->
             val skuList = ArrayList<QueryProductDetailsParams.Product>()
             for (i in 0 until skuArr.size()) {
                 if (skuArr.getType(i) == ReadableType.String) {
-                    val sku = skuArr.getString(i)
-                    sku?.let {
+                    skuArr.getString(i)?.let { sku -> // null check for older versions of RN
                         skuList.add(
                             QueryProductDetailsParams.Product.newBuilder().setProductId(sku)
                                 .setProductType(type).build()
@@ -236,52 +235,53 @@ class RNIapModule(
                             "priceAmountMicros",
                             it.priceAmountMicros.toString()
                         )
+                        item.putMap("oneTimePurchaseOfferDetails", oneTimePurchaseOfferDetails)
                     }
-                    item.putMap("oneTimePurchaseOfferDetails", oneTimePurchaseOfferDetails)
-
-                    val subscriptionOfferDetails = Arguments.createArray()
-                    skuDetails.subscriptionOfferDetails?.forEach { subscriptionOfferDetailsItem ->
-                        val offerDetails = Arguments.createMap()
-                        offerDetails.putString(
-                            "offerToken",
-                            subscriptionOfferDetailsItem.offerToken
-                        )
-                        val offerTags = Arguments.createArray()
-                        subscriptionOfferDetailsItem.offerTags.forEach { offerTag ->
-                            offerTags.pushString(offerTag)
-                        }
-                        offerDetails.putArray("offerTags", offerTags)
-
-                        val pricingPhasesList = Arguments.createArray()
-                        subscriptionOfferDetailsItem.pricingPhases.pricingPhaseList.forEach { pricingPhaseItem ->
-                            val pricingPhase = Arguments.createMap()
-                            pricingPhase.putString(
-                                "formattedPrice",
-                                pricingPhaseItem.formattedPrice
-                            )
-                            pricingPhase.putString(
-                                "priceCurrencyCode",
-                                pricingPhaseItem.priceCurrencyCode
-                            )
-                            pricingPhase.putString("billingPeriod", pricingPhaseItem.billingPeriod)
-                            pricingPhase.putInt(
-                                "billingCycleCount",
-                                pricingPhaseItem.billingCycleCount
+                    skuDetails.subscriptionOfferDetails?.let {
+                        val subscriptionOfferDetails = Arguments.createArray()
+                        it.forEach { subscriptionOfferDetailsItem ->
+                            val offerDetails = Arguments.createMap()
+                            offerDetails.putString(
+                                "offerToken",
+                                subscriptionOfferDetailsItem.offerToken
                             )
-                            pricingPhase.putString(
-                                "priceAmountMicros",
-                                pricingPhaseItem.priceAmountMicros.toString()
-                            )
-                            pricingPhase.putInt("recurrenceMode", pricingPhaseItem.recurrenceMode)
-
-                            pricingPhasesList.pushMap(pricingPhase)
+                            val offerTags = Arguments.createArray()
+                            subscriptionOfferDetailsItem.offerTags.forEach { offerTag ->
+                                offerTags.pushString(offerTag)
+                            }
+                            offerDetails.putArray("offerTags", offerTags)
+
+                            val pricingPhasesList = Arguments.createArray()
+                            subscriptionOfferDetailsItem.pricingPhases.pricingPhaseList.forEach { pricingPhaseItem ->
+                                val pricingPhase = Arguments.createMap()
+                                pricingPhase.putString(
+                                    "formattedPrice",
+                                    pricingPhaseItem.formattedPrice
+                                )
+                                pricingPhase.putString(
+                                    "priceCurrencyCode",
+                                    pricingPhaseItem.priceCurrencyCode
+                                )
+                                pricingPhase.putString("billingPeriod", pricingPhaseItem.billingPeriod)
+                                pricingPhase.putInt(
+                                    "billingCycleCount",
+                                    pricingPhaseItem.billingCycleCount
+                                )
+                                pricingPhase.putString(
+                                    "priceAmountMicros",
+                                    pricingPhaseItem.priceAmountMicros.toString()
+                                )
+                                pricingPhase.putInt("recurrenceMode", pricingPhaseItem.recurrenceMode)
+
+                                pricingPhasesList.pushMap(pricingPhase)
+                            }
+                            val pricingPhases = Arguments.createMap()
+                            pricingPhases.putArray("pricingPhaseList", pricingPhasesList)
+                            offerDetails.putMap("pricingPhases", pricingPhases)
+                            subscriptionOfferDetails.pushMap(offerDetails)
                         }
-                        val pricingPhases = Arguments.createMap()
-                        pricingPhases.putArray("pricingPhaseList", pricingPhasesList)
-                        offerDetails.putMap("pricingPhases", pricingPhases)
-                        subscriptionOfferDetails.pushMap(offerDetails)
+                        item.putArray("subscriptionOfferDetails", subscriptionOfferDetails)
                     }
-                    item.putArray("subscriptionOfferDetails", subscriptionOfferDetails)
                     items.pushMap(item)
                 }
                 promise.safeResolve(items)
@@ -319,7 +319,7 @@ class RNIapModule(
                 if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
                 purchases?.forEach { purchase ->
                     val item = WritableNativeMap()
-                    item.putString("productId", purchase.products[0])// kept for convenience/backward-compatibility. productIds has the complete 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)
@@ -345,7 +345,7 @@ class RNIapModule(
                         item.putBoolean("autoRenewingAndroid", purchase.isAutoRenewing)
                     }
                     items.pushMap(item)
-                    }
+                }
                 promise.safeResolve(items)
             }
         }
@@ -394,7 +394,8 @@ class RNIapModule(
         prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
-        selectedOfferIndices: ReadableArray, // New optional parameter in V5
+        offerTokenArr: ReadableArray, // New parameter in V5
+        isOfferPersonalized: Boolean, // New parameter in V5
         promise: Promise
     ) {
         val activity = currentActivity
@@ -409,36 +410,43 @@ class RNIapModule(
                 PROMISE_BUY_ITEM,
                 promise
             )
+            if (type == BillingClient.ProductType.SUBS && skuArr.size() != offerTokenArr.size()) {
+                val debugMessage =
+                    "The number of skus (${skuArr.size()}) must match: the number of offerTokens (${offerTokenArr.size()}) for Subscriptions"
+                val error = Arguments.createMap()
+                error.putString("debugMessage", debugMessage)
+                error.putString("code", PROMISE_BUY_ITEM)
+                error.putString("message", debugMessage)
+                sendEvent(reactContext, "purchase-error", error)
+                promise.safeReject(PROMISE_BUY_ITEM, debugMessage)
+                return@ensureConnection
+            }
             val productParamsList =
-            skuArr.toArrayList().map { it.toString() }.mapIndexed{ index,sku ->
-                val selectedSku: ProductDetails? = skus[sku]
-                if (selectedSku == null) {
-                    val debugMessage =
-                        "The sku was not found. Please fetch products first by calling getItems"
-                    val error = Arguments.createMap()
-                    error.putString("debugMessage", debugMessage)
-                    error.putString("code", PROMISE_BUY_ITEM)
-                    error.putString("message", debugMessage)
-                    error.putString("productId", sku)
-                    sendEvent(reactContext, "purchase-error", error)
-                    promise.safeReject(PROMISE_BUY_ITEM, debugMessage)
-                    return@ensureConnection
-                }
-                var productParams = BillingFlowParams.ProductDetailsParams.newBuilder().setProductDetails(selectedSku)
-                val selectedOfferIndex = selectedOfferIndices.getInt(index)
-                if (selectedOfferIndex > -1 && (
-                    selectedSku.subscriptionOfferDetails?.size
-                        ?: 0
-                    ) > selectedOfferIndex
-                ) {
-                    val offerToken =
-                        selectedSku.subscriptionOfferDetails?.get(selectedOfferIndex)?.offerToken
-                    offerToken?.let { productParams = productParams.setOfferToken(offerToken) }
+                skuArr.toArrayList().map { it.toString() }.mapIndexed { index, sku ->
+                    val selectedSku: ProductDetails? = skus[sku]
+                    if (selectedSku == null) {
+                        val debugMessage =
+                            "The sku was not found. Please fetch products first by calling getItems"
+                        val error = Arguments.createMap()
+                        error.putString("debugMessage", debugMessage)
+                        error.putString("code", PROMISE_BUY_ITEM)
+                        error.putString("message", debugMessage)
+                        error.putString("productId", sku)
+                        sendEvent(reactContext, "purchase-error", error)
+                        promise.safeReject(PROMISE_BUY_ITEM, debugMessage)
+                        return@ensureConnection
+                    }
+                    var productDetailParams = BillingFlowParams.ProductDetailsParams.newBuilder().setProductDetails(selectedSku)
+                    if (type == BillingClient.ProductType.SUBS) {
+                        offerTokenArr.getString(index)?.let { offerToken -> // null check for older versions of RN
+                            productDetailParams = productDetailParams.setOfferToken(offerToken)
+                        }
+                    }
+                    productDetailParams.build()
                 }
-                productParams.build()
-            }
             val builder = BillingFlowParams.newBuilder()
-            builder.setProductDetailsParamsList(productParamsList)
+            builder.setProductDetailsParamsList(productParamsList).setIsOfferPersonalized(isOfferPersonalized)
+
             val subscriptionUpdateParamsBuilder = SubscriptionUpdateParams.newBuilder()
             if (purchaseToken != null) {
                 subscriptionUpdateParamsBuilder.setOldPurchaseToken(purchaseToken)
@@ -568,7 +576,7 @@ class RNIapModule(
                     .getBillingResponseData(billingResult.responseCode)
                 map.putString("code", errorData[0])
                 map.putString("message", errorData[1])
-                map.putString("purchaseToken",purchaseToken)
+                map.putString("purchaseToken", purchaseToken)
                 promise.safeResolve(map)
             }
         }
@@ -618,7 +626,7 @@ class RNIapModule(
                         accountIdentifiers.obfuscatedProfileId
                     )
                 }
-                promiseItems.pushMap(item)
+                promiseItems.pushMap(item.copy())
                 sendEvent(reactContext, "purchase-updated", item)
             }
             DoobooUtils.instance.resolvePromisesForKey(PROMISE_BUY_ITEM, promiseItems)

package/ios/RNIapIos.swift

@@ -43,7 +43,8 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
   private var promotedPayment: SKPayment?
   private var promotedProduct: SKProduct?
   private var productsRequest: SKProductsRequest?
-  private var countPendingTransaction: Int?
+  private var countPendingTransaction: Int = 0
+  private var hasTransactionObserver = false
 
   override init() {
     promisesByKey = [String: [RNIapIosPromise]]()
@@ -51,17 +52,31 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     myQueue = DispatchQueue(label: "reject")
     validProducts = [SKProduct]()
     super.init()
-    SKPaymentQueue.default().add(self)
+    addTransactionObserver()
   }
 
   deinit {
-    SKPaymentQueue.default().remove(self)
+    removeTransactionObserver()
   }
 
   override class func requiresMainQueueSetup() -> Bool {
     return true
   }
 
+  func addTransactionObserver() {
+    if !hasTransactionObserver {
+      hasTransactionObserver = true
+      SKPaymentQueue.default().add(self)
+    }
+  }
+
+  func removeTransactionObserver() {
+    if hasTransactionObserver {
+      hasTransactionObserver = false
+      SKPaymentQueue.default().remove(self)
+    }
+  }
+
   func flushUnheardEvents() {
     paymentQueue(SKPaymentQueue.default(), updatedTransactions: SKPaymentQueue.default().transactions)
   }
@@ -136,6 +151,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
     reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
   ) {
+    addTransactionObserver()
     let canMakePayments = SKPaymentQueue.canMakePayments()
     resolve(NSNumber(value: canMakePayments))
   }
@@ -143,7 +159,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
     reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
   ) {
-    SKPaymentQueue.default().remove(self)
+    removeTransactionObserver()
     resolve(nil)
   }
   @objc public func getItems(
@@ -300,18 +316,19 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
     reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
   ) {
-    debugMessage("clear remaining Transactions. Call this before make a new transaction")
-
     let pendingTrans = SKPaymentQueue.default().transactions
-    let countPendingTransaction = pendingTrans.count
+    countPendingTransaction = pendingTrans.count
+
+    debugMessage("clear remaining Transactions (\(countPendingTransaction)). Call this before make a new transaction")
 
     if countPendingTransaction > 0 {
       addPromise(forKey: "cleaningTransactions", resolve: resolve, reject: reject)
       for transaction in pendingTrans {
         SKPaymentQueue.default().finishTransaction(transaction)
       }
+    } else {
+      resolve(nil)
     }
-    resolve(nil)
   }
 
   @objc public func clearProducts(
@@ -936,18 +953,14 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
   }
 
   func paymentQueue(_ queue: SKPaymentQueue, removedTransactions transactions: [SKPaymentTransaction]) {
-    debugMessage("removedTransactions")
+    debugMessage("removedTransactions - countPendingTransactions \(countPendingTransaction)")
 
-    guard var unwrappedCount = countPendingTransaction else {
-      return
-    }
-
-    if unwrappedCount > 0 {
-      unwrappedCount -= transactions.count
+    if countPendingTransaction > 0 {
+      countPendingTransaction -= transactions.count
 
-      if unwrappedCount == 0 {
+      if countPendingTransaction <= 0 {
         resolvePromises(forKey: "cleaningTransactions", value: nil)
-        countPendingTransaction = nil
+        countPendingTransaction = 0
       }
     }
   }

package/lib/commonjs/iap.js

@@ -17,6 +17,7 @@ const {
   RNIapAmazonModule
 } = _reactNative.NativeModules;
 const isAndroid = _reactNative.Platform.OS === 'android';
+const isAmazon = isAndroid && !!RNIapAmazonModule;
 const isIos = _reactNative.Platform.OS === 'ios';
 const ANDROID_ITEM_TYPE_SUBSCRIPTION = 'subs';
 const ANDROID_ITEM_TYPE_IAP = 'inapp';
@@ -220,6 +221,8 @@ const getAvailablePurchases = () => (_reactNative.Platform.select({
  * @param {boolean} [andDangerouslyFinishTransactionAutomaticallyIOS] You should set this to false and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.
  * @param {string} [obfuscatedAccountIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
+ * @param {string[]} [skus] Product Ids to purchase. Note that this is only for Android. iOS only uses a single SKU. If not provided, it'll default to using [sku] for backward-compatibility
+ * @param {boolean} [isOfferPersonalized] Defaults to false, Only for Android V5
  * @returns {Promise<InAppPurchase>}
  */
 
@@ -232,7 +235,11 @@ const requestPurchase = _ref => {
     andDangerouslyFinishTransactionAutomaticallyIOS = false,
     obfuscatedAccountIdAndroid,
     obfuscatedProfileIdAndroid,
-    applicationUsername
+    applicationUsername,
+    skus,
+    // Android Billing V5
+    isOfferPersonalized = undefined // Android Billing V5
+
   } = _ref;
   return (_reactNative.Platform.select({
     ios: async () => {
@@ -243,7 +250,7 @@ const requestPurchase = _ref => {
       return getIosModule().buyProduct(sku, andDangerouslyFinishTransactionAutomaticallyIOS, applicationUsername);
     },
     android: async () => {
-      return getAndroidModule().buyItemByType(ANDROID_ITEM_TYPE_IAP, [sku], null, -1, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, undefined);
+      return getAndroidModule().buyItemByType(ANDROID_ITEM_TYPE_IAP, skus !== null && skus !== void 0 && skus.length ? skus : [sku], null, -1, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, undefined, isOfferPersonalized ?? false);
     }
   }) || Promise.resolve)();
 };
@@ -256,8 +263,7 @@ const requestPurchase = _ref => {
  * @param {ProrationModesAndroid} [prorationModeAndroid] UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY, IMMEDIATE_WITH_TIME_PRORATION, IMMEDIATE_AND_CHARGE_PRORATED_PRICE, IMMEDIATE_WITHOUT_PRORATION, DEFERRED
  * @param {string} [obfuscatedAccountIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
- * @param {string[]} [selectedOfferIndices] Array of Selected Offer indices from the list returned by get products
- * @param {string[]} [skus] Skus to purchase, if more than one, otherwise it'll default to sku
+ * @param {SubscriptionOffers[]} [subscriptionOffers] Array of SubscriptionOffers. Every sku must be paired with a corresponding offerToken
  * @returns {Promise<SubscriptionPurchase | null>} Promise resolves to null when using proratioModesAndroid=DEFERRED, and to a SubscriptionPurchase otherwise
  */
 
@@ -272,9 +278,9 @@ const requestSubscription = _ref2 => {
     prorationModeAndroid = -1,
     obfuscatedAccountIdAndroid,
     obfuscatedProfileIdAndroid,
-    selectedOfferIndices = undefined,
+    subscriptionOffers = undefined,
     // Android Billing V5
-    skus = undefined,
+    isOfferPersonalized = undefined,
     // Android Billing V5
     applicationUsername
   } = _ref2;
@@ -287,7 +293,16 @@ const requestSubscription = _ref2 => {
       return getIosModule().buyProduct(sku, andDangerouslyFinishTransactionAutomaticallyIOS, applicationUsername);
     },
     android: async () => {
-      return getAndroidModule().buyItemByType(ANDROID_ITEM_TYPE_SUBSCRIPTION, skus ? skus : [sku], purchaseTokenAndroid, prorationModeAndroid, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, selectedOfferIndices);
+      if (isAmazon) {
+        return RNIapAmazonModule.buyItemByType(sku);
+      } else {
+        if (!(subscriptionOffers !== null && subscriptionOffers !== void 0 && subscriptionOffers.length)) {
+          Promise.reject('subscriptionOffers are required for Google Play Subscriptions');
+          return;
+        }
+
+        return RNIapModule.buyItemByType(ANDROID_ITEM_TYPE_SUBSCRIPTION, subscriptionOffers === null || subscriptionOffers === void 0 ? void 0 : subscriptionOffers.map(so => so.sku), purchaseTokenAndroid, prorationModeAndroid, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, subscriptionOffers === null || subscriptionOffers === void 0 ? void 0 : subscriptionOffers.map(so => so.offerToken), isOfferPersonalized ?? false);
+      }
     }
   }) || Promise.resolve)();
 };