From 66f3e81f574b4dee20f5d49758d826332a6d41fa Mon Sep 17 00:00:00 2001
From: Hyo <hyo@hyo.dev>
Date: Tue, 4 Aug 2026 03:49:56 +0900
Subject: [PATCH] fix(google): fall back to token for blank horizon order ids

The Horizon billing-compatibility Purchase.orderId is a non-null String and
arrives blank on device, so the converter's null-only `orderId ?: token`
fallback never fired and produced purchases with an empty id and
transactionId. The strict cross-SDK purchase decoders introduced in #276
correctly reject an empty id, which failed the whole available-purchases
batch on a Quest 3 with two real store purchases:

  getAvailablePurchases result: purchaseCount=2
  NitroPurchase has invalid required field: id
  PurchaseError: billing-response-json-parse-error

Blank-aware fallbacks now cover toPurchase (id, transactionId) and
toActiveSubscription (transactionId), pinned by regression tests that build
the Meta Purchase with a blank and a present orderId, and the payload-parity
audit's pinned source expression for the Horizon transactionId is updated to
the new canonical form. Verified on the same Quest 3: the batch decodes as
4 available purchases and 2 active subscriptions with no decode errors.

Also enable the commented-out HORIZON_APP_ID meta-data in the React Native
example manifest. Without it the Horizon platform SDK cannot initialize, so
initConnection failed before any store call and the example was not runnable
on the device at all. The meta-data is inert on Play and FireOS builds.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../android/app/src/main/AndroidManifest.xml  |  4 +-
 .../hyo/openiap/utils/BillingConverters.kt    | 12 ++--
 .../hyo/openiap/HorizonBlankOrderIdTest.kt    | 62 +++++++++++++++++++
 scripts/audit-purchase-payload-parity.mjs     |  3 +-
 4 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 packages/google/openiap/src/testHorizon/java/dev/hyo/openiap/HorizonBlankOrderIdTest.kt

diff --git a/libraries/react-native-iap/example/android/app/src/main/AndroidManifest.xml b/libraries/react-native-iap/example/android/app/src/main/AndroidManifest.xml
index 28994e41b..f4e6565f2 100644
--- a/libraries/react-native-iap/example/android/app/src/main/AndroidManifest.xml
+++ b/libraries/react-native-iap/example/android/app/src/main/AndroidManifest.xml
@@ -12,9 +12,9 @@
       android:supportsRtl="true">
 
       <!-- Horizon OS (Meta Quest) Configuration -->
-      <!-- <meta-data
+      <meta-data
         android:name="com.meta.horizon.platform.HORIZON_APP_ID"
-        android:value="31705015229097839" /> -->
+        android:value="31705015229097839" />
 
       <activity
         android:name=".MainActivity"
diff --git a/packages/google/openiap/src/horizon/java/dev/hyo/openiap/utils/BillingConverters.kt b/packages/google/openiap/src/horizon/java/dev/hyo/openiap/utils/BillingConverters.kt
index 1467bae48..d740e5e2e 100644
--- a/packages/google/openiap/src/horizon/java/dev/hyo/openiap/utils/BillingConverters.kt
+++ b/packages/google/openiap/src/horizon/java/dev/hyo/openiap/utils/BillingConverters.kt
@@ -125,13 +125,16 @@ internal object HorizonBillingConverters {
         val token = purchaseToken
         val productsList = products ?: emptyList()
         val state = PurchaseState.fromHorizonState(getPurchaseState())
-
         return PurchaseAndroid(
             autoRenewingAndroid = isAutoRenewing(),
             currentPlanId = basePlanId,
             dataAndroid = originalJson,
             developerPayloadAndroid = developerPayload,
-            id = orderId ?: token,
+            // Horizon reports a present-but-blank orderId (the module already
+            // logs orderIdPresent via isNullOrBlank), so a null-only fallback
+            // produced an empty id/transactionId that the SDKs' strict
+            // purchase decoders reject, failing the whole batch on device.
+            id = orderId?.takeIf { it.isNotBlank() } ?: token,
             ids = productsList,
             isAcknowledgedAndroid = isAcknowledged(),
             isAutoRenewing = isAutoRenewing(),
@@ -145,7 +148,7 @@ internal object HorizonBillingConverters {
             signatureAndroid = signature,
             store = IapStore.Horizon,
             transactionDate = (purchaseTime ?: 0L).toDouble(),
-            transactionId = orderId ?: token
+            transactionId = orderId?.takeIf { it.isNotBlank() } ?: token
         )
     }
 
@@ -158,7 +161,8 @@ internal object HorizonBillingConverters {
         purchaseToken = purchaseToken,
         purchaseTokenAndroid = purchaseToken,
         transactionDate = (purchaseTime ?: 0L).toDouble(),
-        transactionId = orderId ?: purchaseToken
+        // Same blank-orderId fallback as toPurchase above.
+        transactionId = orderId?.takeIf { it.isNotBlank() } ?: purchaseToken
     )
 
     fun PurchaseAndroid.toActiveSubscription(): ActiveSubscription = ActiveSubscription(
diff --git a/packages/google/openiap/src/testHorizon/java/dev/hyo/openiap/HorizonBlankOrderIdTest.kt b/packages/google/openiap/src/testHorizon/java/dev/hyo/openiap/HorizonBlankOrderIdTest.kt
new file mode 100644
index 000000000..45e3acbce
--- /dev/null
+++ b/packages/google/openiap/src/testHorizon/java/dev/hyo/openiap/HorizonBlankOrderIdTest.kt
@@ -0,0 +1,62 @@
+package dev.hyo.openiap
+
+import com.meta.horizon.billingclient.api.Purchase as HorizonPurchase
+import dev.hyo.openiap.utils.HorizonBillingConverters
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+/**
+ * The Horizon billing-compatibility `Purchase.orderId` is a non-null String
+ * and arrives blank on device, so a null-only `orderId ?: token` fallback
+ * produced an empty `id`/`transactionId`. The SDKs' strict purchase decoders
+ * reject an empty id, which failed the whole available-purchases batch on a
+ * Quest 3 with real store data. These tests pin the blank-aware fallback.
+ */
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE, sdk = [29])
+class HorizonBlankOrderIdTest {
+
+    private fun horizonPurchase(orderId: String): HorizonPurchase = HorizonPurchase(
+        5L,
+        "purchase-token",
+        listOf("product-id"),
+        "dev.hyo.openiap.test",
+        "",
+        orderId,
+        """{"purchaseState":0,"acknowledged":false,"autoRenewing":false}""",
+        1,
+        "signature",
+    )
+
+    @Test
+    fun `blank orderId falls back to the purchase token for id and transactionId`() {
+        val purchase = with(HorizonBillingConverters) {
+            horizonPurchase(orderId = "").toPurchase()
+        }
+
+        assertEquals("purchase-token", purchase.id)
+        assertEquals("purchase-token", purchase.transactionId)
+    }
+
+    @Test
+    fun `present orderId is preserved for id and transactionId`() {
+        val purchase = with(HorizonBillingConverters) {
+            horizonPurchase(orderId = "order-1").toPurchase()
+        }
+
+        assertEquals("order-1", purchase.id)
+        assertEquals("order-1", purchase.transactionId)
+    }
+
+    @Test
+    fun `blank orderId falls back to the purchase token for active subscriptions`() {
+        val subscription = with(HorizonBillingConverters) {
+            horizonPurchase(orderId = "").toActiveSubscription()
+        }
+
+        assertEquals("purchase-token", subscription.transactionId)
+    }
+}
diff --git a/scripts/audit-purchase-payload-parity.mjs b/scripts/audit-purchase-payload-parity.mjs
index 5785c28de..1342e4b3e 100644
--- a/scripts/audit-purchase-payload-parity.mjs
+++ b/scripts/audit-purchase-payload-parity.mjs
@@ -1835,7 +1835,8 @@ function checkGooglePurchasePayloadContracts() {
         productId: /^productsList\.firstOrNull\(\)\.orEmpty\(\)$/,
         purchaseToken: /^token$/,
         signatureAndroid: /^signature$/,
-        transactionId: /^orderId \?: token$/,
+        transactionId:
+          /^orderId\?\.takeIf \{ it\.isNotBlank\(\) \} \?: token$/,
       },
       intentionallyDefaultedFields: [
         "isSuspendedAndroid",