react-native-iap 9.0.0-beta → 9.0.0-beta10

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

@@ -26,6 +26,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableType
+import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
@@ -40,8 +41,7 @@ class RNIapModule(
     private val googleApiAvailability: GoogleApiAvailability = GoogleApiAvailability.getInstance()
 ) :
     ReactContextBaseJavaModule(reactContext),
-    PurchasesUpdatedListener,
-    RNIapModuleInterface {
+    PurchasesUpdatedListener {
 
     private var billingClientCache: BillingClient? = null
     private val skus: MutableMap<String, ProductDetails> = mutableMapOf()
@@ -49,7 +49,7 @@ class RNIapModule(
         return TAG
     }
 
-    internal fun ensureConnection(
+    fun ensureConnection(
         promise: Promise,
         callback: (billingClient: BillingClient) -> Unit
     ) {
@@ -87,7 +87,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-    override 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
-    override fun endConnection(promise: Promise) {
+     fun endConnection(promise: Promise) {
         billingClientCache?.endConnection()
         billingClientCache = null
         promise.safeResolve(true)
@@ -160,7 +160,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-    override fun flushFailedPurchasesCachedAsPending(promise: Promise) {
+     fun flushFailedPurchasesCachedAsPending(promise: Promise) {
         ensureConnection(
             promise
         ) { billingClient ->
@@ -193,7 +193,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-    override fun getItemsByType(type: String, skuArr: ReadableArray, promise: Promise) {
+     fun getItemsByType(type: String, skuArr: ReadableArray, promise: Promise) {
         ensureConnection(
             promise
         ) { billingClient ->
@@ -201,10 +201,12 @@ class RNIapModule(
             for (i in 0 until skuArr.size()) {
                 if (skuArr.getType(i) == ReadableType.String) {
                     val sku = skuArr.getString(i)
-                    skuList.add(
-                        QueryProductDetailsParams.Product.newBuilder().setProductId(sku)
-                            .setProductType(type).build()
-                    )
+                    sku?.let {
+                        skuList.add(
+                            QueryProductDetailsParams.Product.newBuilder().setProductId(sku)
+                                .setProductType(type).build()
+                        )
+                    }
                 }
             }
             val params = QueryProductDetailsParams.newBuilder().setProductList(skuList)
@@ -304,7 +306,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-    override fun getAvailableItemsByType(type: String, promise: Promise) {
+    fun getAvailableItemsByType(type: String, promise: Promise) {
         ensureConnection(
             promise
         ) { billingClient ->
@@ -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)
@@ -350,7 +355,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-    override fun getPurchaseHistoryByType(type: String, promise: Promise) {
+    fun getPurchaseHistoryByType(type: String, promise: Promise) {
         ensureConnection(
             promise
         ) { billingClient ->
@@ -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)
@@ -382,14 +390,14 @@ class RNIapModule(
     }
 
     @ReactMethod
-    override fun buyItemByType(
+    fun buyItemByType(
         type: String,
-        sku: String, // TODO: should this now be an array?
+        skuArr: ReadableArray,
         purchaseToken: String?,
-        prorationMode: Int?,
+        prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
-        selectedOfferIndex: Int?, // New optional parameter in V5, TODO: should it be an array?
+        selectedOfferIndexArr: ReadableArray, // New optional parameter in V5
         promise: Promise
     ) {
         val activity = currentActivity
@@ -404,32 +412,36 @@ class RNIapModule(
                 PROMISE_BUY_ITEM,
                 promise
             )
-            val builder = BillingFlowParams.newBuilder()
-            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)
-            if (selectedOfferIndex != null && (
-                selectedSku.subscriptionOfferDetails?.size
-                    ?: 0
-                ) > selectedOfferIndex
-            ) {
-                val offerToken =
-                    selectedSku.subscriptionOfferDetails?.get(selectedOfferIndex)?.offerToken
-                offerToken?.let { productParams = productParams.setOfferToken(offerToken) }
+            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) }
+                }
+                productParams.build()
             }
-
-            builder.setProductDetailsParamsList(listOf(productParams.build()))
+            val builder = BillingFlowParams.newBuilder()
+            builder.setProductDetailsParamsList(productParamsList)
             val subscriptionUpdateParamsBuilder = SubscriptionUpdateParams.newBuilder()
             if (purchaseToken != null) {
                 subscriptionUpdateParamsBuilder.setOldPurchaseToken(purchaseToken)
@@ -440,14 +452,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" +
@@ -457,7 +469,7 @@ class RNIapModule(
                         error.putString("debugMessage", debugMessage)
                         error.putString("code", PROMISE_BUY_ITEM)
                         error.putString("message", debugMessage)
-                        error.putString("productId", sku)
+                        error.putArray("productIds", skuArr)
                         sendEvent(reactContext, "purchase-error", error)
                         promise.safeReject(PROMISE_BUY_ITEM, debugMessage)
                         return@ensureConnection
@@ -508,7 +520,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-    override fun acknowledgePurchase(
+    fun acknowledgePurchase(
         token: String,
         developerPayLoad: String?,
         promise: Promise
@@ -538,7 +550,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-    override fun consumeProduct(
+    fun consumeProduct(
         token: String,
         developerPayLoad: String?,
         promise: Promise
@@ -559,6 +571,7 @@ class RNIapModule(
                     .getBillingResponseData(billingResult.responseCode)
                 map.putString("code", errorData[0])
                 map.putString("message", errorData[1])
+                map.putString("purchaseToken",purchaseToken)
                 promise.safeResolve(map)
             }
         }
@@ -579,11 +592,13 @@ class RNIapModule(
             return
         }
         if (purchases != null) {
-            var promiseItem: WritableMap? = null
-            for (i in purchases.indices) {
+            val promiseItems: WritableArray = Arguments.createArray()
+            purchases.forEach { purchase ->
                 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)
@@ -606,13 +621,10 @@ class RNIapModule(
                         accountIdentifiers.obfuscatedProfileId
                     )
                 }
-                promiseItem = WritableNativeMap()
-                promiseItem.merge(item)
+                promiseItems.pushMap(item)
                 sendEvent(reactContext, "purchase-updated", item)
             }
-            if (promiseItem != null) {
-                DoobooUtils.instance.resolvePromisesForKey(PROMISE_BUY_ITEM, promiseItem)
-            }
+            DoobooUtils.instance.resolvePromisesForKey(PROMISE_BUY_ITEM, promiseItems)
         } else {
             val result = Arguments.createMap()
             result.putInt("responseCode", billingResult.responseCode)
@@ -649,22 +661,22 @@ class RNIapModule(
     }
 
     @ReactMethod
-    override fun startListening(promise: Promise) {
+    fun startListening(promise: Promise) {
         sendUnconsumedPurchases(promise)
     }
 
     @ReactMethod
-    override fun addListener(eventName: String) {
+    fun addListener(eventName: String) {
         // Keep: Required for RN built-in Event Emitter Calls.
     }
 
     @ReactMethod
-    override fun removeListeners(count: Double) {
+    fun removeListeners(count: Double) {
         // Keep: Required for RN built-in Event Emitter Calls.
     }
 
     @ReactMethod
-    override fun getPackageName(promise: Promise) = promise.resolve(reactApplicationContext.packageName)
+    fun getPackageName(promise: Promise) = promise.resolve(reactApplicationContext.packageName)
 
     private fun sendEvent(
         reactContext: ReactContext,
@@ -687,6 +699,7 @@ class RNIapModule(
             override fun onHostPause() {}
             override fun onHostDestroy() {
                 billingClientCache?.endConnection()
+                billingClientCache = null
             }
         }
         reactContext.addLifecycleEventListener(lifecycleEventListener)

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

@@ -15,7 +15,6 @@ class RNIapPackage : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
         val modules: MutableList<NativeModule> = ArrayList()
         modules.add(RNIapModule(reactContext))
-        modules.add(RNIapModuleV4(reactContext))
         return modules
     }
 }

package/android/src/testPlay/java/com/dooboolab/RNIap/{RNIapModuleTestV4.kt → RNIapModuleTest.kt}

@@ -4,8 +4,11 @@ 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
@@ -30,7 +33,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 
-class RNIapModuleTestV4 {
+class RNIapModuleTest {
 
     @MockK
     lateinit var context: ReactApplicationContext
@@ -44,14 +47,14 @@ class RNIapModuleTestV4 {
     @MockK
     lateinit var availability: GoogleApiAvailability
 
-    private lateinit var module: RNIapModuleV4
+    private lateinit var module: RNIapModule
 
     @Before
     fun setUp() {
         MockKAnnotations.init(this, relaxUnitFun = true)
         every { builder.setListener(any()) } returns builder
         every { builder.build() } returns billingClient
-        module = RNIapModuleV4(context, builder, availability)
+        module = RNIapModule(context, builder, availability)
     }
 
     @Test
@@ -134,7 +137,7 @@ class RNIapModuleTestV4 {
         every { billingClient.isReady } returns true
         val promise = mockk<Promise>(relaxed = true)
         val listener = slot<PurchasesResponseListener>()
-        every { billingClient.queryPurchasesAsync(any<String>(), capture(listener)) } answers {
+        every { billingClient.queryPurchasesAsync(any<QueryPurchasesParams>(), capture(listener)) } answers {
             listener.captured.onQueryPurchasesResponse(BillingResult.newBuilder().build(), listOf())
         }
         module.initConnection(mockk())
@@ -150,7 +153,7 @@ class RNIapModuleTestV4 {
         every { billingClient.isReady } returns true
         val promise = mockk<Promise>(relaxed = true)
         val listener = slot<PurchasesResponseListener>()
-        every { billingClient.queryPurchasesAsync(any<String>(), capture(listener)) } answers {
+        every { billingClient.queryPurchasesAsync(any<QueryPurchasesParams>(), capture(listener)) } answers {
             listener.captured.onQueryPurchasesResponse(
                 BillingResult.newBuilder().build(),
                 listOf(
@@ -207,30 +210,39 @@ class RNIapModuleTestV4 {
         every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
         every { billingClient.isReady } returns true
         val promise = mockk<Promise>(relaxed = true)
-        val listener = slot<SkuDetailsResponseListener>()
-        every { billingClient.querySkuDetailsAsync(any(), capture(listener)) } answers {
-            listener.captured.onSkuDetailsResponse(
+        val listener = slot<ProductDetailsResponseListener>()
+        every { billingClient.queryProductDetailsAsync(any(), capture(listener)) } answers {
+            listener.captured.onProductDetailsResponse(
                 BillingResult.newBuilder().build(),
                 listOf(
                     mockk {
-                        every { sku } returns "sku1"
-                        every { introductoryPriceAmountMicros } returns 0
-                        every { priceAmountMicros } returns 1
-                        every { priceCurrencyCode } returns "USD"
-                        every { type } returns "sub"
-                        every { price } returns "$10.0"
-                        every { title } returns "My product"
-                        every { description } returns "My desc"
-                        every { introductoryPrice } returns "$5.0"
-                        every { zzc() } returns "com.mypackage"
-                        every { originalPrice } returns "$13.0"
-                        every { subscriptionPeriod } returns "3 months"
-                        every { freeTrialPeriod } returns "1 week"
-                        every { introductoryPriceCycles } returns 1
-                        every { introductoryPricePeriod } returns "1"
-                        every { iconUrl } returns "http://myicon.com/icon"
-                        every { originalJson } returns "{}"
-                        every { originalPriceAmountMicros } returns 2
+                        every { productId } returns "sku1"
+
+                        every { title } returns "title2"
+                        every { description } returns "My product"
+
+                        every { productType } returns "sub"
+                        every { name } returns "name of product"
+                        every { oneTimePurchaseOfferDetails } returns mockk {
+                            every { priceCurrencyCode} returns "my code"
+                            every {formattedPrice} returns "$20.00"
+                            every { priceAmountMicros } returns 20000
+
+                            }
+                        every { subscriptionOfferDetails } returns  listOf( mockk {
+                            every { offerToken } returns "sToken"
+                            every { offerTags  } returns listOf("offerTag1","offerTag2")
+                            every { pricingPhases} returns mockk{
+                                every { pricingPhaseList } returns listOf(mockk{
+                                    every { formattedPrice } returns "$13.0"
+                                    every { priceCurrencyCode } returns "USD"
+                                    every { billingPeriod } returns "1 week"
+                                    every { billingCycleCount } returns 1
+                                    every { priceAmountMicros } returns 13000
+                                    every { recurrenceMode } returns 2
+                                })
+                            }
+                        })
                     }
                 )
             )
@@ -242,19 +254,21 @@ class RNIapModuleTestV4 {
         }
         mockkStatic(Arguments::class)
 
-        val itemsMap = mockk<WritableMap>()
-        val itemsArr = mockk<WritableArray>()
-        every { Arguments.createMap() } returns itemsMap
-        every { Arguments.createArray() } returns itemsArr
-        every { itemsMap.putString(any(), any()) } just runs
+        val itemsMap = mockk<WritableMap>(relaxed = true)
         var itemsSize = 0
-        every { itemsArr.pushMap(any()) } answers {
-            itemsSize++
+        val itemsArr = mockk<WritableArray>{
+            every { pushString(any()) } just runs
+            every { pushMap(any()) } answers {
+                itemsSize++
+            }
         }
+        every { Arguments.createMap() } returns itemsMap
+        every { Arguments.createArray() } returns itemsArr
+
         module.initConnection(mockk())
         module.getItemsByType("subs", skus, promise)
         verify { promise.resolve(any()) }
-        assertEquals(itemsSize, 1)
+        assertEquals(3, itemsSize)
     }
 
     @Test

package/ios/RNIapIos-Bridging-Header.h

@@ -0,0 +1,2 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>

package/ios/RNIapIos.m

@@ -3,23 +3,28 @@
 #import <React/RCTBridgeModule.h>
 
 @interface RCT_EXTERN_MODULE (RNIapIos, NSObject)
+
 RCT_EXTERN_METHOD(initConnection:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(endConnection:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(getItems:
                   (NSArray*)skus
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(getAvailableItems:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(buyProduct:
                   (NSString*)sku
-                  appAccountToken:(NSString*)appAccountToken
                   andDangerouslyFinishTransactionAutomatically:(BOOL)andDangerouslyFinishTransactionAutomatically
+                  applicationUsername:(NSString*)applicationUsername
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(buyProductWithOffer:
@@ -33,17 +38,22 @@ RCT_EXTERN_METHOD(buyProductWithQuantityIOS:
                   quantity:(NSInteger)quantity
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(clearTransaction:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(clearProducts:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(promotedProduct:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(buyPromotedProduct:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(requestReceipt:
                   (BOOL)refresh
                   resolve:(RCTPromiseResolveBlock)resolve
@@ -52,10 +62,13 @@ RCT_EXTERN_METHOD(finishTransaction:
                   (NSString*)transactionIdentifier
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(getPendingTransactions:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(presentCodeRedemptionSheet:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 @end