react-native-iap 15.4.0 → 15.5.0

package/src/utils/errorMapping.ts

@@ -4,7 +4,11 @@
  * and constructing structured purchase errors.
  */
 
-import {ErrorCode, type IapPlatform} from '../types';
+import {
+  ErrorCode,
+  type IapPlatform,
+  type SubResponseCodeAndroid,
+} from '../types';
 
 /**
  * Error code for duplicate purchase events detected on iOS.
@@ -54,6 +58,7 @@ export interface PurchaseErrorProps {
   productIds?: string[];
   productType?: string;
   isEmptyProductList?: boolean;
+  subResponseCodeAndroid?: SubResponseCodeAndroid;
   platform?: IapPlatform;
 }
 
@@ -65,6 +70,7 @@ export interface PurchaseError extends Error {
   productIds?: string[];
   productType?: string;
   isEmptyProductList?: boolean;
+  subResponseCodeAndroid?: SubResponseCodeAndroid;
   platform?: IapPlatform;
 }
 
@@ -146,6 +152,7 @@ export const createPurchaseError = (
   error.productIds = props.productIds;
   error.productType = props.productType;
   error.isEmptyProductList = props.isEmptyProductList;
+  error.subResponseCodeAndroid = props.subResponseCodeAndroid;
   error.platform = props.platform;
   return error;
 };
@@ -170,6 +177,7 @@ export const createPurchaseErrorFromPlatform = (
     productIds: errorData.productIds,
     productType: errorData.productType,
     isEmptyProductList: errorData.isEmptyProductList,
+    subResponseCodeAndroid: errorData.subResponseCodeAndroid,
     platform,
   });
 };

package/src/utils/type-bridge.ts

@@ -8,6 +8,7 @@
 import type {
   NitroProduct,
   NitroPurchase,
+  NitroRenewalInfoIOS,
   NitroSubscriptionStatus,
 } from '../specs/RnIap.nitro';
 import type {
@@ -25,6 +26,7 @@ import type {
   Purchase,
   PurchaseAndroid,
   PurchaseIOS,
+  RenewalInfoIOS,
   SubscriptionStatusIOS,
 } from '../types';
 import {RnIapConsole} from './debug';
@@ -191,6 +193,30 @@ function toNullableBoolean(value: unknown): boolean | null {
   return null;
 }
 
+function convertNitroRenewalInfoToRenewalInfoIOS(
+  renewalInfo: NitroRenewalInfoIOS,
+): RenewalInfoIOS {
+  return {
+    autoRenewPreference: toNullableString(renewalInfo.autoRenewPreference),
+    commitmentInfo: renewalInfo.commitmentInfo ?? null,
+    expirationReason: toNullableString(renewalInfo.expirationReason),
+    gracePeriodExpirationDate: toNullableNumber(
+      renewalInfo.gracePeriodExpirationDate,
+    ),
+    isInBillingRetry: toNullableBoolean(renewalInfo.isInBillingRetry),
+    jsonRepresentation: toNullableString(renewalInfo.jsonRepresentation),
+    pendingUpgradeProductId: toNullableString(
+      renewalInfo.pendingUpgradeProductId,
+    ),
+    priceIncreaseStatus: toNullableString(renewalInfo.priceIncreaseStatus),
+    renewalBillingPlanType: renewalInfo.renewalBillingPlanType ?? null,
+    renewalDate: toNullableNumber(renewalInfo.renewalDate),
+    renewalOfferId: toNullableString(renewalInfo.renewalOfferId),
+    renewalOfferType: toNullableString(renewalInfo.renewalOfferType),
+    willAutoRenew: renewalInfo.willAutoRenew ?? false,
+  };
+}
+
 function parseSubscriptionOffers(value?: Nullable<string> | any[]) {
   if (!value) return undefined;
 
@@ -442,8 +468,13 @@ export function convertNitroPurchaseToPurchase(
       quantity: nitroPurchase.quantity ?? 1,
       purchaseState,
       isAutoRenewing: Boolean(nitroPurchase.isAutoRenewing),
+      currentPlanId: toNullableString(nitroPurchase.currentPlanId),
+      ids: nitroPurchase.ids ?? null,
       // PurchaseIOS requires both id and transactionId (they are the same value)
       transactionId: nitroPurchase.id,
+      advancedCommerceInfoIOS: nitroPurchase.advancedCommerceInfoIOS ?? null,
+      billingPlanTypeIOS: nitroPurchase.billingPlanTypeIOS ?? null,
+      commitmentInfoIOS: nitroPurchase.commitmentInfoIOS ?? null,
       quantityIOS: toNullableNumber(nitroPurchase.quantityIOS),
       originalTransactionDateIOS: toNullableNumber(
         nitroPurchase.originalTransactionDateIOS,
@@ -488,39 +519,7 @@ export function convertNitroPurchaseToPurchase(
         nitroPurchase.webOrderLineItemIdIOS,
       ),
       renewalInfoIOS: nitroPurchase.renewalInfoIOS
-        ? {
-            autoRenewPreference: toNullableString(
-              nitroPurchase.renewalInfoIOS.autoRenewPreference,
-            ),
-            expirationReason: toNullableString(
-              nitroPurchase.renewalInfoIOS.expirationReason,
-            ),
-            gracePeriodExpirationDate: toNullableNumber(
-              nitroPurchase.renewalInfoIOS.gracePeriodExpirationDate,
-            ),
-            isInBillingRetry: toNullableBoolean(
-              nitroPurchase.renewalInfoIOS.isInBillingRetry,
-            ),
-            jsonRepresentation: toNullableString(
-              nitroPurchase.renewalInfoIOS.jsonRepresentation,
-            ),
-            pendingUpgradeProductId: toNullableString(
-              nitroPurchase.renewalInfoIOS.pendingUpgradeProductId,
-            ),
-            priceIncreaseStatus: toNullableString(
-              nitroPurchase.renewalInfoIOS.priceIncreaseStatus,
-            ),
-            renewalDate: toNullableNumber(
-              nitroPurchase.renewalInfoIOS.renewalDate,
-            ),
-            renewalOfferId: toNullableString(
-              nitroPurchase.renewalInfoIOS.renewalOfferId,
-            ),
-            renewalOfferType: toNullableString(
-              nitroPurchase.renewalInfoIOS.renewalOfferType,
-            ),
-            willAutoRenew: nitroPurchase.renewalInfoIOS.willAutoRenew ?? false,
-          }
+        ? convertNitroRenewalInfoToRenewalInfoIOS(nitroPurchase.renewalInfoIOS)
         : null,
     };
     return iosPurchase;
@@ -537,6 +536,8 @@ export function convertNitroPurchaseToPurchase(
     quantity: nitroPurchase.quantity ?? 1,
     purchaseState,
     isAutoRenewing: Boolean(nitroPurchase.isAutoRenewing),
+    currentPlanId: toNullableString(nitroPurchase.currentPlanId),
+    ids: nitroPurchase.ids ?? null,
     // PurchaseAndroid has optional transactionId (may differ from id/orderId)
     transactionId: toNullableString(nitroPurchase.id),
     autoRenewingAndroid: toNullableBoolean(
@@ -558,6 +559,8 @@ export function convertNitroPurchaseToPurchase(
       nitroPurchase.developerPayloadAndroid,
     ),
     isSuspendedAndroid: toNullableBoolean(nitroPurchase.isSuspendedAndroid),
+    pendingPurchaseUpdateAndroid:
+      nitroPurchase.pendingPurchaseUpdateAndroid ?? null,
   };
 
   return androidPurchase;
@@ -572,13 +575,7 @@ export function convertNitroSubscriptionStatusToSubscriptionStatusIOS(
   return {
     state: String(nitro.state ?? ''),
     renewalInfo: nitro.renewalInfo
-      ? {
-          autoRenewPreference: toNullableString(
-            nitro.renewalInfo.autoRenewPreference,
-          ),
-          jsonRepresentation: JSON.stringify(nitro.renewalInfo),
-          willAutoRenew: Boolean(nitro.renewalInfo.autoRenewStatus),
-        }
+      ? convertNitroRenewalInfoToRenewalInfoIOS(nitro.renewalInfo)
       : undefined,
   };
 }

package/src/vega-adapter.ts

@@ -9,6 +9,7 @@ import type {
   RnIap,
 } from './specs/RnIap.nitro';
 import {ErrorCode} from './types';
+import type {SubResponseCodeAndroid} from './types';
 
 type ResponseOperation =
   | 'product-data'
@@ -97,9 +98,13 @@ interface VegaUserDataRequest {
 interface VegaError extends Error {
   code?: ErrorCode;
   debugMessage?: string;
+  isEmptyProductList?: boolean;
   platform?: 'android';
   productId?: string;
+  productIds?: string[];
+  productType?: string;
   responseCode?: number;
+  subResponseCodeAndroid?: SubResponseCodeAndroid;
 }
 
 export interface VegaPurchasingService {
@@ -145,14 +150,141 @@ function createVegaError(
   return error;
 }
 
+function isValidIpv4Address(address: string): boolean {
+  const octets = address.split('.');
+  return (
+    octets.length === 4 &&
+    octets.every(
+      (octet) =>
+        /^(?:0|[1-9]\d{0,2})$/.test(octet) && Number(octet) <= 255,
+    )
+  );
+}
+
+function isValidIpv6Address(address: string): boolean {
+  let ipv6Part = address;
+  let ipv4GroupCount = 0;
+
+  if (address.includes('.')) {
+    const lastColon = address.lastIndexOf(':');
+    if (lastColon < 0 || !isValidIpv4Address(address.slice(lastColon + 1))) {
+      return false;
+    }
+    const ipv6Prefix = address.slice(0, lastColon);
+    ipv6Part = ipv6Prefix.endsWith(':') ? `${ipv6Prefix}:` : ipv6Prefix;
+    ipv4GroupCount = 2;
+  }
+
+  if (
+    !ipv6Part.includes(':') ||
+    !/^[0-9a-f:]+$/i.test(ipv6Part) ||
+    ipv6Part.includes(':::')
+  ) {
+    return false;
+  }
+
+  const compressionIndex = ipv6Part.indexOf('::');
+  const hasCompression = compressionIndex >= 0;
+  if (
+    (hasCompression && ipv6Part.indexOf('::', compressionIndex + 2) >= 0) ||
+    (!hasCompression && (ipv6Part.startsWith(':') || ipv6Part.endsWith(':')))
+  ) {
+    return false;
+  }
+
+  const sections = hasCompression ? ipv6Part.split('::') : [ipv6Part];
+  const groups: string[] = [];
+  for (const section of sections) {
+    if (section.length > 0) groups.push(...section.split(':'));
+  }
+  if (!groups.every((group) => /^[0-9a-f]{1,4}$/i.test(group))) {
+    return false;
+  }
+
+  const groupCount = groups.length + ipv4GroupCount;
+  return hasCompression ? groupCount < 8 : groupCount === 8;
+}
+
+function isValidHostname(hostname: string): boolean {
+  if (/^[0-9.]+$/.test(hostname)) {
+    return isValidIpv4Address(hostname);
+  }
+
+  const normalizedHostname = hostname.endsWith('.')
+    ? hostname.slice(0, -1)
+    : hostname;
+  if (normalizedHostname.length === 0 || normalizedHostname.length > 253) {
+    return false;
+  }
+  const hostnameLabels = normalizedHostname.split('.');
+  const lastLabel = hostnameLabels[hostnameLabels.length - 1]!;
+  if (/^(?:[0-9]+|0x[0-9a-f]+)$/i.test(lastLabel)) {
+    return false;
+  }
+
+  return normalizedHostname
+    .split('.')
+    .every(
+      (label) =>
+        label.length <= 63 && /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i.test(label),
+    );
+}
+
+function getIapkitVerifyUrl(baseUrl?: string | null): string {
+  const requestedBaseUrl =
+    typeof baseUrl === 'string' && baseUrl.trim().length > 0
+      ? baseUrl.trim()
+      : IAPKIT_DEFAULT_BASE_URL;
+  const normalizedBaseUrl = requestedBaseUrl.replace(/\/+$/, '');
+  // Kepler's URL polyfill throws for standard getters such as protocol,
+  // host, and pathname. Parse the small origin-only contract directly.
+  const originMatch = /^(https?):\/\/([^/?#@\s\\]+)$/i.exec(normalizedBaseUrl);
+  if (!originMatch) {
+    throw createVegaError(
+      ErrorCode.DeveloperError,
+      'IAPKit baseUrl must be a valid HTTP(S) origin',
+    );
+  }
+
+  const authority = originMatch[2]!;
+  const isBracketedIpv6 = authority.startsWith('[');
+  const authorityMatch = isBracketedIpv6
+    ? /^\[([^\]]+)\](?::([0-9]+))?$/.exec(authority)
+    : /^([^:]+)(?::([0-9]+))?$/.exec(authority);
+  const host = authorityMatch?.[1];
+  const requestedPort = authorityMatch?.[2];
+  const portNumber = requestedPort ? Number(requestedPort) : null;
+  const hasValidHost =
+    typeof host === 'string' &&
+    (isBracketedIpv6 ? isValidIpv6Address(host) : isValidHostname(host));
+  const hasValidPort =
+    portNumber === null ||
+    (Number.isInteger(portNumber) && portNumber >= 1 && portNumber <= 65535);
+  if (!authorityMatch || !hasValidHost || !hasValidPort) {
+    throw createVegaError(
+      ErrorCode.DeveloperError,
+      'IAPKit baseUrl must be a valid HTTP(S) origin',
+    );
+  }
+
+  const scheme = originMatch[1]!.toLowerCase();
+  const serializedHost = isBracketedIpv6 ? `[${host!}]` : host!;
+  const port = requestedPort ? `:${requestedPort}` : '';
+  return `${scheme}://${serializedHost}${port}${IAPKIT_VERIFY_PATH}`;
+}
+
 function parseVegaErrorPayload(error: unknown): Record<string, unknown> {
   if (!(error instanceof Error)) return {};
   const vegaError = error as VegaError;
   if (
     vegaError.code != null ||
     vegaError.debugMessage != null ||
+    vegaError.isEmptyProductList != null ||
     vegaError.productId != null ||
-    vegaError.responseCode != null
+    vegaError.productIds != null ||
+    vegaError.productType != null ||
+    vegaError.responseCode != null ||
+    vegaError.subResponseCodeAndroid != null
   ) {
     return {
       code: vegaError.code,
@@ -160,6 +292,10 @@ function parseVegaErrorPayload(error: unknown): Record<string, unknown> {
       responseCode: vegaError.responseCode,
       debugMessage: vegaError.debugMessage,
       productId: vegaError.productId,
+      productIds: vegaError.productIds,
+      productType: vegaError.productType,
+      isEmptyProductList: vegaError.isEmptyProductList,
+      subResponseCodeAndroid: vegaError.subResponseCodeAndroid,
       platform: vegaError.platform,
     };
   }
@@ -176,9 +312,12 @@ function parseVegaErrorPayload(error: unknown): Record<string, unknown> {
 function toPurchaseErrorResult(
   error: unknown,
   fallbackMessage: string,
+  productId?: string,
 ): NitroPurchaseResult {
   const parsed = parseVegaErrorPayload(error);
   const responseCode = parsed.responseCode;
+  const parsedProductIds = parsed.productIds;
+  const parsedSubResponseCode = parsed.subResponseCodeAndroid;
   return {
     responseCode: typeof responseCode === 'number' ? responseCode : -1,
     code:
@@ -192,6 +331,23 @@ function toPurchaseErrorResult(
     debugMessage:
       typeof parsed.debugMessage === 'string' ? parsed.debugMessage : undefined,
     purchaseToken: undefined,
+    productId:
+      typeof parsed.productId === 'string' ? parsed.productId : productId,
+    productIds: Array.isArray(parsedProductIds)
+      ? parsedProductIds.filter(
+          (candidate): candidate is string => typeof candidate === 'string',
+        )
+      : undefined,
+    productType:
+      typeof parsed.productType === 'string' ? parsed.productType : undefined,
+    isEmptyProductList:
+      typeof parsed.isEmptyProductList === 'boolean'
+        ? parsed.isEmptyProductList
+        : undefined,
+    subResponseCodeAndroid:
+      typeof parsedSubResponseCode === 'string'
+        ? (parsedSubResponseCode as SubResponseCodeAndroid)
+        : undefined,
   };
 }
 
@@ -564,6 +720,8 @@ function mapReceipt(
     productId,
     transactionDate: toTimestamp(receipt.purchaseDate),
     purchaseToken: receiptId,
+    currentPlanId: type === 'subs' ? productId : null,
+    ids: productId ? [productId] : [],
     platform: 'android',
     store: 'amazon',
     quantity: 1,
@@ -719,8 +877,34 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
   };
 
   const getStorefront = async (): Promise<string> => {
-    await getUserData();
-    return cachedUserData?.marketplace ?? cachedUserData?.countryCode ?? '';
+    try {
+      const userData = await getUserData();
+      const storefront = userData?.marketplace ?? userData?.countryCode;
+      if (typeof storefront !== 'string' || storefront.trim().length === 0) {
+        throw createVegaError(
+          ErrorCode.ServiceError,
+          'Amazon Vega storefront lookup returned no country code.',
+        );
+      }
+      return storefront;
+    } catch (error) {
+      const errorCode =
+        error instanceof Error
+          ? (error as Error & {code?: unknown}).code
+          : undefined;
+      if (
+        typeof errorCode === 'string' &&
+        Object.values(ErrorCode).includes(errorCode as ErrorCode)
+      ) {
+        throw error;
+      }
+      throw createVegaError(
+        ErrorCode.ServiceError,
+        `Failed to get Amazon Vega storefront: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+      );
+    }
   };
 
   const getPurchaseUpdateReceipts = async (): Promise<VegaReceipt[]> => {
@@ -962,27 +1146,6 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
   const verifyWithIapkit = async (
     params: NitroVerifyPurchaseWithProviderProps,
   ): Promise<NitroVerifyPurchaseWithProviderResult> => {
-    type IapkitEndpointOptions = NonNullable<
-      NitroVerifyPurchaseWithProviderProps['iapkit']
-    > & {
-      baseUrl?: string | null;
-    };
-
-    function iapkitVerifyUrl(
-      iapkit: NitroVerifyPurchaseWithProviderProps['iapkit'],
-    ): string {
-      const endpointOptions = iapkit as
-        | IapkitEndpointOptions
-        | null
-        | undefined;
-      const baseUrl =
-        typeof endpointOptions?.baseUrl === 'string' &&
-        endpointOptions.baseUrl.trim().length > 0
-          ? endpointOptions.baseUrl.trim()
-          : IAPKIT_DEFAULT_BASE_URL;
-      return `${baseUrl.replace(/\/+$/, '')}${IAPKIT_VERIFY_PATH}`;
-    }
-
     function normalizeIapkitState(state: unknown): IapkitPurchaseState {
       const normalized =
         typeof state === 'string'
@@ -1137,6 +1300,7 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
 
     const apiKey =
       typeof iapkit?.apiKey === 'string' ? iapkit.apiKey.trim() : '';
+    const verificationUrl = getIapkitVerifyUrl(iapkit?.baseUrl);
     let response: Response;
     try {
       const controller = new AbortController();
@@ -1144,7 +1308,7 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
         () => controller.abort(),
         IAPKIT_VERIFY_TIMEOUT_MS,
       );
-      response = await fetch(iapkitVerifyUrl(iapkit), {
+      response = await fetch(verificationUrl, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -1322,6 +1486,7 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
           toPurchaseErrorResult(
             error,
             'Failed to complete Amazon Vega purchase',
+            sku,
           ),
         );
         throw error;
@@ -1401,7 +1566,7 @@ export function createVegaIapModule(service: VegaPurchasingService): RnIap {
     async getPromotedProductIOS(): Promise<null> {
       return throwUnsupportedFeature('getPromotedProductIOS');
     },
-    async buyPromotedProductIOS(): Promise<void> {
+    async buyPromotedProductIOS(): Promise<boolean> {
       return throwUnsupportedFeature('buyPromotedProductIOS');
     },
     async presentCodeRedemptionSheetIOS(): Promise<boolean> {

package/nitrogen/generated/android/c++/JNitroSubscriptionRenewalInfo.hpp

@@ -1,83 +0,0 @@
-///
-/// JNitroSubscriptionRenewalInfo.hpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#pragma once
-
-#include <fbjni/fbjni.h>
-#include "NitroSubscriptionRenewalInfo.hpp"
-
-#include "JVariant_NullType_Double.hpp"
-#include "JVariant_NullType_String.hpp"
-#include <NitroModules/JNull.hpp>
-#include <NitroModules/Null.hpp>
-#include <optional>
-#include <string>
-#include <variant>
-
-namespace margelo::nitro::iap {
-
-  using namespace facebook;
-
-  /**
-   * The C++ JNI bridge between the C++ struct "NitroSubscriptionRenewalInfo" and the the Kotlin data class "NitroSubscriptionRenewalInfo".
-   */
-  struct JNitroSubscriptionRenewalInfo final: public jni::JavaClass<JNitroSubscriptionRenewalInfo> {
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/iap/NitroSubscriptionRenewalInfo;";
-
-  public:
-    /**
-     * Convert this Java/Kotlin-based struct to the C++ struct NitroSubscriptionRenewalInfo by copying all values to C++.
-     */
-    [[maybe_unused]]
-    [[nodiscard]]
-    NitroSubscriptionRenewalInfo toCpp() const {
-      static const auto clazz = javaClassStatic();
-      static const auto fieldAutoRenewStatus = clazz->getField<jboolean>("autoRenewStatus");
-      jboolean autoRenewStatus = this->getFieldValue(fieldAutoRenewStatus);
-      static const auto fieldAutoRenewPreference = clazz->getField<JVariant_NullType_String>("autoRenewPreference");
-      jni::local_ref<JVariant_NullType_String> autoRenewPreference = this->getFieldValue(fieldAutoRenewPreference);
-      static const auto fieldExpirationReason = clazz->getField<JVariant_NullType_Double>("expirationReason");
-      jni::local_ref<JVariant_NullType_Double> expirationReason = this->getFieldValue(fieldExpirationReason);
-      static const auto fieldGracePeriodExpirationDate = clazz->getField<JVariant_NullType_Double>("gracePeriodExpirationDate");
-      jni::local_ref<JVariant_NullType_Double> gracePeriodExpirationDate = this->getFieldValue(fieldGracePeriodExpirationDate);
-      static const auto fieldCurrentProductID = clazz->getField<JVariant_NullType_String>("currentProductID");
-      jni::local_ref<JVariant_NullType_String> currentProductID = this->getFieldValue(fieldCurrentProductID);
-      static const auto fieldPlatform = clazz->getField<jni::JString>("platform");
-      jni::local_ref<jni::JString> platform = this->getFieldValue(fieldPlatform);
-      return NitroSubscriptionRenewalInfo(
-        static_cast<bool>(autoRenewStatus),
-        autoRenewPreference != nullptr ? std::make_optional(autoRenewPreference->toCpp()) : std::nullopt,
-        expirationReason != nullptr ? std::make_optional(expirationReason->toCpp()) : std::nullopt,
-        gracePeriodExpirationDate != nullptr ? std::make_optional(gracePeriodExpirationDate->toCpp()) : std::nullopt,
-        currentProductID != nullptr ? std::make_optional(currentProductID->toCpp()) : std::nullopt,
-        platform->toStdString()
-      );
-    }
-
-  public:
-    /**
-     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
-     */
-    [[maybe_unused]]
-    static jni::local_ref<JNitroSubscriptionRenewalInfo::javaobject> fromCpp(const NitroSubscriptionRenewalInfo& value) {
-      using JSignature = JNitroSubscriptionRenewalInfo(jboolean, jni::alias_ref<JVariant_NullType_String>, jni::alias_ref<JVariant_NullType_Double>, jni::alias_ref<JVariant_NullType_Double>, jni::alias_ref<JVariant_NullType_String>, jni::alias_ref<jni::JString>);
-      static const auto clazz = javaClassStatic();
-      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
-      return create(
-        clazz,
-        value.autoRenewStatus,
-        value.autoRenewPreference.has_value() ? JVariant_NullType_String::fromCpp(value.autoRenewPreference.value()) : nullptr,
-        value.expirationReason.has_value() ? JVariant_NullType_Double::fromCpp(value.expirationReason.value()) : nullptr,
-        value.gracePeriodExpirationDate.has_value() ? JVariant_NullType_Double::fromCpp(value.gracePeriodExpirationDate.value()) : nullptr,
-        value.currentProductID.has_value() ? JVariant_NullType_String::fromCpp(value.currentProductID.value()) : nullptr,
-        jni::make_jstring(value.platform)
-      );
-    }
-  };
-
-} // namespace margelo::nitro::iap

package/nitrogen/generated/android/c++/JVariant_NullType_NitroSubscriptionRenewalInfo.cpp

@@ -1,26 +0,0 @@
-///
-/// JVariant_NullType_NitroSubscriptionRenewalInfo.cpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#include "JVariant_NullType_NitroSubscriptionRenewalInfo.hpp"
-
-namespace margelo::nitro::iap {
-  /**
-   * Converts JVariant_NullType_NitroSubscriptionRenewalInfo to std::variant<nitro::NullType, NitroSubscriptionRenewalInfo>
-   */
-  std::variant<nitro::NullType, NitroSubscriptionRenewalInfo> JVariant_NullType_NitroSubscriptionRenewalInfo::toCpp() const {
-    if (isInstanceOf(JVariant_NullType_NitroSubscriptionRenewalInfo_impl::First::javaClassStatic())) {
-      // It's a `nitro::NullType`
-      auto jniValue = static_cast<const JVariant_NullType_NitroSubscriptionRenewalInfo_impl::First*>(this)->getValue();
-      return nitro::null;
-    } else if (isInstanceOf(JVariant_NullType_NitroSubscriptionRenewalInfo_impl::Second::javaClassStatic())) {
-      // It's a `NitroSubscriptionRenewalInfo`
-      auto jniValue = static_cast<const JVariant_NullType_NitroSubscriptionRenewalInfo_impl::Second*>(this)->getValue();
-      return jniValue->toCpp();
-    }
-    throw std::invalid_argument("Variant is unknown Kotlin instance!");
-  }
-} // namespace margelo::nitro::iap

package/nitrogen/generated/android/c++/JVariant_NullType_NitroSubscriptionRenewalInfo.hpp

@@ -1,75 +0,0 @@
-///
-/// JVariant_NullType_NitroSubscriptionRenewalInfo.hpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#pragma once
-
-#include <fbjni/fbjni.h>
-#include <variant>
-
-#include <NitroModules/Null.hpp>
-#include "NitroSubscriptionRenewalInfo.hpp"
-#include <variant>
-#include <NitroModules/JNull.hpp>
-#include "JNitroSubscriptionRenewalInfo.hpp"
-#include <string>
-#include <optional>
-#include "JVariant_NullType_String.hpp"
-#include "JVariant_NullType_Double.hpp"
-
-namespace margelo::nitro::iap {
-
-  using namespace facebook;
-
-  /**
-   * The C++ JNI bridge between the C++ std::variant and the Java class "Variant_NullType_NitroSubscriptionRenewalInfo".
-   */
-  class JVariant_NullType_NitroSubscriptionRenewalInfo: public jni::JavaClass<JVariant_NullType_NitroSubscriptionRenewalInfo> {
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/iap/Variant_NullType_NitroSubscriptionRenewalInfo;";
-
-    static jni::local_ref<JVariant_NullType_NitroSubscriptionRenewalInfo> create_0(jni::alias_ref<JNull> value) {
-      static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_NitroSubscriptionRenewalInfo(jni::alias_ref<JNull>)>("create");
-      return method(javaClassStatic(), value);
-    }
-    static jni::local_ref<JVariant_NullType_NitroSubscriptionRenewalInfo> create_1(jni::alias_ref<JNitroSubscriptionRenewalInfo> value) {
-      static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_NitroSubscriptionRenewalInfo(jni::alias_ref<JNitroSubscriptionRenewalInfo>)>("create");
-      return method(javaClassStatic(), value);
-    }
-
-    static jni::local_ref<JVariant_NullType_NitroSubscriptionRenewalInfo> fromCpp(const std::variant<nitro::NullType, NitroSubscriptionRenewalInfo>& variant) {
-      switch (variant.index()) {
-        case 0: return create_0(JNull::null());
-        case 1: return create_1(JNitroSubscriptionRenewalInfo::fromCpp(std::get<1>(variant)));
-        default: throw std::invalid_argument("Variant holds unknown index! (" + std::to_string(variant.index()) + ")");
-      }
-    }
-
-    [[nodiscard]] std::variant<nitro::NullType, NitroSubscriptionRenewalInfo> toCpp() const;
-  };
-
-  namespace JVariant_NullType_NitroSubscriptionRenewalInfo_impl {
-    class First final: public jni::JavaClass<First, JVariant_NullType_NitroSubscriptionRenewalInfo> {
-    public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/iap/Variant_NullType_NitroSubscriptionRenewalInfo$First;";
-    
-      [[nodiscard]] jni::local_ref<JNull> getValue() const {
-        static const auto field = javaClassStatic()->getField<JNull>("value");
-        return getFieldValue(field);
-      }
-    };
-    
-    class Second final: public jni::JavaClass<Second, JVariant_NullType_NitroSubscriptionRenewalInfo> {
-    public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/iap/Variant_NullType_NitroSubscriptionRenewalInfo$Second;";
-    
-      [[nodiscard]] jni::local_ref<JNitroSubscriptionRenewalInfo> getValue() const {
-        static const auto field = javaClassStatic()->getField<JNitroSubscriptionRenewalInfo>("value");
-        return getFieldValue(field);
-      }
-    };
-  } // namespace JVariant_NullType_NitroSubscriptionRenewalInfo_impl
-} // namespace margelo::nitro::iap