expo-iap 3.1.4 → 3.1.6

package/ios/ExpoIapModule.swift

@@ -246,11 +246,11 @@ public final class ExpoIapModule: Module {
             return nil
         }
 
-        AsyncFunction("getStorefrontIOS") { () async throws -> String in
-            ExpoIapLog.payload("getStorefrontIOS", payload: nil)
+        AsyncFunction("getStorefront") { () async throws -> String in
+            ExpoIapLog.payload("getStorefront", payload: nil)
             try await ExpoIapHelper.ensureConnection(isInitialized: self.isInitialized)
             let storefront = try await OpenIapModule.shared.getStorefrontIOS()
-            ExpoIapLog.result("getStorefrontIOS", value: storefront)
+            ExpoIapLog.result("getStorefront", value: storefront)
             return storefront
         }
 

package/openiap-versions.json

@@ -1,5 +1,5 @@
 {
-  "apple": "1.2.3",
-  "google": "1.2.7",
-  "gql": "1.0.8"
+  "apple": "1.2.4",
+  "google": "1.2.9",
+  "gql": "1.0.9"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "3.1.4",
+  "version": "3.1.6",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/index.ts

@@ -9,7 +9,6 @@ import {
   validateReceiptIOS,
   deepLinkToSubscriptionsIOS,
   syncIOS,
-  getStorefrontIOS,
 } from './modules/ios';
 import {
   isProductAndroid,
@@ -292,15 +291,11 @@ export const getAvailablePurchases: QueryField<
   return normalizePurchaseArray(purchases as Purchase[]);
 };
 
-export const getStorefront: QueryField<'getStorefrontIOS'> = async () => {
-  // Cross-platform storefront
-  if (Platform.OS === 'android') {
-    if (typeof ExpoIapModule.getStorefrontAndroid === 'function') {
-      return ExpoIapModule.getStorefrontAndroid();
-    }
+export const getStorefront: QueryField<'getStorefront'> = async () => {
+  if (Platform.OS !== 'ios' && Platform.OS !== 'android') {
     return '';
   }
-  return getStorefrontIOS();
+  return ExpoIapModule.getStorefront();
 };
 
 /**

package/src/modules/android.ts

@@ -11,6 +11,16 @@ import type {
   ReceiptValidationResultAndroid,
 } from '../types';
 
+type NativeAndroidModule = {
+  deepLinkToSubscriptionsAndroid?: (params: {
+    skuAndroid?: string;
+    packageNameAndroid?: string;
+  }) => Promise<void> | void;
+  getStorefront?: () => Promise<string> | string;
+};
+
+const nativeAndroidModule = ExpoIapModule as NativeAndroidModule;
+
 // Type guards
 export function isProductAndroid<T extends {platform?: string}>(
   item: unknown,
@@ -46,8 +56,8 @@ export const deepLinkToSubscriptionsAndroid = async (
   const packageName = options?.packageNameAndroid ?? undefined;
 
   // Prefer native deep link implementation via OpenIAP module
-  if (ExpoIapModule?.deepLinkToSubscriptionsAndroid) {
-    return (ExpoIapModule as any).deepLinkToSubscriptionsAndroid({
+  if (nativeAndroidModule?.deepLinkToSubscriptionsAndroid) {
+    return nativeAndroidModule.deepLinkToSubscriptionsAndroid({
       skuAndroid: sku,
       packageNameAndroid: packageName,
     });

package/src/modules/ios.ts

@@ -16,7 +16,7 @@ import type {
   SubscriptionStatusIOS,
 } from '../types';
 import type {PurchaseError} from '../utils/errorMapping';
-import {Linking, Platform} from 'react-native';
+import {Linking} from 'react-native';
 
 export type TransactionEvent = {
   transaction?: Purchase;
@@ -178,28 +178,6 @@ export const getReceiptDataIOS: QueryField<'getReceiptDataIOS'> = async () => {
 
 export const getReceiptIOS = getReceiptDataIOS;
 
-/**
- * Retrieves the current storefront information from the iOS App Store.
- *
- * @returns Promise resolving to the storefront country code
- * @throws Error if called on non-iOS platform
- *
- * @example
- * ```typescript
- * const storefront = await getStorefrontIOS();
- * console.log(storefront); // 'US'
- * ```
- *
- * @platform iOS
- */
-export const getStorefrontIOS: QueryField<'getStorefrontIOS'> = async () => {
-  if (Platform.OS !== 'ios') {
-    console.warn('getStorefrontIOS: This method is only available on iOS');
-    return '';
-  }
-  return ExpoIapModule.getStorefrontIOS();
-};
-
 /**
  * Check if a transaction is verified through StoreKit 2.
  * StoreKit 2 performs local verification of transaction JWS signatures.

package/src/types.ts

@@ -449,7 +449,12 @@ export interface Query {
   getPromotedProductIOS?: Promise<(ProductIOS | null)>;
   /** Get base64-encoded receipt data for validation */
   getReceiptDataIOS?: Promise<(string | null)>;
-  /** Get the current App Store storefront country code */
+  /** Get the current storefront country code */
+  getStorefront: Promise<string>;
+  /**
+   * Get the current App Store storefront country code
+   * @deprecated Use getStorefront
+   */
   getStorefrontIOS: Promise<string>;
   /** Get the transaction JWS (StoreKit 2) */
   getTransactionJwsIOS?: Promise<(string | null)>;
@@ -680,6 +685,7 @@ export type QueryArgsMap = {
   getPendingTransactionsIOS: never;
   getPromotedProductIOS: never;
   getReceiptDataIOS: never;
+  getStorefront: never;
   getStorefrontIOS: never;
   getTransactionJwsIOS: QueryGetTransactionJwsIosArgs;
   hasActiveSubscriptions: QueryHasActiveSubscriptionsArgs;

package/src/useIAP.ts

@@ -37,6 +37,8 @@ import type {
   PurchaseInput,
   ReceiptValidationProps,
   ReceiptValidationResult,
+  ProductAndroid,
+  ProductSubscriptionIOS,
 } from './types';
 import {ErrorCode} from './types';
 import type {PurchaseError} from './utils/errorMapping';
@@ -159,6 +161,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
       if (!value) {
         return 'in-app';
       }
+
       const normalized = value.trim().toLowerCase().replace(/[_-]/g, '');
       return normalized === 'subs' ? 'subs' : 'in-app';
     },
@@ -191,6 +194,8 @@ export function useIAP(options?: UseIAPOptions): UseIap {
         const result = await fetchProducts(request);
         const items = (result ?? []) as (Product | ProductSubscription)[];
 
+        console.log('Fetched products:', items);
+
         if (queryType === 'subs') {
           const subscriptionsResult = items as ProductSubscription[];
           setSubscriptions((prevSubscriptions) =>
@@ -210,12 +215,40 @@ export function useIAP(options?: UseIAPOptions): UseIap {
             ),
           );
         } else {
-          const productItems = items.filter(
-            (item) => canonicalProductType(item.type as string) === 'in-app',
-          ) as Product[];
-          const subscriptionItems = items.filter(
-            (item) => canonicalProductType(item.type as string) === 'subs',
-          ) as ProductSubscription[];
+          // For 'all' type, need to properly distinguish between products and subscriptions
+          // On Android, check subscriptionOfferDetailsAndroid to determine if it's a real subscription
+          const productItems = items.filter((item) => {
+            // iOS: check type
+            if (Platform.OS === 'ios') {
+              return canonicalProductType(item.type as string) === 'in-app';
+            }
+            // Android: check if it has actual subscription details
+            const androidItem = item as ProductAndroid;
+            return (
+              !androidItem.subscriptionOfferDetailsAndroid ||
+              (Array.isArray(androidItem.subscriptionOfferDetailsAndroid) &&
+                androidItem.subscriptionOfferDetailsAndroid.length === 0)
+            );
+          }) as Product[];
+
+          const subscriptionItems = items.filter((item) => {
+            // iOS: check type
+            if (Platform.OS === 'ios') {
+              return (
+                canonicalProductType(
+                  item.type as ProductSubscriptionIOS['type'],
+                ) === 'subs'
+              );
+            }
+            // Android: check if it has actual subscription details
+            const androidItem = item as ProductAndroid;
+
+            return (
+              androidItem.subscriptionOfferDetailsAndroid &&
+              Array.isArray(androidItem.subscriptionOfferDetailsAndroid) &&
+              androidItem.subscriptionOfferDetailsAndroid.length > 0
+            );
+          }) as ProductSubscription[];
 
           setProducts((prevProducts) =>
             mergeWithDuplicateCheck(