fix: treat received as successful result code

Adyen · Nov 10, 2023 · 868c21c · 868c21c
1 parent b3ad31e
commit 868c21c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/adyen/controllers/payments-details.js b/adyen/controllers/payments-details.js
@@ -3,14 +3,22 @@ import AdyenCheckoutConfig from './checkout-config'
 import Logger from './logger'
 import {createErrorResponse} from '../utils/createErrorResponse.mjs'
 
+const errorMessages = {
+    PAYMENTS_DETAILS_NOT_SUCCESSFUL: 'payments details call not successful'
+}
+
 async function sendPaymentDetails(req, res) {
     Logger.info('sendPaymentDetails', 'start')
     const checkout = AdyenCheckoutConfig.getInstance()
     try {
         const {data} = req.body
         const response = await checkout.instance.paymentsDetails(data)
         Logger.info('sendPaymentDetails', `resultCode ${response.resultCode}`)
-        res.json(createCheckoutResponse(response))
+        const checkoutResponse = createCheckoutResponse(response)
+        if (checkoutResponse.isFinal && !checkoutResponse.isSuccessful) {
+            throw new Error(errorMessages.PAYMENTS_DETAILS_NOT_SUCCESSFUL)
+        }
+        res.json(checkoutResponse)
     } catch (err) {
         Logger.error('sendPaymentDetails', err.message)
         res.status(err.statusCode || 500).json(

diff --git a/adyen/controllers/payments.js b/adyen/controllers/payments.js
@@ -17,7 +17,8 @@ const errorMessages = {
     AMOUNT_NOT_CORRECT: 'amount not correct',
     INVALID_ORDER: 'order is invalid',
     INVALID_PARAMS: 'invalid request params',
-    INVALID_BASKET: 'invalid basket'
+    INVALID_BASKET: 'invalid basket',
+    PAYMENT_NOT_SUCCESSFUL: 'payment not successful'
 }
 
 const validateRequestParams = (req) => {
@@ -150,7 +151,12 @@ async function sendPayments(req, res) {
         //     }
         // })
 
-        res.json(createCheckoutResponse(response))
+        const checkoutResponse = createCheckoutResponse(response)
+        if (checkoutResponse.isFinal && !checkoutResponse.isSuccessful) {
+            throw new Error(errorMessages.PAYMENT_NOT_SUCCESSFUL)
+        }
+
+        res.json(checkoutResponse)
     } catch (err) {
         Logger.error('sendPayments', err.message)
         res.status(err.statusCode || 500).json(

diff --git a/adyen/utils/createCheckoutResponse.mjs b/adyen/utils/createCheckoutResponse.mjs
@@ -7,12 +7,13 @@ export function createCheckoutResponse(response) {
       RESULT_CODES.REFUSED,
       RESULT_CODES.ERROR,
       RESULT_CODES.CANCELLED,
+      RESULT_CODES.RECEIVED,
     ].includes(response.resultCode)
   ) {
     return {
       isFinal: true,
       isSuccessful:
-        response.resultCode === RESULT_CODES.AUTHORISED,
+        response.resultCode === RESULT_CODES.AUTHORISED || response.resultCode === RESULT_CODES.RECEIVED,
       merchantReference: response.merchantReference,
     };
   }
@@ -32,12 +33,6 @@ export function createCheckoutResponse(response) {
     };
   }
 
-  if (response.resultCode === RESULT_CODES.RECEIVED) {
-    return {
-      isFinal: false,
-    };
-  }
-
   return {
     isFinal: true,
     isSuccessful: false,