react-native-iap 8.2.0 → 8.2.1

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

@@ -7,7 +7,7 @@ import com.facebook.react.bridge.Promise
 class PlayUtils {
     fun rejectPromiseWithBillingError(promise: Promise, responseCode: Int) {
         val errorData = getBillingResponseData(responseCode)
-        promise.reject(errorData[0], errorData[1])
+        promise.safeReject(errorData[0], errorData[1])
     }
 
     fun getBillingResponseData(responseCode: Int): Array<String?> {

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

@@ -0,0 +1,33 @@
+package com.dooboolab.RNIap
+
+import android.util.Log
+import com.facebook.react.bridge.ObjectAlreadyConsumedException
+import com.facebook.react.bridge.Promise
+
+/**
+ * Extension functions used to simplify promise handling since we don't
+ * want to crash in the case of it being resolved/rejected more than once
+ */
+
+fun Promise.safeResolve(value: Any) {
+    try {
+        this.resolve(value)
+    } catch (oce: ObjectAlreadyConsumedException) {
+        Log.d(RNIapModule.TAG, "Already consumed ${oce.message}")
+    }
+}
+
+fun Promise.safeReject(message: String) = this.safeReject(message, null, null)
+
+fun Promise.safeReject(code: String?, message: String?) = this.safeReject(code, message, null)
+
+fun Promise.safeReject(code: String?, throwable: Throwable?) =
+    this.safeReject(code, null, throwable)
+
+fun Promise.safeReject(code: String?, message: String?, throwable: Throwable?) {
+    try {
+        this.reject(code, message, throwable)
+    } catch (oce: ObjectAlreadyConsumedException) {
+        Log.d(RNIapModule.TAG, "Already consumed ${oce.message}")
+    }
+}

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

@@ -15,7 +15,6 @@ import com.android.billingclient.api.SkuDetails
 import com.android.billingclient.api.SkuDetailsParams
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.LifecycleEventListener
-import com.facebook.react.bridge.ObjectAlreadyConsumedException
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.PromiseImpl
 import com.facebook.react.bridge.ReactApplicationContext
@@ -46,7 +45,7 @@ class RNIapModule(
         return "RNIapModule"
     }
 
-    private fun ensureConnection(promise: Promise, callback: () -> Unit) {
+    internal fun ensureConnection(promise: Promise, callback: () -> Unit) {
         if (billingClient.isReady) {
             callback()
             return
@@ -61,7 +60,7 @@ class RNIapModule(
                 },
                 {
                     if (it.size > 1 && it[0] is String && it[1] is String) {
-                        promise.reject(
+                        promise.safeReject(
                             it[0] as String, it[1] as String
                         )
                     } else {
@@ -80,14 +79,14 @@ class RNIapModule(
                 TAG,
                 "Already initialized, you should only call initConnection() once when your app starts"
             )
-            promise.resolve(true)
+            promise.safeResolve(true)
             return
         }
         if (googleApiAvailability.isGooglePlayServicesAvailable(reactContext)
             != ConnectionResult.SUCCESS
         ) {
             Log.i(TAG, "Google Play Services are not available on this device")
-            promise.reject(DoobooUtils.E_NOT_PREPARED, "Google Play Services are not available on this device")
+            promise.safeReject(DoobooUtils.E_NOT_PREPARED, "Google Play Services are not available on this device")
             return
         }
 
@@ -97,15 +96,12 @@ class RNIapModule(
             object : BillingClientStateListener {
                 override fun onBillingSetupFinished(billingResult: BillingResult) {
                     val responseCode = billingResult.responseCode
-                    try {
-                        if (responseCode == BillingClient.BillingResponseCode.OK) {
-                            promise.resolve(true)
-                        } else {
-                            PlayUtils.instance
-                                .rejectPromiseWithBillingError(promise, responseCode)
-                        }
-                    } catch (oce: ObjectAlreadyConsumedException) {
-                        Log.e(TAG, oce.message!!)
+
+                    if (responseCode == BillingClient.BillingResponseCode.OK) {
+                        promise.safeResolve(true)
+                    } else {
+                        PlayUtils.instance
+                            .rejectPromiseWithBillingError(promise, responseCode)
                     }
                 }
 
@@ -118,7 +114,7 @@ class RNIapModule(
     @ReactMethod
     fun endConnection(promise: Promise) {
         billingClient.endConnection()
-        promise.resolve(true)
+        promise.safeResolve(true)
     }
 
     private fun consumeItems(
@@ -143,11 +139,8 @@ class RNIapModule(
                                 )
                             return@ConsumeResponseListener
                         }
-                        try {
-                            promise.resolve(true)
-                        } catch (oce: ObjectAlreadyConsumedException) {
-                            promise.reject(oce.message)
-                        }
+
+                        promise.safeResolve(true)
                     }
                 billingClient.consumeAsync(consumeParams, listener)
             }
@@ -164,7 +157,7 @@ class RNIapModule(
             ) { _: BillingResult?, list: List<Purchase>? ->
                 if (list == null) {
                     // No purchases found
-                    promise.resolve(false)
+                    promise.safeResolve(false)
                     return@queryPurchasesAsync
                 }
                 // we only want to try to consume PENDING items, in order to force cache-refresh
@@ -172,7 +165,7 @@ class RNIapModule(
                 val pendingPurchases = list.filter { it.purchaseState == Purchase.PurchaseState.PENDING }
 
                 if (pendingPurchases.isEmpty()) {
-                    promise.resolve(false)
+                    promise.safeResolve(false)
                     return@queryPurchasesAsync
                 }
                 consumeItems(
@@ -262,11 +255,7 @@ class RNIapModule(
                     item.putString("originalPrice", originalPrice)
                     items.pushMap(item)
                 }
-                try {
-                    promise.resolve(items)
-                } catch (oce: ObjectAlreadyConsumedException) {
-                    Log.e(TAG, oce.message!!)
-                }
+                promise.safeResolve(items)
             }
         }
     }
@@ -309,11 +298,7 @@ class RNIapModule(
                         items.pushMap(item)
                     }
                 }
-                try {
-                    promise.resolve(items)
-                } catch (oce: ObjectAlreadyConsumedException) {
-                    Log.e(TAG, oce.message!!)
-                }
+                promise.safeResolve(items)
             }
         }
     }
@@ -345,11 +330,7 @@ class RNIapModule(
                     item.putString("developerPayload", purchase.developerPayload)
                     items.pushMap(item)
                 }
-                try {
-                    promise.resolve(items)
-                } catch (oce: ObjectAlreadyConsumedException) {
-                    Log.e(TAG, oce.message!!)
-                }
+                promise.safeResolve(items)
             }
         }
     }
@@ -366,7 +347,7 @@ class RNIapModule(
     ) {
         val activity = currentActivity
         if (activity == null) {
-            promise.reject(DoobooUtils.E_UNKNOWN, "getCurrentActivity returned null")
+            promise.safeReject(DoobooUtils.E_UNKNOWN, "getCurrentActivity returned null")
             return
         }
         ensureConnection(
@@ -386,7 +367,7 @@ class RNIapModule(
                 error.putString("message", debugMessage)
                 error.putString("productId", sku)
                 sendEvent(reactContext, "purchase-error", error)
-                promise.reject(PROMISE_BUY_ITEM, debugMessage)
+                promise.safeReject(PROMISE_BUY_ITEM, debugMessage)
                 return@ensureConnection
             }
             builder.setSkuDetails(selectedSku)
@@ -419,7 +400,7 @@ class RNIapModule(
                         error.putString("message", debugMessage)
                         error.putString("productId", sku)
                         sendEvent(reactContext, "purchase-error", error)
-                        promise.reject(PROMISE_BUY_ITEM, debugMessage)
+                        promise.safeReject(PROMISE_BUY_ITEM, debugMessage)
                         return@ensureConnection
                     }
                 } else if (prorationMode
@@ -481,18 +462,14 @@ class RNIapModule(
                     PlayUtils.instance
                         .rejectPromiseWithBillingError(promise, billingResult.responseCode)
                 }
-                try {
-                    val map = Arguments.createMap()
-                    map.putInt("responseCode", billingResult.responseCode)
-                    map.putString("debugMessage", billingResult.debugMessage)
-                    val errorData: Array<String?> = PlayUtils.instance
-                        .getBillingResponseData(billingResult.responseCode)
-                    map.putString("code", errorData[0])
-                    map.putString("message", errorData[1])
-                    promise.resolve(map)
-                } catch (oce: ObjectAlreadyConsumedException) {
-                    Log.e(TAG, oce.message!!)
-                }
+                val map = Arguments.createMap()
+                map.putInt("responseCode", billingResult.responseCode)
+                map.putString("debugMessage", billingResult.debugMessage)
+                val errorData: Array<String?> = PlayUtils.instance
+                    .getBillingResponseData(billingResult.responseCode)
+                map.putString("code", errorData[0])
+                map.putString("message", errorData[1])
+                promise.safeResolve(map)
             }
         }
     }
@@ -514,18 +491,15 @@ class RNIapModule(
                     PlayUtils.instance
                         .rejectPromiseWithBillingError(promise, billingResult.responseCode)
                 }
-                try {
-                    val map = Arguments.createMap()
-                    map.putInt("responseCode", billingResult.responseCode)
-                    map.putString("debugMessage", billingResult.debugMessage)
-                    val errorData: Array<String?> = PlayUtils.instance
-                        .getBillingResponseData(billingResult.responseCode)
-                    map.putString("code", errorData[0])
-                    map.putString("message", errorData[1])
-                    promise.resolve(map)
-                } catch (oce: ObjectAlreadyConsumedException) {
-                    promise.reject(oce.message)
-                }
+
+                val map = Arguments.createMap()
+                map.putInt("responseCode", billingResult.responseCode)
+                map.putString("debugMessage", billingResult.debugMessage)
+                val errorData: Array<String?> = PlayUtils.instance
+                    .getBillingResponseData(billingResult.responseCode)
+                map.putString("code", errorData[0])
+                map.putString("message", errorData[1])
+                promise.safeResolve(map)
             }
         }
     }
@@ -612,7 +586,7 @@ class RNIapModule(
                     onPurchasesUpdated(billingResult, unacknowledgedPurchases)
                 }
             }
-            promise.resolve(true)
+            promise.safeResolve(true)
         }
     }
 

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

@@ -3,6 +3,8 @@ package com.dooboolab.RNIap
 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.Purchase
 import com.android.billingclient.api.PurchasesResponseListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -14,6 +16,7 @@ import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.verify
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 
@@ -55,7 +58,7 @@ class RNIapModuleTest {
         val promise = mockk<Promise>(relaxed = true)
 
         module.initConnection(promise)
-        verify { promise.reject(any(), any<String>()) }
+        verify { promise.safeReject(any(), any<String>()) }
         verify(exactly = 0) { promise.resolve(any()) }
     }
 
@@ -85,7 +88,7 @@ class RNIapModuleTest {
         val promise = mockk<Promise>(relaxed = true)
 
         module.initConnection(promise)
-        verify { promise.reject(any(), any<String>()) }
+        verify { promise.safeReject(any(), any<String>()) }
         verify(exactly = 0) { promise.resolve(any()) }
     }
 
@@ -114,6 +117,51 @@ class RNIapModuleTest {
         verify { promise.resolve(false) } // empty list
     }
 
+    @Test
+    fun `flushFailedPurchasesCachedAsPending resolves to true if pending purchases`() {
+        every { billingClient.isReady } returns true
+        val promise = mockk<Promise>(relaxed = true)
+        val listener = slot<PurchasesResponseListener>()
+        every { billingClient.queryPurchasesAsync(any(), capture(listener)) } answers {
+            listener.captured.onQueryPurchasesResponse(
+                BillingResult.newBuilder().build(),
+                listOf(
+                    // 4 = Pending
+                    mockk<Purchase> {
+                        every { purchaseState } returns 2
+                        every { purchaseToken } returns "token"
+                    },
+                    Purchase("", "1")
+                )
+            )
+        }
+        val consumeListener = slot<ConsumeResponseListener>()
+        every { billingClient.consumeAsync(any(), capture(consumeListener)) } answers {
+            consumeListener.captured.onConsumeResponse(BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.ITEM_NOT_OWNED).build(), "")
+        }
+
+        module.flushFailedPurchasesCachedAsPending(promise)
+
+        verify(exactly = 0) { promise.reject(any(), any<String>()) }
+        verify { promise.resolve(true) } // at least one pending transactions
+    }
+
+    @Test
+    fun `ensureConnection should attempt to reconnect, if not in ready state`() {
+        every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
+        val promise = mockk<Promise>(relaxed = true)
+        var isCallbackCalled = false
+        val callback = {
+            isCallbackCalled = true
+            promise.resolve(true)
+        }
+
+        every { billingClient.isReady } returns false andThen true
+        module.ensureConnection(promise, callback)
+        verify { promise.resolve(true) } // at least one pending transactions
+        assertTrue("Should call callback", isCallbackCalled)
+    }
+
     @Test
     fun getItemsByType() {
     }

package/package.json

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