expo-iap 2.9.7 → 3.0.0

package/plugin/src/withLocalOpenIAP.ts

@@ -1,4 +1,9 @@
-import {ConfigPlugin, withDangerousMod} from '@expo/config-plugins';
+import {
+  ConfigPlugin,
+  withDangerousMod,
+  withSettingsGradle,
+  withAppBuildGradle,
+} from 'expo/config-plugins';
 import * as fs from 'fs';
 import * as path from 'path';
 
@@ -6,46 +11,60 @@ import * as path from 'path';
  * Plugin to add local OpenIAP pod dependency for development
  * This is only for local development with openiap-apple library
  */
-const withLocalOpenIAP: ConfigPlugin<{localPath?: string} | void> = (
+type LocalPathOption = string | {ios?: string; android?: string};
+
+const withLocalOpenIAP: ConfigPlugin<{localPath?: LocalPathOption} | void> = (
   config,
   props,
 ) => {
-  return withDangerousMod(config, [
+  // Helper to resolve Android module path
+  const resolveAndroidModulePath = (p?: string): string | null => {
+    if (!p) return null;
+    // Prefer the module directory if it exists
+    const candidates = [
+      path.join(p, 'openiap-google'),
+      path.join(p, 'openiap'),
+      p,
+    ];
+    for (const c of candidates) {
+      if (
+        fs.existsSync(path.join(c, 'build.gradle')) ||
+        fs.existsSync(path.join(c, 'build.gradle.kts'))
+      ) {
+        return c;
+      }
+    }
+    return null;
+  };
+
+  // iOS: inject local pod path
+  config = withDangerousMod(config, [
     'ios',
     async (config) => {
-      const {platformProjectRoot} = config.modRequest;
+      const {platformProjectRoot, projectRoot} = config.modRequest as any;
+      const raw = props?.localPath;
+      const iosPath =
+        (typeof raw === 'string' ? raw : raw?.ios) ||
+        path.resolve(projectRoot, 'openiap-apple');
       const podfilePath = path.join(platformProjectRoot, 'Podfile');
 
-      // Default local path or use provided one
-      const localOpenIapPath =
-        props?.localPath ||
-        path.resolve(config.modRequest.projectRoot, 'openiap-apple');
-
-      // Check if local path exists
-      if (!fs.existsSync(localOpenIapPath)) {
-        console.warn(
-          `⚠️  Local openiap-apple path not found: ${localOpenIapPath}`,
-        );
-        console.warn(
-          '   Skipping local pod injection. Using default pod resolution.',
-        );
+      if (!fs.existsSync(iosPath)) {
+        console.warn(`⚠️  Local openiap-apple path not found: ${iosPath}`);
+        console.warn('   Skipping local pod injection.');
         return config;
       }
 
-      // Read Podfile
       if (!fs.existsSync(podfilePath)) {
         console.warn(`⚠️  Podfile not found at ${podfilePath}. Skipping.`);
         return config;
       }
       let podfileContent = fs.readFileSync(podfilePath, 'utf8');
 
-      // Check if already has the local pod reference
       if (podfileContent.includes("pod 'openiap',")) {
         console.log('✅ Local OpenIAP pod already configured');
         return config;
       }
 
-      // Find the target block and inject the local pod
       const targetRegex =
         /target\s+['"][\w]+['"]\s+do\s*\n\s*use_expo_modules!/;
 
@@ -54,12 +73,10 @@ const withLocalOpenIAP: ConfigPlugin<{localPath?: string} | void> = (
           return `${match}
   
   # Local OpenIAP pod for development (added by expo-iap plugin)
-  pod 'openiap', :path => '${localOpenIapPath}'`;
+  pod 'openiap', :path => '${iosPath}'`;
         });
-
-        // Write back to Podfile
         fs.writeFileSync(podfilePath, podfileContent);
-        console.log(`✅ Added local OpenIAP pod at: ${localOpenIapPath}`);
+        console.log(`✅ Added local OpenIAP pod at: ${iosPath}`);
       } else {
         console.warn('⚠️  Could not find target block in Podfile');
       }
@@ -67,6 +84,193 @@ const withLocalOpenIAP: ConfigPlugin<{localPath?: string} | void> = (
       return config;
     },
   ]);
+
+  // Android: include local module and add dependency if available
+  config = withSettingsGradle(config, (config) => {
+    const raw = props?.localPath;
+    const projectRoot = (config.modRequest as any).projectRoot as string;
+    const androidInput = typeof raw === 'string' ? undefined : raw?.android;
+    const androidModulePath =
+      resolveAndroidModulePath(androidInput) ||
+      resolveAndroidModulePath(path.resolve(projectRoot, 'openiap-google')) ||
+      null;
+
+    if (!androidModulePath || !fs.existsSync(androidModulePath)) {
+      if (androidInput) {
+        console.warn(
+          `⚠️  Could not resolve Android OpenIAP module at: ${androidInput}. Skipping local Android linkage.`,
+        );
+      }
+      return config;
+    }
+
+    // 1) settings.gradle: include and map projectDir
+    const settings = config.modResults;
+    const includeLine = "include ':openiap-google'";
+    const projectDirLine = `project(':openiap-google').projectDir = new File('${androidModulePath.replace(
+      /\\/g,
+      '/',
+    )}')`;
+    let contents = settings.contents ?? '';
+
+    // Ensure pluginManagement has plugin mappings required by the included module
+    const injectPluginManagement = () => {
+      const header = 'pluginManagement {';
+      const needsVannik =
+        !/id\s*\(\s*["']com\.vanniktech\.maven\.publish["']/.test(contents);
+      const needsKotlinAndroid =
+        !/id\s*\(\s*["']org\.jetbrains\.kotlin\.android["']/.test(contents);
+      const needsCompose =
+        !/id\s*\(\s*["']org\.jetbrains\.kotlin\.plugin\.compose["']/.test(
+          contents,
+        );
+      const needsRepos = !/pluginManagement[\s\S]*?repositories\s*\{/.test(
+        contents,
+      );
+
+      const pluginLines: string[] = [];
+      if (needsVannik)
+        pluginLines.push(
+          `  id("com.vanniktech.maven.publish") version "0.29.0"`,
+        );
+      if (needsKotlinAndroid)
+        pluginLines.push(
+          `  id("org.jetbrains.kotlin.android") version "2.0.21"`,
+        );
+      if (needsCompose)
+        pluginLines.push(
+          `  id("org.jetbrains.kotlin.plugin.compose") version "2.0.21"`,
+        );
+
+      // If everything already present, skip
+      if (pluginLines.length === 0 && !needsRepos) return;
+
+      const pluginsBlock = pluginLines.length
+        ? `plugins {\n${pluginLines.join('\n')}\n}`
+        : '';
+      const reposBlock = `repositories { gradlePluginPortal(); google(); mavenCentral() }`;
+
+      if (contents.includes(header)) {
+        contents = contents.replace(/pluginManagement\s*\{/, (m) => {
+          let injection =
+            m + `\n  // Added by expo-iap (local openiap-google)\n`;
+          if (pluginsBlock) injection += `  ${pluginsBlock}\n`;
+          if (needsRepos) injection += `  ${reposBlock}\n`;
+          return injection;
+        });
+      } else {
+        contents =
+          `pluginManagement {\n  // Added by expo-iap (local openiap-google)\n` +
+          (pluginsBlock ? `  ${pluginsBlock}\n` : '') +
+          `  ${reposBlock}\n}\n\n${contents}`;
+      }
+    };
+
+    if (
+      !/com\.vanniktech\.maven\.publish/.test(contents) ||
+      !/org\.jetbrains\.kotlin\.android/.test(contents)
+    ) {
+      injectPluginManagement();
+    }
+    if (!contents.includes(includeLine)) contents += `\n${includeLine}\n`;
+    if (!contents.includes(projectDirLine)) contents += `${projectDirLine}\n`;
+    settings.contents = contents;
+    console.log(`✅ Linked local Android module at: ${androidModulePath}`);
+    return config;
+  });
+
+  // 2) app/build.gradle: add implementation project(':openiap-google')
+  config = withAppBuildGradle(config, (config) => {
+    const raw = props?.localPath;
+    const projectRoot = (config.modRequest as any).projectRoot as string;
+    const androidInput = typeof raw === 'string' ? undefined : raw?.android;
+    const androidModulePath =
+      resolveAndroidModulePath(androidInput) ||
+      resolveAndroidModulePath(path.resolve(projectRoot, 'openiap-google')) ||
+      null;
+
+    if (!androidModulePath || !fs.existsSync(androidModulePath)) {
+      return config;
+    }
+
+    const gradle = config.modResults;
+    const dependencyLine = `    implementation project(':openiap-google')`;
+
+    // Remove any previously injected external deps that can conflict with the local module
+    const removalPatterns = [
+      /\n\s*implementation\s+"com\.android\.billingclient:billing-ktx:[^"]+"\s*\n/g,
+      /\n\s*implementation\s+"com\.google\.android\.gms:play-services-base:[^"]+"\s*\n/g,
+    ];
+    let contents = gradle.contents;
+    let removedAny = false;
+    for (const pattern of removalPatterns) {
+      if (pattern.test(contents)) {
+        contents = contents.replace(pattern, '\n');
+        removedAny = true;
+      }
+    }
+    if (removedAny) {
+      gradle.contents = contents;
+      console.log(
+        '🧹 Removed external Play Billing/GMS deps to use local :openiap-google',
+      );
+    }
+    if (!gradle.contents.includes(dependencyLine)) {
+      const anchor = /dependencies\s*\{/m;
+      if (anchor.test(gradle.contents)) {
+        gradle.contents = gradle.contents.replace(
+          anchor,
+          (m) => `${m}\n${dependencyLine}`,
+        );
+      } else {
+        gradle.contents += `\n\ndependencies {\n${dependencyLine}\n}\n`;
+      }
+      console.log('🛠️ Added dependency on local :openiap-google project');
+    }
+    return config;
+  });
+
+  // 3) Ensure final cleanup in app/build.gradle after all mods are applied
+  config = withDangerousMod(config, [
+    'android',
+    async (config) => {
+      try {
+        const {platformProjectRoot} = config.modRequest as any;
+        const appBuildGradle = path.join(
+          platformProjectRoot,
+          'app',
+          'build.gradle',
+        );
+        if (fs.existsSync(appBuildGradle)) {
+          let contents = fs.readFileSync(appBuildGradle, 'utf8');
+          const patterns = [
+            /\n\s*implementation\s+"com\.android\.billingclient:billing-ktx:[^"]+"\s*\n/g,
+            /\n\s*implementation\s+"com\.google\.android\.gms:play-services-base:[^"]+"\s*\n/g,
+          ];
+          let changed = false;
+          for (const p of patterns) {
+            if (p.test(contents)) {
+              contents = contents.replace(p, '\n');
+              changed = true;
+            }
+          }
+          if (changed) {
+            fs.writeFileSync(appBuildGradle, contents);
+            console.log(
+              '🧹 expo-iap: Cleaned app/build.gradle billing/gms deps for local :openiap-google',
+            );
+          }
+        }
+      } catch (e) {
+        console.warn('expo-iap: cleanup step failed:', e);
+      }
+      return config;
+    },
+  ]);
+
+  // (removed) Avoid global root build.gradle mutations; included module should manage its plugins
+
+  return config;
 };
 
 export default withLocalOpenIAP;

package/src/ExpoIap.types.ts

@@ -37,7 +37,6 @@ export type PurchaseCommon = {
   id: string; // Transaction identifier - used by finishTransaction
   productId: string; // Product identifier - which product was purchased
   ids?: string[]; // Product identifiers for purchases that include multiple products
-  transactionId?: string; // @deprecated - use id instead
   transactionDate: number;
   transactionReceipt: string;
   purchaseToken?: string; // Unified purchase token (jwsRepresentation for iOS, purchaseToken for Android)
@@ -70,17 +69,11 @@ export type Purchase =
   | (PurchaseAndroid & AndroidPlatform)
   | (PurchaseIOS & IosPlatform);
 
-// Removed legacy type aliases `ProductPurchase` and `SubscriptionPurchase` in v2.9.0
-
 export type PurchaseResult = {
   responseCode?: number;
   debugMessage?: string;
   code?: string;
   message?: string;
-  /**
-   * @deprecated Use `purchaseToken` instead. This field will be removed in a future version.
-   */
-  purchaseTokenAndroid?: string;
   purchaseToken?: string;
 };
 /**
@@ -399,7 +392,6 @@ export interface RequestPurchaseAndroidProps {
  */
 export interface RequestSubscriptionAndroidProps
   extends RequestPurchaseAndroidProps {
-  readonly purchaseTokenAndroid?: string;
   readonly replacementModeAndroid?: number;
   readonly subscriptionOffers: {
     sku: string;

package/src/helpers/subscription.ts

@@ -39,7 +39,8 @@ export const getActiveSubscriptions = async (
       // Check if this purchase has subscription-specific fields
       const hasSubscriptionFields =
         ('expirationDateIOS' in purchase && !!purchase.expirationDateIOS) ||
-        'autoRenewingAndroid' in purchase;
+        'autoRenewingAndroid' in purchase ||
+        ('environmentIOS' in purchase && !!(purchase as any).environmentIOS);
 
       if (!hasSubscriptionFields) {
         return false;
@@ -76,12 +77,22 @@ export const getActiveSubscriptions = async (
       return false;
     });
 
+    // Deduplicate by transaction identifier (id)
+    const seen = new Set<string>();
+    const dedupedPurchases = filteredPurchases.filter((p) => {
+      const key = String(p.id);
+      if (seen.has(key)) return false;
+      seen.add(key);
+      return true;
+    });
+
     // Convert to ActiveSubscription format
-    for (const purchase of filteredPurchases) {
+    for (const purchase of dedupedPurchases) {
       const subscription: ActiveSubscription = {
         productId: purchase.productId,
         isActive: true,
-        transactionId: purchase.transactionId || purchase.id,
+        // Use unified id as transaction identifier in v3
+        transactionId: purchase.id,
         purchaseToken: purchase.purchaseToken,
         transactionDate: purchase.transactionDate,
       };

package/src/index.ts

@@ -49,8 +49,6 @@ export const PI = ExpoIapModule.PI;
 export enum OpenIapEvent {
   PurchaseUpdated = 'purchase-updated',
   PurchaseError = 'purchase-error',
-  /** @deprecated Use PurchaseUpdated instead. This will be removed in a future version. */
-  TransactionIapUpdated = 'iap-transaction-updated',
   PromotedProductIOS = 'promoted-product-ios',
 }
 
@@ -139,89 +137,6 @@ export function initConnection(): Promise<boolean> {
   return Promise.resolve(result);
 }
 
-export const getProducts = async (skus: string[]): Promise<Product[]> => {
-  console.warn(
-    "`getProducts` is deprecated. Use `fetchProducts({ skus, type: 'inapp' })` instead. This function will be removed in version 3.0.0.",
-  );
-  if (!skus?.length) {
-    return Promise.reject(
-      new PurchaseError({
-        message: 'No SKUs provided',
-        code: ErrorCode.E_EMPTY_SKU_LIST,
-      }),
-    );
-  }
-
-  return Platform.select({
-    ios: async () => {
-      const rawItems = await ExpoIapModule.fetchProducts(skus);
-      return 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)
-        );
-      }) as Product[];
-    },
-    android: async () => {
-      const products = await ExpoIapModule.fetchProducts('inapp', skus);
-      return products.filter((product: unknown) =>
-        isProductAndroid<Product>(product),
-      );
-    },
-    default: () => Promise.reject(new Error('Unsupported Platform')),
-  })();
-};
-
-export const getSubscriptions = async (
-  skus: string[],
-): Promise<SubscriptionProduct[]> => {
-  console.warn(
-    "`getSubscriptions` is deprecated. Use `fetchProducts({ skus, type: 'subs' })` instead. This function will be removed in version 3.0.0.",
-  );
-  if (!skus?.length) {
-    return Promise.reject(
-      new PurchaseError({
-        message: 'No SKUs provided',
-        code: ErrorCode.E_EMPTY_SKU_LIST,
-      }),
-    );
-  }
-
-  return Platform.select({
-    ios: async () => {
-      const rawItems = await ExpoIapModule.fetchProducts(skus);
-      return 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)
-        );
-      }) as SubscriptionProduct[];
-    },
-    android: async () => {
-      const rawItems = await ExpoIapModule.fetchProducts('subs', skus);
-      return rawItems.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)
-        );
-      }) as SubscriptionProduct[];
-    },
-    default: () => Promise.reject(new Error('Unsupported Platform')),
-  })();
-};
-
 export async function endConnection(): Promise<boolean> {
   return ExpoIapModule.endConnection();
 }
@@ -304,81 +219,10 @@ export const fetchProducts = async ({
   throw new Error('Unsupported platform');
 };
 
-/**
- * @deprecated Use `fetchProducts` instead. This method will be removed in version 3.0.0.
- *
- * The 'request' prefix should only be used for event-based operations that trigger
- * purchase flows. Since this function simply fetches product information, it has been
- * renamed to `fetchProducts` to follow OpenIAP terminology guidelines.
- *
- * @example
- * ```typescript
- * // Old way (deprecated)
- * const products = await requestProducts({
- *   skus: ['com.example.product1'],
- *   type: 'inapp'
- * });
- *
- * // New way (recommended)
- * const products = await fetchProducts({
- *   skus: ['com.example.product1'],
- *   type: 'inapp'
- * });
- * ```
- */
-export const requestProducts = async ({
-  skus,
-  type = 'inapp',
-}: {
-  skus: string[];
-  type?: 'inapp' | 'subs';
-}): Promise<Product[] | SubscriptionProduct[]> => {
-  console.warn(
-    "`requestProducts` is deprecated. Use `fetchProducts` instead. The 'request' prefix should only be used for event-based operations. This method will be removed in version 3.0.0.",
-  );
-  return fetchProducts({skus, type});
-};
-
-/**
- * @deprecated Use `getPurchaseHistories` instead. This function will be removed in version 3.0.0.
- */
-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.',
-  );
-  // Use available purchases as a best-effort replacement
-  return getAvailablePurchases({
-    alsoPublishToEventListenerIOS:
-      alsoPublishToEventListenerIOS ?? alsoPublishToEventListener,
-    onlyIncludeActiveItemsIOS:
-      onlyIncludeActiveItemsIOS ?? onlyIncludeActiveItems,
-  });
-};
-
-// NOTE: `getPurchaseHistories` removed in v2.9.0. Use `getAvailablePurchases` instead.
-
 export const getAvailablePurchases = ({
-  alsoPublishToEventListener = false,
-  onlyIncludeActiveItems = true,
-  alsoPublishToEventListenerIOS,
-  onlyIncludeActiveItemsIOS,
+  alsoPublishToEventListenerIOS = false,
+  onlyIncludeActiveItemsIOS = true,
 }: {
-  /** @deprecated Use alsoPublishToEventListenerIOS instead */
-  alsoPublishToEventListener?: boolean;
-  /** @deprecated Use onlyIncludeActiveItemsIOS instead */
-  onlyIncludeActiveItems?: boolean;
   alsoPublishToEventListenerIOS?: boolean;
   onlyIncludeActiveItemsIOS?: boolean;
 } = {}): Promise<Purchase[]> =>
@@ -386,16 +230,10 @@ export const getAvailablePurchases = ({
     Platform.select({
       ios: () =>
         ExpoIapModule.getAvailableItems(
-          alsoPublishToEventListenerIOS ?? alsoPublishToEventListener,
-          onlyIncludeActiveItemsIOS ?? onlyIncludeActiveItems,
+          alsoPublishToEventListenerIOS,
+          onlyIncludeActiveItemsIOS,
         ),
-      android: async () => {
-        const products = await ExpoIapModule.getAvailableItemsByType('inapp');
-        const subscriptions = await ExpoIapModule.getAvailableItemsByType(
-          'subs',
-        );
-        return products.concat(subscriptions);
-      },
+      android: () => ExpoIapModule.getAvailableItems(),
     }) || (() => Promise.resolve([]))
   )();
 
@@ -574,7 +412,6 @@ export const requestPurchase = (
         isOfferPersonalized,
         subscriptionOffers = [],
         replacementModeAndroid = -1,
-        purchaseTokenAndroid,
         purchaseToken,
       } = normalizedRequest;
 
@@ -582,7 +419,7 @@ export const requestPurchase = (
         return ExpoIapModule.requestPurchase({
           type: 'subs',
           skuArr: skus,
-          purchaseToken: purchaseTokenAndroid || purchaseToken,
+          purchaseToken,
           replacementMode: replacementModeAndroid,
           obfuscatedAccountId: obfuscatedAccountIdAndroid,
           obfuscatedProfileId: obfuscatedProfileIdAndroid,
@@ -600,44 +437,6 @@ export const requestPurchase = (
   return Promise.resolve(); // Fallback for unsupported platforms
 };
 
-/**
- * @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,
-): Promise<Purchase | Purchase[] | null | void> => {
-  console.warn(
-    "`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
-    | Purchase
-    | Purchase[]
-    | null
-    | void;
-};
-
 export const finishTransaction = ({
   purchase,
   isConsumable = false,
@@ -661,8 +460,7 @@ export const finishTransaction = ({
         const androidPurchase = purchase as PurchaseAndroid;
 
         // Use purchaseToken if available, fallback to purchaseTokenAndroid for backward compatibility
-        const token =
-          androidPurchase.purchaseToken || androidPurchase.purchaseTokenAndroid;
+        const token = androidPurchase.purchaseToken;
 
         if (!token) {
           return Promise.reject(
@@ -676,7 +474,7 @@ export const finishTransaction = ({
         }
 
         if (isConsumable) {
-          return ExpoIapModule.consumeProductAndroid(token);
+          return ExpoIapModule.consumePurchaseAndroid(token);
         }
 
         return ExpoIapModule.acknowledgePurchaseAndroid(token);
@@ -708,12 +506,20 @@ export const getStorefrontIOS = (): Promise<string> => {
 };
 
 /**
- * @deprecated Use `getStorefrontIOS` instead. This function will be removed in version 3.0.0.
+ * Gets the storefront country code from the underlying native store.
+ * Returns a two-letter country code such as 'US', 'KR', or empty string on failure.
+ *
+ * @platform ios
+ * @platform android
  */
 export const getStorefront = (): Promise<string> => {
-  console.warn(
-    '`getStorefront` is deprecated. Use `getStorefrontIOS` instead. This function will be removed in version 3.0.0.',
-  );
+  // Cross-platform storefront
+  if (Platform.OS === 'android') {
+    if (typeof (ExpoIapModule as any).getStorefrontAndroid === 'function') {
+      return (ExpoIapModule as any).getStorefrontAndroid();
+    }
+    return Promise.resolve('');
+  }
   return getStorefrontIOS();
 };
 
@@ -786,23 +592,9 @@ export const deepLinkToSubscriptions = (options: {
   }
 
   if (Platform.OS === 'android') {
-    if (!options.skuAndroid) {
-      return Promise.reject(
-        new Error(
-          'skuAndroid is required to locate subscription in Android Store',
-        ),
-      );
-    }
-    if (!options.packageNameAndroid) {
-      return Promise.reject(
-        new Error(
-          'packageNameAndroid is required to identify your app in Android Store',
-        ),
-      );
-    }
     return deepLinkToSubscriptionsAndroid({
-      sku: options.skuAndroid,
-      packageName: options.packageNameAndroid,
+      sku: options?.skuAndroid,
+      packageName: options?.packageNameAndroid,
     });
   }