expo-iap 2.7.5-rc.1 → 2.7.6

package/src/useIap.ts

@@ -10,11 +10,9 @@ import {
   purchaseErrorListener,
   purchaseUpdatedListener,
   promotedProductListenerIOS,
-  getProducts,
   getAvailablePurchases,
   getPurchaseHistories,
   finishTransaction as finishTransactionInternal,
-  getSubscriptions,
   requestPurchase as requestPurchaseInternal,
   requestProducts,
 } from './';
@@ -42,6 +40,8 @@ import {
 type UseIap = {
   connected: boolean;
   products: Product[];
+  promotedProductsIOS: ProductPurchase[];
+  promotedProductIdIOS?: string;
   subscriptions: SubscriptionProduct[];
   purchaseHistories: ProductPurchase[];
   availablePurchases: ProductPurchase[];
@@ -59,12 +59,14 @@ type UseIap = {
   }) => Promise<PurchaseResult | boolean>;
   getAvailablePurchases: (skus: string[]) => Promise<void>;
   getPurchaseHistories: (skus: string[]) => Promise<void>;
-  getProducts: (skus: string[]) => Promise<void>;
-  getSubscriptions: (skus: string[]) => Promise<void>;
   requestProducts: (params: {
     skus: string[];
     type?: 'inapp' | 'subs';
   }) => Promise<void>;
+  /** @deprecated Use requestProducts({ skus, type: 'inapp' }) instead. This method will be removed in version 3.0.0. */
+  getProducts: (skus: string[]) => Promise<void>;
+  /** @deprecated Use requestProducts({ skus, type: 'subs' }) instead. This method will be removed in version 3.0.0. */
+  getSubscriptions: (skus: string[]) => Promise<void>;
   requestPurchase: (params: {
     request: RequestPurchaseProps | RequestSubscriptionProps;
     type?: 'inapp' | 'subs';
@@ -96,6 +98,7 @@ export interface UseIAPOptions {
 export function useIAP(options?: UseIAPOptions): UseIap {
   const [connected, setConnected] = useState<boolean>(false);
   const [products, setProducts] = useState<Product[]>([]);
+  const [promotedProductsIOS] = useState<ProductPurchase[]>([]);
   const [subscriptions, setSubscriptions] = useState<SubscriptionProduct[]>([]);
   const [purchaseHistories, setPurchaseHistories] = useState<ProductPurchase[]>(
     [],
@@ -107,6 +110,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   const [promotedProductIOS, setPromotedProductIOS] = useState<Product>();
   const [currentPurchaseError, setCurrentPurchaseError] =
     useState<PurchaseError>();
+  const [promotedProductIdIOS] = useState<string>();
 
   const optionsRef = useRef<UseIAPOptions | undefined>(options);
 
@@ -139,6 +143,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     purchaseUpdate?: EventSubscription;
     purchaseError?: EventSubscription;
     promotedProductsIos?: EventSubscription;
+    promotedProductIOS?: EventSubscription;
   }>({});
 
   const subscriptionsRefState = useRef<SubscriptionProduct[]>([]);
@@ -158,11 +163,11 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   const getProductsInternal = useCallback(
     async (skus: string[]): Promise<void> => {
       try {
-        const result = await getProducts(skus);
+        const result = await requestProducts({skus, type: 'inapp'});
         setProducts((prevProducts) =>
           mergeWithDuplicateCheck(
             prevProducts,
-            result,
+            result as Product[],
             (product) => product.id,
           ),
         );
@@ -176,11 +181,11 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   const getSubscriptionsInternal = useCallback(
     async (skus: string[]): Promise<void> => {
       try {
-        const result = await getSubscriptions(skus);
+        const result = await requestProducts({skus, type: 'subs'});
         setSubscriptions((prevSubscriptions) =>
           mergeWithDuplicateCheck(
             prevSubscriptions,
-            result,
+            result as SubscriptionProduct[],
             (subscription) => subscription.id,
           ),
         );
@@ -392,7 +397,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
           });
       }
     }
-  }, [refreshSubscriptionStatus]);
+  }, [refreshSubscriptionStatus, mergeWithDuplicateCheck]);
 
   useEffect(() => {
     initIapWithSubscriptions();
@@ -402,6 +407,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
       currentSubscriptions.purchaseUpdate?.remove();
       currentSubscriptions.purchaseError?.remove();
       currentSubscriptions.promotedProductsIos?.remove();
+      currentSubscriptions.promotedProductIOS?.remove();
       endConnection();
       setConnected(false);
     };
@@ -410,6 +416,8 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   return {
     connected,
     products,
+    promotedProductsIOS,
+    promotedProductIdIOS,
     subscriptions,
     purchaseHistories,
     finishTransaction,
@@ -421,15 +429,13 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     clearCurrentPurchaseError,
     getAvailablePurchases: getAvailablePurchasesInternal,
     getPurchaseHistories: getPurchaseHistoriesInternal,
-    getProducts: getProductsInternal,
-    getSubscriptions: getSubscriptionsInternal,
     requestProducts: requestProductsInternal,
     requestPurchase: requestPurchaseWithReset,
     validateReceipt,
     restorePurchases,
-    getPromotedProductIOS:
-      Platform.OS === 'ios' ? getPromotedProductIOS : async () => null,
-    buyPromotedProductIOS:
-      Platform.OS === 'ios' ? buyPromotedProductIOS : async () => {},
+    getProducts: getProductsInternal,
+    getSubscriptions: getSubscriptionsInternal,
+    getPromotedProductIOS,
+    buyPromotedProductIOS,
   };
 }