expo-iap 2.8.4 → 2.8.6

package/src/index.ts

@@ -20,6 +20,7 @@ import {
   Product,
   Purchase,
   PurchaseError,
+  ErrorCode,
   PurchaseResult,
   RequestSubscriptionProps,
   RequestPurchaseProps,
@@ -131,7 +132,7 @@ export const getProducts = async (skus: string[]): Promise<Product[]> => {
 
   return Platform.select({
     ios: async () => {
-      const rawItems = await ExpoIapModule.getItems(skus);
+      const rawItems = await ExpoIapModule.requestProducts(skus);
       return rawItems.filter((item: unknown) => {
         if (!isProductIOS(item)) return false;
         return (
@@ -144,7 +145,7 @@ export const getProducts = async (skus: string[]): Promise<Product[]> => {
       }) as Product[];
     },
     android: async () => {
-      const products = await ExpoIapModule.getItemsByType('inapp', skus);
+      const products = await ExpoIapModule.requestProducts('inapp', skus);
       return products.filter((product: unknown) =>
         isProductAndroid<Product>(product),
       );
@@ -165,7 +166,7 @@ export const getSubscriptions = async (
 
   return Platform.select({
     ios: async () => {
-      const rawItems = await ExpoIapModule.getItems(skus);
+      const rawItems = await ExpoIapModule.requestProducts(skus);
       return rawItems.filter((item: unknown) => {
         if (!isProductIOS(item)) return false;
         return (
@@ -178,7 +179,7 @@ export const getSubscriptions = async (
       }) as SubscriptionProduct[];
     },
     android: async () => {
-      const rawItems = await ExpoIapModule.getItemsByType('subs', skus);
+      const rawItems = await ExpoIapModule.requestProducts('subs', skus);
       return rawItems.filter((item: unknown) => {
         if (!isProductAndroid(item)) return false;
         return (
@@ -232,7 +233,7 @@ export const requestProducts = async ({
   }
 
   if (Platform.OS === 'ios') {
-    const rawItems = await ExpoIapModule.getItems(skus);
+    const rawItems = await ExpoIapModule.requestProducts(skus);
     const filteredItems = rawItems.filter((item: unknown) => {
       if (!isProductIOS(item)) return false;
       return (
@@ -250,7 +251,7 @@ export const requestProducts = async ({
   }
 
   if (Platform.OS === 'android') {
-    const items = await ExpoIapModule.getItemsByType(type, skus);
+    const items = await ExpoIapModule.requestProducts(type, skus);
     const filteredItems = items.filter((item: unknown) => {
       if (!isProductAndroid(item)) return false;
       return (
@@ -276,32 +277,51 @@ export const requestProducts = async ({
 export const getPurchaseHistory = ({
   alsoPublishToEventListener = false,
   onlyIncludeActiveItems = false,
+  alsoPublishToEventListenerIOS,
+  onlyIncludeActiveItemsIOS,
 }: {
+  /** @deprecated Use alsoPublishToEventListenerIOS instead */
   alsoPublishToEventListener?: boolean;
+  /** @deprecated Use onlyIncludeActiveItemsIOS instead */
   onlyIncludeActiveItems?: boolean;
+  alsoPublishToEventListenerIOS?: boolean;
+  onlyIncludeActiveItemsIOS?: boolean;
 } = {}): Promise<Purchase[]> => {
   console.warn(
     '`getPurchaseHistory` is deprecated. Use `getPurchaseHistories` instead. This function will be removed in version 3.0.0.',
   );
   return getPurchaseHistories({
-    alsoPublishToEventListener,
-    onlyIncludeActiveItems,
+    alsoPublishToEventListenerIOS:
+      alsoPublishToEventListenerIOS ?? alsoPublishToEventListener,
+    onlyIncludeActiveItemsIOS:
+      onlyIncludeActiveItemsIOS ?? onlyIncludeActiveItems,
   });
 };
 
+/**
+ * @deprecated Use getAvailablePurchases instead. This function is just calling getAvailablePurchases internally on iOS
+ * and returns an empty array on Android (Google Play Billing v8 removed purchase history API).
+ * Will be removed in v2.9.0
+ */
 export const getPurchaseHistories = ({
   alsoPublishToEventListener = false,
   onlyIncludeActiveItems = false,
+  alsoPublishToEventListenerIOS,
+  onlyIncludeActiveItemsIOS,
 }: {
+  /** @deprecated Use alsoPublishToEventListenerIOS instead */
   alsoPublishToEventListener?: boolean;
+  /** @deprecated Use onlyIncludeActiveItemsIOS instead */
   onlyIncludeActiveItems?: boolean;
+  alsoPublishToEventListenerIOS?: boolean;
+  onlyIncludeActiveItemsIOS?: boolean;
 } = {}): Promise<Purchase[]> =>
   (
     Platform.select({
       ios: async () => {
         return ExpoIapModule.getAvailableItems(
-          alsoPublishToEventListener,
-          onlyIncludeActiveItems,
+          alsoPublishToEventListenerIOS ?? alsoPublishToEventListener,
+          onlyIncludeActiveItemsIOS ?? onlyIncludeActiveItems,
         );
       },
       android: async () => {
@@ -318,16 +338,22 @@ export const getPurchaseHistories = ({
 export const getAvailablePurchases = ({
   alsoPublishToEventListener = false,
   onlyIncludeActiveItems = true,
+  alsoPublishToEventListenerIOS,
+  onlyIncludeActiveItemsIOS,
 }: {
+  /** @deprecated Use alsoPublishToEventListenerIOS instead */
   alsoPublishToEventListener?: boolean;
+  /** @deprecated Use onlyIncludeActiveItemsIOS instead */
   onlyIncludeActiveItems?: boolean;
+  alsoPublishToEventListenerIOS?: boolean;
+  onlyIncludeActiveItemsIOS?: boolean;
 } = {}): Promise<Purchase[]> =>
   (
     Platform.select({
       ios: () =>
         ExpoIapModule.getAvailableItems(
-          alsoPublishToEventListener,
-          onlyIncludeActiveItems,
+          alsoPublishToEventListenerIOS ?? alsoPublishToEventListener,
+          onlyIncludeActiveItemsIOS ?? onlyIncludeActiveItems,
         ),
       android: async () => {
         const products = await ExpoIapModule.getAvailableItemsByType('inapp');
@@ -429,7 +455,7 @@ export const requestPurchase = (
 
     return (async () => {
       const offer = offerToRecordIOS(withOffer);
-      const purchase = await ExpoIapModule.buyProduct(
+      const purchase = await ExpoIapModule.requestPurchase(
         sku,
         andDangerouslyFinishTransactionAutomatically,
         appAccountToken,
@@ -459,7 +485,7 @@ export const requestPurchase = (
       } = normalizedRequest;
 
       return (async () => {
-        return ExpoIapModule.buyItemByType({
+        return ExpoIapModule.requestPurchase({
           type: 'inapp',
           skuArr: skus,
           purchaseToken: undefined,
@@ -485,7 +511,7 @@ export const requestPurchase = (
       } = normalizedRequest;
 
       return (async () => {
-        return ExpoIapModule.buyItemByType({
+        return ExpoIapModule.requestPurchase({
           type: 'subs',
           skuArr: skus,
           purchaseToken: purchaseTokenAndroid || purchaseToken,
@@ -566,11 +592,29 @@ export const finishTransaction = ({
       android: async () => {
         const androidPurchase = purchase as PurchaseAndroid;
 
+        // Use purchaseToken if available, fallback to purchaseTokenAndroid for backward compatibility
+        const token =
+          androidPurchase.purchaseToken || androidPurchase.purchaseTokenAndroid;
+
+        if (!token) {
+          return Promise.reject(
+            new PurchaseError(
+              '[expo-iap]: PurchaseError',
+              'Purchase token is required to finish transaction',
+              undefined,
+              undefined,
+              'E_DEVELOPER_ERROR' as ErrorCode,
+              androidPurchase.productId,
+              'android',
+            ),
+          );
+        }
+
         if (isConsumable) {
-          return ExpoIapModule.consumeProduct(androidPurchase.purchaseToken);
+          return ExpoIapModule.consumeProductAndroid(token);
         }
 
-        return ExpoIapModule.acknowledgePurchase(androidPurchase.purchaseToken);
+        return ExpoIapModule.acknowledgePurchaseAndroid(token);
       },
     }) || (() => Promise.reject(new Error('Unsupported Platform')))
   )();

package/src/modules/android.ts

@@ -113,7 +113,7 @@ export const acknowledgePurchaseAndroid = ({
 }: {
   token: string;
 }): Promise<PurchaseResult | boolean | void> => {
-  return ExpoIapModule.acknowledgePurchase(token);
+  return ExpoIapModule.acknowledgePurchaseAndroid(token);
 };
 
 /**

package/src/modules/ios.ts

@@ -5,7 +5,7 @@ import {purchaseUpdatedListener} from '..';
 import ExpoIapModule from '../ExpoIapModule';
 
 // Types
-import {Purchase, PurchaseError} from '../ExpoIap.types';
+import {Product, Purchase, PurchaseError} from '../ExpoIap.types';
 import type {
   ProductStatusIOS,
   AppTransactionIOS,
@@ -91,7 +91,7 @@ export function isProductIOS<T extends {platform?: string}>(
  * @platform iOS
  */
 export const syncIOS = (): Promise<null> => {
-  return ExpoIapModule.sync();
+  return ExpoIapModule.syncIOS();
 };
 
 /**
@@ -106,7 +106,7 @@ export const syncIOS = (): Promise<null> => {
 export const isEligibleForIntroOfferIOS = (
   groupId: string,
 ): Promise<boolean> => {
-  return ExpoIapModule.isEligibleForIntroOffer(groupId);
+  return ExpoIapModule.isEligibleForIntroOfferIOS(groupId);
 };
 
 /**
@@ -121,7 +121,7 @@ export const isEligibleForIntroOfferIOS = (
 export const subscriptionStatusIOS = (
   sku: string,
 ): Promise<ProductStatusIOS[]> => {
-  return ExpoIapModule.subscriptionStatus(sku);
+  return ExpoIapModule.subscriptionStatusIOS(sku);
 };
 
 /**
@@ -134,7 +134,7 @@ export const subscriptionStatusIOS = (
  * @platform iOS
  */
 export const currentEntitlementIOS = (sku: string): Promise<Purchase> => {
-  return ExpoIapModule.currentEntitlement(sku);
+  return ExpoIapModule.currentEntitlementIOS(sku);
 };
 
 /**
@@ -147,7 +147,7 @@ export const currentEntitlementIOS = (sku: string): Promise<Purchase> => {
  * @platform iOS
  */
 export const latestTransactionIOS = (sku: string): Promise<Purchase> => {
-  return ExpoIapModule.latestTransaction(sku);
+  return ExpoIapModule.latestTransactionIOS(sku);
 };
 
 /**
@@ -163,7 +163,7 @@ type RefundRequestStatus = 'success' | 'userCancelled';
 export const beginRefundRequestIOS = (
   sku: string,
 ): Promise<RefundRequestStatus> => {
-  return ExpoIapModule.beginRefundRequest(sku);
+  return ExpoIapModule.beginRefundRequestIOS(sku);
 };
 
 /**
@@ -177,7 +177,7 @@ export const beginRefundRequestIOS = (
  * @platform iOS
  */
 export const showManageSubscriptionsIOS = (): Promise<null> => {
-  return ExpoIapModule.showManageSubscriptions();
+  return ExpoIapModule.showManageSubscriptionsIOS();
 };
 
 /**
@@ -191,7 +191,7 @@ export const showManageSubscriptionsIOS = (): Promise<null> => {
  * @returns {Promise<string>} Base64 encoded receipt data
  */
 export const getReceiptIOS = (): Promise<string> => {
-  return ExpoIapModule.getReceiptData();
+  return ExpoIapModule.getReceiptDataIOS();
 };
 
 /**
@@ -205,7 +205,7 @@ export const getReceiptIOS = (): Promise<string> => {
  * @platform iOS
  */
 export const isTransactionVerifiedIOS = (sku: string): Promise<boolean> => {
-  return ExpoIapModule.isTransactionVerified(sku);
+  return ExpoIapModule.isTransactionVerifiedIOS(sku);
 };
 
 /**
@@ -219,7 +219,7 @@ export const isTransactionVerifiedIOS = (sku: string): Promise<boolean> => {
  * @platform iOS
  */
 export const getTransactionJwsIOS = (sku: string): Promise<string> => {
-  return ExpoIapModule.getTransactionJws(sku);
+  return ExpoIapModule.getTransactionJwsIOS(sku);
 };
 
 /**
@@ -261,7 +261,7 @@ export const validateReceiptIOS = async (
  * @platform iOS
  */
 export const presentCodeRedemptionSheetIOS = (): Promise<boolean> => {
-  return ExpoIapModule.presentCodeRedemptionSheet();
+  return ExpoIapModule.presentCodeRedemptionSheetIOS();
 };
 
 /**
@@ -279,20 +279,21 @@ export const presentCodeRedemptionSheetIOS = (): Promise<boolean> => {
  * @since iOS 16.0
  */
 export const getAppTransactionIOS = (): Promise<AppTransactionIOS | null> => {
-  return ExpoIapModule.getAppTransaction();
+  return ExpoIapModule.getAppTransactionIOS();
 };
 
 /**
- * Get the promoted product details (iOS only).
+ * Get information about a promoted product if one is available (iOS only).
+ * Promoted products are products that the App Store promotes on your behalf.
  * This is called after a promoted product event is received from the App Store.
  *
- * @returns Promise resolving to the promoted product details or null if none available
+ * @returns Promise resolving to the promoted product information or null if none available
  * @throws Error if called on non-iOS platform
  *
  * @platform iOS
  */
-export const getPromotedProductIOS = (): Promise<any | null> => {
-  return ExpoIapModule.getPromotedProduct();
+export const getPromotedProductIOS = (): Promise<Product | null> => {
+  return ExpoIapModule.getPromotedProductIOS();
 };
 
 /**
@@ -304,8 +305,35 @@ export const getPromotedProductIOS = (): Promise<any | null> => {
  *
  * @platform iOS
  */
+export const requestPurchaseOnPromotedProductIOS = (): Promise<void> => {
+  return ExpoIapModule.requestPurchaseOnPromotedProductIOS();
+};
+
+/**
+ * @deprecated Use requestPurchaseOnPromotedProductIOS instead. Will be removed in v2.9.0
+ */
 export const buyPromotedProductIOS = (): Promise<void> => {
-  return ExpoIapModule.buyPromotedProduct();
+  return requestPurchaseOnPromotedProductIOS();
+};
+
+/**
+ * Get pending transactions that haven't been finished yet (iOS only).
+ *
+ * @returns Promise resolving to array of pending transactions
+ * @platform iOS
+ */
+export const getPendingTransactionsIOS = (): Promise<any[]> => {
+  return ExpoIapModule.getPendingTransactionsIOS();
+};
+
+/**
+ * Clear a specific transaction (iOS only).
+ *
+ * @returns Promise resolving when transaction is cleared
+ * @platform iOS
+ */
+export const clearTransactionIOS = (): Promise<void> => {
+  return ExpoIapModule.clearTransactionIOS();
 };
 
 /**

package/src/useIAP.ts

@@ -23,7 +23,7 @@ import {
 import {
   syncIOS,
   getPromotedProductIOS,
-  buyPromotedProductIOS,
+  requestPurchaseOnPromotedProductIOS,
 } from './modules/ios';
 
 // Types
@@ -87,8 +87,10 @@ type UseIap = {
       isSub?: boolean;
     },
   ) => Promise<any>;
-  restorePurchases: () => Promise<void>; // 구매 복원 함수 추가
-  getPromotedProductIOS: () => Promise<any | null>;
+  restorePurchases: () => Promise<void>;
+  getPromotedProductIOS: () => Promise<Product | null>;
+  requestPurchaseOnPromotedProductIOS: () => Promise<void>;
+  /** @deprecated Use requestPurchaseOnPromotedProductIOS instead */
   buyPromotedProductIOS: () => Promise<void>;
   getActiveSubscriptions: (
     subscriptionIds?: string[],
@@ -276,6 +278,10 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     [],
   );
 
+  /**
+   * @deprecated Use getAvailablePurchases instead. This function is just calling getAvailablePurchases internally.
+   * Will be removed in v2.9.0
+   */
   const getPurchaseHistoriesInternal = useCallback(async (): Promise<void> => {
     setPurchaseHistories(await getPurchaseHistories());
   }, []);
@@ -455,7 +461,8 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     getProducts: getProductsInternal,
     getSubscriptions: getSubscriptionsInternal,
     getPromotedProductIOS,
-    buyPromotedProductIOS,
+    requestPurchaseOnPromotedProductIOS,
+    buyPromotedProductIOS: requestPurchaseOnPromotedProductIOS, // deprecated alias
     getActiveSubscriptions: getActiveSubscriptionsInternal,
     hasActiveSubscriptions: hasActiveSubscriptionsInternal,
   };