From 7c72e7bae960088df1efca1cba7275d95ecdaf12 Mon Sep 17 00:00:00 2001
From: Stevche Radevski <sradevski@live.com>
Date: Fri, 31 Oct 2025 11:45:00 +0100
Subject: [PATCH] fix: Updates to medusa payments provider (#13914)

---
 .changeset/warm-bears-melt.md                 |  5 +++
 .../services/medusa-payments.ts               | 37 ++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/warm-bears-melt.md

diff --git a/.changeset/warm-bears-melt.md b/.changeset/warm-bears-melt.md
new file mode 100644
index 0000000000..a98a9501f7
--- /dev/null
+++ b/.changeset/warm-bears-melt.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/payment": patch
+---
+
+Minor fixes to medusa payments provider
diff --git a/packages/modules/payment/src/providers/payment-medusa/services/medusa-payments.ts b/packages/modules/payment/src/providers/payment-medusa/services/medusa-payments.ts
index a360efafb2..a11fb15721 100644
--- a/packages/modules/payment/src/providers/payment-medusa/services/medusa-payments.ts
+++ b/packages/modules/payment/src/providers/payment-medusa/services/medusa-payments.ts
@@ -155,12 +155,24 @@ export class MedusaPaymentsProvider extends AbstractPaymentProvider<MedusaPaymen
   }
 
   handleStripeError(error: CloudServiceError): HandledErrorType {
+    let medusaPayment: MedusaPayment | undefined
+
     switch (error.type) {
       case "MedusaCardError":
         // Medusa has created a payment but it failed
         // Extract and return payment object to be stored in payment_session
         // Allows for reference to the failed intent and potential webhook reconciliation
-        const medusaPayment = error.data as MedusaPayment | undefined
+        medusaPayment = error.data as MedusaPayment | undefined
+        if (medusaPayment) {
+          return {
+            retry: false,
+            data: medusaPayment,
+          }
+        } else {
+          throw error
+        }
+      case "MedusaPaymentUnexpectedStateError":
+        medusaPayment = error.data as MedusaPayment | undefined
         if (medusaPayment) {
           return {
             retry: false,
@@ -169,7 +181,6 @@ export class MedusaPaymentsProvider extends AbstractPaymentProvider<MedusaPaymen
         } else {
           throw error
         }
-
       case "MedusaConnectionError":
       case "MedusaRateLimitError":
         // Connection or rate limit errors indicate an uncertain result
@@ -239,11 +250,11 @@ export class MedusaPaymentsProvider extends AbstractPaymentProvider<MedusaPaymen
     }
 
     const payment = await this.retrievePayment({ data: { id } })
+    const statusResponse = this.getStatus(
+      payment.data as unknown as MedusaPayment
+    )
 
-    return {
-      status: payment.data?.status as PaymentSessionStatus,
-      data: payment.data,
-    }
+    return statusResponse
   }
 
   async initiatePayment({
@@ -307,6 +318,13 @@ export class MedusaPaymentsProvider extends AbstractPaymentProvider<MedusaPaymen
       }).then((data) => data.payment)
     })) as MedusaPayment
 
+    const status = this.getStatus(intent)
+    if (status.status !== PaymentSessionStatus.CANCELED) {
+      throw new Error(
+        `Payment with id ${id} could not be canceled. Status: ${status.status}`
+      )
+    }
+
     return { data: intent as unknown as Record<string, unknown> }
   }
 
@@ -325,6 +343,13 @@ export class MedusaPaymentsProvider extends AbstractPaymentProvider<MedusaPaymen
       }).then((data) => data.payment)
     })) as MedusaPayment
 
+    const status = this.getStatus(intent)
+    if (status.status !== PaymentSessionStatus.CAPTURED) {
+      throw new Error(
+        `Payment with id ${id} could not be captured. Status: ${status.status}`
+      )
+    }
+
     return { data: intent as unknown as Record<string, unknown> }
   }