react-native-iap 11.0.0-rc.3 → 11.0.0-rc.5

package/lib/typescript/iap.d.ts

@@ -2,9 +2,22 @@ import * as IapAmazon from './modules/amazon';
 import * as IapAndroid from './modules/android';
 import * as IapIos from './modules/ios';
 import * as IapIosSk2 from './modules/iosSk2';
-import { enableStorekit2, isIosStorekit2 } from './internal';
+import { isIosStorekit2 } from './internal';
 import { Product, ProductPurchase, PurchaseResult, RequestPurchase, RequestSubscription, Subscription, SubscriptionPurchase } from './types';
-export { IapAndroid, IapAmazon, IapIos, IapIosSk2, isIosStorekit2, enableStorekit2, };
+export { IapAndroid, IapAmazon, IapIos, IapIosSk2, isIosStorekit2 };
+/**
+ * STOREKIT1_MODE: Will not enable Storekit 2 even if the device supports it. Thigs will work as before,
+ * minimum changes required in the migration guide (default)
+ * HYBRID_MODE: Will enable Storekit 2 for iOS devices > 15.0 but will fallback to Sk1 on older devices
+ * There are some edge cases that you need to handle in this case (described in migration guide). This mode
+ * is for developers that are migrating to Storekit 2 but want to keep supporting older versions.
+ * STOREKIT2_MODE: Will *only* enable Storekit 2. This disables Storekit 1. This is for apps that
+ * have already targeted a min version of 15 for their app.
+ */
+export declare type STOREKIT_OPTIONS = 'STOREKIT1_MODE' | 'STOREKIT_HYBRID_MODE' | 'STOREKIT2_MODE';
+export declare const setup: ({ storekitMode, }?: {
+    storekitMode?: STOREKIT_OPTIONS | undefined;
+}) => void;
 /**
  * Init module for purchase flow. Required on Android. In ios it will check whether user canMakePayment.
  * ## Usage

package/lib/typescript/internal/platform.d.ts

@@ -8,5 +8,7 @@ export declare const getNativeModule: () => import("..").AmazonModuleProps | imp
 export declare const isIosStorekit2: () => boolean;
 export declare const isStorekit2Avaiable: () => boolean;
 export declare const setIosNativeModule: (nativeModule: import("..").IosModuleProps | import("../modules/iosSk2").IosModulePropsSk2) => void;
-export declare const enableStorekit2: () => boolean;
+export declare const storekit2Mode: () => boolean;
+export declare const storekit1Mode: () => boolean;
+export declare const storekitHybridMode: () => boolean;
 export declare const getIosModule: () => import("..").IosModuleProps | import("../modules/iosSk2").IosModulePropsSk2;

package/lib/typescript/modules/ios.d.ts

@@ -4,7 +4,7 @@ import type { PaymentDiscount } from '../types/apple';
 import type { NativeModuleProps } from './common';
 declare type getItems = (skus: Sku[]) => Promise<Product[] | Subscription[]>;
 declare type getAvailableItems = () => Promise<Purchase[]>;
-export declare type BuyProduct = (sku: Sku, andDangerouslyFinishTransactionAutomaticallyIOS: boolean, applicationUsername: string | undefined, quantity: number, withOffer: PaymentDiscount | undefined) => Promise<Purchase>;
+export declare type BuyProduct = (sku: Sku, andDangerouslyFinishTransactionAutomaticallyIOS: boolean, applicationUsername: string | undefined, quantity: number, withOffer: Record<keyof PaymentDiscount, string> | undefined) => Promise<Purchase>;
 declare type clearTransaction = () => Promise<void>;
 declare type clearProducts = () => Promise<void>;
 declare type promotedProduct = () => Promise<Product | null>;
@@ -25,6 +25,7 @@ export interface IosModuleProps extends NativeModuleProps {
     finishTransaction: finishTransaction;
     getPendingTransactions: getPendingTransactions;
     presentCodeRedemptionSheet: presentCodeRedemptionSheet;
+    disable: () => Promise<null>;
 }
 /**
  * Get the current receipt base64 encoded in IOS.

package/lib/typescript/modules/iosSk2.d.ts

@@ -2,8 +2,8 @@ import type { Product, ProductPurchase, Purchase, Sku } from '../types';
 import type { PaymentDiscountSk2, ProductSk2, ProductStatus, TransactionSk2 } from '../types/appleSk2';
 import type { NativeModuleProps } from './common';
 declare type getItems = (skus: Sku[]) => Promise<ProductSk2[]>;
-declare type getAvailableItems = (alsoPublishToEventListener?: boolean) => Promise<Purchase[]>;
-export declare type BuyProduct = (sku: Sku, andDangerouslyFinishTransactionAutomaticallyIOS: boolean, applicationUsername: string | undefined, quantity: number, withOffer: PaymentDiscountSk2 | undefined) => Promise<Purchase>;
+declare type getAvailableItems = (alsoPublishToEventListener?: boolean) => Promise<TransactionSk2[]>;
+export declare type BuyProduct = (sku: Sku, andDangerouslyFinishTransactionAutomaticallyIOS: boolean, applicationUsername: string | undefined, quantity: number, withOffer: Record<keyof PaymentDiscountSk2, string> | undefined) => Promise<Purchase>;
 declare type clearTransaction = () => Promise<void>;
 declare type clearProducts = () => Promise<void>;
 declare type promotedProduct = () => Promise<Product | null>;
@@ -29,6 +29,7 @@ export interface IosModulePropsSk2 extends NativeModuleProps {
     finishTransaction: finishTransaction;
     getPendingTransactions: getPendingTransactions;
     presentCodeRedemptionSheet: presentCodeRedemptionSheet;
+    disable: () => Promise<null>;
 }
 /**
  * Sync state with Appstore (iOS only)

package/lib/typescript/types/apple.d.ts

@@ -23,3 +23,4 @@ export interface PaymentDiscount {
      */
     timestamp: number;
 }
+export declare const offerToRecord: (offer: PaymentDiscount | undefined) => Record<keyof PaymentDiscount, string> | undefined;

package/lib/typescript/types/appleSk2.d.ts

@@ -97,4 +97,4 @@ export interface PaymentDiscountSk2 {
      */
     timestamp: number;
 }
-export declare const offerSk2Map: (offer: Apple.PaymentDiscount | undefined) => PaymentDiscountSk2 | undefined;
+export declare const offerSk2Map: (offer: Apple.PaymentDiscount | undefined) => Record<keyof PaymentDiscountSk2, string> | undefined;

package/lib/typescript/types/index.d.ts

@@ -119,6 +119,7 @@ export interface SubscriptionAndroid extends ProductCommon {
                 recurrenceMode: number;
             }[];
         };
+        offerTags: string[];
     }[];
 }
 export interface SubscriptionIOS extends ProductCommon {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "11.0.0-rc.3",
+  "version": "11.0.0-rc.5",
   "description": "React Native In App Purchase Module.",
   "repository": "https://github.com/dooboolab/react-native-iap",
   "author": "dooboolab <support@dooboolab.com> (https://github.com/dooboolab)",

package/src/iap.ts

@@ -4,20 +4,24 @@ import * as IapAmazon from './modules/amazon';
 import * as IapAndroid from './modules/android';
 import * as IapIos from './modules/ios';
 import * as IapIosSk2 from './modules/iosSk2';
+import {offerToRecord} from './types/apple';
 import {
   offerSk2Map,
   ProductSk2,
   productSk2Map,
   subscriptionSk2Map,
+  transactionSk2Map,
 } from './types/appleSk2';
 import {
-  enableStorekit2,
   fillProductsWithAdditionalData,
   getAndroidModule,
   getIosModule,
   getNativeModule,
   isAmazon,
   isIosStorekit2,
+  storekit1Mode,
+  storekit2Mode,
+  storekitHybridMode,
 } from './internal';
 import {
   Product,
@@ -31,19 +35,46 @@ import {
 } from './types';
 import {PurchaseStateAndroid} from './types';
 
-export {
-  IapAndroid,
-  IapAmazon,
-  IapIos,
-  IapIosSk2,
-  isIosStorekit2,
-  enableStorekit2,
-};
+export {IapAndroid, IapAmazon, IapIos, IapIosSk2, isIosStorekit2};
 
 const {RNIapIos, RNIapIosSk2, RNIapModule, RNIapAmazonModule} = NativeModules;
 const ANDROID_ITEM_TYPE_SUBSCRIPTION = ProductType.subs;
 const ANDROID_ITEM_TYPE_IAP = ProductType.inapp;
 
+/**
+ * STOREKIT1_MODE: Will not enable Storekit 2 even if the device supports it. Thigs will work as before,
+ * minimum changes required in the migration guide (default)
+ * HYBRID_MODE: Will enable Storekit 2 for iOS devices > 15.0 but will fallback to Sk1 on older devices
+ * There are some edge cases that you need to handle in this case (described in migration guide). This mode
+ * is for developers that are migrating to Storekit 2 but want to keep supporting older versions.
+ * STOREKIT2_MODE: Will *only* enable Storekit 2. This disables Storekit 1. This is for apps that
+ * have already targeted a min version of 15 for their app.
+ */
+export type STOREKIT_OPTIONS =
+  | 'STOREKIT1_MODE'
+  | 'STOREKIT_HYBRID_MODE'
+  | 'STOREKIT2_MODE';
+
+export const setup = ({
+  storekitMode = 'STOREKIT1_MODE',
+}: {
+  storekitMode?: STOREKIT_OPTIONS;
+} = {}) => {
+  switch (storekitMode) {
+    case 'STOREKIT1_MODE':
+      storekit1Mode();
+      break;
+    case 'STOREKIT2_MODE':
+      storekit2Mode();
+      break;
+    case 'STOREKIT_HYBRID_MODE':
+      storekitHybridMode();
+      break;
+    default:
+      break;
+  }
+};
+
 /**
  * Init module for purchase flow. Required on Android. In ios it will check whether user canMakePayment.
  * ## Usage
@@ -259,7 +290,15 @@ export const getPurchaseHistory = ({
   (
     Platform.select({
       ios: async () => {
-        return getIosModule().getAvailableItems(alsoPublishToEventListener);
+        if (isIosStorekit2()) {
+          return Promise.resolve(
+            (
+              await RNIapIosSk2.getAvailableItems(alsoPublishToEventListener)
+            ).map(transactionSk2Map),
+          );
+        } else {
+          return RNIapIos.getAvailableItems();
+        }
       },
       android: async () => {
         if (RNIapAmazonModule) {
@@ -367,7 +406,15 @@ export const getAvailablePurchases = ({
   (
     Platform.select({
       ios: async () => {
-        return getIosModule().getAvailableItems(alsoPublishToEventListener);
+        if (isIosStorekit2()) {
+          return Promise.resolve(
+            (
+              await RNIapIosSk2.getAvailableItems(alsoPublishToEventListener)
+            ).map(transactionSk2Map),
+          );
+        } else {
+          return RNIapIos.getAvailableItems();
+        }
       },
       android: async () => {
         if (RNIapAmazonModule) {
@@ -493,7 +540,7 @@ export const requestPurchase = ({
             andDangerouslyFinishTransactionAutomaticallyIOS,
             appAccountToken,
             quantity ?? -1,
-            withOffer,
+            offerToRecord(withOffer),
           );
         }
       },
@@ -646,7 +693,7 @@ export const requestSubscription = ({
             andDangerouslyFinishTransactionAutomaticallyIOS,
             appAccountToken,
             quantity ?? -1,
-            withOffer,
+            offerToRecord(withOffer),
           );
         }
       },

package/src/internal/platform.ts

@@ -57,9 +57,10 @@ export const setIosNativeModule = (
   iosNativeModule = nativeModule;
 };
 
-export const enableStorekit2 = () => {
+export const storekit2Mode = () => {
+  iosNativeModule = RNIapIosSk2;
   if (RNIapIosSk2) {
-    iosNativeModule = RNIapIosSk2;
+    RNIapIos.disable();
     return true;
   }
   console.warn('Storekit 2 is not available on this device');
@@ -67,6 +68,27 @@ export const enableStorekit2 = () => {
   return false;
 };
 
+export const storekit1Mode = () => {
+  iosNativeModule = RNIapIos;
+  if (RNIapIosSk2) {
+    RNIapIosSk2.disable();
+    return true;
+  }
+  return false;
+};
+
+export const storekitHybridMode = () => {
+  if (RNIapIosSk2) {
+    iosNativeModule = RNIapIosSk2;
+    console.info('Using Storekit 2');
+    return true;
+  } else {
+    iosNativeModule = RNIapIos;
+    console.info('Using Storekit 1');
+    return true;
+  }
+};
+
 const checkNativeIOSAvailable = (): void => {
   if (!RNIapIos && !RNIapIosSk2) {
     throw new Error('IAP_NOT_AVAILABLE');

package/src/modules/ios.ts

@@ -21,7 +21,7 @@ export type BuyProduct = (
   andDangerouslyFinishTransactionAutomaticallyIOS: boolean,
   applicationUsername: string | undefined,
   quantity: number,
-  withOffer: PaymentDiscount | undefined,
+  withOffer: Record<keyof PaymentDiscount, string> | undefined,
 ) => Promise<Purchase>;
 
 type clearTransaction = () => Promise<void>;
@@ -47,6 +47,7 @@ export interface IosModuleProps extends NativeModuleProps {
   finishTransaction: finishTransaction;
   getPendingTransactions: getPendingTransactions;
   presentCodeRedemptionSheet: presentCodeRedemptionSheet;
+  disable: () => Promise<null>;
 }
 
 /**

package/src/modules/iosSk2.ts

@@ -15,14 +15,14 @@ type getItems = (skus: Sku[]) => Promise<ProductSk2[]>;
 
 type getAvailableItems = (
   alsoPublishToEventListener?: boolean,
-) => Promise<Purchase[]>;
+) => Promise<TransactionSk2[]>;
 
 export type BuyProduct = (
   sku: Sku,
   andDangerouslyFinishTransactionAutomaticallyIOS: boolean,
   applicationUsername: string | undefined,
   quantity: number,
-  withOffer: PaymentDiscountSk2 | undefined,
+  withOffer: Record<keyof PaymentDiscountSk2, string> | undefined,
 ) => Promise<Purchase>;
 
 type clearTransaction = () => Promise<void>;
@@ -53,6 +53,7 @@ export interface IosModulePropsSk2 extends NativeModuleProps {
   finishTransaction: finishTransaction;
   getPendingTransactions: getPendingTransactions;
   presentCodeRedemptionSheet: presentCodeRedemptionSheet;
+  disable: () => Promise<null>;
 }
 
 /**

package/src/types/apple.ts

@@ -27,3 +27,18 @@ export interface PaymentDiscount {
    */
   timestamp: number;
 }
+
+export const offerToRecord = (
+  offer: PaymentDiscount | undefined,
+): Record<keyof PaymentDiscount, string> | undefined => {
+  if (!offer) {
+    return undefined;
+  }
+  return {
+    identifier: offer.identifier,
+    keyIdentifier: offer.keyIdentifier,
+    nonce: offer.nonce,
+    signature: offer.signature,
+    timestamp: offer.timestamp.toString(),
+  };
+};

package/src/types/appleSk2.ts

@@ -175,7 +175,7 @@ export interface PaymentDiscountSk2 {
 
 export const offerSk2Map = (
   offer: Apple.PaymentDiscount | undefined,
-): PaymentDiscountSk2 | undefined => {
+): Record<keyof PaymentDiscountSk2, string> | undefined => {
   if (!offer) {
     return undefined;
   }
@@ -184,6 +184,6 @@ export const offerSk2Map = (
     keyID: offer.keyIdentifier,
     nonce: offer.nonce,
     signature: offer.signature,
-    timestamp: offer.timestamp,
+    timestamp: offer.timestamp.toString(),
   };
 };

package/src/types/index.ts

@@ -147,6 +147,7 @@ export interface SubscriptionAndroid extends ProductCommon {
         recurrenceMode: number;
       }[];
     };
+    offerTags: string[];
   }[];
 }