parse all error messages

Author: kiftio

platforms/android/lib/src/main/java/com/shopify/checkoutkit/CheckoutProtocol.kt

@@ -26,6 +26,7 @@ import android.net.Uri
 import android.os.Looper
 import androidx.core.net.toUri
 import com.shopify.checkoutkit.ShopifyCheckoutKit.log
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
@@ -67,14 +68,14 @@ public object CheckoutProtocol {
     public val lineItemsChange: NotificationDescriptor<Checkout> = checkoutDescriptor("ec.line_items.change")
     internal val buyerChange: NotificationDescriptor<Checkout> = checkoutDescriptor("ec.buyer.change")
     public val totalsChange: NotificationDescriptor<Checkout> = checkoutDescriptor("ec.totals.change")
-    public val error: NotificationDescriptor<CheckoutError> = NotificationDescriptor(
+    public val error: NotificationDescriptor<CheckoutErrorResponse> = NotificationDescriptor(
         method = "ec.error",
         decode = { params ->
-            params?.jsonObject?.get("messages")?.let {
+            params?.let {
                 try {
-                    json.decodeFromJsonElement<List<CheckoutError>>(it).firstOrNull()
+                    json.decodeFromJsonElement<CheckoutErrorResponse>(it)
                 } catch (e: Exception) {
-                    log.d(BaseWebView.ECP_LOG_TAG, "Failed to decode ec.error messages: $e  raw=$it")
+                    log.d(BaseWebView.ECP_LOG_TAG, "Failed to decode ec.error params: $e  raw=$it")
                     null
                 }
             }
@@ -320,7 +321,20 @@ internal sealed class WindowOpenResult {
     data class Rejected(val reason: String? = null) : WindowOpenResult()
 }
 
-/** Payload delivered with the [CheckoutProtocol.error] notification. */
+/**
+ * Payload delivered with the [CheckoutProtocol.error] notification.
+ *
+ * Mirrors the UCP `ec.error` params shape — a session-fatal envelope carrying the full
+ * list of error [messages] (consumers should iterate, not assume a single message) and
+ * an optional [continueUrl] for buyer handoff or session recovery.
+ */
+@Serializable
+public data class CheckoutErrorResponse internal constructor(
+    public val messages: List<CheckoutError> = emptyList(),
+    @SerialName("continue_url") public val continueUrl: String? = null,
+)
+
+/** A single error message inside a [CheckoutErrorResponse]. */
 @Serializable
 public data class CheckoutError internal constructor(
     public val code: String? = null,

platforms/android/lib/src/test/java/com/shopify/checkoutkit/CheckoutProtocolTest.kt

@@ -135,18 +135,25 @@ class CheckoutProtocolTest {
 
     @Test
     fun `process dispatches ec error to registered handler with decoded payload`() {
-        var received: CheckoutError? = null
+        var received: CheckoutErrorResponse? = null
         val client = CheckoutProtocol.Client()
             .on(CheckoutProtocol.error) { received = it }
 
         val errorMsg = """{"jsonrpc":"2.0","method":"ec.error","params":""" +
-            """{"messages":[{"code":"unknown_error","content":"fail","severity":"unrecoverable"}]}}"""
+            """{"messages":[""" +
+            """{"code":"unknown_error","content":"fail","severity":"unrecoverable"},""" +
+            """{"code":"session_expired","content":"expired","severity":"recoverable"}""" +
+            """],"continue_url":"https://example.com/retry"}}"""
         client.process(errorMsg)
         shadowOf(Looper.getMainLooper()).runToEndOfTasks()
 
-        assertThat(received?.code).isEqualTo("unknown_error")
-        assertThat(received?.content).isEqualTo("fail")
-        assertThat(received?.severity).isEqualTo("unrecoverable")
+        assertThat(received?.messages).hasSize(2)
+        assertThat(received?.messages?.get(0)?.code).isEqualTo("unknown_error")
+        assertThat(received?.messages?.get(0)?.content).isEqualTo("fail")
+        assertThat(received?.messages?.get(0)?.severity).isEqualTo("unrecoverable")
+        assertThat(received?.messages?.get(1)?.code).isEqualTo("session_expired")
+        assertThat(received?.messages?.get(1)?.severity).isEqualTo("recoverable")
+        assertThat(received?.continueUrl).isEqualTo("https://example.com/retry")
     }
 
     @Test