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

package/src/iap.ts

@@ -4,6 +4,7 @@ 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,
@@ -11,13 +12,15 @@ import {
   subscriptionSk2Map,
 } from './types/appleSk2';
 import {
-  enableStorekit2,
   fillProductsWithAdditionalData,
   getAndroidModule,
   getIosModule,
   getNativeModule,
   isAmazon,
   isIosStorekit2,
+  storekit1Mode,
+  storekit2Mode,
+  storekitHybridMode,
 } from './internal';
 import {
   Product,
@@ -31,19 +34,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
@@ -493,7 +523,7 @@ export const requestPurchase = ({
             andDangerouslyFinishTransactionAutomaticallyIOS,
             appAccountToken,
             quantity ?? -1,
-            withOffer,
+            offerToRecord(withOffer),
           );
         }
       },
@@ -646,7 +676,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

@@ -22,7 +22,7 @@ export type BuyProduct = (
   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[];
   }[];
 }