expo-iap 3.0.3 → 3.0.5

package/src/helpers/subscription.ts

@@ -1,18 +1,6 @@
 import {Platform} from 'react-native';
 import {getAvailablePurchases} from '../index';
-
-export interface ActiveSubscription {
-  productId: string;
-  isActive: boolean;
-  transactionId: string; // Transaction identifier for backend validation
-  purchaseToken?: string; // JWT token (iOS) or purchase token (Android) for backend validation
-  transactionDate: number; // Transaction timestamp
-  expirationDateIOS?: Date;
-  autoRenewingAndroid?: boolean;
-  environmentIOS?: string;
-  willExpireSoon?: boolean;
-  daysUntilExpirationIOS?: number;
-}
+import type {ActiveSubscription} from '../types';
 
 /**
  * Get all active subscriptions with detailed information
@@ -91,8 +79,7 @@ export const getActiveSubscriptions = async (
       const subscription: ActiveSubscription = {
         productId: purchase.productId,
         isActive: true,
-        // Use unified id as transaction identifier in v3
-        transactionId: purchase.id,
+        transactionId: String(purchase.id),
         purchaseToken: purchase.purchaseToken,
         transactionDate: purchase.transactionDate,
       };
@@ -100,8 +87,7 @@ export const getActiveSubscriptions = async (
       // Add platform-specific details
       if (Platform.OS === 'ios') {
         if ('expirationDateIOS' in purchase && purchase.expirationDateIOS) {
-          const expirationDate = new Date(purchase.expirationDateIOS);
-          subscription.expirationDateIOS = expirationDate;
+          subscription.expirationDateIOS = purchase.expirationDateIOS;
 
           // Calculate days until expiration (round to nearest day)
           const daysUntilExpiration = Math.round(
@@ -112,13 +98,19 @@ export const getActiveSubscriptions = async (
         }
 
         if ('environmentIOS' in purchase) {
-          subscription.environmentIOS = purchase.environmentIOS;
+          subscription.environmentIOS = purchase.environmentIOS ?? undefined;
         }
       } else if (Platform.OS === 'android') {
         if ('autoRenewingAndroid' in purchase) {
-          subscription.autoRenewingAndroid = purchase.autoRenewingAndroid;
+          if (typeof purchase.autoRenewingAndroid !== 'undefined') {
+            subscription.autoRenewingAndroid = purchase.autoRenewingAndroid;
+          }
           // If auto-renewing is false, subscription will expire soon
-          subscription.willExpireSoon = !purchase.autoRenewingAndroid;
+          if (purchase.autoRenewingAndroid === false) {
+            subscription.willExpireSoon = true;
+          } else if (purchase.autoRenewingAndroid === true) {
+            subscription.willExpireSoon = false;
+          }
         }
       }
 

package/src/index.ts

@@ -20,19 +20,21 @@ import {
 import {
   Product,
   Purchase,
-  PurchaseError,
   ErrorCode,
-  PurchaseResult,
-  RequestSubscriptionProps,
   RequestPurchaseProps,
+  RequestPurchasePropsByPlatforms,
+  RequestSubscriptionPropsByPlatforms,
   ProductSubscription,
-  // Bring platform types from the barrel to avoid deep imports
   PurchaseAndroid,
-  PaymentDiscount,
-} from './ExpoIap.types';
+  DiscountOfferInputIOS,
+  VoidResult,
+  ReceiptValidationResult,
+} from './types';
+import {PurchaseError} from './purchase-error';
 
 // Export all types
-export * from './ExpoIap.types';
+export * from './types';
+export {ErrorCodeUtils, ErrorCodeMapping} from './purchase-error';
 export * from './modules/android';
 export * from './modules/ios';
 
@@ -40,7 +42,6 @@ export * from './modules/ios';
 export {
   getActiveSubscriptions,
   hasActiveSubscriptions,
-  type ActiveSubscription,
 } from './helpers/subscription';
 
 // Get the native constant value
@@ -68,6 +69,58 @@ export const emitter = (ExpoIapModule || NativeModulesProxy.ExpoIap) as {
   ) => void;
 };
 
+/**
+ * TODO(v3.1.0): Remove legacy 'inapp' alias once downstream apps migrate to 'in-app'.
+ */
+export type ProductTypeInput = 'inapp' | 'in-app' | 'subs';
+export type InAppTypeInput = Exclude<ProductTypeInput, 'subs'>;
+
+type PurchaseRequestInApp = {
+  request: RequestPurchasePropsByPlatforms;
+  type?: InAppTypeInput;
+};
+
+type PurchaseRequestSubscription = {
+  request: RequestSubscriptionPropsByPlatforms;
+  type: 'subs';
+};
+
+export type PurchaseRequestInput =
+  | PurchaseRequestInApp
+  | PurchaseRequestSubscription;
+
+export type PurchaseRequest =
+  | {
+      request: RequestPurchaseProps;
+      type?: InAppTypeInput;
+    }
+  | {
+      request: RequestSubscriptionPropsByPlatforms;
+      type: 'subs';
+    };
+
+const normalizeProductType = (type?: ProductTypeInput) => {
+  if (type === 'inapp') {
+    console.warn(
+      "expo-iap: 'inapp' product type is deprecated and will be removed in v3.1.0. Use 'in-app' instead.",
+    );
+  }
+
+  if (!type || type === 'inapp' || type === 'in-app') {
+    return {
+      canonical: 'in-app' as const,
+      native: 'inapp' as const,
+    };
+  }
+  if (type === 'subs') {
+    return {
+      canonical: 'subs' as const,
+      native: 'subs' as const,
+    };
+  }
+  throw new Error(`Unsupported product type: ${type}`);
+};
+
 export const purchaseUpdatedListener = (
   listener: (event: Purchase) => void,
 ) => {
@@ -146,14 +199,14 @@ export async function endConnection(): Promise<boolean> {
  *
  * @param params - Product fetch 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
+ * @param params.type - Type of products: 'in-app' for regular products (default) or 'subs' for subscriptions
  *
  * @example
  * ```typescript
  * // Regular products
  * const products = await fetchProducts({
  *   skus: ['product1', 'product2'],
- *   type: 'inapp'
+ *   type: 'in-app'
  * });
  *
  * // Subscriptions
@@ -165,10 +218,10 @@ export async function endConnection(): Promise<boolean> {
  */
 export const fetchProducts = async ({
   skus,
-  type = 'inapp',
+  type,
 }: {
   skus: string[];
-  type?: 'inapp' | 'subs';
+  type?: ProductTypeInput;
 }): Promise<Product[] | ProductSubscription[]> => {
   if (!skus?.length) {
     throw new PurchaseError({
@@ -177,8 +230,10 @@ export const fetchProducts = async ({
     });
   }
 
+  const {canonical, native} = normalizeProductType(type);
+
   if (Platform.OS === 'ios') {
-    const rawItems = await ExpoIapModule.fetchProducts({skus, type});
+    const rawItems = await ExpoIapModule.fetchProducts({skus, type: native});
 
     const filteredItems = rawItems.filter((item: unknown) => {
       if (!isProductIOS(item)) {
@@ -193,13 +248,13 @@ export const fetchProducts = async ({
       return isValid;
     });
 
-    return type === 'inapp'
+    return canonical === 'in-app'
       ? (filteredItems as Product[])
       : (filteredItems as ProductSubscription[]);
   }
 
   if (Platform.OS === 'android') {
-    const items = await ExpoIapModule.fetchProducts(type, skus);
+    const items = await ExpoIapModule.fetchProducts(native, skus);
     const filteredItems = items.filter((item: unknown) => {
       if (!isProductAndroid(item)) return false;
       return (
@@ -211,7 +266,7 @@ export const fetchProducts = async ({
       );
     });
 
-    return type === 'inapp'
+    return canonical === 'in-app'
       ? (filteredItems as Product[])
       : (filteredItems as ProductSubscription[]);
   }
@@ -272,8 +327,8 @@ export const restorePurchases = async (
 };
 
 const offerToRecordIOS = (
-  offer: PaymentDiscount | undefined,
-): Record<keyof PaymentDiscount, string> | undefined => {
+  offer: DiscountOfferInputIOS | undefined,
+): Record<keyof DiscountOfferInputIOS, string> | undefined => {
   if (!offer) return undefined;
   return {
     identifier: offer.identifier,
@@ -284,22 +339,13 @@ const offerToRecordIOS = (
   };
 };
 
-// Define discriminated union with explicit type parameter
-type PurchaseRequest =
-  | {
-      request: RequestPurchaseProps;
-      type?: 'inapp';
-    }
-  | {
-      request: RequestSubscriptionProps;
-      type: 'subs';
-    };
-
 /**
  * Helper to normalize request props to platform-specific format
  */
 const normalizeRequestProps = (
-  request: RequestPurchaseProps | RequestSubscriptionProps,
+  request:
+    | RequestPurchasePropsByPlatforms
+    | RequestSubscriptionPropsByPlatforms,
   platform: 'ios' | 'android',
 ): any => {
   // Platform-specific format - directly return the appropriate platform data
@@ -311,7 +357,7 @@ const normalizeRequestProps = (
  *
  * @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
+ * @param requestObj.type - Type of purchase: 'in-app' for products (default) or 'subs' for subscriptions
  *
  * @example
  * ```typescript
@@ -321,7 +367,7 @@ const normalizeRequestProps = (
  *     ios: { sku: productId },
  *     android: { skus: [productId] }
  *   },
- *   type: 'inapp'
+ *   type: 'in-app'
  * });
  *
  * // Subscription purchase
@@ -338,9 +384,11 @@ const normalizeRequestProps = (
  * ```
  */
 export const requestPurchase = (
-  requestObj: PurchaseRequest,
+  requestObj: PurchaseRequestInput,
 ): Promise<Purchase | Purchase[] | void> => {
-  const {request, type = 'inapp'} = requestObj;
+  const {request, type} = requestObj;
+  const {canonical, native} = normalizeProductType(type);
+  const isInAppPurchase = canonical === 'in-app';
 
   if (Platform.OS === 'ios') {
     const normalizedRequest = normalizeRequestProps(request, 'ios');
@@ -369,7 +417,7 @@ export const requestPurchase = (
         withOffer: offer,
       });
 
-      return type === 'inapp' ? (purchase as Purchase) : (purchase as Purchase);
+      return purchase as Purchase;
     })();
   }
 
@@ -382,7 +430,7 @@ export const requestPurchase = (
       );
     }
 
-    if (type === 'inapp') {
+    if (isInAppPurchase) {
       const {
         skus,
         obfuscatedAccountIdAndroid,
@@ -392,7 +440,7 @@ export const requestPurchase = (
 
       return (async () => {
         return ExpoIapModule.requestPurchase({
-          type: 'inapp',
+          type: native,
           skuArr: skus,
           purchaseToken: undefined,
           replacementMode: -1,
@@ -404,7 +452,7 @@ export const requestPurchase = (
       })();
     }
 
-    if (type === 'subs') {
+    if (canonical === 'subs') {
       const {
         skus,
         obfuscatedAccountIdAndroid,
@@ -417,7 +465,7 @@ export const requestPurchase = (
 
       return (async () => {
         return ExpoIapModule.requestPurchase({
-          type: 'subs',
+          type: native,
           skuArr: skus,
           purchaseToken,
           replacementMode: replacementModeAndroid,
@@ -443,7 +491,7 @@ export const finishTransaction = ({
 }: {
   purchase: Purchase;
   isConsumable?: boolean;
-}): Promise<PurchaseResult | boolean> => {
+}): Promise<VoidResult | boolean> => {
   return (
     Platform.select({
       ios: async () => {
@@ -539,7 +587,7 @@ export const validateReceipt = async (
     accessToken: string;
     isSub?: boolean;
   },
-): Promise<any> => {
+): Promise<ReceiptValidationResult> => {
   if (Platform.OS === 'ios') {
     return await validateReceiptIOS(sku);
   } else if (Platform.OS === 'android') {

package/src/modules/android.ts

@@ -5,7 +5,7 @@ import {Linking} from 'react-native';
 import ExpoIapModule from '../ExpoIapModule';
 
 // Types
-import type {PurchaseResult, ReceiptAndroid} from '../ExpoIap.types';
+import type {ReceiptValidationResultAndroid, VoidResult} from '../types';
 
 // Type guards
 export function isProductAndroid<T extends {platform?: string}>(
@@ -15,7 +15,7 @@ export function isProductAndroid<T extends {platform?: string}>(
     item != null &&
     typeof item === 'object' &&
     'platform' in item &&
-    item.platform === 'android'
+    (item as any).platform === 'android'
   );
 }
 
@@ -71,7 +71,7 @@ export const deepLinkToSubscriptionsAndroid = async ({
  * @param {string} params.productId - product id for your in app product.
  * @param {string} params.productToken - token for your purchase (called 'token' in the API documentation).
  * @param {string} params.accessToken - OAuth access token with androidpublisher scope. Required for authentication.
- * @param {boolean} params.isSub - whether this is subscription or inapp. `true` for subscription.
+ * @param {boolean} params.isSub - whether this is subscription or in-app. `true` for subscription.
  * @returns {Promise<ReceiptAndroid>}
  */
 export const validateReceiptAndroid = async ({
@@ -86,7 +86,7 @@ export const validateReceiptAndroid = async ({
   productToken: string;
   accessToken: string;
   isSub?: boolean;
-}): Promise<ReceiptAndroid> => {
+}): Promise<ReceiptValidationResultAndroid> => {
   const type = isSub ? 'subscriptions' : 'products';
 
   const url =
@@ -115,14 +115,30 @@ export const validateReceiptAndroid = async ({
  * Acknowledge a product (on Android.) No-op on iOS.
  * @param {Object} params - The parameters object
  * @param {string} params.token - The product's token (on Android)
- * @returns {Promise<PurchaseResult | void>}
+ * @returns {Promise<VoidResult | void>}
  */
-export const acknowledgePurchaseAndroid = ({
+export const acknowledgePurchaseAndroid = async ({
   token,
 }: {
   token: string;
-}): Promise<PurchaseResult | boolean | void> => {
-  return ExpoIapModule.acknowledgePurchaseAndroid(token);
+}): Promise<VoidResult | boolean | void> => {
+  const result = await ExpoIapModule.acknowledgePurchaseAndroid(token);
+
+  if (typeof result === 'boolean' || typeof result === 'undefined') {
+    return result;
+  }
+
+  if (result && typeof result === 'object') {
+    const record = result as Record<string, unknown>;
+    if (typeof record.success === 'boolean') {
+      return {success: record.success};
+    }
+    if (typeof record.responseCode === 'number') {
+      return {success: record.responseCode === 0};
+    }
+  }
+
+  return {success: true};
 };
 
 /**

package/src/modules/ios.ts

@@ -8,10 +8,11 @@ import ExpoIapModule from '../ExpoIapModule';
 import type {
   Product,
   Purchase,
-  PurchaseError,
   SubscriptionStatusIOS,
-  AppTransactionIOS,
-} from '../ExpoIap.types';
+  AppTransaction,
+  ReceiptValidationResultIOS,
+} from '../types';
+import type {PurchaseError} from '../purchase-error';
 import {Linking} from 'react-native';
 
 export type TransactionEvent = {
@@ -29,7 +30,7 @@ export function isProductIOS<T extends {platform?: string}>(
     item != null &&
     typeof item === 'object' &&
     'platform' in item &&
-    item.platform === 'ios'
+    (item as any).platform === 'ios'
   );
 }
 
@@ -191,12 +192,7 @@ export const getTransactionJwsIOS = (sku: string): Promise<string> => {
  */
 export const validateReceiptIOS = async (
   sku: string,
-): Promise<{
-  isValid: boolean;
-  receiptData: string;
-  jwsRepresentation: string;
-  latestTransaction?: Purchase;
-}> => {
+): Promise<ReceiptValidationResultIOS> => {
   const result = await ExpoIapModule.validateReceiptIOS(sku);
   return result;
 };
@@ -230,7 +226,7 @@ export const presentCodeRedemptionSheetIOS = (): Promise<boolean> => {
  * @platform iOS
  * @since iOS 16.0
  */
-export const getAppTransactionIOS = (): Promise<AppTransactionIOS | null> => {
+export const getAppTransactionIOS = (): Promise<AppTransaction | null> => {
   return ExpoIapModule.getAppTransactionIOS();
 };