expo-iap 2.7.10 → 2.7.12

package/ios/ExpoIapModule.swift

@@ -48,9 +48,10 @@ func serializeTransaction(_ transaction: Transaction, jwsRepresentationIos: Stri
     }
 
     var purchaseMap: [String: Any?] = [
-        "id": transaction.productID,
+        "id": String(transaction.id),
+        "productId": transaction.productID,
         "ids": [transaction.productID],
-        "transactionId": String(transaction.id),
+        "transactionId": String(transaction.id), // @deprecated - use id instead
         "transactionDate": transaction.purchaseDate.timeIntervalSince1970 * 1000,
         "transactionReceipt": jwsReceipt,
         "platform": "ios",

package/package.json

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

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/withIAP.ts"],"version":"5.8.3"}
+{"root":["./src/withIAP.ts"],"version":"5.9.2"}

package/src/ExpoIap.types.ts

@@ -1,15 +1,11 @@
 import {
   ProductAndroid,
   ProductPurchaseAndroid,
-  RequestPurchaseAndroidProps,
-  RequestSubscriptionAndroidProps,
   SubscriptionProductAndroid,
 } from './types/ExpoIapAndroid.types';
 import {
   ProductIos,
   ProductPurchaseIos,
-  RequestPurchaseIosProps,
-  RequestSubscriptionIosProps,
   SubscriptionProductIos,
 } from './types/ExpoIapIos.types';
 import {NATIVE_ERROR_CODES} from './ExpoIapModule';
@@ -32,8 +28,9 @@ export type ProductBase = {
 };
 
 export type PurchaseBase = {
-  id: string;
-  transactionId?: string;
+  id: string; // Transaction identifier - used by finishTransaction
+  productId: string; // Product identifier - which product was purchased
+  transactionId?: string; // @deprecated - use id instead
   transactionDate: number;
   transactionReceipt: string;
 };
@@ -51,15 +48,6 @@ export type SubscriptionProduct =
   | (SubscriptionProductAndroid & AndroidPlatform)
   | (SubscriptionProductIos & IosPlatform);
 
-// Legacy internal platform-specific types (kept for backward compatibility)
-export type LegacyRequestPurchaseProps =
-  | RequestPurchaseIosProps
-  | RequestPurchaseAndroidProps;
-
-export type LegacyRequestSubscriptionProps =
-  | RequestSubscriptionAndroidProps
-  | RequestSubscriptionIosProps;
-
 // ============================================================================
 // Legacy Types (For backward compatibility with useIap hook)
 // ============================================================================
@@ -323,20 +311,6 @@ export interface UnifiedRequestPurchaseProps {
   readonly isOfferPersonalized?: boolean;
 }
 
-/**
- * Unified subscription request props
- */
-export interface UnifiedRequestSubscriptionProps
-  extends UnifiedRequestPurchaseProps {
-  // Android subscription-specific properties
-  readonly purchaseTokenAndroid?: string;
-  readonly replacementModeAndroid?: number;
-  readonly subscriptionOffers?: {
-    sku: string;
-    offerToken: string;
-  }[];
-}
-
 // ============================================================================
 // New Platform-Specific Request Types (v2.7.0+)
 // ============================================================================
@@ -344,7 +318,7 @@ export interface UnifiedRequestSubscriptionProps
 /**
  * iOS-specific purchase request parameters
  */
-export interface IosRequestPurchaseProps {
+export interface RequestPurchaseIosProps {
   readonly sku: string;
   readonly andDangerouslyFinishTransactionAutomaticallyIOS?: boolean;
   readonly appAccountToken?: string;
@@ -355,7 +329,7 @@ export interface IosRequestPurchaseProps {
 /**
  * Android-specific purchase request parameters
  */
-export interface AndroidRequestPurchaseProps {
+export interface RequestPurchaseAndroidProps {
   readonly skus: string[];
   readonly obfuscatedAccountIdAndroid?: string;
   readonly obfuscatedProfileIdAndroid?: string;
@@ -365,8 +339,8 @@ export interface AndroidRequestPurchaseProps {
 /**
  * Android-specific subscription request parameters
  */
-export interface AndroidRequestSubscriptionProps
-  extends AndroidRequestPurchaseProps {
+export interface RequestSubscriptionAndroidProps
+  extends RequestPurchaseAndroidProps {
   readonly purchaseTokenAndroid?: string;
   readonly replacementModeAndroid?: number;
   readonly subscriptionOffers: {
@@ -379,88 +353,29 @@ export interface AndroidRequestSubscriptionProps
  * Modern platform-specific request structure (v2.7.0+)
  * Allows clear separation of iOS and Android parameters
  */
-export interface PlatformRequestPurchaseProps {
-  readonly ios?: IosRequestPurchaseProps;
-  readonly android?: AndroidRequestPurchaseProps;
+export interface RequestPurchasePropsByPlatforms {
+  readonly ios?: RequestPurchaseIosProps;
+  readonly android?: RequestPurchaseAndroidProps;
 }
 
 /**
  * Modern platform-specific subscription request structure (v2.7.0+)
  */
-export interface PlatformRequestSubscriptionProps {
-  readonly ios?: IosRequestPurchaseProps;
-  readonly android?: AndroidRequestSubscriptionProps;
+export interface RequestSubscriptionPropsByPlatforms {
+  readonly ios?: RequestPurchaseIosProps;
+  readonly android?: RequestSubscriptionAndroidProps;
 }
 
 /**
  * Modern request purchase parameters (v2.7.0+)
  * This is the recommended API moving forward
  */
-export type RequestPurchaseProps = PlatformRequestPurchaseProps;
+export type RequestPurchaseProps = RequestPurchasePropsByPlatforms;
 
 /**
  * Modern request subscription parameters (v2.7.0+)
  * This is the recommended API moving forward
  */
-export type RequestSubscriptionProps = PlatformRequestSubscriptionProps;
-
-/**
- * Legacy request purchase parameters (deprecated)
- * Includes both unified and old platform-specific formats
- * @deprecated Use RequestPurchaseProps with platform-specific structure instead
- */
-export type LegacyRequestPurchasePropsAll =
-  | UnifiedRequestPurchaseProps
-  | LegacyRequestPurchaseProps;
-
-/**
- * Legacy request subscription parameters (deprecated)
- * Includes both unified and old platform-specific formats
- * @deprecated Use RequestSubscriptionProps with platform-specific structure instead
- */
-export type LegacyRequestSubscriptionPropsAll =
-  | UnifiedRequestSubscriptionProps
-  | LegacyRequestSubscriptionProps;
-
-/**
- * All supported request purchase parameters
- * Used internally for backward compatibility
- * @internal
- */
-export type RequestPurchasePropsWithLegacy =
-  | RequestPurchaseProps
-  | LegacyRequestPurchasePropsAll;
-
-/**
- * All supported request subscription parameters
- * Used internally for backward compatibility
- * @internal
- */
-export type RequestSubscriptionPropsWithLegacy =
-  | RequestSubscriptionProps
-  | LegacyRequestSubscriptionPropsAll;
-
-// ============================================================================
-// Type Guards and Utility Functions
-// ============================================================================
-
-// Type guards to check which API style is being used
-export function isPlatformRequestProps(
-  props: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy,
-): props is PlatformRequestPurchaseProps | PlatformRequestSubscriptionProps {
-  return 'ios' in props || 'android' in props;
-}
-
-export function isUnifiedRequestProps(
-  props: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy,
-): props is UnifiedRequestPurchaseProps | UnifiedRequestSubscriptionProps {
-  return 'sku' in props || 'skus' in props;
-}
-
-export function isLegacyRequestProps(
-  props: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy,
-): props is LegacyRequestPurchaseProps | LegacyRequestSubscriptionProps {
-  return 'productId' in props || 'productIds' in props;
-}
+export type RequestSubscriptionProps = RequestSubscriptionPropsByPlatforms;
 
-// Note: Other type guard functions are exported from index.ts to avoid conflicts
+// Note: Type guard functions are exported from index.ts to avoid conflicts

package/src/helpers/subscription.ts

@@ -0,0 +1,122 @@
+import {Platform} from 'react-native';
+import {getAvailablePurchases} from '../index';
+
+export interface ActiveSubscription {
+  productId: string;
+  isActive: boolean;
+  expirationDateIOS?: Date;
+  autoRenewingAndroid?: boolean;
+  environmentIOS?: string;
+  willExpireSoon?: boolean;
+  daysUntilExpirationIOS?: number;
+}
+
+/**
+ * Get all active subscriptions with detailed information
+ * @param subscriptionIds - Optional array of subscription product IDs to filter. If not provided, returns all active subscriptions.
+ * @returns Promise<ActiveSubscription[]> array of active subscriptions with details
+ */
+export const getActiveSubscriptions = async (
+  subscriptionIds?: string[],
+): Promise<ActiveSubscription[]> => {
+  try {
+    const purchases = await getAvailablePurchases();
+    const currentTime = Date.now();
+    const activeSubscriptions: ActiveSubscription[] = [];
+
+    // Filter purchases to find active subscriptions
+    const filteredPurchases = purchases.filter((purchase) => {
+      // If specific IDs provided, filter by them
+      if (subscriptionIds && subscriptionIds.length > 0) {
+        if (!subscriptionIds.includes(purchase.id)) {
+          return false;
+        }
+      }
+
+      // Check if this purchase has subscription-specific fields
+      const hasSubscriptionFields =
+        ('expirationDateIos' in purchase && purchase.expirationDateIos) ||
+        'autoRenewingAndroid' in purchase;
+
+      if (!hasSubscriptionFields) {
+        return false;
+      }
+
+      // Check if it's actually active
+      if (Platform.OS === 'ios') {
+        if ('expirationDateIos' in purchase && purchase.expirationDateIos) {
+          return purchase.expirationDateIos > currentTime;
+        }
+        if (
+          'environmentIos' in purchase &&
+          purchase.environmentIos === 'Sandbox'
+        ) {
+          const dayInMs = 24 * 60 * 60 * 1000;
+          if (
+            purchase.transactionDate &&
+            currentTime - purchase.transactionDate < dayInMs
+          ) {
+            return true;
+          }
+        }
+      } else if (Platform.OS === 'android') {
+        // For Android, if it's in the purchases list, it's active
+        return true;
+      }
+
+      return false;
+    });
+
+    // Convert to ActiveSubscription format
+    for (const purchase of filteredPurchases) {
+      const subscription: ActiveSubscription = {
+        productId: purchase.id,
+        isActive: true,
+      };
+
+      // Add platform-specific details
+      if (Platform.OS === 'ios') {
+        if ('expirationDateIos' in purchase && purchase.expirationDateIos) {
+          const expirationDate = new Date(purchase.expirationDateIos);
+          subscription.expirationDateIOS = expirationDate;
+
+          // Calculate days until expiration
+          const daysUntilExpiration = Math.floor(
+            (purchase.expirationDateIos - currentTime) / (1000 * 60 * 60 * 24),
+          );
+          subscription.daysUntilExpirationIOS = daysUntilExpiration;
+          subscription.willExpireSoon = daysUntilExpiration <= 7;
+        }
+
+        if ('environmentIos' in purchase) {
+          subscription.environmentIOS = purchase.environmentIos;
+        }
+      } else if (Platform.OS === 'android') {
+        if ('autoRenewingAndroid' in purchase) {
+          subscription.autoRenewingAndroid = purchase.autoRenewingAndroid;
+          // If auto-renewing is false, subscription will expire soon
+          subscription.willExpireSoon = !purchase.autoRenewingAndroid;
+        }
+      }
+
+      activeSubscriptions.push(subscription);
+    }
+
+    return activeSubscriptions;
+  } catch (error) {
+    console.error('Error getting active subscriptions:', error);
+    return [];
+  }
+};
+
+/**
+ * Check if user has any active subscriptions
+ * @param subscriptionIds - Optional array of subscription product IDs to check. If not provided, checks all subscriptions.
+ * @returns Promise<boolean> true if user has at least one active subscription
+ */
+export const hasActiveSubscriptions = async (
+  subscriptionIds?: string[],
+): Promise<boolean> => {
+  const subscriptions = await getActiveSubscriptions(subscriptionIds);
+  return subscriptions.length > 0;
+};

package/src/index.ts

@@ -22,12 +22,10 @@ import {
   Purchase,
   PurchaseError,
   PurchaseResult,
-  RequestSubscriptionPropsWithLegacy,
-  RequestPurchasePropsWithLegacy,
+  RequestSubscriptionProps,
+  RequestPurchaseProps,
   SubscriptionProduct,
   SubscriptionPurchase,
-  isPlatformRequestProps,
-  isUnifiedRequestProps,
 } from './ExpoIap.types';
 import {ProductPurchaseAndroid} from './types/ExpoIapAndroid.types';
 import {PaymentDiscount} from './types/ExpoIapIos.types';
@@ -38,6 +36,13 @@ export * from './modules/android';
 export * from './modules/ios';
 export type {AppTransactionIOS} from './types/ExpoIapIos.types';
 
+// Export subscription helpers
+export {
+  getActiveSubscriptions,
+  hasActiveSubscriptions,
+  type ActiveSubscription,
+} from './helpers/subscription';
+
 // Get the native constant value
 export const PI = ExpoIapModule.PI;
 
@@ -328,8 +333,9 @@ export const getAvailablePurchases = ({
         ),
       android: async () => {
         const products = await ExpoIapModule.getAvailableItemsByType('inapp');
-        const subscriptions =
-          await ExpoIapModule.getAvailableItemsByType('subs');
+        const subscriptions = await ExpoIapModule.getAvailableItemsByType(
+          'subs',
+        );
         return products.concat(subscriptions);
       },
     }) || (() => Promise.resolve([]))
@@ -349,14 +355,13 @@ const offerToRecordIos = (
 };
 
 // Define discriminated union with explicit type parameter
-// Using legacy types internally for backward compatibility
 type PurchaseRequest =
   | {
-      request: RequestPurchasePropsWithLegacy;
+      request: RequestPurchaseProps;
       type?: 'inapp';
     }
   | {
-      request: RequestSubscriptionPropsWithLegacy;
+      request: RequestSubscriptionProps;
       type: 'subs';
     };
 
@@ -364,50 +369,11 @@ type PurchaseRequest =
  * Helper to normalize request props to platform-specific format
  */
 const normalizeRequestProps = (
-  request: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy,
+  request: RequestPurchaseProps | RequestSubscriptionProps,
   platform: 'ios' | 'android',
 ): any => {
-  // If it's already platform-specific format
-  if (isPlatformRequestProps(request)) {
-    return platform === 'ios' ? request.ios : request.android;
-  }
-
-  // If it's unified format, convert to platform-specific
-  if (isUnifiedRequestProps(request)) {
-    if (platform === 'ios') {
-      return {
-        sku: request.sku || (request.skus?.[0] ?? ''),
-        andDangerouslyFinishTransactionAutomaticallyIOS:
-          request.andDangerouslyFinishTransactionAutomaticallyIOS,
-        appAccountToken: request.appAccountToken,
-        quantity: request.quantity,
-        withOffer: request.withOffer,
-      };
-    } else {
-      const androidRequest: any = {
-        skus: request.skus || (request.sku ? [request.sku] : []),
-        obfuscatedAccountIdAndroid: request.obfuscatedAccountIdAndroid,
-        obfuscatedProfileIdAndroid: request.obfuscatedProfileIdAndroid,
-        isOfferPersonalized: request.isOfferPersonalized,
-      };
-
-      // Add subscription-specific fields if present
-      if ('subscriptionOffers' in request && request.subscriptionOffers) {
-        androidRequest.subscriptionOffers = request.subscriptionOffers;
-      }
-      if ('purchaseTokenAndroid' in request) {
-        androidRequest.purchaseTokenAndroid = request.purchaseTokenAndroid;
-      }
-      if ('replacementModeAndroid' in request) {
-        androidRequest.replacementModeAndroid = request.replacementModeAndroid;
-      }
-
-      return androidRequest;
-    }
-  }
-
-  // Legacy format handling
-  return request;
+  // Platform-specific format - directly return the appropriate platform data
+  return platform === 'ios' ? request.ios : request.android;
 };
 
 /**
@@ -575,7 +541,7 @@ export const requestPurchase = (
  * ```
  */
 export const requestSubscription = async (
-  request: RequestSubscriptionPropsWithLegacy,
+  request: RequestSubscriptionProps,
 ): Promise<SubscriptionPurchase | SubscriptionPurchase[] | null | void> => {
   console.warn(
     "`requestSubscription` is deprecated and will be removed in version 3.0.0. Use `requestPurchase({ request, type: 'subs' })` instead.",
@@ -597,10 +563,10 @@ export const finishTransaction = ({
   return (
     Platform.select({
       ios: async () => {
-        const transactionId = purchase.transactionId;
+        const transactionId = purchase.id;
         if (!transactionId) {
           return Promise.reject(
-            new Error('transactionId required to finish iOS transaction'),
+            new Error('purchase.id required to finish iOS transaction'),
           );
         }
         await ExpoIapModule.finishTransaction(transactionId);

package/src/useIap.ts

@@ -16,6 +16,9 @@ import {
   requestPurchase as requestPurchaseInternal,
   requestProducts,
   validateReceipt as validateReceiptInternal,
+  getActiveSubscriptions,
+  hasActiveSubscriptions,
+  type ActiveSubscription,
 } from './';
 import {
   syncIOS,
@@ -47,6 +50,7 @@ type UseIap = {
   currentPurchase?: ProductPurchase;
   currentPurchaseError?: PurchaseError;
   promotedProductIOS?: Product;
+  activeSubscriptions: ActiveSubscription[];
   clearCurrentPurchase: () => void;
   clearCurrentPurchaseError: () => void;
   finishTransaction: ({
@@ -88,6 +92,10 @@ type UseIap = {
   restorePurchases: () => Promise<void>; // 구매 복원 함수 추가
   getPromotedProductIOS: () => Promise<any | null>;
   buyPromotedProductIOS: () => Promise<void>;
+  getActiveSubscriptions: (
+    subscriptionIds?: string[],
+  ) => Promise<ActiveSubscription[]>;
+  hasActiveSubscriptions: (subscriptionIds?: string[]) => Promise<boolean>;
 };
 
 export interface UseIAPOptions {
@@ -116,6 +124,9 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   const [currentPurchaseError, setCurrentPurchaseError] =
     useState<PurchaseError>();
   const [promotedProductIdIOS] = useState<string>();
+  const [activeSubscriptions, setActiveSubscriptions] = useState<
+    ActiveSubscription[]
+  >([]);
 
   const optionsRef = useRef<UseIAPOptions | undefined>(options);
 
@@ -241,6 +252,33 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     }
   }, []);
 
+  const getActiveSubscriptionsInternal = useCallback(
+    async (subscriptionIds?: string[]): Promise<ActiveSubscription[]> => {
+      try {
+        const result = await getActiveSubscriptions(subscriptionIds);
+        setActiveSubscriptions(result);
+        return result;
+      } catch (error) {
+        console.error('Error getting active subscriptions:', error);
+        setActiveSubscriptions([]);
+        return [];
+      }
+    },
+    [],
+  );
+
+  const hasActiveSubscriptionsInternal = useCallback(
+    async (subscriptionIds?: string[]): Promise<boolean> => {
+      try {
+        return await hasActiveSubscriptions(subscriptionIds);
+      } catch (error) {
+        console.error('Error checking active subscriptions:', error);
+        return false;
+      }
+    },
+    [],
+  );
+
   const getPurchaseHistoriesInternal = useCallback(async (): Promise<void> => {
     setPurchaseHistories(await getPurchaseHistories());
   }, []);
@@ -408,6 +446,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     currentPurchase,
     currentPurchaseError,
     promotedProductIOS,
+    activeSubscriptions,
     clearCurrentPurchase,
     clearCurrentPurchaseError,
     getAvailablePurchases: getAvailablePurchasesInternal,
@@ -420,5 +459,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     getSubscriptions: getSubscriptionsInternal,
     getPromotedProductIOS,
     buyPromotedProductIOS,
+    getActiveSubscriptions: getActiveSubscriptionsInternal,
+    hasActiveSubscriptions: hasActiveSubscriptionsInternal,
   };
 }