react-native-iap 16.3.0 → 16.3.2

package/README.md

@@ -5,9 +5,9 @@
 
 [![Version](http://img.shields.io/npm/v/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap) [![Download](http://img.shields.io/npm/dm/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap) [![OpenIAP](https://img.shields.io/badge/OpenIAP-Compliant-green?style=flat-square)](https://openiap.dev) [![Backers and Sponsors](https://img.shields.io/opencollective/all/openiap.svg)](https://opencollective.com/openiap) [![CI - Test](https://github.com/hyodotdev/openiap/actions/workflows/ci-react-native-iap.yml/badge.svg?branch=main)](https://github.com/hyodotdev/openiap/actions/workflows/ci-react-native-iap.yml?query=branch%3Amain) [![codecov](https://codecov.io/gh/hyodotdev/openiap/branch/main/graph/badge.svg?component=react-native-iap)](https://app.codecov.io/gh/hyodotdev/openiap/tree/main/libraries/react-native-iap) [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fhyochan%2Freact-native-iap.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Fhyochan%2Freact-native-iap?ref=badge_shield&issueType=license)
 
-**React Native IAP** is a high-performance in-app purchase library using Nitro Modules that **conforms to the [Open IAP specification](https://openiap.dev)**. It provides a unified API for handling in-app purchases across iOS and Android platforms with comprehensive error handling and modern TypeScript support.
+**React Native IAP** is a high-performance in-app purchase library using Nitro Modules that **conforms to the [OpenIAP specification](https://openiap.dev)**. It provides a unified API for handling in-app purchases across iOS and Android platforms with comprehensive error handling and modern TypeScript support.
 
-<a href="https://openiap.dev"><img src="https://raw.githubusercontent.com/hyodotdev/openiap/main/logo.png" alt="Open IAP" height="40" /></a>
+<a href="https://openiap.dev"><img src="https://raw.githubusercontent.com/hyodotdev/openiap/main/logo.webp" alt="OpenIAP" height="40" /></a>
 </div>
 
 ## 📚 Documentation
@@ -137,7 +137,7 @@ Quick links:
 
 ## Powered by OpenIAP
 
-<a href="https://openiap.dev"><img src="https://raw.githubusercontent.com/hyodotdev/openiap/main/logo.png" alt="OpenIAP" height="50" /></a>
+<a href="https://openiap.dev"><img src="https://raw.githubusercontent.com/hyodotdev/openiap/main/logo.webp" alt="OpenIAP" height="50" /></a>
 
 React Native IAP conforms to the **[OpenIAP specification](https://openiap.dev)** — an open, vendor-neutral interoperability standard for in-app purchases. OpenIAP provides:
 

package/android/src/main/java/com/margelo/nitro/iap/HybridRnIap.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.NullType
 import com.margelo.nitro.core.Promise
-import dev.hyo.openiap.AndroidSubscriptionOfferInput
+import dev.hyo.openiap.AndroidSubscriptionOfferInput as OpenIapAndroidSubscriptionOfferInput
 import dev.hyo.openiap.DeepLinkOptions as OpenIapDeepLinkOptions
 import dev.hyo.openiap.FetchProductsResult
 import dev.hyo.openiap.FetchProductsResultAll
@@ -31,8 +31,10 @@ import dev.hyo.openiap.SubResponseCodeAndroid as OpenIapSubResponseCodeAndroid
 import dev.hyo.openiap.SubscriptionProductReplacementParamsAndroid as OpenIapSubscriptionProductReplacementParams
 import dev.hyo.openiap.SubscriptionReplacementModeAndroid as OpenIapSubscriptionReplacementMode
 import dev.hyo.openiap.VerifyPurchaseGoogleOptions
+import dev.hyo.openiap.VerifyPurchaseHorizonOptions
 import dev.hyo.openiap.VerifyPurchaseProps
 import dev.hyo.openiap.VerifyPurchaseResultAndroid
+import dev.hyo.openiap.VerifyPurchaseResultHorizon
 import dev.hyo.openiap.InitConnectionConfig as OpenIapInitConnectionConfig
 import dev.hyo.openiap.listener.OpenIapPurchaseErrorListener
 import dev.hyo.openiap.listener.OpenIapPurchaseUpdateListener
@@ -99,6 +101,44 @@ internal fun <T> removeSingletonBridgeListener(
     }
 }
 
+internal fun requireValidSubscriptionOffers(
+    offers: Array<AndroidSubscriptionOfferInput>?,
+): List<OpenIapAndroidSubscriptionOfferInput> {
+    require(offers.orEmpty().all { it.sku.isNotBlank() && it.offerToken.isNotBlank() }) {
+        "Every subscription offer must include non-empty sku and offerToken strings"
+    }
+    return offers.orEmpty().map { offer ->
+        OpenIapAndroidSubscriptionOfferInput(
+            sku = offer.sku,
+            offerToken = offer.offerToken,
+        )
+    }
+}
+
+internal fun requireMatchingPurchaseOptions(
+    type: ProductQueryType,
+    hasSubscriptionOffers: Boolean,
+    hasSubscriptionReplacementParams: Boolean,
+    purchaseToken: String?,
+    originalExternalTransactionId: String?,
+    offerToken: String?,
+) {
+    when (type) {
+        ProductQueryType.InApp -> require(
+            !hasSubscriptionOffers &&
+                !hasSubscriptionReplacementParams &&
+                purchaseToken == null &&
+                originalExternalTransactionId == null,
+        ) { "Subscription options require product type subs" }
+        ProductQueryType.Subs -> require(offerToken == null) {
+            "offerToken requires product type in-app"
+        }
+        ProductQueryType.All -> throw IllegalArgumentException(
+            "Product type all is only supported for product queries"
+        )
+    }
+}
+
 /**
  * Bound for the pending purchase-event queues, matching expo-iap's
  * ExpoIapHelper.MAX_BUFFERED_EVENTS. Oldest entries are dropped on overflow.
@@ -555,17 +595,37 @@ class HybridRnIap : HybridRnIapSpec() {
                 val typeHint = androidRequest.skus.firstOrNull()?.let { productTypeBySku[it] } ?: "in-app"
                 val queryType = parseProductQueryType(typeHint)
 
-                val subscriptionOffers = (androidRequest.subscriptionOffers as? Variant_NullType_Array_AndroidSubscriptionOfferInput_.Second)?.value
-                    ?.mapNotNull { offer ->
-                        val sku = offer.sku
-                        val token = offer.offerToken
-                        if (sku.isBlank() || token.isBlank()) {
-                            null
-                        } else {
-                            AndroidSubscriptionOfferInput(sku = sku, offerToken = token)
-                        }
-                    }
-                    ?: emptyList()
+                try {
+                    requireMatchingPurchaseOptions(
+                        type = queryType,
+                        hasSubscriptionOffers = androidRequest.subscriptionOffers is
+                            Variant_NullType_Array_AndroidSubscriptionOfferInput_.Second,
+                        hasSubscriptionReplacementParams =
+                            androidRequest.subscriptionProductReplacementParams is
+                                Variant_NullType_SubscriptionProductReplacementParamsAndroid.Second,
+                        purchaseToken = androidRequest.purchaseToken.unwrapString(),
+                        originalExternalTransactionId =
+                            androidRequest.originalExternalTransactionId.unwrapString(),
+                        offerToken = androidRequest.offerToken.unwrapString(),
+                    )
+                } catch (error: IllegalArgumentException) {
+                    sendPurchaseError(
+                        toErrorResult(OpenIapError.DeveloperError(error.message))
+                    )
+                    return@async defaultResult
+                }
+
+                val subscriptionOffers = try {
+                    requireValidSubscriptionOffers(
+                        (androidRequest.subscriptionOffers as?
+                            Variant_NullType_Array_AndroidSubscriptionOfferInput_.Second)?.value,
+                    )
+                } catch (error: IllegalArgumentException) {
+                    sendPurchaseError(
+                        toErrorResult(OpenIapError.DeveloperError(error.message))
+                    )
+                    return@async defaultResult
+                }
                 val normalizedOffers = subscriptionOffers.takeIf { it.isNotEmpty() }
                 val developerBillingOption =
                     (androidRequest.developerBillingOption as?
@@ -1405,10 +1465,45 @@ class HybridRnIap : HybridRnIapSpec() {
     }
 
     // Receipt validation - calls OpenIAP's verifyPurchase
-    override fun verifyPurchase(params: NitroPurchaseVerificationParams): Promise<Variant_NitroPurchaseVerificationResultIOS_NitroPurchaseVerificationResultAndroid> {
+    override fun verifyPurchase(params: NitroPurchaseVerificationParams): Promise<Variant_NitroPurchaseVerificationResultIOS_NitroPurchaseVerificationResultAndroid_NitroPurchaseVerificationResultHorizon> {
         return Promise.async {
             try {
-                // For Android, we need the google options to be provided (new platform-specific structure)
+                val nitroHorizonOptions =
+                    (params.horizon as? Variant_NullType_NitroPurchaseVerificationHorizonOptions.Second)?.value
+                if (nitroHorizonOptions != null) {
+                    val validations = mapOf(
+                        "horizon.sku" to nitroHorizonOptions.sku,
+                        "horizon.userId" to nitroHorizonOptions.userId,
+                        "horizon.accessToken" to nitroHorizonOptions.accessToken
+                    )
+                    for ((name, value) in validations) {
+                        if (value.isEmpty()) {
+                            throw OpenIapException(toErrorJson(OpenIapError.DeveloperError(), debugMessage = "Missing or empty required parameter: $name"))
+                        }
+                    }
+
+                    RnIapLog.payload("verifyPurchase", mapOf(
+                        "store" to "horizon",
+                        "sku" to nitroHorizonOptions.sku
+                    ))
+                    val props = VerifyPurchaseProps(
+                        horizon = VerifyPurchaseHorizonOptions(
+                            sku = nitroHorizonOptions.sku,
+                            userId = nitroHorizonOptions.userId,
+                            accessToken = nitroHorizonOptions.accessToken
+                        )
+                    )
+                    val horizonResult = openIap.verifyPurchase(props) as? VerifyPurchaseResultHorizon
+                        ?: throw OpenIapException(toErrorJson(OpenIapError.InvalidPurchaseVerification, debugMessage = "Unexpected Horizon result type from verifyPurchase"))
+                    @Suppress("DEPRECATION")
+                    val result = NitroPurchaseVerificationResultHorizon(
+                        isValid = horizonResult.isValid,
+                        grantTime = horizonResult.grantTime.wrapVariant(),
+                        success = horizonResult.success
+                    )
+                    return@async Variant_NitroPurchaseVerificationResultIOS_NitroPurchaseVerificationResultAndroid_NitroPurchaseVerificationResultHorizon.Third(result)
+                }
+
                 val nitroGoogleOptions = (params.google as? Variant_NullType_NitroPurchaseVerificationGoogleOptions.Second)?.value
                     ?: throw OpenIapException(toErrorJson(OpenIapError.DeveloperError(), debugMessage = "Missing required parameter: google options"))
 
@@ -1459,6 +1554,7 @@ class HybridRnIap : HybridRnIapSpec() {
 
                 // Convert OpenIAP result to Nitro result
                 val result = NitroPurchaseVerificationResultAndroid(
+                    isValid = androidResult.isValid,
                     autoRenewing = androidResult.autoRenewing,
                     betaProduct = androidResult.betaProduct,
                     cancelDate = androidResult.cancelDate.wrapVariant(),
@@ -1479,7 +1575,7 @@ class HybridRnIap : HybridRnIapSpec() {
                     testTransaction = androidResult.testTransaction
                 )
 
-                Variant_NitroPurchaseVerificationResultIOS_NitroPurchaseVerificationResultAndroid.Second(result)
+                Variant_NitroPurchaseVerificationResultIOS_NitroPurchaseVerificationResultAndroid_NitroPurchaseVerificationResultHorizon.Second(result)
 
             } catch (e: OpenIapException) {
                 RnIapLog.failure("verifyPurchase", e)

package/android/src/main/java/com/margelo/nitro/iap/RnIapLog.kt

@@ -67,7 +67,7 @@ internal object RnIapLog {
         }
     }
 
-    private fun sanitizeMap(source: Map<*, *>): Map<String, Any?> {
+    internal fun sanitizeMap(source: Map<*, *>): Map<String, Any?> {
         fun isSensitiveKey(key: String): Boolean {
             val normalized = key.lowercase(Locale.ROOT).filter { it.isLetterOrDigit() }
             return SENSITIVE_KEY_FRAGMENTS.any { normalized.contains(it) } ||
@@ -77,6 +77,10 @@ internal object RnIapLog {
         val sanitized = linkedMapOf<String, Any?>()
         for ((rawKey, rawValue) in source) {
             val key = rawKey as? String ?: continue
+            if (rawValue == null || rawValue === JSONObject.NULL) {
+                sanitized[key] = JSONObject.NULL
+                continue
+            }
             if (isSensitiveKey(key)) {
                 sanitized[key] = "hidden"
                 continue

package/ios/HybridRnIap.swift

@@ -399,7 +399,7 @@ class HybridRnIap: HybridRnIapSpec {
         }
     }
     
-    func verifyPurchase(params: NitroPurchaseVerificationParams) throws -> Promise<Variant_NitroPurchaseVerificationResultIOS_NitroPurchaseVerificationResultAndroid> {
+    func verifyPurchase(params: NitroPurchaseVerificationParams) throws -> Promise<Variant_NitroPurchaseVerificationResultIOS_NitroPurchaseVerificationResultAndroid_NitroPurchaseVerificationResultHorizon> {
         return Promise.async {
             do {
                 // Extract SKU from apple options (new platform-specific structure)

package/ios/RnIapLog.swift

@@ -105,22 +105,22 @@ enum RnIapLog {
     }
 
     private static func sanitize(_ value: Any?) -> Any? {
-        guard let value else { return nil }
-
-        if let dictionary = value as? [String: Any] {
-            return sanitizeDictionary(dictionary)
-        }
+        guard let value, !(value is NSNull) else { return nil }
 
         if let optionalDictionary = value as? [String: Any?] {
             var compact: [String: Any] = [:]
             for (key, optionalValue) in optionalDictionary {
-                if let optionalValue {
+                if let optionalValue, !(optionalValue is NSNull) {
                     compact[key] = optionalValue
                 }
             }
             return sanitizeDictionary(compact)
         }
 
+        if let dictionary = value as? [String: Any] {
+            return sanitizeDictionary(dictionary)
+        }
+
         if let array = value as? [Any] {
             return array.compactMap { sanitize($0) }
         }

package/lib/module/index.js

@@ -621,7 +621,10 @@ export const fetchProducts = async request => {
   } = request;
   try {
     if (!skus?.length) {
-      throw new Error('No SKUs provided');
+      throw createPurchaseError({
+        message: 'No SKUs provided',
+        code: ErrorCode.EmptySkuList
+      });
     }
     const normalizedType = normalizeProductQueryType(type);
     const fetchAndConvert = async nitroType => {
@@ -1269,6 +1272,12 @@ export const requestPurchase = async request => {
       type
     } = request;
     const normalizedType = normalizeProductQueryType(type ?? 'in-app');
+    if (normalizedType === 'all') {
+      throw createPurchaseError({
+        code: ErrorCode.DeveloperError,
+        message: 'Product type all is only supported for product queries.'
+      });
+    }
     const isSubs = isSubscriptionQuery(normalizedType);
     const perPlatformRequest = platformRequest;
     if (!perPlatformRequest) {
@@ -1278,11 +1287,18 @@ export const requestPurchase = async request => {
     const androidRequestSource = isAndroidStoreRuntime() ? perPlatformRequest.google : undefined;
     if (Platform.OS === 'ios') {
       if (!iosRequestSource?.sku) {
-        throw new Error('Invalid request for iOS. The `sku` property is required.');
+        throw createPurchaseError({
+          message: 'Invalid request for iOS. The `sku` property is required.',
+          code: ErrorCode.EmptySkuList
+        });
       }
     } else if (isAndroidStoreRuntime()) {
-      if (!androidRequestSource?.skus?.length) {
-        throw new Error('Invalid request for Android. The `skus` property is required and must be a non-empty array.');
+      const skus = androidRequestSource?.skus;
+      if (!Array.isArray(skus) || skus.length === 0 || skus.some(sku => typeof sku !== 'string' || sku.trim() === '')) {
+        throw createPurchaseError({
+          message: 'Invalid request for Android. The `skus` property must contain only non-empty strings.',
+          code: ErrorCode.EmptySkuList
+        });
       }
     } else {
       throw unsupportedPlatformError();
@@ -1327,6 +1343,14 @@ export const requestPurchase = async request => {
       unifiedRequest.apple = iosPayload;
     }
     if (isAndroidStoreRuntime() && androidRequestSource) {
+      const rawAndroidRequest = androidRequestSource;
+      const subscriptionOnlyFields = ['subscriptionOffers', 'subscriptionProductReplacementParams', 'purchaseToken', 'originalExternalTransactionId'];
+      if (!isSubs && subscriptionOnlyFields.some(field => rawAndroidRequest[field] != null) || isSubs && rawAndroidRequest.offerToken != null) {
+        throw createPurchaseError({
+          message: 'Invalid request for Android. Purchase options must match the selected product type.',
+          code: ErrorCode.DeveloperError
+        });
+      }
       const androidRequest = isSubs ? androidRequestSource : androidRequestSource;
       const androidPayload = {
         skus: androidRequest.skus
@@ -1353,6 +1377,19 @@ export const requestPurchase = async request => {
       }
       if (isSubs) {
         const subsRequest = androidRequest;
+        const subscriptionOffers = subsRequest.subscriptionOffers;
+        if (subscriptionOffers != null && (!Array.isArray(subscriptionOffers) || subscriptionOffers.some(offer => {
+          if (offer == null || typeof offer !== 'object') {
+            return true;
+          }
+          const candidate = offer;
+          return typeof candidate.sku !== 'string' || candidate.sku.trim() === '' || typeof candidate.offerToken !== 'string' || candidate.offerToken.trim() === '';
+        }))) {
+          throw createPurchaseError({
+            message: 'Invalid request for Android. Every subscription offer must include non-empty `sku` and `offerToken` strings.',
+            code: ErrorCode.DeveloperError
+          });
+        }
         if (subsRequest.purchaseToken) {
           androidPayload.purchaseToken = subsRequest.purchaseToken;
         }
@@ -1362,7 +1399,7 @@ export const requestPurchase = async request => {
         if (subsRequest.subscriptionProductReplacementParams) {
           androidPayload.subscriptionProductReplacementParams = subsRequest.subscriptionProductReplacementParams;
         }
-        androidPayload.subscriptionOffers = (subsRequest.subscriptionOffers ?? []).filter(offer => offer != null).map(offer => ({
+        androidPayload.subscriptionOffers = (subscriptionOffers ?? []).map(offer => ({
           sku: offer.sku,
           offerToken: offer.offerToken
         }));
@@ -1642,10 +1679,18 @@ export const verifyPurchase = async options => {
         latestTransaction: iosResult.latestTransaction ? convertNitroPurchaseToPurchase(iosResult.latestTransaction) : undefined
       };
       return result;
+    } else if (params.horizon !== null) {
+      const horizonResult = nitroResult;
+      const result = {
+        isValid: horizonResult.isValid,
+        grantTime: horizonResult.grantTime,
+        success: horizonResult.success
+      };
+      return result;
     } else {
-      // Android
       const androidResult = nitroResult;
       const result = {
+        isValid: androidResult.isValid,
         autoRenewing: androidResult.autoRenewing,
         betaProduct: androidResult.betaProduct,
         cancelDate: androidResult.cancelDate,