expo-iap 2.6.3 → 2.7.1

package/src/index.ts

@@ -14,21 +14,17 @@ import {
   Purchase,
   PurchaseError,
   PurchaseResult,
-  RequestSubscriptionProps,
+  RequestSubscriptionPropsWithLegacy,
+  RequestPurchasePropsWithLegacy,
   SubscriptionProduct,
   SubscriptionPurchase,
+  isPlatformRequestProps,
+  isUnifiedRequestProps,
 } from './ExpoIap.types';
-import {
-  ProductPurchaseAndroid,
-  RequestPurchaseAndroidProps,
-  RequestSubscriptionAndroidProps,
-} from './types/ExpoIapAndroid.types';
-import {
-  PaymentDiscount,
-  RequestPurchaseIosProps,
-  RequestSubscriptionIosProps,
-} from './types/ExpoIapIos.types';
+import {ProductPurchaseAndroid} from './types/ExpoIapAndroid.types';
+import {PaymentDiscount} from './types/ExpoIapIos.types';
 
+// Export all types
 export * from './ExpoIap.types';
 export * from './modules/android';
 export * from './modules/ios';
@@ -81,6 +77,9 @@ export function initConnection() {
 }
 
 export const getProducts = async (skus: string[]): Promise<Product[]> => {
+  console.warn(
+    "`getProducts` is deprecated. Use `requestProducts({ skus, type: 'inapp' })` instead. This function will be removed in version 3.0.0.",
+  );
   if (!skus?.length) {
     return Promise.reject(new Error('"skus" is required'));
   }
@@ -112,6 +111,9 @@ export const getProducts = async (skus: string[]): Promise<Product[]> => {
 export const getSubscriptions = async (
   skus: string[],
 ): Promise<SubscriptionProduct[]> => {
+  console.warn(
+    "`getSubscriptions` is deprecated. Use `requestProducts({ skus, type: 'subs' })` instead. This function will be removed in version 3.0.0.",
+  );
   if (!skus?.length) {
     return Promise.reject(new Error('"skus" is required'));
   }
@@ -151,6 +153,78 @@ export async function endConnection(): Promise<boolean> {
   return ExpoIapModule.endConnection();
 }
 
+/**
+ * Request products with unified API (v2.7.0+)
+ *
+ * @param params - Product request configuration
+ * @param params.skus - Array of product SKUs to fetch
+ * @param params.type - Type of products: 'inapp' for regular products (default) or 'subs' for subscriptions
+ *
+ * @example
+ * ```typescript
+ * // Regular products
+ * const products = await requestProducts({
+ *   skus: ['product1', 'product2'],
+ *   type: 'inapp'
+ * });
+ *
+ * // Subscriptions
+ * const subscriptions = await requestProducts({
+ *   skus: ['sub1', 'sub2'],
+ *   type: 'subs'
+ * });
+ * ```
+ */
+export const requestProducts = async ({
+  skus,
+  type = 'inapp',
+}: {
+  skus: string[];
+  type?: 'inapp' | 'subs';
+}): Promise<Product[] | SubscriptionProduct[]> => {
+  if (!skus?.length) {
+    throw new Error('No SKUs provided');
+  }
+
+  if (Platform.OS === 'ios') {
+    const rawItems = await ExpoIapModule.getItems(skus);
+    const filteredItems = rawItems.filter((item: unknown) => {
+      if (!isProductIos(item)) return false;
+      return (
+        typeof item === 'object' &&
+        item !== null &&
+        'id' in item &&
+        typeof item.id === 'string' &&
+        skus.includes(item.id)
+      );
+    });
+
+    return type === 'inapp'
+      ? (filteredItems as Product[])
+      : (filteredItems as SubscriptionProduct[]);
+  }
+
+  if (Platform.OS === 'android') {
+    const items = await ExpoIapModule.getItemsByType(type, skus);
+    const filteredItems = items.filter((item: unknown) => {
+      if (!isProductAndroid(item)) return false;
+      return (
+        typeof item === 'object' &&
+        item !== null &&
+        'id' in item &&
+        typeof item.id === 'string' &&
+        skus.includes(item.id)
+      );
+    });
+
+    return type === 'inapp'
+      ? (filteredItems as Product[])
+      : (filteredItems as SubscriptionProduct[]);
+  }
+
+  throw new Error('Unsupported platform');
+};
+
 /**
  * @deprecated Use `getPurchaseHistories` instead. This function will be removed in version 3.0.0.
  */
@@ -186,10 +260,12 @@ export const getPurchaseHistories = ({
         );
       },
       android: async () => {
-        const products = await ExpoIapModule.getPurchaseHistoryByType('inapp');
-        const subscriptions =
-          await ExpoIapModule.getPurchaseHistoryByType('subs');
-        return products.concat(subscriptions);
+        // getPurchaseHistoryByType was removed in Google Play Billing Library v8
+        // Android doesn't provide purchase history anymore, only active purchases
+        console.warn(
+          'getPurchaseHistories is not supported on Android with Google Play Billing Library v8. Use getAvailablePurchases instead to get active purchases.',
+        );
+        return [];
       },
     }) || (() => Promise.resolve([]))
   )();
@@ -231,22 +307,98 @@ const offerToRecordIos = (
 };
 
 // Define discriminated union with explicit type parameter
+// Using legacy types internally for backward compatibility
 type PurchaseRequest =
   | {
-      request: RequestPurchaseIosProps | RequestPurchaseAndroidProps;
+      request: RequestPurchasePropsWithLegacy;
       type?: 'inapp';
     }
   | {
-      request: RequestSubscriptionAndroidProps | RequestSubscriptionIosProps;
+      request: RequestSubscriptionPropsWithLegacy;
       type: 'subs';
     };
 
-// Type guards for request objects
-const isIosRequest = (
-  request: any,
-): request is RequestPurchaseIosProps | RequestSubscriptionIosProps =>
-  'sku' in request && typeof request.sku === 'string';
+/**
+ * Helper to normalize request props to platform-specific format
+ */
+const normalizeRequestProps = (
+  request: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy,
+  platform: 'ios' | 'android',
+): any => {
+  // If it's already platform-specific format
+  if (isPlatformRequestProps(request)) {
+    return platform === 'ios' ? request.ios : request.android;
+  }
 
+  // If it's unified format, convert to platform-specific
+  if (isUnifiedRequestProps(request)) {
+    if (platform === 'ios') {
+      return {
+        sku: request.sku || (request.skus?.[0] ?? ''),
+        andDangerouslyFinishTransactionAutomaticallyIOS:
+          request.andDangerouslyFinishTransactionAutomaticallyIOS,
+        appAccountToken: request.appAccountToken,
+        quantity: request.quantity,
+        withOffer: request.withOffer,
+      };
+    } else {
+      const androidRequest: any = {
+        skus: request.skus || (request.sku ? [request.sku] : []),
+        obfuscatedAccountIdAndroid: request.obfuscatedAccountIdAndroid,
+        obfuscatedProfileIdAndroid: request.obfuscatedProfileIdAndroid,
+        isOfferPersonalized: request.isOfferPersonalized,
+      };
+
+      // Add subscription-specific fields if present
+      if ('subscriptionOffers' in request && request.subscriptionOffers) {
+        androidRequest.subscriptionOffers = request.subscriptionOffers;
+      }
+      if ('purchaseTokenAndroid' in request) {
+        androidRequest.purchaseTokenAndroid = request.purchaseTokenAndroid;
+      }
+      if ('replacementModeAndroid' in request) {
+        androidRequest.replacementModeAndroid = request.replacementModeAndroid;
+      }
+
+      return androidRequest;
+    }
+  }
+
+  // Legacy format handling
+  return request;
+};
+
+/**
+ * Request a purchase for products or subscriptions.
+ *
+ * @param requestObj - Purchase request configuration
+ * @param requestObj.request - Platform-specific purchase parameters
+ * @param requestObj.type - Type of purchase: 'inapp' for products (default) or 'subs' for subscriptions
+ *
+ * @example
+ * ```typescript
+ * // Product purchase
+ * await requestPurchase({
+ *   request: {
+ *     ios: { sku: productId },
+ *     android: { skus: [productId] }
+ *   },
+ *   type: 'inapp'
+ * });
+ *
+ * // Subscription purchase
+ * await requestPurchase({
+ *   request: {
+ *     ios: { sku: subscriptionId },
+ *     android: {
+ *       skus: [subscriptionId],
+ *       subscriptionOffers: [{ sku: subscriptionId, offerToken: 'token' }]
+ *     }
+ *   },
+ *   type: 'subs'
+ * });
+ * ```
+ */
 export const requestPurchase = (
   requestObj: PurchaseRequest,
 ): Promise<
@@ -259,7 +411,9 @@ export const requestPurchase = (
   const {request, type = 'inapp'} = requestObj;
 
   if (Platform.OS === 'ios') {
-    if (!isIosRequest(request)) {
+    const normalizedRequest = normalizeRequestProps(request, 'ios');
+
+    if (!normalizedRequest?.sku) {
       throw new Error(
         'Invalid request for iOS. The `sku` property is required and must be a string.',
       );
@@ -271,7 +425,7 @@ export const requestPurchase = (
       appAccountToken,
       quantity,
       withOffer,
-    } = request;
+    } = normalizedRequest;
 
     return (async () => {
       const offer = offerToRecordIos(withOffer);
@@ -290,13 +444,21 @@ export const requestPurchase = (
   }
 
   if (Platform.OS === 'android') {
+    const normalizedRequest = normalizeRequestProps(request, 'android');
+
+    if (!normalizedRequest?.skus?.length) {
+      throw new Error(
+        'Invalid request for Android. The `skus` property is required and must be a non-empty array.',
+      );
+    }
+
     if (type === 'inapp') {
       const {
         skus,
         obfuscatedAccountIdAndroid,
         obfuscatedProfileIdAndroid,
         isOfferPersonalized,
-      } = request as RequestPurchaseAndroidProps;
+      } = normalizedRequest;
 
       return (async () => {
         return ExpoIapModule.buyItemByType({
@@ -321,7 +483,7 @@ export const requestPurchase = (
         subscriptionOffers = [],
         replacementModeAndroid = -1,
         purchaseTokenAndroid,
-      } = request as RequestSubscriptionAndroidProps;
+      } = normalizedRequest;
 
       return (async () => {
         return ExpoIapModule.buyItemByType({
@@ -331,14 +493,14 @@ export const requestPurchase = (
           replacementMode: replacementModeAndroid,
           obfuscatedAccountId: obfuscatedAccountIdAndroid,
           obfuscatedProfileId: obfuscatedProfileIdAndroid,
-          offerTokenArr: subscriptionOffers.map((so) => so.offerToken),
+          offerTokenArr: subscriptionOffers.map((so: any) => so.offerToken),
           isOfferPersonalized: isOfferPersonalized ?? false,
         }) 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'.",
+      "Invalid request for Android: Expected a valid request object with 'skus' array.",
     );
   }
 
@@ -346,13 +508,35 @@ export const requestPurchase = (
 };
 
 /**
- * @deprecated Use `requestPurchase({ request, type: 'subs' })` instead. This method will be removed in version 3.0.0+.
+ * @deprecated Use `requestPurchase({ request, type: 'subs' })` instead. This method will be removed in version 3.0.0.
+ *
+ * @example
+ * ```typescript
+ * // Old way (deprecated)
+ * await requestSubscription({
+ *   sku: subscriptionId,
+ *   // or for Android
+ *   skus: [subscriptionId],
+ * });
+ *
+ * // New way (recommended)
+ * await requestPurchase({
+ *   request: {
+ *     ios: { sku: subscriptionId },
+ *     android: {
+ *       skus: [subscriptionId],
+ *       subscriptionOffers: [{ sku: subscriptionId, offerToken: 'token' }]
+ *     }
+ *   },
+ *   type: 'subs'
+ * });
+ * ```
  */
 export const requestSubscription = async (
-  request: RequestSubscriptionProps,
+  request: RequestSubscriptionPropsWithLegacy,
 ): 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+.",
+    "`requestSubscription` is deprecated and will be removed in version 3.0.0. Use `requestPurchase({ request, type: 'subs' })` instead.",
   );
   return (await requestPurchase({request, type: 'subs'})) as
     | SubscriptionPurchase
@@ -418,7 +602,8 @@ export const finishTransaction = ({
  */
 export const getStorefrontIOS = (): Promise<string> => {
   if (Platform.OS !== 'ios') {
-    throw new Error('getStorefrontIOS: This method is only available on iOS');
+    console.warn('getStorefrontIOS: This method is only available on iOS');
+    return Promise.resolve('');
   }
   return ExpoIapModule.getStorefront();
 };

package/src/modules/ios.ts

@@ -1,5 +1,4 @@
 // External dependencies
-import {Platform} from 'react-native';
 
 // Internal modules
 import {purchaseUpdatedListener} from '..';
@@ -39,10 +38,6 @@ export type TransactionEvent = {
 export const transactionUpdatedIos = (
   listener: (event: TransactionEvent) => void,
 ) => {
-  if (Platform.OS !== 'ios') {
-    throw new Error('This method is only available on iOS');
-  }
-
   const isProductPurchase = (item: unknown): item is ProductPurchase => {
     return (
       item != null &&
@@ -100,9 +95,6 @@ export function isProductIos<T extends {platform?: string}>(
  * @platform iOS
  */
 export const syncIOS = (): Promise<null> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error('syncIOS: This method is only available on iOS');
-  }
   return ExpoIapModule.sync();
 };
 
@@ -118,11 +110,6 @@ export const syncIOS = (): Promise<null> => {
 export const isEligibleForIntroOfferIOS = (
   groupID: string,
 ): Promise<boolean> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'isEligibleForIntroOfferIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.isEligibleForIntroOffer(groupID);
 };
 
@@ -138,11 +125,6 @@ export const isEligibleForIntroOfferIOS = (
 export const subscriptionStatusIOS = (
   sku: string,
 ): Promise<ProductStatusIos[]> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'subscriptionStatusIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.subscriptionStatus(sku);
 };
 
@@ -158,11 +140,6 @@ export const subscriptionStatusIOS = (
 export const currentEntitlementIOS = (
   sku: string,
 ): Promise<ProductPurchase> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'currentEntitlementIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.currentEntitlement(sku);
 };
 
@@ -176,11 +153,6 @@ export const currentEntitlementIOS = (
  * @platform iOS
  */
 export const latestTransactionIOS = (sku: string): Promise<ProductPurchase> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'latestTransactionIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.latestTransaction(sku);
 };
 
@@ -197,11 +169,6 @@ type RefundRequestStatus = 'success' | 'userCancelled';
 export const beginRefundRequestIOS = (
   sku: string,
 ): Promise<RefundRequestStatus> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'beginRefundRequestIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.beginRefundRequest(sku);
 };
 
@@ -216,11 +183,6 @@ export const beginRefundRequestIOS = (
  * @platform iOS
  */
 export const showManageSubscriptionsIOS = (): Promise<null> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'showManageSubscriptionsIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.showManageSubscriptions();
 };
 
@@ -235,9 +197,6 @@ export const showManageSubscriptionsIOS = (): Promise<null> => {
  * @returns {Promise<string>} Base64 encoded receipt data
  */
 export const getReceiptIOS = (): Promise<string> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error('This method is only available on iOS');
-  }
   return ExpoIapModule.getReceiptData();
 };
 
@@ -252,11 +211,6 @@ export const getReceiptIOS = (): Promise<string> => {
  * @platform iOS
  */
 export const isTransactionVerifiedIOS = (sku: string): Promise<boolean> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'isTransactionVerifiedIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.isTransactionVerified(sku);
 };
 
@@ -271,11 +225,6 @@ export const isTransactionVerifiedIOS = (sku: string): Promise<boolean> => {
  * @platform iOS
  */
 export const getTransactionJwsIOS = (sku: string): Promise<string> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'getTransactionJwsIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.getTransactionJws(sku);
 };
 
@@ -302,10 +251,6 @@ export const validateReceiptIOS = async (
   jwsRepresentation: string;
   latestTransaction?: ProductPurchase;
 }> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error('This method is only available on iOS');
-  }
-
   const result = await ExpoIapModule.validateReceiptIOS(sku);
   return result;
 };
@@ -322,11 +267,6 @@ export const validateReceiptIOS = async (
  * @platform iOS
  */
 export const presentCodeRedemptionSheetIOS = (): Promise<boolean> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'presentCodeRedemptionSheetIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.presentCodeRedemptionSheet();
 };
 
@@ -340,11 +280,6 @@ export const presentCodeRedemptionSheetIOS = (): Promise<boolean> => {
  * @platform iOS
  */
 export const getAppTransactionIOS = (): Promise<AppTransactionIOS | null> => {
-  if (Platform.OS !== 'ios') {
-    throw new Error(
-      'getAppTransactionIOS: This method is only available on iOS',
-    );
-  }
   return ExpoIapModule.getAppTransaction();
 };
 

package/src/useIap.ts

@@ -15,6 +15,7 @@ import {
   finishTransaction as finishTransactionInternal,
   getSubscriptions,
   requestPurchase as requestPurchaseInternal,
+  requestProducts,
 } from './';
 import {syncIOS, validateReceiptIOS} from './modules/ios';
 import {validateReceiptAndroid} from './modules/android';
@@ -28,6 +29,8 @@ import {
   PurchaseResult,
   SubscriptionProduct,
   SubscriptionPurchase,
+  RequestPurchaseProps,
+  RequestSubscriptionProps,
 } from './ExpoIap.types';
 
 type UseIap = {
@@ -52,8 +55,12 @@ type UseIap = {
   getPurchaseHistories: (skus: string[]) => Promise<void>;
   getProducts: (skus: string[]) => Promise<void>;
   getSubscriptions: (skus: string[]) => Promise<void>;
+  requestProducts: (params: {
+    skus: string[];
+    type?: 'inapp' | 'subs';
+  }) => Promise<void>;
   requestPurchase: (params: {
-    request: any;
+    request: RequestPurchaseProps | RequestSubscriptionProps;
     type?: 'inapp' | 'subs';
   }) => Promise<any>;
   validateReceipt: (
@@ -177,6 +184,37 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     [mergeWithDuplicateCheck],
   );
 
+  const requestProductsInternal = useCallback(
+    async (params: {
+      skus: string[];
+      type?: 'inapp' | 'subs';
+    }): Promise<void> => {
+      try {
+        const result = await requestProducts(params);
+        if (params.type === 'subs') {
+          setSubscriptions((prevSubscriptions) =>
+            mergeWithDuplicateCheck(
+              prevSubscriptions,
+              result as SubscriptionProduct[],
+              (subscription) => subscription.id,
+            ),
+          );
+        } else {
+          setProducts((prevProducts) =>
+            mergeWithDuplicateCheck(
+              prevProducts,
+              result as Product[],
+              (product) => product.id,
+            ),
+          );
+        }
+      } catch (error) {
+        console.error('Error fetching products:', error);
+      }
+    },
+    [mergeWithDuplicateCheck],
+  );
+
   const getAvailablePurchasesInternal = useCallback(async (): Promise<void> => {
     try {
       const result = await getAvailablePurchases();
@@ -387,6 +425,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     getPurchaseHistories: getPurchaseHistoriesInternal,
     getProducts: getProductsInternal,
     getSubscriptions: getSubscriptionsInternal,
+    requestProducts: requestProductsInternal,
     requestPurchase: requestPurchaseWithReset,
     validateReceipt,
     restorePurchases,