@defra-fish/gafl-webapp-service 1.62.0-rc.4 → 1.62.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.62.0-rc.4",
+  "version": "1.62.0-rc.6",
   "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.62.0-rc.4",
-    "@defra-fish/connectors-lib": "1.62.0-rc.4",
+    "@defra-fish/business-rules-lib": "1.62.0-rc.6",
+    "@defra-fish/connectors-lib": "1.62.0-rc.6",
     "@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": "ffb61b6f55dc319cc1afbe57f8787deeb27f1dee"
+  "gitHead": "99bf15ee471b05eb6f99d1051ddf955c1cbed9bf"
 }

package/src/pages/layout/layout.njk

@@ -1,5 +1,5 @@
 {% extends "template.njk" %}
-{% set assetPath = "/public" %}
+{% set assetPath = "/public/assets/rebrand" %}
 
 {% if not journeyBeginning %}
     <meta name="robots" content="noindex">
@@ -182,7 +182,7 @@
     <footer class="govuk-footer">
     <div class="govuk-width-container">
         <div class="govuk-footer__meta">
-            <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">      
+            <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
                 {% if (title === mssgs.address_lookup_title_you) or (title === mssgs.address_lookup_title_other) %}
                     <p class="govuk-body-s">{{ mssgs.address_lookup_crown_copyright }}<a class="govuk-link" href="http://www.ordnancesurvey.co.uk" rel="noreferrer noopener" target="_blank">{{ mssgs.address_lookup_crown_copyright_new_tab }}</a> {{ mssgs.address_lookup_crown_copyright_ref }}
                     <br>{{ mssgs.address_lookup_crown_copyright_terms }} <a class="govuk-link" href="{{ data.uri.osTerms }}">{{ mssgs.address_lookup_crown_copyright_terms_link }}</a></p>

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

@@ -426,23 +426,20 @@ describe('The govuk-pay-service', () => {
       [false, false],
       [false, undefined]
     ])('should call the govUkPayApi with recurring as %s if the argument is %s', async (expected, value) => {
-      const mockResponse = { ok: true, status: 200, json: () => {} }
-      govUkPayApi.fetchPaymentStatus.mockResolvedValue(mockResponse)
+      govUkPayApi.fetchPaymentStatus.mockResolvedValue(getMockFetchPaymentStatus())
       await getPaymentStatus(paymentId, value)
       expect(govUkPayApi.fetchPaymentStatus).toHaveBeenCalledWith(paymentId, expected)
     })
 
     it('should send provided paymentId to Gov.UK Pay', async () => {
-      const mockResponse = { ok: true, status: 200, json: () => {} }
-      govUkPayApi.fetchPaymentStatus.mockResolvedValue(mockResponse)
+      govUkPayApi.fetchPaymentStatus.mockResolvedValue(getMockFetchPaymentStatus())
       await getPaymentStatus(paymentId)
       expect(govUkPayApi.fetchPaymentStatus).toHaveBeenCalledWith(paymentId, false)
     })
 
     it('should return response body when payment status check is successful', async () => {
-      const resBody = Symbol('body')
-      const mockResponse = { ok: true, status: 200, json: jest.fn().mockResolvedValue(resBody) }
-      govUkPayApi.fetchPaymentStatus.mockResolvedValue(mockResponse)
+      const resBody = { card_details: { foo: Symbol('foo') }, bar: Symbol('bar'), baz: Symbol('baz') }
+      govUkPayApi.fetchPaymentStatus.mockResolvedValue(getMockFetchPaymentStatus(resBody))
 
       const result = await getPaymentStatus(paymentId)
 
@@ -450,13 +447,13 @@ describe('The govuk-pay-service', () => {
     })
 
     it('should log debug message when response.ok is true', async () => {
-      const resBody = Symbol('body')
-      const mockResponse = { ok: true, status: 200, json: jest.fn().mockResolvedValue(resBody) }
-      govUkPayApi.fetchPaymentStatus.mockResolvedValue(mockResponse)
+      const expectedLoggedOutput = { bar: Symbol('bar'), baz: Symbol('baz') }
+      const resBody = { card_details: { foo: Symbol('foo') }, ...expectedLoggedOutput }
+      govUkPayApi.fetchPaymentStatus.mockResolvedValue(getMockFetchPaymentStatus(resBody))
 
       await getPaymentStatus(paymentId)
 
-      expect(debug).toHaveBeenCalledWith('Payment status response: %o', resBody)
+      expect(debug).toHaveBeenCalledWith('Payment status response: %o', expectedLoggedOutput)
     })
 
     it('should log error message when response.ok is false', async () => {
@@ -530,3 +527,9 @@ describe('The govuk-pay-service', () => {
     })
   })
 })
+
+const getMockFetchPaymentStatus = (resBody = { card_details: 'foo' }) => ({
+  ok: true,
+  status: 200,
+  json: jest.fn().mockResolvedValue(resBody)
+})

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

@@ -93,7 +93,9 @@ export const getPaymentStatus = async (paymentId, recurring = false) => {
 
   if (response.ok) {
     const resBody = await response.json()
-    debug('Payment status response: %o', resBody)
+    // eslint-disable-next-line camelcase
+    const { card_details, ...loggableBody } = resBody
+    debug('Payment status response: %o', loggableBody)
     return resBody
   } else {
     const mes = {