react-native-iap 8.2.1 → 8.2.2

package/android/build.gradle

@@ -66,7 +66,7 @@ repositories {
 
 dependencies {
   implementation 'com.facebook.react:react-native:+'
-  testImplementation 'junit:junit:4.12'
+  testImplementation 'junit:junit:4.13.1'
   testImplementation "io.mockk:mockk:1.12.4"
   playImplementation 'com.android.billingclient:billing:4.0.0'
   def playServicesVersion = safeExtGet('playServicesVersion', DEFAULT_PLAY_SERVICES_VERSION)

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

@@ -2,6 +2,7 @@ package com.dooboolab.RNIap
 
 import com.amazon.device.iap.PurchasingService
 import com.amazon.device.iap.model.FulfillmentResult
+import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
@@ -10,9 +11,8 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.WritableNativeArray
 import java.util.HashSet
 
-class RNIapAmazonModule(reactContext: ReactApplicationContext?) :
+class RNIapAmazonModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
-    val TAG = "RNIapAmazonModule"
     override fun getName(): String {
         return TAG
     }
@@ -127,5 +127,23 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext?) :
         const val PROMISE_QUERY_PURCHASES = "PROMISE_QUERY_PURCHASES"
         const val PROMISE_QUERY_AVAILABLE_ITEMS = "PROMISE_QUERY_AVAILABLE_ITEMS"
         const val PROMISE_GET_USER_DATA = "PROMISE_GET_USER_DATA"
+
+        const val TAG = "RNIapAmazonModule"
+    }
+    init {
+        val lifecycleEventListener: LifecycleEventListener = object : LifecycleEventListener {
+            /**
+             * From https://developer.amazon.com/docs/in-app-purchasing/iap-implement-iap.html#getpurchaseupdates-responses
+             * We should fetch updates on resume
+             */
+            override fun onHostResume() {
+                PurchasingService.getUserData()
+                PurchasingService.getPurchaseUpdates(false)
+            }
+            override fun onHostPause() {}
+            override fun onHostDestroy() {
+            }
+        }
+        reactContext.addLifecycleEventListener(lifecycleEventListener)
     }
 }

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

@@ -42,7 +42,7 @@ class RNIapModule(
     private var billingClient: BillingClient = builder.setListener(this).build()
     private val skus: MutableMap<String, SkuDetails> = mutableMapOf()
     override fun getName(): String {
-        return "RNIapModule"
+        return TAG
     }
 
     internal fun ensureConnection(promise: Promise, callback: () -> Unit) {
@@ -95,14 +95,9 @@ class RNIapModule(
         billingClient.startConnection(
             object : BillingClientStateListener {
                 override fun onBillingSetupFinished(billingResult: BillingResult) {
-                    val responseCode = billingResult.responseCode
+                    if (!isValidResult(billingResult, promise)) return
 
-                    if (responseCode == BillingClient.BillingResponseCode.OK) {
-                        promise.safeResolve(true)
-                    } else {
-                        PlayUtils.instance
-                            .rejectPromiseWithBillingError(promise, responseCode)
-                    }
+                    promise.safeResolve(true)
                 }
 
                 override fun onBillingServiceDisconnected() {
@@ -154,7 +149,8 @@ class RNIapModule(
         ) {
             billingClient.queryPurchasesAsync(
                 BillingClient.SkuType.INAPP
-            ) { _: BillingResult?, list: List<Purchase>? ->
+            ) { billingResult: BillingResult, list: List<Purchase>? ->
+                if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
                 if (list == null) {
                     // No purchases found
                     promise.safeResolve(false)
@@ -178,7 +174,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-    fun getItemsByType(type: String?, skuArr: ReadableArray, promise: Promise) {
+    fun getItemsByType(type: String, skuArr: ReadableArray, promise: Promise) {
         ensureConnection(
             promise
         ) {
@@ -190,22 +186,18 @@ class RNIapModule(
                 }
             }
             val params = SkuDetailsParams.newBuilder()
-            params.setSkusList(skuList).setType(type!!)
+            params.setSkusList(skuList).setType(type)
             billingClient.querySkuDetailsAsync(
                 params.build()
             ) { billingResult: BillingResult, skuDetailsList: List<SkuDetails>? ->
-                Log.d(TAG, "responseCode: " + billingResult.responseCode)
-                if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
-                    PlayUtils.instance
-                        .rejectPromiseWithBillingError(promise, billingResult.responseCode)
-                    return@querySkuDetailsAsync
-                }
+                if (!isValidResult(billingResult, promise)) return@querySkuDetailsAsync
+
                 if (skuDetailsList != null) {
                     for (sku in skuDetailsList) {
                         skus[sku.sku] = sku
                     }
                 }
-                val items = WritableNativeArray()
+                val items = Arguments.createArray()
                 for (skuDetails in skuDetailsList!!) {
                     val item = Arguments.createMap()
                     item.putString("productId", skuDetails.sku)
@@ -260,6 +252,22 @@ class RNIapModule(
         }
     }
 
+    /**
+     * Rejects promise with billing code if BillingResult is not OK
+     */
+    private fun isValidResult(
+        billingResult: BillingResult,
+        promise: Promise
+    ): Boolean {
+        Log.d(TAG, "responseCode: " + billingResult.responseCode)
+        if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
+            PlayUtils.instance
+                .rejectPromiseWithBillingError(promise, billingResult.responseCode)
+            return false
+        }
+        return true
+    }
+
     @ReactMethod
     fun getAvailableItemsByType(type: String, promise: Promise) {
         ensureConnection(
@@ -268,7 +276,8 @@ class RNIapModule(
             val items = WritableNativeArray()
             billingClient.queryPurchasesAsync(
                 if (type == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP
-            ) { billingResult: BillingResult?, purchases: List<Purchase>? ->
+            ) { billingResult: BillingResult, purchases: List<Purchase>? ->
+                if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
                 if (purchases != null) {
                     for (i in purchases.indices) {
                         val purchase = purchases[i]
@@ -311,16 +320,12 @@ class RNIapModule(
             billingClient.queryPurchaseHistoryAsync(
                 if (type == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP
             ) { billingResult, purchaseHistoryRecordList ->
-                if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
-                    PlayUtils.instance
-                        .rejectPromiseWithBillingError(promise, billingResult.responseCode)
-                    return@queryPurchaseHistoryAsync
-                }
+                if (!isValidResult(billingResult, promise)) return@queryPurchaseHistoryAsync
+
                 Log.d(TAG, purchaseHistoryRecordList.toString())
                 val items = Arguments.createArray()
-                for (i in purchaseHistoryRecordList!!.indices) {
+                purchaseHistoryRecordList?.forEach { purchase ->
                     val item = Arguments.createMap()
-                    val purchase = purchaseHistoryRecordList[i]
                     item.putString("productId", purchase.skus[0])
                     item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                     item.putString("transactionReceipt", purchase.originalJson)
@@ -437,8 +442,14 @@ class RNIapModule(
             }
             val flowParams = builder.build()
             val billingResult = billingClient.launchBillingFlow(activity, flowParams)
-            val errorData: Array<String?> =
-                PlayUtils.instance.getBillingResponseData(billingResult.responseCode)
+            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                promise.safeResolve(true)
+                return@ensureConnection
+            } else {
+                val errorData: Array<String?> =
+                    PlayUtils.instance.getBillingResponseData(billingResult.responseCode)
+                promise.safeReject(errorData[0], errorData[1])
+            }
         }
     }
 
@@ -458,10 +469,8 @@ class RNIapModule(
             billingClient.acknowledgePurchase(
                 acknowledgePurchaseParams
             ) { billingResult: BillingResult ->
-                if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
-                    PlayUtils.instance
-                        .rejectPromiseWithBillingError(promise, billingResult.responseCode)
-                }
+                if (!isValidResult(billingResult, promise)) return@acknowledgePurchase
+
                 val map = Arguments.createMap()
                 map.putInt("responseCode", billingResult.responseCode)
                 map.putString("debugMessage", billingResult.debugMessage)
@@ -487,10 +496,7 @@ class RNIapModule(
             billingClient.consumeAsync(
                 params
             ) { billingResult: BillingResult, purchaseToken: String? ->
-                if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
-                    PlayUtils.instance
-                        .rejectPromiseWithBillingError(promise, billingResult.responseCode)
-                }
+                if (!isValidResult(billingResult, promise)) return@consumeAsync
 
                 val map = Arguments.createMap()
                 map.putInt("responseCode", billingResult.responseCode)
@@ -575,14 +581,10 @@ class RNIapModule(
             for (type in types) {
                 billingClient.queryPurchasesAsync(
                     type
-                ) { billingResult: BillingResult, list: List<Purchase>? ->
-                    val unacknowledgedPurchases = ArrayList<Purchase>()
+                ) { billingResult: BillingResult, list: List<Purchase> ->
+                    if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
 
-                    for (purchase in list!!) {
-                        if (!purchase.isAcknowledged) {
-                            unacknowledgedPurchases.add(purchase)
-                        }
-                    }
+                    val unacknowledgedPurchases = list.filter { !it.isAcknowledged }
                     onPurchasesUpdated(billingResult, unacknowledgedPurchases)
                 }
             }

package/android/src/testPlay/java/com/dooboolab/RNIap/RNIapModuleTest.kt

@@ -6,16 +6,25 @@ import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.ConsumeResponseListener
 import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesResponseListener
+import com.android.billingclient.api.SkuDetailsResponseListener
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.just
 import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.runs
 import io.mockk.slot
 import io.mockk.verify
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -24,10 +33,13 @@ class RNIapModuleTest {
 
     @MockK
     lateinit var context: ReactApplicationContext
+
     @MockK
     lateinit var builder: BillingClient.Builder
+
     @MockK
     lateinit var billingClient: BillingClient
+
     @MockK
     lateinit var availability: GoogleApiAvailability
 
@@ -67,7 +79,10 @@ class RNIapModuleTest {
         every { billingClient.isReady } returns false
         val listener = slot<BillingClientStateListener>()
         every { billingClient.startConnection(capture(listener)) } answers {
-            listener.captured.onBillingSetupFinished(BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.OK).build())
+            listener.captured.onBillingSetupFinished(
+                BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.OK)
+                    .build()
+            )
         }
         every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
         val promise = mockk<Promise>(relaxed = true)
@@ -82,7 +97,10 @@ class RNIapModuleTest {
         every { billingClient.isReady } returns false
         val listener = slot<BillingClientStateListener>()
         every { billingClient.startConnection(capture(listener)) } answers {
-            listener.captured.onBillingSetupFinished(BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.ERROR).build())
+            listener.captured.onBillingSetupFinished(
+                BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.ERROR)
+                    .build()
+            )
         }
         every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
         val promise = mockk<Promise>(relaxed = true)
@@ -137,7 +155,11 @@ class RNIapModuleTest {
         }
         val consumeListener = slot<ConsumeResponseListener>()
         every { billingClient.consumeAsync(any(), capture(consumeListener)) } answers {
-            consumeListener.captured.onConsumeResponse(BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.ITEM_NOT_OWNED).build(), "")
+            consumeListener.captured.onConsumeResponse(
+                BillingResult.newBuilder()
+                    .setResponseCode(BillingClient.BillingResponseCode.ITEM_NOT_OWNED).build(),
+                ""
+            )
         }
 
         module.flushFailedPurchasesCachedAsPending(promise)
@@ -164,6 +186,55 @@ class RNIapModuleTest {
 
     @Test
     fun getItemsByType() {
+        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(
+                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
+                    }
+                )
+            )
+        }
+        val skus = mockk<ReadableArray>() {
+            every { size() } returns 1
+            every { getString(0) } returns "sku0"
+        }
+        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
+        var itemsSize = 0
+        every { itemsArr.pushMap(any()) } answers {
+            itemsSize++
+        }
+
+        module.getItemsByType("subs", skus, promise)
+        verify { promise.resolve(any()) }
+        assertEquals(itemsSize, 1)
     }
 
     @Test

package/package.json

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