react-native-iap 9.0.0-beta → 9.0.0-beta4

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

@@ -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)
@@ -386,10 +388,10 @@ class RNIapModule(
         type: String,
         sku: String, // TODO: should this now be an array?
         purchaseToken: String?,
-        prorationMode: Int?,
+        prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
-        selectedOfferIndex: Int?, // New optional parameter in V5, TODO: should it be an array?
+        selectedOfferIndex: Int, // New optional parameter in V5, TODO: should it be an array?
         promise: Promise
     ) {
         val activity = currentActivity
@@ -419,7 +421,7 @@ class RNIapModule(
                 return@ensureConnection
             }
             var productParams = BillingFlowParams.ProductDetailsParams.newBuilder().setProductDetails(selectedSku)
-            if (selectedOfferIndex != null && (
+            if (selectedOfferIndex > -1 && (
                 selectedSku.subscriptionOfferDetails?.size
                     ?: 0
                 ) > selectedOfferIndex

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

@@ -20,10 +20,10 @@ interface RNIapModuleInterface {
         type: String,
         sku: String,
         purchaseToken: String?,
-        prorationMode: Int?,
+        prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
-        selectedOfferIndex: Int?, // New optional parameter in V5 (added to maintain interface consistency)
+        selectedOfferIndex: Int, // New optional parameter in V5 (added to maintain interface consistency)
         promise: Promise
     )
     fun acknowledgePurchase(

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

@@ -197,7 +197,9 @@ class RNIapModuleV4(
             for (i in 0 until skuArr.size()) {
                 if (skuArr.getType(i) == ReadableType.String) {
                     val sku = skuArr.getString(i)
-                    skuList.add(sku)
+                    sku?.let {
+                        skuList.add(sku)
+                    }
                 }
             }
             val params = SkuDetailsParams.newBuilder()
@@ -361,10 +363,10 @@ class RNIapModuleV4(
         type: String,
         sku: String,
         purchaseToken: String?,
-        prorationMode: Int?,
+        prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
-        selectedOfferIndex: Int?, // New optional parameter in V5 (added to maintain interface consistency)
+        selectedOfferIndex: Int, // New optional parameter in V5 (added to maintain interface consistency)
         promise: Promise
     ) {
         val activity = currentActivity

package/ios/RNIapIos.m

@@ -20,6 +20,7 @@ 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:

package/ios/RNIapIos.swift

@@ -47,6 +47,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         myQueue = DispatchQueue(label: "reject")
         validProducts = [SKProduct]()
         super.init()
+        SKPaymentQueue.default().add(self)
     }
     
     deinit {
@@ -132,12 +133,6 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
     ) {
-        SKPaymentQueue.default().remove(RNIapQueue.shared)
-        if let queue = RNIapQueue.shared.queue, let payment = RNIapQueue.shared.payment, let product = RNIapQueue.shared.product  {
-            let val = paymentQueue(queue, shouldAddStorePayment: payment,for: product)
-            print("Promoted product response \(val)")
-        }
-        SKPaymentQueue.default().add(self)
         let canMakePayments = SKPaymentQueue.canMakePayments()
         resolve(NSNumber(value: canMakePayments))
     }
@@ -178,8 +173,8 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     
     @objc public func buyProduct(
         _ sku:String,
-        appAccountToken:String,
         andDangerouslyFinishTransactionAutomatically: Bool,
+        applicationUsername:String?,
         resolve: @escaping RCTPromiseResolveBlock = { _ in },
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
     ) {
@@ -198,7 +193,10 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
             addPromise(forKey: prod.productIdentifier, resolve: resolve, reject: reject)
             
             let payment = SKMutablePayment(product: prod)
-            payment.applicationUsername = appAccountToken 
+
+            if (applicationUsername != nil) {
+                payment.applicationUsername = applicationUsername 
+            }
             SKPaymentQueue.default().add(payment)
         } else{
             if hasListeners {

package/package.json

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

package/src/iap.d.ts

@@ -2,8 +2,9 @@ import * as Amazon from './types/amazon';
 import * as Android from './types/android';
 import * as Apple from './types/apple';
 import { EmitterSubscription } from 'react-native';
-import { InAppPurchase, InstallSourceAndroid, Product, ProductPurchase, ProrationModesAndroid, PurchaseError, PurchaseResult, Subscription, SubscriptionPurchase } from './types';
+import { InAppPurchase, InstallSourceAndroid, Product, ProductPurchase, PurchaseError, PurchaseResult, RequestPurchase, RequestSubscription, Subscription, SubscriptionPurchase } from './types';
 export declare const getInstallSourceAndroid: () => InstallSourceAndroid;
+export declare const setAndroidNativeModule: (nativeModule: any) => void;
 /**
  * Init module for purchase flow. Required on Android. In ios it will check whether user canMakePayment.
  * @returns {Promise<boolean>}
@@ -44,13 +45,13 @@ export declare const getAvailablePurchases: () => Promise<(InAppPurchase | Subsc
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} sku The product's sku/ID
- * @param {string} [appAccountToken] The purchaser's user ID
+ * @param {string} [applicationUsername] The purchaser's user ID
  * @param {boolean} [andDangerouslyFinishTransactionAutomaticallyIOS] You should set this to false and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.
  * @param {string} [obfuscatedAccountIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
  * @returns {Promise<InAppPurchase>}
  */
-export declare const requestPurchase: (sku: string, appAccountToken: string, andDangerouslyFinishTransactionAutomaticallyIOS?: boolean, obfuscatedAccountIdAndroid?: string | undefined, obfuscatedProfileIdAndroid?: string | undefined, selectedOfferIndex?: number | undefined) => Promise<InAppPurchase>;
+export declare const requestPurchase: ({ sku, andDangerouslyFinishTransactionAutomaticallyIOS, applicationUsername, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, }: RequestPurchase) => Promise<InAppPurchase>;
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} [sku] The product's sku/ID
@@ -59,9 +60,10 @@ export declare const requestPurchase: (sku: string, appAccountToken: string, and
  * @param {ProrationModesAndroid} [prorationModeAndroid] UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY, IMMEDIATE_WITH_TIME_PRORATION, IMMEDIATE_AND_CHARGE_PRORATED_PRICE, IMMEDIATE_WITHOUT_PRORATION, DEFERRED
  * @param {string} [obfuscatedAccountIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
+ * @param {string} [selectedOfferIndex] Selected Offer index from the list returned by get products
  * @returns {Promise<SubscriptionPurchase | null>} Promise resolves to null when using proratioModesAndroid=DEFERRED, and to a SubscriptionPurchase otherwise
  */
-export declare const requestSubscription: (sku: string, andDangerouslyFinishTransactionAutomaticallyIOS?: boolean, purchaseTokenAndroid?: string | undefined, prorationModeAndroid?: ProrationModesAndroid, obfuscatedAccountIdAndroid?: string | undefined, obfuscatedProfileIdAndroid?: string | undefined) => Promise<SubscriptionPurchase | null>;
+export declare const requestSubscription: ({ sku, andDangerouslyFinishTransactionAutomaticallyIOS, purchaseTokenAndroid, prorationModeAndroid, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, selectedOfferIndex, }: RequestSubscription) => Promise<SubscriptionPurchase | null>;
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} sku The product's sku/ID

package/src/iap.js

@@ -49,7 +49,7 @@ export var getInstallSourceAndroid = function () {
  * Defaulting to V4 to minimize migration, it'll eventually be changed to default to V5
  */
 var androidNativeModule = RNIapModuleV4;
-var setAndroidNativeModule = function (nativeModule) {
+export var setAndroidNativeModule = function (nativeModule) {
     androidNativeModule = nativeModule;
 };
 var checkNativeAndroidAvailable = function () {
@@ -148,13 +148,15 @@ var fillProductsAdditionalData = function (products) { return __awaiter(void 0,
 export var getProducts = function (skus) {
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
+            var products;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, getIosModule()
-                            .getItems(skus)
-                            .filter(function (item) { return skus.includes(item.productId); })
-                            .filter(function (item) { return item.type === 'iap'; })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4 /*yield*/, getIosModule().getItems(skus)];
+                    case 1:
+                        products = _a.sent();
+                        return [2 /*return*/, products.filter(function (item) {
+                                return skus.includes(item.productId) && item.type === 'iap';
+                            })];
                 }
             });
         }); },
@@ -179,13 +181,15 @@ export var getProducts = function (skus) {
 export var getSubscriptions = function (skus) {
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
+            var subscriptions;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, getIosModule()
-                            .getItems(skus)
-                            .filter(function (item) { return skus.includes(item.productId); })
-                            .filter(function (item) { return item.type === 'subs'; })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4 /*yield*/, getIosModule().getItems(skus)];
+                    case 1:
+                        subscriptions = _a.sent();
+                        return [2 /*return*/, subscriptions.filter(function (item) {
+                                return skus.includes(item.productId) && item.type === 'subs';
+                            })];
                 }
             });
         }); },
@@ -267,17 +271,14 @@ export var getAvailablePurchases = function () {
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} sku The product's sku/ID
- * @param {string} [appAccountToken] The purchaser's user ID
+ * @param {string} [applicationUsername] The purchaser's user ID
  * @param {boolean} [andDangerouslyFinishTransactionAutomaticallyIOS] You should set this to false and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.
  * @param {string} [obfuscatedAccountIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
  * @returns {Promise<InAppPurchase>}
  */
-export var requestPurchase = function (sku, appAccountToken, andDangerouslyFinishTransactionAutomaticallyIOS, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, selectedOfferIndex) {
-    if (andDangerouslyFinishTransactionAutomaticallyIOS === void 0) { andDangerouslyFinishTransactionAutomaticallyIOS = false; }
-    if (obfuscatedAccountIdAndroid === void 0) { obfuscatedAccountIdAndroid = undefined; }
-    if (obfuscatedProfileIdAndroid === void 0) { obfuscatedProfileIdAndroid = undefined; }
-    if (selectedOfferIndex === void 0) { selectedOfferIndex = undefined; }
+export var requestPurchase = function (_a) {
+    var sku = _a.sku, _b = _a.andDangerouslyFinishTransactionAutomaticallyIOS, andDangerouslyFinishTransactionAutomaticallyIOS = _b === void 0 ? false : _b, applicationUsername = _a.applicationUsername, _c = _a.obfuscatedAccountIdAndroid, obfuscatedAccountIdAndroid = _c === void 0 ? undefined : _c, _d = _a.obfuscatedProfileIdAndroid, obfuscatedProfileIdAndroid = _d === void 0 ? undefined : _d;
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -287,12 +288,12 @@ export var requestPurchase = function (sku, appAccountToken, andDangerouslyFinis
                     // eslint-disable-next-line max-len
                     'You are dangerously allowing react-native-iap to finish your transaction automatically. You should set andDangerouslyFinishTransactionAutomatically to false when calling requestPurchase and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.');
                 }
-                return [2 /*return*/, getIosModule().buyProduct(sku, appAccountToken, andDangerouslyFinishTransactionAutomaticallyIOS)];
+                return [2 /*return*/, getIosModule().buyProduct(sku, andDangerouslyFinishTransactionAutomaticallyIOS, applicationUsername)];
             });
         }); },
         android: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, getAndroidModule().buyItemByType(ANDROID_ITEM_TYPE_IAP, sku, null, 0, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, selectedOfferIndex)];
+                return [2 /*return*/, getAndroidModule().buyItemByType(ANDROID_ITEM_TYPE_IAP, sku, null, 0, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, undefined)];
             });
         }); },
     }) || Promise.resolve)();
@@ -305,14 +306,11 @@ export var requestPurchase = function (sku, appAccountToken, andDangerouslyFinis
  * @param {ProrationModesAndroid} [prorationModeAndroid] UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY, IMMEDIATE_WITH_TIME_PRORATION, IMMEDIATE_AND_CHARGE_PRORATED_PRICE, IMMEDIATE_WITHOUT_PRORATION, DEFERRED
  * @param {string} [obfuscatedAccountIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
+ * @param {string} [selectedOfferIndex] Selected Offer index from the list returned by get products
  * @returns {Promise<SubscriptionPurchase | null>} Promise resolves to null when using proratioModesAndroid=DEFERRED, and to a SubscriptionPurchase otherwise
  */
-export var requestSubscription = function (sku, andDangerouslyFinishTransactionAutomaticallyIOS, purchaseTokenAndroid, prorationModeAndroid, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid) {
-    if (andDangerouslyFinishTransactionAutomaticallyIOS === void 0) { andDangerouslyFinishTransactionAutomaticallyIOS = false; }
-    if (purchaseTokenAndroid === void 0) { purchaseTokenAndroid = undefined; }
-    if (prorationModeAndroid === void 0) { prorationModeAndroid = -1; }
-    if (obfuscatedAccountIdAndroid === void 0) { obfuscatedAccountIdAndroid = undefined; }
-    if (obfuscatedProfileIdAndroid === void 0) { obfuscatedProfileIdAndroid = undefined; }
+export var requestSubscription = function (_a) {
+    var sku = _a.sku, _b = _a.andDangerouslyFinishTransactionAutomaticallyIOS, andDangerouslyFinishTransactionAutomaticallyIOS = _b === void 0 ? false : _b, _c = _a.purchaseTokenAndroid, purchaseTokenAndroid = _c === void 0 ? undefined : _c, _d = _a.prorationModeAndroid, prorationModeAndroid = _d === void 0 ? -1 : _d, _e = _a.obfuscatedAccountIdAndroid, obfuscatedAccountIdAndroid = _e === void 0 ? undefined : _e, _f = _a.obfuscatedProfileIdAndroid, obfuscatedProfileIdAndroid = _f === void 0 ? undefined : _f, _g = _a.selectedOfferIndex, selectedOfferIndex = _g === void 0 ? -1 : _g;
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -327,7 +325,7 @@ export var requestSubscription = function (sku, andDangerouslyFinishTransactionA
         }); },
         android: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, getAndroidModule().buyItemByType(ANDROID_ITEM_TYPE_SUBSCRIPTION, sku, purchaseTokenAndroid, prorationModeAndroid, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid)];
+                return [2 /*return*/, getAndroidModule().buyItemByType(ANDROID_ITEM_TYPE_SUBSCRIPTION, sku, purchaseTokenAndroid, prorationModeAndroid, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid, selectedOfferIndex)];
             });
         }); },
     }) || Promise.resolve)();

package/src/types/index.d.ts

@@ -62,28 +62,6 @@ export interface ProductPurchase {
     developerPayloadAndroid?: string;
     obfuscatedAccountIdAndroid?: string;
     obfuscatedProfileIdAndroid?: string;
-    title?: string;
-    description?: string;
-    productType?: string;
-    name?: string;
-    oneTimePurchaseOfferDetails?: {
-        priceCurrencyCode?: string;
-        formattedPrice?: string;
-        priceAmountMicros?: string;
-    }[];
-    subscriptionOfferDetails?: {
-        offerToken?: string[];
-        pricingPhases: {
-            pricingPhaseList: {
-                formattedPrice?: string;
-                priceCurrencyCode?: string;
-                billingPeriod?: string;
-                billingCycleCount?: number;
-                priceAmountMicros?: string;
-                recurrenceMode?: number;
-            };
-        };
-    }[];
     userIdAmazon?: string;
     userMarketplaceAmazon?: string;
     userJsonAmazon?: string;
@@ -136,4 +114,40 @@ export interface Subscription extends ProductCommon {
     introductoryPricePeriodAndroid?: string;
     subscriptionPeriodAndroid?: string;
     freeTrialPeriodAndroid?: string;
+    productType?: string;
+    name?: string;
+    oneTimePurchaseOfferDetails?: {
+        priceCurrencyCode?: string;
+        formattedPrice?: string;
+        priceAmountMicros?: string;
+    }[];
+    subscriptionOfferDetails?: {
+        offerToken?: string[];
+        pricingPhases: {
+            pricingPhaseList: {
+                formattedPrice?: string;
+                priceCurrencyCode?: string;
+                billingPeriod?: string;
+                billingCycleCount?: number;
+                priceAmountMicros?: string;
+                recurrenceMode?: number;
+            };
+        };
+    }[];
+}
+export interface RequestPurchase {
+    sku: string;
+    andDangerouslyFinishTransactionAutomaticallyIOS: boolean;
+    applicationUsername?: string;
+    obfuscatedAccountIdAndroid: string | undefined;
+    obfuscatedProfileIdAndroid: string | undefined;
+}
+export interface RequestSubscription {
+    sku: string;
+    andDangerouslyFinishTransactionAutomaticallyIOS: boolean;
+    purchaseTokenAndroid: string | undefined;
+    prorationModeAndroid: ProrationModesAndroid;
+    obfuscatedAccountIdAndroid: string | undefined;
+    obfuscatedProfileIdAndroid: string | undefined;
+    selectedOfferIndex?: number | undefined;
 }

package/ios/RNIapQueue.swift

@@ -1,36 +0,0 @@
-//
-//  RNIapQueue.swift
-//  
-//
-//  Created by Andres Aguilar on 9/8/21.
-//
-
-import Foundation
-import StoreKit
-
-// Temporarily stores payment information since it is sent by the OS before RN instantiates the RNModule
-@objc(RNIapQueue)
-public class RNIapQueue: NSObject, SKPaymentTransactionObserver {
-    public func paymentQueue(_ queue: SKPaymentQueue, updatedTransactions transactions: [SKPaymentTransaction]) {
-        //No-op
-    }
-    
-    @objc
-    public static let shared = RNIapQueue()
-    
-    var queue: SKPaymentQueue? = nil;
-    var payment: SKPayment? = nil;
-    var product: SKProduct? = nil;
-    
-    private override init(){}
-    
-    // Sent when a user initiates an IAP buy from the App Store
-    @available(iOS 11.0, *)
-    func paymentQueue(_ queue: SKPaymentQueue, shouldAddStorePayment payment: SKPayment, for product: SKProduct) -> Bool{
-        RNIapQueue.shared.queue = queue
-        RNIapQueue.shared.payment = payment
-        RNIapQueue.shared.product = product
-        return false
-    }
-    
-}