expo-iap 2.2.7 → 2.2.8-rc.1

package/src/index.ts

@@ -5,7 +5,6 @@ import {Platform} from 'react-native';
 import {
   Product,
   ProductPurchase,
-  ProductType,
   Purchase,
   PurchaseError,
   PurchaseResult,
@@ -24,16 +23,13 @@ import {
   RequestPurchaseIosProps,
   RequestSubscriptionIosProps,
 } from './types/ExpoIapIos.types';
-import {isProductIos, isSubscriptionProductIos} from './modules/ios';
-import {
-  isProductAndroid,
-  isSubscriptionProductAndroid,
-} from './modules/android';
+import {isProductIos} from './modules/ios';
+import {isProductAndroid} from './modules/android';
 
 export * from './modules/android';
 export * from './modules/ios';
 
-// Get the native constant value.
+// Get the native constant value
 export const PI = ExpoIapModule.PI;
 
 export enum IapEvent {
@@ -81,11 +77,7 @@ export const getProducts = async (skus: string[]): Promise<Product[]> => {
       return items.filter((item: unknown) => isProductIos<Product>(item));
     },
     android: async () => {
-      const products = await ExpoIapModule.getItemsByType(
-        ProductType.InAppPurchase,
-        skus,
-      );
-
+      const products = await ExpoIapModule.getItemsByType('inapp', skus);
       return products.filter((product: unknown) =>
         isProductAndroid<Product>(product),
       );
@@ -105,7 +97,7 @@ export const getSubscriptions = async (
     ios: async () => {
       const rawItems = await ExpoIapModule.getItems(skus);
       return rawItems.filter((item: unknown) => {
-        if (!isSubscriptionProductIos(item)) return false;
+        if (!isProductIos(item)) return false;
         return (
           typeof item === 'object' &&
           item !== null &&
@@ -118,7 +110,7 @@ export const getSubscriptions = async (
     android: async () => {
       const rawItems = await ExpoIapModule.getItemsByType('subs', skus);
       return rawItems.filter((item: unknown) => {
-        if (!isSubscriptionProductAndroid(item)) return false;
+        if (!isProductAndroid(item)) return false;
         return (
           typeof item === 'object' &&
           item !== null &&
@@ -152,12 +144,9 @@ export const getPurchaseHistory = ({
         );
       },
       android: async () => {
-        const products = await ExpoIapModule.getPurchaseHistoryByType(
-          ProductType.InAppPurchase,
-        );
-        const subscriptions = await ExpoIapModule.getPurchaseHistoryByType(
-          ProductType.Subscription,
-        );
+        const products = await ExpoIapModule.getPurchaseHistoryByType('inapp');
+        const subscriptions =
+          await ExpoIapModule.getPurchaseHistoryByType('subs');
         return products.concat(subscriptions);
       },
     }) || (() => Promise.resolve([]))
@@ -178,12 +167,9 @@ export const getAvailablePurchases = ({
           onlyIncludeActiveItems,
         ),
       android: async () => {
-        const products = await ExpoIapModule.getAvailableItemsByType(
-          ProductType.InAppPurchase,
-        );
-        const subscriptions = await ExpoIapModule.getAvailableItemsByType(
-          ProductType.Subscription,
-        );
+        const products = await ExpoIapModule.getAvailableItemsByType('inapp');
+        const subscriptions =
+          await ExpoIapModule.getAvailableItemsByType('subs');
         return products.concat(subscriptions);
       },
     }) || (() => Promise.resolve([]))
@@ -192,9 +178,7 @@ export const getAvailablePurchases = ({
 const offerToRecordIos = (
   offer: PaymentDiscount | undefined,
 ): Record<keyof PaymentDiscount, string> | undefined => {
-  if (!offer) {
-    return undefined;
-  }
+  if (!offer) return undefined;
   return {
     identifier: offer.identifier,
     keyIdentifier: offer.keyIdentifier,
@@ -204,44 +188,90 @@ const offerToRecordIos = (
   };
 };
 
+// Define discriminated union with explicit type parameter
+type PurchaseRequest =
+  | {
+      request: RequestPurchaseIosProps | RequestPurchaseAndroidProps;
+      type?: 'inapp';
+    }
+  | {
+      request: RequestSubscriptionAndroidProps | RequestSubscriptionIosProps;
+      type: 'subs';
+    };
+
+// Type guards for request objects
+const isIosRequest = (
+  request: any,
+): request is RequestPurchaseIosProps | RequestSubscriptionIosProps =>
+  'sku' in request && typeof request.sku === 'string';
+
+const isAndroidInAppRequest = (
+  request: any,
+): request is RequestPurchaseAndroidProps =>
+  'skus' in request &&
+  Array.isArray(request.skus) &&
+  !('subscriptionOffers' in request);
+
+const isAndroidSubscriptionRequest = (
+  request: any,
+): request is RequestSubscriptionAndroidProps =>
+  'skus' in request &&
+  Array.isArray(request.skus) &&
+  'subscriptionOffers' in request;
+
 export const requestPurchase = (
-  request: RequestPurchaseIosProps | RequestPurchaseAndroidProps,
-): Promise<ProductPurchase | ProductPurchase[] | void> =>
-  (
-    Platform.select({
-      ios: async () => {
-        if (!('sku' in request)) {
-          throw new Error('sku is required for iOS purchase');
-        }
-        const {
-          sku,
-          andDangerouslyFinishTransactionAutomaticallyIOS = false,
-          appAccountToken,
-          quantity,
-          withOffer,
-        } = request;
-        const offer = offerToRecordIos(withOffer);
-        const purchase = await ExpoIapModule.buyProduct(
-          sku,
-          andDangerouslyFinishTransactionAutomaticallyIOS,
-          appAccountToken,
-          quantity ?? -1,
-          offer,
-        );
-        return Promise.resolve(purchase);
-      },
-      android: async () => {
-        if (!('skus' in request) || !request.skus.length) {
-          throw new Error('skus is required for Android purchase');
-        }
-        const {
-          skus,
-          obfuscatedAccountIdAndroid,
-          obfuscatedProfileIdAndroid,
-          isOfferPersonalized,
-        } = request;
+  requestObj: PurchaseRequest,
+): Promise<
+  | ProductPurchase
+  | SubscriptionPurchase
+  | ProductPurchase[]
+  | SubscriptionPurchase[]
+  | void
+> => {
+  const {request, type = 'inapp'} = requestObj;
+
+  if (Platform.OS === 'ios') {
+    if (!isIosRequest(request)) {
+      throw new Error(
+        "Invalid request for iOS: Expected a 'RequestPurchaseIosProps' or 'RequestSubscriptionIosProps' object with a valid 'sku' property.",
+      );
+    }
+
+    const {
+      sku,
+      andDangerouslyFinishTransactionAutomaticallyIOS = false,
+      appAccountToken,
+      quantity,
+      withOffer,
+    } = request;
+
+    return (async () => {
+      const offer = offerToRecordIos(withOffer);
+      const purchase = await ExpoIapModule.buyProduct(
+        sku,
+        andDangerouslyFinishTransactionAutomaticallyIOS,
+        appAccountToken,
+        quantity ?? -1,
+        offer,
+      );
+      return type === 'inapp'
+        ? (purchase as ProductPurchase)
+        : (purchase as SubscriptionPurchase);
+    })();
+  }
+
+  if (Platform.OS === 'android') {
+    if (isAndroidInAppRequest(request)) {
+      const {
+        skus,
+        obfuscatedAccountIdAndroid,
+        obfuscatedProfileIdAndroid,
+        isOfferPersonalized,
+      } = request;
+
+      return (async () => {
         return ExpoIapModule.buyItemByType({
-          type: ProductType.InAppPurchase,
+          type: 'inapp',
           skuArr: skus,
           purchaseToken: undefined,
           replacementMode: -1,
@@ -249,60 +279,58 @@ export const requestPurchase = (
           obfuscatedProfileId: obfuscatedProfileIdAndroid,
           offerTokenArr: [],
           isOfferPersonalized: isOfferPersonalized ?? false,
-        });
-      },
-    }) || Promise.resolve
-  )();
+        }) as Promise<ProductPurchase[]>;
+      })();
+    }
 
-export const requestSubscription = (
-  request: RequestSubscriptionProps,
-): Promise<SubscriptionPurchase | SubscriptionPurchase[] | null | void> =>
-  (
-    Platform.select({
-      ios: async () => {
-        if (!('sku' in request)) {
-          throw new Error('sku is required for iOS subscriptions');
-        }
-        const {
-          sku,
-          andDangerouslyFinishTransactionAutomaticallyIOS = false,
-          appAccountToken,
-          quantity,
-          withOffer,
-        } = request as RequestSubscriptionIosProps;
-        const offer = offerToRecordIos(withOffer);
-        const purchase = await ExpoIapModule.buyProduct(
-          sku,
-          andDangerouslyFinishTransactionAutomaticallyIOS,
-          appAccountToken,
-          quantity ?? -1,
-          offer,
-        );
-        return Promise.resolve(purchase as SubscriptionPurchase);
-      },
-      android: async () => {
-        const {
-          skus,
-          isOfferPersonalized,
-          obfuscatedAccountIdAndroid,
-          obfuscatedProfileIdAndroid,
-          subscriptionOffers,
-          replacementModeAndroid,
-          purchaseTokenAndroid,
-        } = request as RequestSubscriptionAndroidProps;
+    if (isAndroidSubscriptionRequest(request)) {
+      const {
+        skus,
+        obfuscatedAccountIdAndroid,
+        obfuscatedProfileIdAndroid,
+        isOfferPersonalized,
+        subscriptionOffers = [],
+        replacementModeAndroid = -1,
+        purchaseTokenAndroid,
+      } = request;
+
+      return (async () => {
         return ExpoIapModule.buyItemByType({
-          type: ProductType.Subscription,
-          skuArr: skus.map((so) => so),
+          type: 'subs',
+          skuArr: skus,
           purchaseToken: purchaseTokenAndroid,
           replacementMode: replacementModeAndroid,
           obfuscatedAccountId: obfuscatedAccountIdAndroid,
           obfuscatedProfileId: obfuscatedProfileIdAndroid,
           offerTokenArr: subscriptionOffers.map((so) => so.offerToken),
           isOfferPersonalized: isOfferPersonalized ?? false,
-        });
-      },
-    }) || (() => Promise.resolve(null))
-  )();
+        }) as Promise<SubscriptionPurchase[]>;
+      })();
+    }
+
+    throw new Error(
+      "Invalid request for Android: Expected a 'RequestPurchaseAndroidProps' object with a valid 'skus' array or a 'RequestSubscriptionAndroidProps' object with 'skus' and 'subscriptionOffers'.",
+    );
+  }
+
+  return Promise.resolve(); // Fallback for unsupported platforms
+};
+
+/**
+ * @deprecated Use `requestPurchase({ request, type: 'subs' })` instead. This method will be removed in version 3.0.0+.
+ */
+export const requestSubscription = async (
+  request: RequestSubscriptionProps,
+): Promise<SubscriptionPurchase | SubscriptionPurchase[] | null | void> => {
+  console.warn(
+    "`requestSubscription` is deprecated. Use `requestPurchase({ request, type: 'subs' })` instead. This method will be removed in version 3.0.0+.",
+  );
+  return (await requestPurchase({request, type: 'subs'})) as
+    | SubscriptionPurchase
+    | SubscriptionPurchase[]
+    | null
+    | void;
+};
 
 export const finishTransaction = ({
   purchase,

package/src/modules/android.ts

@@ -15,12 +15,6 @@ export function isProductAndroid<T extends {platform?: string}>(
   );
 }
 
-export function isSubscriptionProductAndroid<T extends {platform?: string}>(
-  item: unknown,
-): item is T & {platform: 'android'} {
-  return isProductAndroid(item);
-}
-
 /**
  * Deep link to subscriptions screen on Android.
  * @param {string} sku The product's SKU (on Android)

package/src/modules/ios.ts

@@ -32,12 +32,6 @@ export function isProductIos<T extends {platform?: string}>(
   );
 }
 
-export function isSubscriptionProductIos<T extends {platform?: string}>(
-  item: unknown,
-): item is T & {platform: 'ios'} {
-  return isProductIos(item);
-}
-
 // Functions
 /**
  * Sync state with Appstore (iOS only)

package/src/useIap.ts

@@ -9,6 +9,7 @@ import {
   getPurchaseHistory,
   finishTransaction as finishTransactionInternal,
   getSubscriptions,
+  requestPurchase as requestPurchaseInternal,
 } from './';
 import {useCallback, useEffect, useState, useRef} from 'react';
 import {
@@ -40,10 +41,11 @@ type IAP_STATUS = {
     purchase: Purchase;
     isConsumable?: boolean;
   }) => Promise<string | boolean | PurchaseResult | void>;
-  getAvailablePurchases: () => Promise<void>;
-  getPurchaseHistories: () => Promise<void>;
+  getAvailablePurchases: (skus: string[]) => Promise<void>;
+  getPurchaseHistories: (skus: string[]) => Promise<void>;
   getProducts: (skus: string[]) => Promise<void>;
   getSubscriptions: (skus: string[]) => Promise<void>;
+  requestPurchase: typeof requestPurchaseInternal;
 };
 
 export function useIAP(): IAP_STATUS {
@@ -63,29 +65,31 @@ export function useIAP(): IAP_STATUS {
   const [currentPurchaseError, setCurrentPurchaseError] =
     useState<PurchaseError>();
 
-  // 구독을 훅 인스턴스별로 관리하기 위한 ref
   const subscriptionsRef = useRef<{
     purchaseUpdate?: Subscription;
     purchaseError?: Subscription;
     promotedProductsIos?: Subscription;
   }>({});
 
-  const requestProducts = useCallback(async (skus: string[]): Promise<void> => {
-    setProducts(await getProducts(skus));
-  }, []);
+  const getProductsInternal = useCallback(
+    async (skus: string[]): Promise<void> => {
+      setProducts(await getProducts(skus));
+    },
+    [],
+  );
 
-  const requestSubscriptions = useCallback(
+  const getSubscriptionsInternal = useCallback(
     async (skus: string[]): Promise<void> => {
       setSubscriptions(await getSubscriptions(skus));
     },
     [],
   );
 
-  const requestAvailablePurchases = useCallback(async (): Promise<void> => {
+  const getAvailablePurchasesInternal = useCallback(async (): Promise<void> => {
     setAvailablePurchases(await getAvailablePurchases());
   }, []);
 
-  const requestPurchaseHistories = useCallback(async (): Promise<void> => {
+  const getPurchaseHistoriesInternal = useCallback(async (): Promise<void> => {
     setPurchaseHistories(await getPurchaseHistory());
   }, []);
 
@@ -172,9 +176,10 @@ export function useIAP(): IAP_STATUS {
     availablePurchases,
     currentPurchase,
     currentPurchaseError,
-    getProducts: requestProducts,
-    getSubscriptions: requestSubscriptions,
-    getAvailablePurchases: requestAvailablePurchases,
-    getPurchaseHistories: requestPurchaseHistories,
+    getAvailablePurchases: getAvailablePurchasesInternal,
+    getPurchaseHistories: getPurchaseHistoriesInternal,
+    getProducts: getProductsInternal,
+    getSubscriptions: getSubscriptionsInternal,
+    requestPurchase: requestPurchaseInternal,
   };
 }