mapping from sk2 transaction to purchase result (#2141)

* mapping from sk2 transaction to purchase result * rename map method for better readability * fix lint Co-authored-by: Andres Aguilar <andres.aguilar@nfl.com>
hyochan · Nov 29, 2022 · ebf2c33 · ebf2c33
1 parent fd23e83
commit ebf2c33
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 23 deletions.
diff --git a/src/eventEmitter.ts b/src/eventEmitter.ts
@@ -1,6 +1,6 @@
 import {EmitterSubscription, NativeEventEmitter} from 'react-native';
 
-import {TransactionEvent, transactionSk2Map} from './types/appleSk2';
+import {TransactionEvent, transactionSk2ToPurchaseMap} from './types/appleSk2';
 import {isIosStorekit2} from './iap';
 import {
   getAndroidModule,
@@ -50,7 +50,7 @@ export const purchaseUpdatedListener = (
   const eventEmitter = new NativeEventEmitter(getNativeModule());
   const proxyListener = isIosStorekit2()
     ? (event: Purchase) => {
-        listener(transactionSk2Map(event as any));
+        listener(transactionSk2ToPurchaseMap(event as any));
       }
     : listener;
   const emitterSubscription = eventEmitter.addListener(

diff --git a/src/iap.ts b/src/iap.ts
@@ -10,7 +10,7 @@ import {
   ProductSk2,
   productSk2Map,
   subscriptionSk2Map,
-  transactionSk2Map,
+  transactionSk2ToPurchaseMap,
 } from './types/appleSk2';
 import {
   fillProductsWithAdditionalData,
@@ -28,6 +28,7 @@ import {
   Product,
   ProductPurchase,
   ProductType,
+  Purchase,
   PurchaseResult,
   PurchaseStateAndroid,
   RequestPurchase,
@@ -345,7 +346,7 @@ export const getPurchaseHistory = ({
   alsoPublishToEventListener?: boolean;
   automaticallyFinishRestoredTransactions?: boolean;
   onlyIncludeActiveItems?: boolean;
-} = {}): Promise<(ProductPurchase | SubscriptionPurchase)[]> =>
+} = {}): Promise<Purchase[]> =>
   (
     Platform.select({
       ios: async () => {
@@ -356,7 +357,7 @@ export const getPurchaseHistory = ({
                 alsoPublishToEventListener,
                 onlyIncludeActiveItems,
               )
-            ).map(transactionSk2Map),
+            ).map(transactionSk2ToPurchaseMap),
           );
         } else {
           return RNIapIos.getAvailableItems(
@@ -472,7 +473,7 @@ export const getAvailablePurchases = ({
   alsoPublishToEventListener?: boolean;
   automaticallyFinishRestoredTransactions?: boolean;
   onlyIncludeActiveItems?: boolean;
-} = {}): Promise<(ProductPurchase | SubscriptionPurchase)[]> =>
+} = {}): Promise<Purchase[]> =>
   (
     Platform.select({
       ios: async () => {
@@ -483,7 +484,7 @@ export const getAvailablePurchases = ({
                 alsoPublishToEventListener,
                 onlyIncludeActiveItems,
               )
-            ).map(transactionSk2Map),
+            ).map(transactionSk2ToPurchaseMap),
           );
         } else {
           return RNIapIos.getAvailableItems(
@@ -603,13 +604,16 @@ export const requestPurchase = (
         if (isIosStorekit2()) {
           const offer = offerSk2Map(withOffer);
 
-          return RNIapIosSk2.buyProduct(
-            sku,
-            andDangerouslyFinishTransactionAutomaticallyIOS,
-            appAccountToken,
-            quantity ?? -1,
-            offer,
+          const purchase = transactionSk2ToPurchaseMap(
+            await RNIapIosSk2.buyProduct(
+              sku,
+              andDangerouslyFinishTransactionAutomaticallyIOS,
+              appAccountToken,
+              quantity ?? -1,
+              offer,
+            ),
           );
+          return Promise.resolve(purchase);
         } else {
           return RNIapIos.buyProduct(
             sku,
@@ -757,13 +761,16 @@ export const requestSubscription = (
         if (isIosStorekit2()) {
           const offer = offerSk2Map(withOffer);
 
-          return RNIapIosSk2.buyProduct(
-            sku,
-            andDangerouslyFinishTransactionAutomaticallyIOS,
-            appAccountToken,
-            quantity ?? -1,
-            offer,
+          const purchase = transactionSk2ToPurchaseMap(
+            await RNIapIosSk2.buyProduct(
+              sku,
+              andDangerouslyFinishTransactionAutomaticallyIOS,
+              appAccountToken,
+              quantity ?? -1,
+              offer,
+            ),
           );
+          return Promise.resolve(purchase);
         } else {
           return RNIapIos.buyProduct(
             sku,
@@ -845,7 +852,7 @@ export const finishTransaction = ({
   isConsumable,
   developerPayloadAndroid,
 }: {
-  purchase: ProductPurchase | SubscriptionPurchase;
+  purchase: Purchase;
   isConsumable?: boolean;
   developerPayloadAndroid?: string;
 }): Promise<PurchaseResult | boolean> => {

diff --git a/src/modules/iosSk2.ts b/src/modules/iosSk2.ts
@@ -1,6 +1,6 @@
 import {NativeModules} from 'react-native';
 
-import type {Product, ProductPurchase, Purchase, Sku} from '../types';
+import type {Product, ProductPurchase, Sku} from '../types';
 import type {
   PaymentDiscountSk2,
   ProductSk2,
@@ -25,7 +25,7 @@ export type BuyProduct = (
   applicationUsername: string | undefined,
   quantity: number,
   withOffer: Record<keyof PaymentDiscountSk2, string> | undefined,
-) => Promise<Purchase>;
+) => Promise<TransactionSk2>;
 
 type clearTransaction = () => Promise<void>;
 type clearProducts = () => Promise<void>;

diff --git a/src/types/appleSk2.ts b/src/types/appleSk2.ts
@@ -136,7 +136,7 @@ export type ProductStatus = {
   state: SubscriptionStatus;
 };
 
-export const transactionSk2Map = ({
+export const transactionSk2ToPurchaseMap = ({
   id,
   originalPurchaseDate,
   productID,