react-native-iap 14.7.3 → 14.7.4

package/nitrogen/generated/shared/c++/NitroRequestPurchaseAndroid.hpp

@@ -42,17 +42,18 @@ namespace margelo::nitro::iap {
   struct NitroRequestPurchaseAndroid {
   public:
     std::vector<std::string> skus     SWIFT_PRIVATE;
-    std::optional<std::string> obfuscatedAccountIdAndroid     SWIFT_PRIVATE;
-    std::optional<std::string> obfuscatedProfileIdAndroid     SWIFT_PRIVATE;
+    std::optional<std::string> obfuscatedAccountId     SWIFT_PRIVATE;
+    std::optional<std::string> obfuscatedProfileId     SWIFT_PRIVATE;
     std::optional<bool> isOfferPersonalized     SWIFT_PRIVATE;
+    std::optional<std::string> offerToken     SWIFT_PRIVATE;
     std::optional<std::vector<AndroidSubscriptionOfferInput>> subscriptionOffers     SWIFT_PRIVATE;
-    std::optional<double> replacementModeAndroid     SWIFT_PRIVATE;
-    std::optional<std::string> purchaseTokenAndroid     SWIFT_PRIVATE;
+    std::optional<double> replacementMode     SWIFT_PRIVATE;
+    std::optional<std::string> purchaseToken     SWIFT_PRIVATE;
     std::optional<SubscriptionProductReplacementParamsAndroid> subscriptionProductReplacementParams     SWIFT_PRIVATE;
 
   public:
     NitroRequestPurchaseAndroid() = default;
-    explicit NitroRequestPurchaseAndroid(std::vector<std::string> skus, std::optional<std::string> obfuscatedAccountIdAndroid, std::optional<std::string> obfuscatedProfileIdAndroid, std::optional<bool> isOfferPersonalized, std::optional<std::vector<AndroidSubscriptionOfferInput>> subscriptionOffers, std::optional<double> replacementModeAndroid, std::optional<std::string> purchaseTokenAndroid, std::optional<SubscriptionProductReplacementParamsAndroid> subscriptionProductReplacementParams): skus(skus), obfuscatedAccountIdAndroid(obfuscatedAccountIdAndroid), obfuscatedProfileIdAndroid(obfuscatedProfileIdAndroid), isOfferPersonalized(isOfferPersonalized), subscriptionOffers(subscriptionOffers), replacementModeAndroid(replacementModeAndroid), purchaseTokenAndroid(purchaseTokenAndroid), subscriptionProductReplacementParams(subscriptionProductReplacementParams) {}
+    explicit NitroRequestPurchaseAndroid(std::vector<std::string> skus, std::optional<std::string> obfuscatedAccountId, std::optional<std::string> obfuscatedProfileId, std::optional<bool> isOfferPersonalized, std::optional<std::string> offerToken, std::optional<std::vector<AndroidSubscriptionOfferInput>> subscriptionOffers, std::optional<double> replacementMode, std::optional<std::string> purchaseToken, std::optional<SubscriptionProductReplacementParamsAndroid> subscriptionProductReplacementParams): skus(skus), obfuscatedAccountId(obfuscatedAccountId), obfuscatedProfileId(obfuscatedProfileId), isOfferPersonalized(isOfferPersonalized), offerToken(offerToken), subscriptionOffers(subscriptionOffers), replacementMode(replacementMode), purchaseToken(purchaseToken), subscriptionProductReplacementParams(subscriptionProductReplacementParams) {}
   };
 
 } // namespace margelo::nitro::iap
@@ -66,24 +67,26 @@ namespace margelo::nitro {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::iap::NitroRequestPurchaseAndroid(
         JSIConverter<std::vector<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "skus")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "obfuscatedAccountIdAndroid")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "obfuscatedProfileIdAndroid")),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "obfuscatedAccountId")),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "obfuscatedProfileId")),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "isOfferPersonalized")),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "offerToken")),
         JSIConverter<std::optional<std::vector<margelo::nitro::iap::AndroidSubscriptionOfferInput>>>::fromJSI(runtime, obj.getProperty(runtime, "subscriptionOffers")),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "replacementModeAndroid")),
-        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "purchaseTokenAndroid")),
+        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "replacementMode")),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "purchaseToken")),
         JSIConverter<std::optional<margelo::nitro::iap::SubscriptionProductReplacementParamsAndroid>>::fromJSI(runtime, obj.getProperty(runtime, "subscriptionProductReplacementParams"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::iap::NitroRequestPurchaseAndroid& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "skus", JSIConverter<std::vector<std::string>>::toJSI(runtime, arg.skus));
-      obj.setProperty(runtime, "obfuscatedAccountIdAndroid", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.obfuscatedAccountIdAndroid));
-      obj.setProperty(runtime, "obfuscatedProfileIdAndroid", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.obfuscatedProfileIdAndroid));
+      obj.setProperty(runtime, "obfuscatedAccountId", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.obfuscatedAccountId));
+      obj.setProperty(runtime, "obfuscatedProfileId", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.obfuscatedProfileId));
       obj.setProperty(runtime, "isOfferPersonalized", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.isOfferPersonalized));
+      obj.setProperty(runtime, "offerToken", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.offerToken));
       obj.setProperty(runtime, "subscriptionOffers", JSIConverter<std::optional<std::vector<margelo::nitro::iap::AndroidSubscriptionOfferInput>>>::toJSI(runtime, arg.subscriptionOffers));
-      obj.setProperty(runtime, "replacementModeAndroid", JSIConverter<std::optional<double>>::toJSI(runtime, arg.replacementModeAndroid));
-      obj.setProperty(runtime, "purchaseTokenAndroid", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.purchaseTokenAndroid));
+      obj.setProperty(runtime, "replacementMode", JSIConverter<std::optional<double>>::toJSI(runtime, arg.replacementMode));
+      obj.setProperty(runtime, "purchaseToken", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.purchaseToken));
       obj.setProperty(runtime, "subscriptionProductReplacementParams", JSIConverter<std::optional<margelo::nitro::iap::SubscriptionProductReplacementParamsAndroid>>::toJSI(runtime, arg.subscriptionProductReplacementParams));
       return obj;
     }
@@ -96,12 +99,13 @@ namespace margelo::nitro {
         return false;
       }
       if (!JSIConverter<std::vector<std::string>>::canConvert(runtime, obj.getProperty(runtime, "skus"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "obfuscatedAccountIdAndroid"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "obfuscatedProfileIdAndroid"))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "obfuscatedAccountId"))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "obfuscatedProfileId"))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "isOfferPersonalized"))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "offerToken"))) return false;
       if (!JSIConverter<std::optional<std::vector<margelo::nitro::iap::AndroidSubscriptionOfferInput>>>::canConvert(runtime, obj.getProperty(runtime, "subscriptionOffers"))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "replacementModeAndroid"))) return false;
-      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "purchaseTokenAndroid"))) return false;
+      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "replacementMode"))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "purchaseToken"))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::iap::SubscriptionProductReplacementParamsAndroid>>::canConvert(runtime, obj.getProperty(runtime, "subscriptionProductReplacementParams"))) return false;
       return true;
     }

package/openiap-versions.json

@@ -1,6 +1,6 @@
 {
-  "apple": "1.3.12",
-  "google": "1.3.25",
-  "gql": "1.3.14",
-  "docs": "1.3.14"
+  "apple": "1.3.13",
+  "google": "1.3.26",
+  "gql": "1.3.15",
+  "docs": "1.3.15"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "14.7.3",
+  "version": "14.7.4",
   "description": "React Native In-App Purchases module for iOS and Android using Nitro",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/hooks/useIAP.ts

@@ -104,6 +104,8 @@ type UseIap = {
 export interface UseIapOptions {
   onPurchaseSuccess?: (purchase: Purchase) => void;
   onPurchaseError?: (error: PurchaseError) => void;
+  /** Callback for non-purchase errors (fetchProducts, getAvailablePurchases, etc.) */
+  onError?: (error: Error) => void;
   onPromotedProductIOS?: (product: Product) => void;
   onUserChoiceBillingAndroid?: (details: UserChoiceBillingDetails) => void;
   /**
@@ -180,6 +182,15 @@ export function useIAP(options?: UseIapOptions): UseIap {
     subscriptionsRefState.current = subscriptions;
   }, [subscriptions]);
 
+  // Helper function to invoke onError callback
+  const invokeOnError = useCallback((error: unknown) => {
+    if (optionsRef.current?.onError) {
+      optionsRef.current.onError(
+        error instanceof Error ? error : new Error(String(error)),
+      );
+    }
+  }, []);
+
   const fetchProductsInternal = useCallback(
     async (params: {
       skus: string[];
@@ -253,9 +264,10 @@ export function useIAP(options?: UseIapOptions): UseIap {
         );
       } catch (error) {
         RnIapConsole.error('Error fetching products:', error);
+        invokeOnError(error);
       }
     },
-    [mergeWithDuplicateCheck],
+    [mergeWithDuplicateCheck, invokeOnError],
   );
 
   const getAvailablePurchasesInternal = useCallback(
@@ -268,9 +280,10 @@ export function useIAP(options?: UseIapOptions): UseIap {
         setAvailablePurchases(result);
       } catch (error) {
         RnIapConsole.error('Error fetching available purchases:', error);
+        invokeOnError(error);
       }
     },
-    [],
+    [invokeOnError],
   );
 
   const getActiveSubscriptionsInternal = useCallback(
@@ -281,12 +294,11 @@ export function useIAP(options?: UseIapOptions): UseIap {
         return result;
       } catch (error) {
         RnIapConsole.error('Error getting active subscriptions:', error);
-        // Don't clear existing activeSubscriptions on error - preserve current state
-        // This prevents the UI from showing empty state when there are temporary network issues
+        invokeOnError(error);
         return [];
       }
     },
-    [],
+    [invokeOnError],
   );
 
   const hasActiveSubscriptionsInternal = useCallback(
@@ -295,10 +307,11 @@ export function useIAP(options?: UseIapOptions): UseIap {
         return await hasActiveSubscriptions(subscriptionIds);
       } catch (error) {
         RnIapConsole.error('Error checking active subscriptions:', error);
+        invokeOnError(error);
         return false;
       }
     },
-    [],
+    [invokeOnError],
   );
 
   const finishTransaction = useCallback(
@@ -469,8 +482,9 @@ export function useIAP(options?: UseIapOptions): UseIap {
       try {
         await restorePurchasesTopLevel();
         await getAvailablePurchasesInternal();
-      } catch (e) {
-        RnIapConsole.warn('Failed to restore purchases:', e);
+      } catch (error) {
+        RnIapConsole.warn('Failed to restore purchases:', error);
+        invokeOnError(error);
       }
     },
     getPromotedProductIOS,

package/src/index.ts

@@ -1241,27 +1241,35 @@ export const requestPurchase: MutationField<'requestPurchase'> = async (
         skus: androidRequest.skus,
       };
 
-      if (androidRequest.obfuscatedAccountIdAndroid) {
-        androidPayload.obfuscatedAccountIdAndroid =
-          androidRequest.obfuscatedAccountIdAndroid;
+      if (androidRequest.obfuscatedAccountId) {
+        androidPayload.obfuscatedAccountId = androidRequest.obfuscatedAccountId;
       }
-      if (androidRequest.obfuscatedProfileIdAndroid) {
-        androidPayload.obfuscatedProfileIdAndroid =
-          androidRequest.obfuscatedProfileIdAndroid;
+      if (androidRequest.obfuscatedProfileId) {
+        androidPayload.obfuscatedProfileId = androidRequest.obfuscatedProfileId;
       }
       if (androidRequest.isOfferPersonalized != null) {
         androidPayload.isOfferPersonalized = androidRequest.isOfferPersonalized;
       }
 
+      // One-time purchase offerToken (Android 7.0+)
+      if (!isSubs) {
+        const purchaseRequest = androidRequest as RequestPurchaseAndroidProps;
+        if (purchaseRequest.offerToken) {
+          androidPayload.offerToken = purchaseRequest.offerToken;
+        }
+      }
+
       if (isSubs) {
         const subsRequest = androidRequest as RequestSubscriptionAndroidProps;
-        if (subsRequest.purchaseTokenAndroid) {
-          androidPayload.purchaseTokenAndroid =
-            subsRequest.purchaseTokenAndroid;
+        if (subsRequest.purchaseToken) {
+          androidPayload.purchaseToken = subsRequest.purchaseToken;
+        }
+        if (subsRequest.replacementMode != null) {
+          androidPayload.replacementMode = subsRequest.replacementMode;
         }
-        if (subsRequest.replacementModeAndroid != null) {
-          androidPayload.replacementModeAndroid =
-            subsRequest.replacementModeAndroid;
+        if (subsRequest.subscriptionProductReplacementParams) {
+          androidPayload.subscriptionProductReplacementParams =
+            subsRequest.subscriptionProductReplacementParams;
         }
         androidPayload.subscriptionOffers = (
           subsRequest.subscriptionOffers ?? []

package/src/specs/RnIap.nitro.ts

@@ -145,16 +145,22 @@ export interface NitroRequestPurchaseIos {
 
 export interface NitroRequestPurchaseAndroid {
   skus: RequestSubscriptionAndroidProps['skus'];
-  obfuscatedAccountIdAndroid?: RequestSubscriptionAndroidProps['obfuscatedAccountIdAndroid'];
-  obfuscatedProfileIdAndroid?: RequestSubscriptionAndroidProps['obfuscatedProfileIdAndroid'];
+  obfuscatedAccountId?: RequestSubscriptionAndroidProps['obfuscatedAccountId'];
+  obfuscatedProfileId?: RequestSubscriptionAndroidProps['obfuscatedProfileId'];
   isOfferPersonalized?: RequestSubscriptionAndroidProps['isOfferPersonalized'];
+  /**
+   * Offer token for one-time purchase discounts (7.0+).
+   * Pass the offerToken from oneTimePurchaseOfferDetailsAndroid or discountOffers
+   * to apply a discount offer to the purchase.
+   */
+  offerToken?: string | null;
   subscriptionOffers?: AndroidSubscriptionOfferInput[] | null;
   /** @deprecated Use subscriptionProductReplacementParams instead for item-level replacement (8.1.0+) */
-  replacementModeAndroid?: RequestSubscriptionAndroidProps['replacementModeAndroid'];
-  purchaseTokenAndroid?: RequestSubscriptionAndroidProps['purchaseTokenAndroid'];
+  replacementMode?: RequestSubscriptionAndroidProps['replacementMode'];
+  purchaseToken?: RequestSubscriptionAndroidProps['purchaseToken'];
   /**
    * Product-level replacement parameters (8.1.0+)
-   * Use this instead of replacementModeAndroid for item-level replacement
+   * Use this instead of replacementMode for item-level replacement
    */
   subscriptionProductReplacementParams?: SubscriptionProductReplacementParamsAndroid | null;
 }

package/src/types.ts

@@ -1194,12 +1194,21 @@ export interface RequestPurchaseAndroidProps {
    * Google Play Billing and the developer's external payment option.
    */
   developerBillingOption?: (DeveloperBillingOptionParamsAndroid | null);
-  /** Personalized offer flag */
+  /**
+   * Personalized offer flag.
+   * When true, indicates the price was customized for this user.
+   */
   isOfferPersonalized?: (boolean | null);
   /** Obfuscated account ID */
-  obfuscatedAccountIdAndroid?: (string | null);
+  obfuscatedAccountId?: (string | null);
   /** Obfuscated profile ID */
-  obfuscatedProfileIdAndroid?: (string | null);
+  obfuscatedProfileId?: (string | null);
+  /**
+   * Offer token for one-time purchase discounts (7.0+).
+   * Pass the offerToken from oneTimePurchaseOfferDetailsAndroid or discountOffers
+   * to apply a discount offer to the purchase.
+   */
+  offerToken?: (string | null);
   /** List of product SKUs */
   skus: string[];
 }
@@ -1271,26 +1280,29 @@ export interface RequestSubscriptionAndroidProps {
    * Google Play Billing and the developer's external payment option.
    */
   developerBillingOption?: (DeveloperBillingOptionParamsAndroid | null);
-  /** Personalized offer flag */
+  /**
+   * Personalized offer flag.
+   * When true, indicates the price was customized for this user.
+   */
   isOfferPersonalized?: (boolean | null);
   /** Obfuscated account ID */
-  obfuscatedAccountIdAndroid?: (string | null);
+  obfuscatedAccountId?: (string | null);
   /** Obfuscated profile ID */
-  obfuscatedProfileIdAndroid?: (string | null);
+  obfuscatedProfileId?: (string | null);
   /** Purchase token for upgrades/downgrades */
-  purchaseTokenAndroid?: (string | null);
+  purchaseToken?: (string | null);
   /**
    * Replacement mode for subscription changes
    * @deprecated Use subscriptionProductReplacementParams instead for item-level replacement (8.1.0+)
    */
-  replacementModeAndroid?: (number | null);
+  replacementMode?: (number | null);
   /** List of subscription SKUs */
   skus: string[];
   /** Subscription offers */
   subscriptionOffers?: (AndroidSubscriptionOfferInput[] | null);
   /**
    * Product-level replacement parameters (8.1.0+)
-   * Use this instead of replacementModeAndroid for item-level replacement
+   * Use this instead of replacementMode for item-level replacement
    */
   subscriptionProductReplacementParams?: (SubscriptionProductReplacementParamsAndroid | null);
 }