expo-iap 2.0.0 → 2.2.0-rc.1

package/plugin/src/withIAP.ts

@@ -1,38 +1,12 @@
 import {
   WarningAggregator,
-  withAppBuildGradle,
+  withAndroidManifest,
   withProjectBuildGradle,
 } from 'expo/config-plugins';
 import {ConfigPlugin, createRunOncePlugin} from 'expo/config-plugins';
 
 const pkg = require('../../package.json');
 
-type PaymentProvider = 'Amazon AppStore' | 'both' | 'Play Store';
-
-const hasPaymentProviderProperValue = (
-  paymentProvider: string,
-): paymentProvider is PaymentProvider => {
-  return ['Amazon AppStore', 'Play Store', 'both'].includes(paymentProvider);
-};
-
-const linesToAdd: {[key in PaymentProvider]: string} = {
-  ['Amazon AppStore']: `missingDimensionStrategy "store", "amazon"`,
-  ['Play Store']: `missingDimensionStrategy "store", "play"`,
-  ['both']: `flavorDimensions "appstore"
-
-productFlavors {
-  googlePlay {
-    dimension "appstore"
-    missingDimensionStrategy "store", "play"
-  }
-
-  amazon {
-    dimension "appstore"
-    missingDimensionStrategy "store", "amazon"
-  }
-}`,
-};
-
 const addToBuildGradle = (
   newLine: string,
   anchor: RegExp | string,
@@ -41,37 +15,13 @@ const addToBuildGradle = (
 ) => {
   const lines = buildGradle.split('\n');
   const lineIndex = lines.findIndex((line) => line.match(anchor));
-  // add after given line
-  lines.splice(lineIndex + offset, 0, newLine);
-  return lines.join('\n');
-};
-
-export const modifyAppBuildGradle = (
-  buildGradle: string,
-  paymentProvider: PaymentProvider,
-) => {
-  if (paymentProvider === 'both') {
-    if (buildGradle.includes(`flavorDimensions "appstore"`)) {
-      return buildGradle;
-    }
-    return addToBuildGradle(
-      linesToAdd[paymentProvider],
-      'defaultConfig',
-      -1,
-      buildGradle,
-    );
+  if (lineIndex === -1) {
+    console.warn('Anchor "ext" not found in build.gradle, appending to end');
+    lines.push(newLine);
+  } else {
+    lines.splice(lineIndex + offset, 0, newLine);
   }
-
-  const missingDimensionStrategy = linesToAdd[paymentProvider];
-  if (buildGradle.includes(missingDimensionStrategy)) {
-    return buildGradle;
-  }
-  return addToBuildGradle(
-    missingDimensionStrategy,
-    'defaultConfig',
-    1,
-    buildGradle,
-  );
+  return lines.join('\n');
 };
 
 export const modifyProjectBuildGradle = (buildGradle: string) => {
@@ -82,54 +32,57 @@ export const modifyProjectBuildGradle = (buildGradle: string) => {
   return addToBuildGradle(supportLibVersion, 'ext', 1, buildGradle);
 };
 
-const withIAPAndroid: ConfigPlugin<{paymentProvider: PaymentProvider}> = (
-  config,
-  {paymentProvider},
-) => {
-  // eslint-disable-next-line @typescript-eslint/no-shadow
-  config = withAppBuildGradle(config, (config) => {
-    config.modResults.contents = modifyAppBuildGradle(
+const withIAPAndroid: ConfigPlugin = (config) => {
+  config = withProjectBuildGradle(config, (config) => {
+    config.modResults.contents = modifyProjectBuildGradle(
       config.modResults.contents,
-      paymentProvider,
     );
     return config;
   });
 
-  // eslint-disable-next-line @typescript-eslint/no-shadow
-  config = withProjectBuildGradle(config, (config) => {
-    config.modResults.contents = modifyProjectBuildGradle(
-      config.modResults.contents,
-    );
+  // Adding BILLING permission to AndroidManifest.xml
+  config = withAndroidManifest(config, (config) => {
+    console.log('Modifying AndroidManifest.xml...');
+    const manifest = config.modResults;
+
+    if (!manifest.manifest['uses-permission']) {
+      manifest.manifest['uses-permission'] = [];
+    }
+
+    const permissions = manifest.manifest['uses-permission'];
+    const billingPermission = {
+      $: {'android:name': 'com.android.vending.BILLING'},
+    };
+    if (
+      !permissions.some(
+        (perm: any) => perm.$['android:name'] === 'com.android.vending.BILLING',
+      )
+    ) {
+      permissions.push(billingPermission);
+      console.log('Added com.android.vending.BILLING to permissions');
+    } else {
+      console.log('com.android.vending.BILLING already exists in manifest');
+    }
+
     return config;
   });
+
   return config;
 };
 
-interface Props {
-  paymentProvider?: PaymentProvider;
-}
+interface Props {}
 
 const withIAP: ConfigPlugin<Props | undefined> = (config, props) => {
-  const paymentProvider = props?.paymentProvider ?? 'Play Store';
-
-  if (!hasPaymentProviderProperValue(paymentProvider)) {
-    WarningAggregator.addWarningAndroid(
-      'expo-iap',
-
-      `The payment provider '${paymentProvider}' is not supported. Please update your app.json file with one of the following supported values: 'Play Store', 'Amazon AppStore', or 'both'.`,
-    );
-    return config;
-  }
   try {
-    config = withIAPAndroid(config, {paymentProvider});
+    console.log('Applying expo-iap plugin...');
+    config = withIAPAndroid(config);
   } catch (error) {
     WarningAggregator.addWarningAndroid(
       'expo-iap',
-
       `There was a problem configuring expo-iap in your native Android project: ${error}`,
     );
+    console.error('Error in expo-iap plugin:', error);
   }
-
   return config;
 };
 

package/src/ExpoIap.types.ts

@@ -1,83 +1,83 @@
 import {
   ProductAndroid,
+  ProductPurchaseAndroid,
   RequestPurchaseAndroidProps,
   RequestSubscriptionAndroidProps,
   SubscriptionProductAndroid,
 } from './types/ExpoIapAndroid.types';
 import {
   ProductIos,
+  ProductPurchaseIos,
   RequestPurchaseIosProps,
   RequestSubscriptionIosProps,
   SubscriptionProductIos,
 } from './types/ExpoIapIos.types';
+
 export type ChangeEventPayload = {
   value: string;
 };
 
-export type Product = ProductAndroid | ProductIos;
+/**
+ * Base product type with common properties shared between iOS and Android
+ */
+export type ProductBase = {
+  id: string;
+  title: string;
+  description: string;
+  type: ProductType;
+  displayName?: string;
+  displayPrice?: string;
+  price?: number;
+  currency?: string;
+};
+
+// Define literal platform types for better type discrimination
+export type IosPlatform = {platform: 'ios'};
+export type AndroidPlatform = {platform: 'android'};
+
 export enum ProductType {
   InAppPurchase = 'inapp',
   Subscription = 'subs',
 }
 
-export type SubscriptionProduct =
-  | SubscriptionProductAndroid
-  | SubscriptionProductIos;
-
-export type RequestPurchaseProps =
-  | RequestPurchaseIosProps
-  | RequestPurchaseAndroidProps;
-
-enum PurchaseStateAndroid {
-  UNSPECIFIED_STATE = 0,
-  PURCHASED = 1,
-  PENDING = 2,
-}
-
-export type ProductPurchase = {
-  productId: string;
+// Common base purchase type
+export type PurchaseBase = {
+  id: string;
   transactionId?: string;
   transactionDate: number;
   transactionReceipt: string;
   purchaseToken?: string;
-  //iOS
-  quantityIOS?: number;
-  originalTransactionDateIOS?: number;
-  originalTransactionIdentifierIOS?: string;
-  verificationResultIOS?: string;
-  appAccountToken?: string;
-  //Android
-  productIds?: string[];
-  dataAndroid?: string;
-  signatureAndroid?: string;
-  autoRenewingAndroid?: boolean;
-  purchaseStateAndroid?: PurchaseStateAndroid;
-  isAcknowledgedAndroid?: boolean;
-  packageNameAndroid?: string;
-  developerPayloadAndroid?: string;
-  obfuscatedAccountIdAndroid?: string;
-  obfuscatedProfileIdAndroid?: string;
 };
 
-export type RequestSubscriptionProps =
-  | RequestSubscriptionAndroidProps
-  | RequestSubscriptionIosProps;
+// Union type for platform-specific product types with proper discriminators
+export type Product =
+  | (ProductAndroid & AndroidPlatform)
+  | (ProductIos & IosPlatform);
 
-enum TransactionReason {
-  PURCHASE = 'PURCHASE',
-  RENEWAL = 'RENEWAL',
-}
+// Union type for platform-specific purchase types with proper discriminators
+export type ProductPurchase =
+  | (ProductPurchaseAndroid & AndroidPlatform)
+  | (ProductPurchaseIos & IosPlatform);
 
-export type SubscriptionPurchase = {
-  autoRenewingAndroid?: boolean;
-  originalTransactionDateIOS?: number;
-  originalTransactionIdentifierIOS?: string;
-  verificationResultIOS?: string;
-  transactionReasonIOS?: TransactionReason | string;
-} & ProductPurchase;
+// Union type for platform-specific subscription purchase types with proper discriminators
+export type SubscriptionPurchase =
+  | (ProductPurchaseAndroid & AndroidPlatform & { autoRenewingAndroid: boolean })
+  | (ProductPurchaseIos & IosPlatform);
 
 export type Purchase = ProductPurchase | SubscriptionPurchase;
 
+export type RequestPurchaseProps =
+  | RequestPurchaseIosProps
+  | RequestPurchaseAndroidProps;
+
+export type SubscriptionProduct =
+  | (SubscriptionProductAndroid & AndroidPlatform)
+  | (SubscriptionProductIos & IosPlatform);
+
+export type RequestSubscriptionProps =
+  | RequestSubscriptionAndroidProps
+  | RequestSubscriptionIosProps;
+
 export type PurchaseResult = {
   responseCode?: number;
   debugMessage?: string;

package/src/index.ts

@@ -2,7 +2,6 @@
 // and on native platforms to ExpoIap.ts
 import {NativeModulesProxy, EventEmitter} from 'expo-modules-core';
 import {Platform} from 'react-native';
-
 import {
   Product,
   ProductPurchase,
@@ -21,13 +20,14 @@ import {
 } from './types/ExpoIapAndroid.types';
 import {
   PaymentDiscount,
-  ProductIos,
   RequestPurchaseIosProps,
   RequestSubscriptionIosProps,
-  SubscriptionProductIos,
-  TransactionSk2,
 } from './types/ExpoIapIos.types';
-import {isProductIos} from './modules/ios';
+import {isProductIos, isSubscriptionProductIos} from './modules/ios';
+import {
+  isProductAndroid,
+  isSubscriptionProductAndroid,
+} from './modules/android';
 
 export * from './modules/android';
 export * from './modules/ios';
@@ -70,22 +70,25 @@ export function initConnection() {
 }
 
 export const getProducts = async (skus: string[]): Promise<Product[]> => {
+  console.log('getProducts', skus);
   if (!skus?.length) {
     return Promise.reject(new Error('"skus" is required'));
   }
 
   return Platform.select({
     ios: async () => {
-      const items = (await ExpoIapModule.getItems(skus)) as ProductIos[];
-      return items.filter((item: ProductIos) => isProductIos(item));
+      const items = await ExpoIapModule.getItems(skus);
+      console.log('items', items);
+      return items.filter((item: unknown) => isProductIos<Product>(item));
     },
     android: async () => {
       const products = await ExpoIapModule.getItemsByType(
         ProductType.InAppPurchase,
         skus,
       );
-
-      return products;
+      return products.filter((product: unknown) =>
+        isProductAndroid<Product>(product),
+      );
     },
     default: () => Promise.reject(new Error('Unsupported Platform')),
   })();
@@ -99,15 +102,33 @@ export const getSubscriptions = async (
   }
 
   return Platform.select({
-    ios: async (): Promise<SubscriptionProductIos[]> => {
-      const items: SubscriptionProductIos[] = (
-        (await ExpoIapModule.getItems(skus)) as SubscriptionProductIos[]
-      ).filter((item: SubscriptionProductIos) => skus.includes(item.id));
-
-      return items;
+    ios: async () => {
+      const rawItems = await ExpoIapModule.getItems(skus);
+
+      return rawItems.filter((item: unknown) => {
+        if (!isSubscriptionProductIos(item)) return false;
+        return (
+          typeof item === 'object' &&
+          item !== null &&
+          'id' in item &&
+          typeof item.id === 'string' &&
+          skus.includes(item.id)
+        );
+      }) as SubscriptionProduct[];
     },
     android: async () => {
-      return ExpoIapModule.getItemsByType('subs', skus);
+      const rawItems = await ExpoIapModule.getItemsByType('subs', skus);
+
+      return rawItems.filter((item: unknown) => {
+        if (!isSubscriptionProductAndroid(item)) return false;
+        return (
+          typeof item === 'object' &&
+          item !== null &&
+          'id' in item &&
+          typeof item.id === 'string' &&
+          skus.includes(item.id)
+        );
+      }) as SubscriptionProduct[];
     },
     default: () => Promise.reject(new Error('Unsupported Platform')),
   })();
@@ -119,11 +140,9 @@ export async function endConnection(): Promise<boolean> {
 
 export const getPurchaseHistory = ({
   alsoPublishToEventListener = false,
-  automaticallyFinishRestoredTransactions = true,
   onlyIncludeActiveItems = false,
 }: {
   alsoPublishToEventListener?: boolean;
-  automaticallyFinishRestoredTransactions?: boolean;
   onlyIncludeActiveItems?: boolean;
 } = {}): Promise<ProductPurchase[]> =>
   (
@@ -150,11 +169,9 @@ export const getPurchaseHistory = ({
 
 export const getAvailablePurchases = ({
   alsoPublishToEventListener = false,
-  automaticallyFinishRestoredTransactions = false,
   onlyIncludeActiveItems = true,
 }: {
   alsoPublishToEventListener?: boolean;
-  automaticallyFinishRestoredTransactions?: boolean;
   onlyIncludeActiveItems?: boolean;
 } = {}): Promise<ProductPurchase[]> =>
   (
@@ -193,43 +210,6 @@ const offerToRecordIos = (
   };
 };
 
-const iosTransactionToPurchaseMap = ({
-  id,
-  originalPurchaseDate,
-  productID,
-  purchaseDate,
-  purchasedQuantity,
-  originalID,
-  verificationResult,
-  appAccountToken,
-  jsonRepresentation,
-}: TransactionSk2): Purchase => {
-  let transactionReasonIOS;
-
-  try {
-    if (jsonRepresentation) {
-      const transactionData = JSON.parse(jsonRepresentation);
-      transactionReasonIOS = transactionData.transactionReason;
-    }
-  } catch (e) {
-    console.log('SK2 Error parsing jsonRepresentation', e);
-  }
-  const purchase: Purchase = {
-    productId: productID,
-    transactionId: String(id),
-    transactionDate: purchaseDate, //??
-    transactionReceipt: '', // Not available
-    purchaseToken: '', //Not available
-    quantityIOS: purchasedQuantity,
-    originalTransactionDateIOS: originalPurchaseDate,
-    originalTransactionIdentifierIOS: originalID,
-    verificationResultIOS: verificationResult ?? '',
-    appAccountToken: appAccountToken ?? '',
-    transactionReasonIOS: transactionReasonIOS ?? '',
-  };
-  return purchase;
-};
-
 export const requestPurchase = (
   request: RequestPurchaseIosProps | RequestPurchaseAndroidProps,
 ): Promise<ProductPurchase | ProductPurchase[] | void> =>
@@ -240,31 +220,17 @@ export const requestPurchase = (
           throw new Error('sku is required for iOS purchase');
         }
 
-        const {
-          sku,
-          andDangerouslyFinishTransactionAutomaticallyIOS = false,
-          appAccountToken,
-          quantity,
-          withOffer,
-        } = request;
-
-        if (andDangerouslyFinishTransactionAutomaticallyIOS) {
-          console.warn(
-            'You are dangerously allowing expo-iap to finish your transaction automatically. You should set andDangerouslyFinishTransactionAutomatically to false when calling requestPurchase and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.',
-          );
-        }
+        const {sku, appAccountToken, quantity, withOffer} = request;
 
         const offer = offerToRecordIos(withOffer);
 
-        const result = await ExpoIapModule.buyProduct(
+        const purchase = await ExpoIapModule.buyProduct(
           sku,
-          andDangerouslyFinishTransactionAutomaticallyIOS,
           appAccountToken,
           quantity ?? -1,
           offer,
         );
 
-        const purchase = iosTransactionToPurchaseMap(result);
         return Promise.resolve(purchase);
       },
       android: async () => {
@@ -303,35 +269,21 @@ export const requestSubscription = (
           throw new Error('sku is required for iOS subscriptions');
         }
 
-        const {
-          sku,
-          andDangerouslyFinishTransactionAutomaticallyIOS = false,
-          appAccountToken,
-          quantity,
-          withOffer,
-        } = request as RequestSubscriptionIosProps;
-
-        if (andDangerouslyFinishTransactionAutomaticallyIOS) {
-          console.warn(
-            'You are dangerously allowing expo-iap to finish your transaction automatically. You should set andDangerouslyFinishTransactionAutomatically to false when calling requestPurchase and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.',
-          );
-        }
+        const {sku, appAccountToken, quantity, withOffer} =
+          request as RequestSubscriptionIosProps;
 
         const offer = offerToRecordIos(withOffer);
 
-        const purchase = iosTransactionToPurchaseMap(
-          await ExpoIapModule.buyProduct(
-            sku,
-            andDangerouslyFinishTransactionAutomaticallyIOS,
-            appAccountToken,
-            quantity ?? -1,
-            offer,
-          ),
+        const purchase = await ExpoIapModule.buyProduct(
+          sku,
+          appAccountToken,
+          quantity ?? -1,
+          offer,
         );
-        return Promise.resolve(purchase);
+
+        return Promise.resolve(purchase as SubscriptionPurchase);
       },
       android: async () => {
-        console.log('requestSubscription', request);
         const {
           skus,
           isOfferPersonalized,
@@ -398,3 +350,5 @@ export const finishTransaction = ({
     }) || (() => Promise.reject(new Error('Unsupported Platform')))
   )();
 };
+
+export * from './useIap';

package/src/modules/android.ts

@@ -1,20 +1,24 @@
 import {Linking} from 'react-native';
-import {Product, PurchaseResult, SubscriptionProduct} from '../ExpoIap.types';
-import {
-  ProductAndroid,
-  ReceiptAndroid,
-  SubscriptionProductAndroid,
-} from '../types/ExpoIapAndroid.types';
+import {PurchaseResult} from '../ExpoIap.types';
+import {ReceiptAndroid} from '../types/ExpoIapAndroid.types';
 import ExpoIapModule from '../ExpoIapModule';
 
-export function isProductAndroid(product: Product): product is ProductAndroid {
-  return (product as ProductAndroid)?.title !== undefined;
+// Type guards
+export function isProductAndroid<T extends {platform?: string}>(
+  item: unknown,
+): item is T & {platform: 'android'} {
+  return (
+    item != null &&
+    typeof item === 'object' &&
+    'platform' in item &&
+    item.platform === 'android'
+  );
 }
 
-export function isSubscriptionProductAndroid(
-  product: SubscriptionProduct,
-): product is SubscriptionProductAndroid {
-  return (product as SubscriptionProductAndroid)?.title !== undefined;
+export function isSubscriptionProductAndroid<T extends {platform?: string}>(
+  item: unknown,
+): item is T & {platform: 'android'} {
+  return isProductAndroid(item);
 }
 
 /**

package/src/modules/ios.ts

@@ -1,16 +1,11 @@
 import {Platform} from 'react-native';
 import {emitter, IapEvent} from '..';
-import {Product, PurchaseError, SubscriptionProduct} from '../ExpoIap.types';
-import type {
-  ProductIos,
-  ProductStatusIos,
-  SubscriptionProductIos,
-  TransactionSk2,
-} from '../types/ExpoIapIos.types';
+import {ProductPurchase, PurchaseError} from '../ExpoIap.types';
+import type {ProductStatusIos} from '../types/ExpoIapIos.types';
 import ExpoIapModule from '../ExpoIapModule';
 
-type TransactionEvent = {
-  transaction?: TransactionSk2;
+export type TransactionEvent = {
+  transaction?: ProductPurchase;
   error?: PurchaseError;
 };
 
@@ -25,17 +20,25 @@ export const transactionUpdatedIos = (
   return emitter.addListener(IapEvent.TransactionIapUpdated, listener);
 };
 
-// Functions
-export function isProductIos(product: Product): product is ProductIos {
-  return (product as ProductIos)?.displayName !== undefined;
+// Type guards
+export function isProductIos<T extends {platform?: string}>(
+  item: unknown,
+): item is T & {platform: 'ios'} {
+  return (
+    item != null &&
+    typeof item === 'object' &&
+    'platform' in item &&
+    item.platform === 'ios'
+  );
 }
 
-export function isSubscriptionProductIos(
-  product: SubscriptionProduct,
-): product is SubscriptionProductIos {
-  return (product as SubscriptionProductIos)?.displayName !== undefined;
+export function isSubscriptionProductIos<T extends {platform?: string}>(
+  item: unknown,
+): item is T & {platform: 'ios'} {
+  return isProductIos(item);
 }
 
+// Functions
 /**
  * Sync state with Appstore (iOS only)
  * https://developer.apple.com/documentation/storekit/appstore/3791906-sync
@@ -58,13 +61,13 @@ export const subscriptionStatus = (sku: string): Promise<ProductStatusIos[]> =>
 /**
  *
  */
-export const currentEntitlement = (sku: string): Promise<TransactionSk2> =>
+export const currentEntitlement = (sku: string): Promise<ProductPurchase> =>
   ExpoIapModule.currentEntitlement(sku);
 
 /**
  *
  */
-export const latestTransaction = (sku: string): Promise<TransactionSk2> =>
+export const latestTransaction = (sku: string): Promise<ProductPurchase> =>
   ExpoIapModule.latestTransaction(sku);
 
 /**