react-native-iap 9.0.0-beta9 → 9.0.0-rc.3

package/README.md

@@ -19,9 +19,22 @@
 
 Published in [website](https://react-native-iap.dooboolab.com).
 
+## Our maintainers
+
+Please [fund the project](https://opencollective.com/react-native-iap) if you are willing the maintainers to make the repository sustainable.
+
+- [andresesfm](https://github.com/andresesfm)
+- [jeremybarbet](https://github.com/jeremybarbet)
+
+> The fund goes to maintainers.
+
+### Supporter
+
+- [hyochan](https://github.com/hyochan)
+
 ## Announcement
 
-- 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.
+- 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 maintainers [andresesfm](https://github.com/andresesfm) and [jeremybarbet](https://github.com/jeremybarbet) are working hard on this.
 
   ```
   yarn add react-native-iap@next

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,7 +193,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-     fun getItemsByType(type: String, skuArr: ReadableArray, promise: Promise) {
+    fun getItemsByType(type: String, skuArr: ReadableArray, promise: Promise) {
         ensureConnection(
             promise
         ) { billingClient ->
@@ -317,37 +317,34 @@ class RNIapModule(
                 ).build()
             ) { billingResult: BillingResult, purchases: List<Purchase>? ->
                 if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
-                if (purchases != null) {
-                    for (i in purchases.indices) {
-                        val purchase = purchases[i]
-                        val item = WritableNativeMap()
-                        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)
-                        item.putString("orderId", purchase.orderId)
-                        item.putString("purchaseToken", purchase.purchaseToken)
-                        item.putString("developerPayloadAndroid", purchase.developerPayload)
-                        item.putString("signatureAndroid", purchase.signature)
-                        item.putInt("purchaseStateAndroid", purchase.purchaseState)
-                        item.putBoolean("isAcknowledgedAndroid", purchase.isAcknowledged)
-                        item.putString("packageNameAndroid", purchase.packageName)
-                        item.putString(
-                            "obfuscatedAccountIdAndroid",
-                            purchase.accountIdentifiers?.obfuscatedAccountId
-                        )
-                        item.putString(
-                            "obfuscatedProfileIdAndroid",
-                            purchase.accountIdentifiers?.obfuscatedProfileId
-                        )
-                        if (type == BillingClient.ProductType.SUBS) {
-                            item.putBoolean("autoRenewingAndroid", purchase.isAutoRenewing)
-                        }
-                        items.pushMap(item)
+                purchases?.forEach { purchase ->
+                    val item = WritableNativeMap()
+                    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)
+                    item.putString("orderId", purchase.orderId)
+                    item.putString("purchaseToken", purchase.purchaseToken)
+                    item.putString("developerPayloadAndroid", purchase.developerPayload)
+                    item.putString("signatureAndroid", purchase.signature)
+                    item.putInt("purchaseStateAndroid", purchase.purchaseState)
+                    item.putBoolean("isAcknowledgedAndroid", purchase.isAcknowledged)
+                    item.putString("packageNameAndroid", purchase.packageName)
+                    item.putString(
+                        "obfuscatedAccountIdAndroid",
+                        purchase.accountIdentifiers?.obfuscatedAccountId
+                    )
+                    item.putString(
+                        "obfuscatedProfileIdAndroid",
+                        purchase.accountIdentifiers?.obfuscatedProfileId
+                    )
+                    if (type == BillingClient.ProductType.SUBS) {
+                        item.putBoolean("autoRenewingAndroid", purchase.isAutoRenewing)
                     }
+                    items.pushMap(item)
                 }
                 promise.safeResolve(items)
             }
@@ -397,7 +394,8 @@ class RNIapModule(
         prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
-        selectedOfferIndexArr: ReadableArray, // New optional parameter in V5
+        offerTokenArr: ReadableArray, // New parameter in V5
+        isOfferPersonalized: Boolean, // New parameter in V5
         promise: Promise
     ) {
         val activity = currentActivity
@@ -412,36 +410,42 @@ 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 = selectedOfferIndexArr.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) {
+                        val offerToken = offerTokenArr.getString(index)
+                        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)
@@ -571,7 +575,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)
             }
         }
@@ -621,7 +625,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/android/src/testPlay/java/com/dooboolab/RNIap/RNIapModuleTest.kt

@@ -4,12 +4,10 @@ import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingClientStateListener
 import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.ConsumeResponseListener
-import com.android.billingclient.api.ProductDetails
 import com.android.billingclient.api.ProductDetailsResponseListener
 import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesResponseListener
 import com.android.billingclient.api.QueryPurchasesParams
-import com.android.billingclient.api.SkuDetailsResponseListener
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext

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/hooks/withIAPContext.js

@@ -81,7 +81,7 @@ function withIAPContext(Component) {
       return () => {
         purchaseUpdateSubscription.remove();
         purchaseErrorSubscription.remove();
-        promotedProductSubscription.remove();
+        promotedProductSubscription === null || promotedProductSubscription === void 0 ? void 0 : promotedProductSubscription.remove();
       };
     }, [connected]);
     return /*#__PURE__*/_react.default.createElement(IAPContext.Provider, {

package/lib/commonjs/hooks/withIAPContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["IAPContext","React","createContext","useIAPContext","ctx","useContext","Error","withIAPContext","Component","WrapperComponent","props","connected","setConnected","useState","products","setProducts","promotedProductsIOS","setPromotedProductsIOS","subscriptions","setSubscriptions","purchaseHistories","setPurchaseHistories","availablePurchases","setAvailablePurchases","currentPurchase","setCurrentPurchase","currentPurchaseError","setCurrentPurchaseError","initConnectionError","setInitConnectionError","context","useMemo","useEffect","initConnection","then","value","undefined","catch","purchaseUpdateSubscription","purchaseUpdatedListener","purchase","purchaseErrorSubscription","purchaseErrorListener","error","promotedProductSubscription","promotedProductListener","product","getPromotedProductIOS","prevProducts","remove"],"sources":["withIAPContext.tsx"],"sourcesContent":["import React, {useContext, useEffect, useMemo, useState} from 'react';\n\nimport {\n  getPromotedProductIOS,\n  initConnection,\n  promotedProductListener,\n  purchaseErrorListener,\n  purchaseUpdatedListener,\n} from '../iap';\nimport type {\n  InAppPurchase,\n  Product,\n  Purchase,\n  PurchaseError,\n  Subscription,\n  SubscriptionPurchase,\n} from '../types';\n\ntype IAPContextType = {\n  connected: boolean;\n  products: Product[];\n  promotedProductsIOS: Product[];\n  subscriptions: Subscription[];\n  purchaseHistories: Purchase[];\n  availablePurchases: Purchase[];\n  currentPurchase?: Purchase;\n  currentPurchaseError?: PurchaseError;\n  initConnectionError?: Error;\n  setProducts: (products: Product[]) => void;\n  setSubscriptions: (subscriptions: Subscription[]) => void;\n  setPurchaseHistories: (purchaseHistories: Purchase[]) => void;\n  setAvailablePurchases: (availablePurchases: Purchase[]) => void;\n  setCurrentPurchase: (currentPurchase: Purchase | undefined) => void;\n  setCurrentPurchaseError: (\n    currentPurchaseError: PurchaseError | undefined,\n  ) => void;\n};\n\n// @ts-ignore\nconst IAPContext = React.createContext<IAPContextType>(null);\n\nexport function useIAPContext(): IAPContextType {\n  const ctx = useContext(IAPContext);\n\n  if (!ctx) {\n    throw new Error('You need wrap your app with withIAPContext HOC');\n  }\n\n  return ctx;\n}\n\nexport function withIAPContext<T>(Component: React.ComponentType<T>) {\n  return function WrapperComponent(props: T) {\n    const [connected, setConnected] = useState(false);\n    const [products, setProducts] = useState<Product[]>([]);\n\n    const [promotedProductsIOS, setPromotedProductsIOS] = useState<Product[]>(\n      [],\n    );\n    const [subscriptions, setSubscriptions] = useState<Subscription[]>([]);\n    const [purchaseHistories, setPurchaseHistories] = useState<Purchase[]>([]);\n\n    const [availablePurchases, setAvailablePurchases] = useState<Purchase[]>(\n      [],\n    );\n    const [currentPurchase, setCurrentPurchase] = useState<Purchase>();\n\n    const [currentPurchaseError, setCurrentPurchaseError] =\n      useState<PurchaseError>();\n\n    const [initConnectionError, setInitConnectionError] = useState<Error>();\n\n    const context = useMemo(\n      () => ({\n        connected,\n        products,\n        subscriptions,\n        promotedProductsIOS,\n        purchaseHistories,\n        availablePurchases,\n        currentPurchase,\n        currentPurchaseError,\n        initConnectionError,\n        setProducts,\n        setSubscriptions,\n        setPurchaseHistories,\n        setAvailablePurchases,\n        setCurrentPurchase,\n        setCurrentPurchaseError,\n      }),\n      [\n        connected,\n        products,\n        subscriptions,\n        promotedProductsIOS,\n        purchaseHistories,\n        availablePurchases,\n        currentPurchase,\n        currentPurchaseError,\n        initConnectionError,\n        setProducts,\n        setSubscriptions,\n        setPurchaseHistories,\n        setAvailablePurchases,\n        setCurrentPurchase,\n        setCurrentPurchaseError,\n      ],\n    );\n\n    useEffect(() => {\n      initConnection()\n        .then((value) => {\n          setInitConnectionError(undefined);\n          setConnected(value);\n        })\n        .catch(setInitConnectionError);\n    }, []);\n\n    useEffect(() => {\n      if (!connected) {\n        return;\n      }\n\n      const purchaseUpdateSubscription = purchaseUpdatedListener(\n        async (purchase: InAppPurchase | SubscriptionPurchase) => {\n          setCurrentPurchaseError(undefined);\n          setCurrentPurchase(purchase);\n        },\n      );\n\n      const purchaseErrorSubscription = purchaseErrorListener(\n        (error: PurchaseError) => {\n          setCurrentPurchase(undefined);\n          setCurrentPurchaseError(error);\n        },\n      );\n\n      const promotedProductSubscription = promotedProductListener(async () => {\n        const product = await getPromotedProductIOS();\n\n        setPromotedProductsIOS((prevProducts) => [\n          ...prevProducts,\n          ...(product ? [product] : []),\n        ]);\n      });\n\n      return () => {\n        purchaseUpdateSubscription.remove();\n        purchaseErrorSubscription.remove();\n        promotedProductSubscription.remove();\n      };\n    }, [connected]);\n\n    return (\n      <IAPContext.Provider value={context}>\n        <Component {...props} />\n      </IAPContext.Provider>\n    );\n  };\n}\n"],"mappings":";;;;;;;;AAAA;;AAEA;;;;;;AAoCA;AACA,MAAMA,UAAU,gBAAGC,cAAA,CAAMC,aAAN,CAAoC,IAApC,CAAnB;;AAEO,SAASC,aAAT,GAAyC;EAC9C,MAAMC,GAAG,GAAG,IAAAC,iBAAA,EAAWL,UAAX,CAAZ;;EAEA,IAAI,CAACI,GAAL,EAAU;IACR,MAAM,IAAIE,KAAJ,CAAU,gDAAV,CAAN;EACD;;EAED,OAAOF,GAAP;AACD;;AAEM,SAASG,cAAT,CAA2BC,SAA3B,EAA8D;EACnE,OAAO,SAASC,gBAAT,CAA0BC,KAA1B,EAAoC;IACzC,MAAM,CAACC,SAAD,EAAYC,YAAZ,IAA4B,IAAAC,eAAA,EAAS,KAAT,CAAlC;IACA,MAAM,CAACC,QAAD,EAAWC,WAAX,IAA0B,IAAAF,eAAA,EAAoB,EAApB,CAAhC;IAEA,MAAM,CAACG,mBAAD,EAAsBC,sBAAtB,IAAgD,IAAAJ,eAAA,EACpD,EADoD,CAAtD;IAGA,MAAM,CAACK,aAAD,EAAgBC,gBAAhB,IAAoC,IAAAN,eAAA,EAAyB,EAAzB,CAA1C;IACA,MAAM,CAACO,iBAAD,EAAoBC,oBAApB,IAA4C,IAAAR,eAAA,EAAqB,EAArB,CAAlD;IAEA,MAAM,CAACS,kBAAD,EAAqBC,qBAArB,IAA8C,IAAAV,eAAA,EAClD,EADkD,CAApD;IAGA,MAAM,CAACW,eAAD,EAAkBC,kBAAlB,IAAwC,IAAAZ,eAAA,GAA9C;IAEA,MAAM,CAACa,oBAAD,EAAuBC,uBAAvB,IACJ,IAAAd,eAAA,GADF;IAGA,MAAM,CAACe,mBAAD,EAAsBC,sBAAtB,IAAgD,IAAAhB,eAAA,GAAtD;IAEA,MAAMiB,OAAO,GAAG,IAAAC,cAAA,EACd,OAAO;MACLpB,SADK;MAELG,QAFK;MAGLI,aAHK;MAILF,mBAJK;MAKLI,iBALK;MAMLE,kBANK;MAOLE,eAPK;MAQLE,oBARK;MASLE,mBATK;MAULb,WAVK;MAWLI,gBAXK;MAYLE,oBAZK;MAaLE,qBAbK;MAcLE,kBAdK;MAeLE;IAfK,CAAP,CADc,EAkBd,CACEhB,SADF,EAEEG,QAFF,EAGEI,aAHF,EAIEF,mBAJF,EAKEI,iBALF,EAMEE,kBANF,EAOEE,eAPF,EAQEE,oBARF,EASEE,mBATF,EAUEb,WAVF,EAWEI,gBAXF,EAYEE,oBAZF,EAaEE,qBAbF,EAcEE,kBAdF,EAeEE,uBAfF,CAlBc,CAAhB;IAqCA,IAAAK,gBAAA,EAAU,MAAM;MACd,IAAAC,mBAAA,IACGC,IADH,CACSC,KAAD,IAAW;QACfN,sBAAsB,CAACO,SAAD,CAAtB;QACAxB,YAAY,CAACuB,KAAD,CAAZ;MACD,CAJH,EAKGE,KALH,CAKSR,sBALT;IAMD,CAPD,EAOG,EAPH;IASA,IAAAG,gBAAA,EAAU,MAAM;MACd,IAAI,CAACrB,SAAL,EAAgB;QACd;MACD;;MAED,MAAM2B,0BAA0B,GAAG,IAAAC,4BAAA,EACjC,MAAOC,QAAP,IAA0D;QACxDb,uBAAuB,CAACS,SAAD,CAAvB;QACAX,kBAAkB,CAACe,QAAD,CAAlB;MACD,CAJgC,CAAnC;MAOA,MAAMC,yBAAyB,GAAG,IAAAC,0BAAA,EAC/BC,KAAD,IAA0B;QACxBlB,kBAAkB,CAACW,SAAD,CAAlB;QACAT,uBAAuB,CAACgB,KAAD,CAAvB;MACD,CAJ+B,CAAlC;MAOA,MAAMC,2BAA2B,GAAG,IAAAC,4BAAA,EAAwB,YAAY;QACtE,MAAMC,OAAO,GAAG,MAAM,IAAAC,0BAAA,GAAtB;QAEA9B,sBAAsB,CAAE+B,YAAD,IAAkB,CACvC,GAAGA,YADoC,EAEvC,IAAIF,OAAO,GAAG,CAACA,OAAD,CAAH,GAAe,EAA1B,CAFuC,CAAnB,CAAtB;MAID,CAPmC,CAApC;MASA,OAAO,MAAM;QACXR,0BAA0B,CAACW,MAA3B;QACAR,yBAAyB,CAACQ,MAA1B;QACAL,2BAA2B,CAACK,MAA5B;MACD,CAJD;IAKD,CAjCD,EAiCG,CAACtC,SAAD,CAjCH;IAmCA,oBACE,6BAAC,UAAD,CAAY,QAAZ;MAAqB,KAAK,EAAEmB;IAA5B,gBACE,6BAAC,SAAD,EAAepB,KAAf,CADF,CADF;EAKD,CA1GD;AA2GD"}
+{"version":3,"names":["IAPContext","React","createContext","useIAPContext","ctx","useContext","Error","withIAPContext","Component","WrapperComponent","props","connected","setConnected","useState","products","setProducts","promotedProductsIOS","setPromotedProductsIOS","subscriptions","setSubscriptions","purchaseHistories","setPurchaseHistories","availablePurchases","setAvailablePurchases","currentPurchase","setCurrentPurchase","currentPurchaseError","setCurrentPurchaseError","initConnectionError","setInitConnectionError","context","useMemo","useEffect","initConnection","then","value","undefined","catch","purchaseUpdateSubscription","purchaseUpdatedListener","purchase","purchaseErrorSubscription","purchaseErrorListener","error","promotedProductSubscription","promotedProductListener","product","getPromotedProductIOS","prevProducts","remove"],"sources":["withIAPContext.tsx"],"sourcesContent":["import React, {useContext, useEffect, useMemo, useState} from 'react';\n\nimport {\n  getPromotedProductIOS,\n  initConnection,\n  promotedProductListener,\n  purchaseErrorListener,\n  purchaseUpdatedListener,\n} from '../iap';\nimport type {\n  InAppPurchase,\n  Product,\n  Purchase,\n  PurchaseError,\n  Subscription,\n  SubscriptionPurchase,\n} from '../types';\n\ntype IAPContextType = {\n  connected: boolean;\n  products: Product[];\n  promotedProductsIOS: Product[];\n  subscriptions: Subscription[];\n  purchaseHistories: Purchase[];\n  availablePurchases: Purchase[];\n  currentPurchase?: Purchase;\n  currentPurchaseError?: PurchaseError;\n  initConnectionError?: Error;\n  setProducts: (products: Product[]) => void;\n  setSubscriptions: (subscriptions: Subscription[]) => void;\n  setPurchaseHistories: (purchaseHistories: Purchase[]) => void;\n  setAvailablePurchases: (availablePurchases: Purchase[]) => void;\n  setCurrentPurchase: (currentPurchase: Purchase | undefined) => void;\n  setCurrentPurchaseError: (\n    currentPurchaseError: PurchaseError | undefined,\n  ) => void;\n};\n\n// @ts-ignore\nconst IAPContext = React.createContext<IAPContextType>(null);\n\nexport function useIAPContext(): IAPContextType {\n  const ctx = useContext(IAPContext);\n\n  if (!ctx) {\n    throw new Error('You need wrap your app with withIAPContext HOC');\n  }\n\n  return ctx;\n}\n\nexport function withIAPContext<T>(Component: React.ComponentType<T>) {\n  return function WrapperComponent(props: T) {\n    const [connected, setConnected] = useState(false);\n    const [products, setProducts] = useState<Product[]>([]);\n\n    const [promotedProductsIOS, setPromotedProductsIOS] = useState<Product[]>(\n      [],\n    );\n    const [subscriptions, setSubscriptions] = useState<Subscription[]>([]);\n    const [purchaseHistories, setPurchaseHistories] = useState<Purchase[]>([]);\n\n    const [availablePurchases, setAvailablePurchases] = useState<Purchase[]>(\n      [],\n    );\n    const [currentPurchase, setCurrentPurchase] = useState<Purchase>();\n\n    const [currentPurchaseError, setCurrentPurchaseError] =\n      useState<PurchaseError>();\n\n    const [initConnectionError, setInitConnectionError] = useState<Error>();\n\n    const context = useMemo(\n      () => ({\n        connected,\n        products,\n        subscriptions,\n        promotedProductsIOS,\n        purchaseHistories,\n        availablePurchases,\n        currentPurchase,\n        currentPurchaseError,\n        initConnectionError,\n        setProducts,\n        setSubscriptions,\n        setPurchaseHistories,\n        setAvailablePurchases,\n        setCurrentPurchase,\n        setCurrentPurchaseError,\n      }),\n      [\n        connected,\n        products,\n        subscriptions,\n        promotedProductsIOS,\n        purchaseHistories,\n        availablePurchases,\n        currentPurchase,\n        currentPurchaseError,\n        initConnectionError,\n        setProducts,\n        setSubscriptions,\n        setPurchaseHistories,\n        setAvailablePurchases,\n        setCurrentPurchase,\n        setCurrentPurchaseError,\n      ],\n    );\n\n    useEffect(() => {\n      initConnection()\n        .then((value) => {\n          setInitConnectionError(undefined);\n          setConnected(value);\n        })\n        .catch(setInitConnectionError);\n    }, []);\n\n    useEffect(() => {\n      if (!connected) {\n        return;\n      }\n\n      const purchaseUpdateSubscription = purchaseUpdatedListener(\n        async (purchase: InAppPurchase | SubscriptionPurchase) => {\n          setCurrentPurchaseError(undefined);\n          setCurrentPurchase(purchase);\n        },\n      );\n\n      const purchaseErrorSubscription = purchaseErrorListener(\n        (error: PurchaseError) => {\n          setCurrentPurchase(undefined);\n          setCurrentPurchaseError(error);\n        },\n      );\n\n      const promotedProductSubscription = promotedProductListener(async () => {\n        const product = await getPromotedProductIOS();\n\n        setPromotedProductsIOS((prevProducts) => [\n          ...prevProducts,\n          ...(product ? [product] : []),\n        ]);\n      });\n\n      return () => {\n        purchaseUpdateSubscription.remove();\n        purchaseErrorSubscription.remove();\n        promotedProductSubscription?.remove();\n      };\n    }, [connected]);\n\n    return (\n      <IAPContext.Provider value={context}>\n        <Component {...props} />\n      </IAPContext.Provider>\n    );\n  };\n}\n"],"mappings":";;;;;;;;AAAA;;AAEA;;;;;;AAoCA;AACA,MAAMA,UAAU,gBAAGC,cAAA,CAAMC,aAAN,CAAoC,IAApC,CAAnB;;AAEO,SAASC,aAAT,GAAyC;EAC9C,MAAMC,GAAG,GAAG,IAAAC,iBAAA,EAAWL,UAAX,CAAZ;;EAEA,IAAI,CAACI,GAAL,EAAU;IACR,MAAM,IAAIE,KAAJ,CAAU,gDAAV,CAAN;EACD;;EAED,OAAOF,GAAP;AACD;;AAEM,SAASG,cAAT,CAA2BC,SAA3B,EAA8D;EACnE,OAAO,SAASC,gBAAT,CAA0BC,KAA1B,EAAoC;IACzC,MAAM,CAACC,SAAD,EAAYC,YAAZ,IAA4B,IAAAC,eAAA,EAAS,KAAT,CAAlC;IACA,MAAM,CAACC,QAAD,EAAWC,WAAX,IAA0B,IAAAF,eAAA,EAAoB,EAApB,CAAhC;IAEA,MAAM,CAACG,mBAAD,EAAsBC,sBAAtB,IAAgD,IAAAJ,eAAA,EACpD,EADoD,CAAtD;IAGA,MAAM,CAACK,aAAD,EAAgBC,gBAAhB,IAAoC,IAAAN,eAAA,EAAyB,EAAzB,CAA1C;IACA,MAAM,CAACO,iBAAD,EAAoBC,oBAApB,IAA4C,IAAAR,eAAA,EAAqB,EAArB,CAAlD;IAEA,MAAM,CAACS,kBAAD,EAAqBC,qBAArB,IAA8C,IAAAV,eAAA,EAClD,EADkD,CAApD;IAGA,MAAM,CAACW,eAAD,EAAkBC,kBAAlB,IAAwC,IAAAZ,eAAA,GAA9C;IAEA,MAAM,CAACa,oBAAD,EAAuBC,uBAAvB,IACJ,IAAAd,eAAA,GADF;IAGA,MAAM,CAACe,mBAAD,EAAsBC,sBAAtB,IAAgD,IAAAhB,eAAA,GAAtD;IAEA,MAAMiB,OAAO,GAAG,IAAAC,cAAA,EACd,OAAO;MACLpB,SADK;MAELG,QAFK;MAGLI,aAHK;MAILF,mBAJK;MAKLI,iBALK;MAMLE,kBANK;MAOLE,eAPK;MAQLE,oBARK;MASLE,mBATK;MAULb,WAVK;MAWLI,gBAXK;MAYLE,oBAZK;MAaLE,qBAbK;MAcLE,kBAdK;MAeLE;IAfK,CAAP,CADc,EAkBd,CACEhB,SADF,EAEEG,QAFF,EAGEI,aAHF,EAIEF,mBAJF,EAKEI,iBALF,EAMEE,kBANF,EAOEE,eAPF,EAQEE,oBARF,EASEE,mBATF,EAUEb,WAVF,EAWEI,gBAXF,EAYEE,oBAZF,EAaEE,qBAbF,EAcEE,kBAdF,EAeEE,uBAfF,CAlBc,CAAhB;IAqCA,IAAAK,gBAAA,EAAU,MAAM;MACd,IAAAC,mBAAA,IACGC,IADH,CACSC,KAAD,IAAW;QACfN,sBAAsB,CAACO,SAAD,CAAtB;QACAxB,YAAY,CAACuB,KAAD,CAAZ;MACD,CAJH,EAKGE,KALH,CAKSR,sBALT;IAMD,CAPD,EAOG,EAPH;IASA,IAAAG,gBAAA,EAAU,MAAM;MACd,IAAI,CAACrB,SAAL,EAAgB;QACd;MACD;;MAED,MAAM2B,0BAA0B,GAAG,IAAAC,4BAAA,EACjC,MAAOC,QAAP,IAA0D;QACxDb,uBAAuB,CAACS,SAAD,CAAvB;QACAX,kBAAkB,CAACe,QAAD,CAAlB;MACD,CAJgC,CAAnC;MAOA,MAAMC,yBAAyB,GAAG,IAAAC,0BAAA,EAC/BC,KAAD,IAA0B;QACxBlB,kBAAkB,CAACW,SAAD,CAAlB;QACAT,uBAAuB,CAACgB,KAAD,CAAvB;MACD,CAJ+B,CAAlC;MAOA,MAAMC,2BAA2B,GAAG,IAAAC,4BAAA,EAAwB,YAAY;QACtE,MAAMC,OAAO,GAAG,MAAM,IAAAC,0BAAA,GAAtB;QAEA9B,sBAAsB,CAAE+B,YAAD,IAAkB,CACvC,GAAGA,YADoC,EAEvC,IAAIF,OAAO,GAAG,CAACA,OAAD,CAAH,GAAe,EAA1B,CAFuC,CAAnB,CAAtB;MAID,CAPmC,CAApC;MASA,OAAO,MAAM;QACXR,0BAA0B,CAACW,MAA3B;QACAR,yBAAyB,CAACQ,MAA1B;QACAL,2BAA2B,SAA3B,IAAAA,2BAA2B,WAA3B,YAAAA,2BAA2B,CAAEK,MAA7B;MACD,CAJD;IAKD,CAjCD,EAiCG,CAACtC,SAAD,CAjCH;IAmCA,oBACE,6BAAC,UAAD,CAAY,QAAZ;MAAqB,KAAK,EAAEmB;IAA5B,gBACE,6BAAC,SAAD,EAAepB,KAAf,CADF,CADF;EAKD,CA1GD;AA2GD"}

package/lib/commonjs/iap.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateReceiptIos = exports.validateReceiptAndroid = exports.validateReceiptAmazon = exports.setAndroidNativeModule = exports.requestSubscription = exports.requestPurchaseWithQuantityIOS = exports.requestPurchaseWithOfferIOS = exports.requestPurchase = exports.purchaseUpdatedListener = exports.purchaseErrorListener = exports.promotedProductListener = exports.presentCodeRedemptionSheetIOS = exports.initConnection = exports.getSubscriptions = exports.getPurchaseHistory = exports.getPromotedProductIOS = exports.getProducts = exports.getPendingPurchasesIOS = exports.getInstallSourceAndroid = exports.getAvailablePurchases = exports.flushFailedPurchasesCachedAsPendingAndroid = exports.finishTransaction = exports.endConnection = exports.deepLinkToSubscriptionsAndroid = exports.clearTransactionIOS = exports.clearProductsIOS = exports.buyPromotedProductIOS = exports.acknowledgePurchaseAndroid = void 0;
+exports.validateReceiptIos = exports.validateReceiptAndroid = exports.validateReceiptAmazon = exports.setAndroidNativeModule = exports.requestSubscription = exports.requestPurchaseWithQuantityIOS = exports.requestPurchaseWithOfferIOS = exports.requestPurchase = exports.purchaseUpdatedListener = exports.purchaseErrorListener = exports.promotedProductListener = exports.presentCodeRedemptionSheetIOS = exports.initConnection = exports.getSubscriptions = exports.getReceiptIOS = exports.getPurchaseHistory = exports.getPromotedProductIOS = exports.getProducts = exports.getPendingPurchasesIOS = exports.getInstallSourceAndroid = exports.getAvailablePurchases = exports.flushFailedPurchasesCachedAsPendingAndroid = exports.finishTransaction = exports.endConnection = exports.deepLinkToSubscriptionsAndroid = exports.clearTransactionIOS = exports.clearProductsIOS = exports.buyPromotedProductIOS = exports.acknowledgePurchaseAndroid = exports.IapError = void 0;
 
 var _reactNative = require("react-native");
 
@@ -17,9 +17,23 @@ 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';
 
+class IapError {
+  constructor(code, message) {
+    this.code = code;
+    this.message = message;
+    this.code = code;
+    this.message = message;
+  }
+
+}
+
+exports.IapError = IapError;
+
 const getInstallSourceAndroid = () => {
   return RNIapModule ? _types.InstallSourceAndroid.GOOGLE_PLAY : _types.InstallSourceAndroid.AMAZON;
 };
@@ -207,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>}
  */
 
@@ -219,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 () => {
@@ -230,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)();
 };
@@ -243,7 +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} [selectedOfferIndex] Selected Offer index from the list returned by get products
+ * @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
  */
 
@@ -258,9 +278,9 @@ const requestSubscription = _ref2 => {
     prorationModeAndroid = -1,
     obfuscatedAccountIdAndroid,
     obfuscatedProfileIdAndroid,
-    selectedOfferIndexArr = undefined,
+    subscriptionOffers = undefined,
     // Android Billing V5
-    skus = undefined,
+    isOfferPersonalized = undefined,
     // Android Billing V5
     applicationUsername
   } = _ref2;
@@ -273,7 +293,16 @@ const requestSubscription = _ref2 => {
       return getIosModule().buyProduct(sku, andDangerouslyFinishTransactionAutomaticallyIOS, applicationUsername);
     },
     android: async () => {
-      return getAndroidModule().buyItemByType(ANDROID_ITEM_TYPE_SUBSCRIPTION, sku ? [sku] : skus, purchaseTokenAndroid, prorationModeAndroid, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, selectedOfferIndexArr);
+      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)();
 };
@@ -560,7 +589,13 @@ const purchaseErrorListener = listener => new _reactNative.NativeEventEmitter(ge
 
 exports.purchaseErrorListener = purchaseErrorListener;
 
-const promotedProductListener = listener => new _reactNative.NativeEventEmitter(getIosModule()).addListener('iap-promoted-product', listener);
+const promotedProductListener = listener => {
+  if (isIos) {
+    return new _reactNative.NativeEventEmitter(getIosModule()).addListener('iap-promoted-product', listener);
+  }
+
+  return null;
+};
 /**
  * Get the current receipt base64 encoded in IOS.
  * @param {forceRefresh?:boolean}
@@ -571,13 +606,23 @@ const promotedProductListener = listener => new _reactNative.NativeEventEmitter(
 exports.promotedProductListener = promotedProductListener;
 
 const getPendingPurchasesIOS = async () => getIosModule().getPendingTransactions();
+/**
+ * Get the current receipt base64 encoded in IOS.
+ * @param {forceRefresh?:boolean}
+ * @returns {Promise<string>}
+ */
+
+
+exports.getPendingPurchasesIOS = getPendingPurchasesIOS;
+
+const getReceiptIOS = async forceRefresh => getIosModule().requestReceipt(forceRefresh ?? false);
 /**
  * Launches a modal to register the redeem offer code in IOS.
  * @returns {Promise<null>}
  */
 
 
-exports.getPendingPurchasesIOS = getPendingPurchasesIOS;
+exports.getReceiptIOS = getReceiptIOS;
 
 const presentCodeRedemptionSheetIOS = async () => getIosModule().presentCodeRedemptionSheet();