@defra-fish/gafl-webapp-service 1.63.0-rc.0 → 1.63.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.63.0-rc.0",
+  "version": "1.63.0-rc.2",
   "description": "The websales frontend for the GAFL service",
   "type": "module",
   "engines": {
@@ -36,8 +36,8 @@
     "prepare": "gulp --gulpfile build/gulpfile.cjs"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.63.0-rc.0",
-    "@defra-fish/connectors-lib": "1.63.0-rc.0",
+    "@defra-fish/business-rules-lib": "1.63.0-rc.2",
+    "@defra-fish/connectors-lib": "1.63.0-rc.2",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -79,5 +79,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "127bd6db86a97eb1b229f3de30e27046119ffca6"
+  "gitHead": "da12968d3b29944a03d9b29f69617d15f4a89264"
 }

package/src/pages/renewals/identify/identify.njk

@@ -102,7 +102,7 @@
                       id: "ref",
                       name: "referenceNumber",
                       type: "text",
-                      classes: "govuk-!-width-one-third",
+                      classes: "govuk-input--width-10",
                       errorMessage: { text: mssgs.identify_error_empty } if error['referenceNumber'],
                       label: {
                         text: mssgs.identify_label_last_six,

package/src/services/payment/__test__/govuk-pay-service.spec.js

@@ -214,15 +214,17 @@ describe('The govuk-pay-service', () => {
     })
 
     it('should log debug message when response.ok is true', async () => {
+      const expectedLoggedOutput = { success: true, paymentId: 'abc123', bar: Symbol('bar'), baz: Symbol('baz') }
+      const resBody = { card_details: { foo: Symbol('foo') }, card_brand: Symbol('foobarbaz'), ...expectedLoggedOutput }
       const mockResponse = {
         ok: true,
-        json: jest.fn().mockResolvedValue({ success: true, paymentId: 'abc123' })
+        json: jest.fn().mockResolvedValue(resBody)
       }
       govUkPayApi.createPayment.mockResolvedValue(mockResponse)
 
       await sendPayment(preparedPayment)
 
-      expect(debug).toHaveBeenCalledWith('Successful payment creation response: %o', { success: true, paymentId: 'abc123' })
+      expect(debug).toHaveBeenCalledWith('Successful payment creation response: %o', expectedLoggedOutput)
     })
 
     it('should log error message when response.ok is false', async () => {
@@ -334,15 +336,17 @@ describe('The govuk-pay-service', () => {
     })
 
     it('should log debug message when response.ok is true', async () => {
+      const expectedLoggedOutput = { success: true, paymentId: 'abc123', bar: Symbol('bar'), baz: Symbol('baz') }
+      const resBody = { card_details: { foo: Symbol('foo') }, card_brand: Symbol('foobarbaz'), ...expectedLoggedOutput }
       const mockResponse = {
         ok: true,
-        json: jest.fn().mockResolvedValue({ success: true, paymentId: 'abc123' })
+        json: jest.fn().mockResolvedValue(resBody)
       }
       govUkPayApi.createRecurringPaymentAgreement.mockResolvedValue(mockResponse)
 
       await sendRecurringPayment(preparedPayment)
 
-      expect(debug).toHaveBeenCalledWith('Successful agreement creation response: %o', { success: true, paymentId: 'abc123' })
+      expect(debug).toHaveBeenCalledWith('Successful agreement creation response: %o', expectedLoggedOutput)
     })
 
     it('should log error message  when response.ok is false', async () => {

package/src/services/payment/govuk-pay-service.js

@@ -60,7 +60,7 @@ export const sendPayment = async (preparedPayment, recurring = false) => {
 
   if (response.ok) {
     const resBody = await response.json()
-    debug('Successful payment creation response: %o', resBody)
+    debug('Successful payment creation response: %o', loggableBody(resBody))
     return resBody
   } else {
     const errMsg = await getTransactionErrorMessage(preparedPayment.id, preparedPayment, response)
@@ -93,9 +93,7 @@ export const getPaymentStatus = async (paymentId, recurring = false) => {
 
   if (response.ok) {
     const resBody = await response.json()
-    // eslint-disable-next-line camelcase
-    const { card_brand, card_details, ...loggableBody } = resBody
-    debug('Payment status response: %o', loggableBody)
+    debug('Payment status response: %o', loggableBody(resBody))
     return resBody
   } else {
     const mes = {
@@ -123,12 +121,18 @@ const createRecurringPaymentAgreement = async preparedPayment => {
   }
 }
 
+const loggableBody = resBody => {
+  // eslint-disable-next-line camelcase
+  const { card_brand, card_details, ...filteredBody } = resBody
+  return filteredBody
+}
+
 export const sendRecurringPayment = async preparedPayment => {
   const response = await createRecurringPaymentAgreement(preparedPayment)
 
   if (response.ok) {
     const resBody = await response.json()
-    debug('Successful agreement creation response: %o', resBody)
+    debug('Successful agreement creation response: %o', loggableBody(resBody))
     return resBody
   } else {
     const errMsg = await getTransactionErrorMessage(preparedPayment.reference, preparedPayment, response)