@defra-fish/gafl-webapp-service 1.61.0-rc.13 → 1.61.0-rc.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.61.0-rc.13",
+  "version": "1.61.0-rc.15",
   "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.61.0-rc.13",
-    "@defra-fish/connectors-lib": "1.61.0-rc.13",
+    "@defra-fish/business-rules-lib": "1.61.0-rc.15",
+    "@defra-fish/connectors-lib": "1.61.0-rc.15",
     "@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": "fdd397ab2b9e6fa2346d765f4ada01ce5475dd10"
+  "gitHead": "906584338318c1402682d486a40bb72ff1abb37d"
 }

package/src/handlers/__tests__/authentication-handler.redirect.spec.js

@@ -1,13 +1,15 @@
 import handler from '../authentication-handler.js'
-import { IDENTIFY, CONTROLLER, RENEWAL_INACTIVE } from '../../uri.js'
+import { LICENCE_NOT_FOUND, CONTROLLER, RENEWAL_INACTIVE } from '../../uri.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 
 jest.mock('../../processors/uri-helper.js')
 jest.mock('../page-handler.js', () => ({ errorShimm: () => {} }))
 jest.mock('../../uri.js', () => ({
   IDENTIFY: {
-    page: 'identify page',
-    uri: Symbol('identify uri')
+    page: 'identify page'
+  },
+  LICENCE_NOT_FOUND: {
+    uri: Symbol('licence not found uri')
   },
   CONTROLLER: {
     uri: Symbol('controller uri')
@@ -40,7 +42,7 @@ const getSampleAuthResult = (description = 'M', durationMagnitude = 12) => ({
 })
 
 describe.each([
-  [false, 'identify', IDENTIFY.uri, 1],
+  [false, 'licence not found', LICENCE_NOT_FOUND.uri, 1],
   [getSampleAuthResult(), 'controller', CONTROLLER.uri, -1],
   [getSampleAuthResult(), 'renewal inactive', RENEWAL_INACTIVE.uri, 61],
   [getSampleAuthResult(), 'renewal inactive', RENEWAL_INACTIVE.uri, -61],

package/src/handlers/authentication-handler.js

@@ -1,5 +1,5 @@
 import { setUpCacheFromAuthenticationResult, setUpPayloads } from '../processors/renewals-write-cache.js'
-import { IDENTIFY, CONTROLLER, RENEWAL_INACTIVE } from '../uri.js'
+import { IDENTIFY, RENEWAL_INACTIVE, LICENCE_NOT_FOUND, CONTROLLER } from '../uri.js'
 import { RENEWAL_ERROR_REASON } from '../constants.js'
 import { validation, RENEW_BEFORE_DAYS, RENEW_AFTER_DAYS, SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
 import Joi from 'joi'
@@ -8,7 +8,7 @@ import moment from 'moment-timezone'
 
 /**
  * Handler to authenticate the user on the easy renewals journey. It will
- * (1) Redirect back to the identification page where there is an authentication failure
+ * (1) Redirect to an error page where there is an authentication failure
  * (2) Redirect to an error page where the renewal has expired
  * (3) Redirect back to an error page where a licence is already issued
  * (4) Establish the session cache and redirect into the controller where the user is authenticated
@@ -43,9 +43,9 @@ export default async (request, h) => {
 
   if (!authenticationResult) {
     payload.referenceNumber = referenceNumber
-    await request.cache().helpers.page.setCurrentPermission(IDENTIFY.page, { payload, error: { referenceNumber: 'string.invalid' } })
+    await request.cache().helpers.page.setCurrentPermission(IDENTIFY.page, { payload })
     await request.cache().helpers.status.setCurrentPermission({ referenceNumber, authentication: { authorized: false } })
-    return h.redirectWithLanguageCode(IDENTIFY.uri)
+    return h.redirectWithLanguageCode(LICENCE_NOT_FOUND.uri)
   } else {
     // Test for 12 month licence
     const daysDiff = moment(authenticationResult.permission.endDate).diff(moment().tz(SERVICE_LOCAL_TIME).startOf('day'), 'days')

package/src/locales/cy.json

@@ -332,8 +332,6 @@
   "identify_error_date_real": "Mae’n rhaid i’r dyddiad geni fod yn ddyddiad dilys",
   "identify_error_empty_postcode": "Nid ydych wedi nodi cod post",
   "identify_error_empty": "Rhowch chwe nodyn olaf eich trwydded",
-  "identify_error_invalid_1": "Nid oes gennym gofnod o rif trwydded sy'n gorffen gyda ",
-  "identify_error_invalid_2": " sy’n cyd-fynd â'r manylion hyn.",
   "identify_error_missing_day": "Mae’n rhaid i’r dyddiad geni gynnwys diwrnod",
   "identify_error_missing_month": "Mae’n rhaid i’r dyddiad geni gynnwys mis",
   "identify_error_missing_year": "Mae’n rhaid i’r dyddiad geni gynnwys blwyddyn",
@@ -420,6 +418,13 @@
   "licence_length_title_other": "Am ba hyd y maent am gael y drwydded?",
   "licence_length_title_you": "Am ba hyd yr hoffech chi gael y drwydded?",
   "licence_num": "Rhif trwydded",
+  "licence_not_found_title": "Ni allwn ddod o hyd i drwydded sy’n cyfateb â'r manylion a roddwyd",
+  "licence_not_found_body_1": "Gwiriwch eich bod wedi mewnbynnu’r manylion yn gywir - ",
+  "licence_not_found_body_previous_page": "ewch yn ôl i’r dudalen flaenorol",
+  "licence_not_found_body_2": "Os byddwch yn parhau i weld y dudalen hon gallwch ofyn am gymorth drwy e-bostio ",
+  "licence_not_found_body_ea_link": "enquiries@environment-agency.gov.uk",
+  "licence_not_found_body_3": " neu ffonio 03708 506 506 (8am - 6pm o ddydd Llun i ddydd Gwener, ac eithrio gwyliau cyhoeddus). ",
+  "licence_not_found_body_call_charges_link": "Gallwch weld costau’r galwadau yma (yn agor mewn tab newydd)",
   "licence_start_days": " diwrnod nesaf",
   "licence_start_enter_todays_date": "Rhowch ddyddiad heddiw os ydych chi am i’r drwydded 1 diwrnod neu 8 diwrnod ddechrau yn hwyrach heddiw.",
   "licence_start_error_date_real": "Mae’n rhaid i ddyddiad dechrau’r drwydded fod yn ddyddiad dilys",

package/src/locales/en.json

@@ -332,8 +332,6 @@
   "identify_error_date_real": "Date of birth must be a real date",
   "identify_error_empty_postcode": "You did not enter a postcode",
   "identify_error_empty": "Enter the last six characters of your licence number",
-  "identify_error_invalid_1": "We do not have any record of a licence number ending ",
-  "identify_error_invalid_2": " matching these details.",
   "identify_error_missing_day": "Date of birth must include a day",
   "identify_error_missing_month": "Date of birth must include a month",
   "identify_error_missing_year": "Date of birth must include a year",
@@ -419,6 +417,13 @@
   "licence_length_one_day": "1 day licences are valid for 24 hours from the start time that you select.",
   "licence_length_title_other": "How long do they want the licence for?",
   "licence_length_title_you": "How long do you want your licence for?",
+  "licence_not_found_title": "We cannot find a licence matching the details you provided",
+  "licence_not_found_body_1": "Check you have entered your details correctly - ",
+  "licence_not_found_body_previous_page": "go back to the previous page",
+  "licence_not_found_body_2": "If you keep seeing this page you can get help by emailing ",
+  "licence_not_found_body_ea_link": "enquiries@environment-agency.gov.uk",
+  "licence_not_found_body_3": " or calling 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays). ",
+  "licence_not_found_body_call_charges_link": "View call charges (opens in new tab)",
   "licence_num": "Licence number",
   "licence_start_days": " days",
   "licence_start_enter_todays_date": "Enter today’s date if you want the 1-day or 8-day licence to start later today.",

package/src/pages/renewals/identify/__tests__/{identity.spec.js → identify.spec.js}

@@ -9,7 +9,8 @@ import {
   RENEWAL_INACTIVE,
   LICENCE_LENGTH,
   CONTACT_SUMMARY,
-  NEW_TRANSACTION
+  NEW_TRANSACTION,
+  LICENCE_NOT_FOUND
 } from '../../../../uri.js'
 import { start, stop, initialize, injectWithCookies, mockSalesApi } from '../../../../__mocks__/test-utils-system.js'
 
@@ -52,15 +53,12 @@ mockSalesApi()
 salesApi.countries.getAll = jest.fn(() => Promise.resolve(mockDefraCountries))
 
 describe('The easy renewal identification page', () => {
-  it('redirects to identify page when called with an invalid permission reference', async () => {
+  it('redirects from identify to licence not found page when called with an invalid permission reference', async () => {
     const data = await injectWithCookies('GET', RENEWAL_PUBLIC.uri.replace('{referenceNumber}', 'not-a-valid-reference-number'))
     expect(data.statusCode).toBe(302)
     expect(data.headers.location).toHaveValidPathFor(IDENTIFY.uri)
-    const data2 = await injectWithCookies('GET', IDENTIFY.uri)
-    expect(data2.statusCode).toBe(302)
-    expect(data2.headers.location).toHaveValidPathFor(IDENTIFY.uri)
-    const data3 = await injectWithCookies('GET', IDENTIFY.uri)
-    expect(data3.statusCode).toBe(200)
+    const data2 = await injectWithCookies('GET', LICENCE_NOT_FOUND.uri)
+    expect(data2.statusCode).toBe(200)
   })
 
   it('returns successfully when called with a valid reference ', async () => {
@@ -87,7 +85,7 @@ describe('The easy renewal identification page', () => {
     expect(data.headers.location).toHaveValidPathFor(IDENTIFY.uri)
   })
 
-  it('redirects back to itself on posting an valid but not authenticated details', async () => {
+  it('redirects to licence not found on posting valid but not authenticated details', async () => {
     salesApi.authenticate.mockImplementation(jest.fn(async () => new Promise(resolve => resolve(null))))
     await injectWithCookies('GET', VALID_RENEWAL_PUBLIC_URI)
     await injectWithCookies('GET', IDENTIFY.uri)
@@ -100,8 +98,8 @@ describe('The easy renewal identification page', () => {
     expect(data.headers.location).toHaveValidPathFor(AUTHENTICATE.uri)
     const data2 = await injectWithCookies('GET', AUTHENTICATE.uri)
     expect(data2.statusCode).toBe(302)
-    expect(data2.headers.location).toHaveValidPathFor(IDENTIFY.uri)
-    const data3 = await injectWithCookies('GET', IDENTIFY.uri)
+    expect(data2.headers.location).toHaveValidPathFor(LICENCE_NOT_FOUND.uri)
+    const data3 = await injectWithCookies('GET', LICENCE_NOT_FOUND.uri)
     expect(data3.statusCode).toBe(200)
   })
 

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

@@ -15,11 +15,7 @@
     set errorMap = {
         'referenceNumber' : {
             'string.empty': { text: mssgs.identify_error_empty, ref: '#ref' },
-            'string.pattern.base': { text: mssgs.identify_error_pattern, ref: '#ref' },
-            'string.invalid': {
-                text: mssgs.identify_error_invalid_1 + payload.referenceNumber + mssgs.identify_error_invalid_2,
-                ref: "#ref"
-            }
+            'string.pattern.base': { text: mssgs.identify_error_pattern, ref: '#ref' }
         },
         'postcode': {
             'string.empty': { ref: '#postcode', text: mssgs.identify_error_empty_postcode },

package/src/pages/renewals/identify/route.js

@@ -1,4 +1,4 @@
-import { IDENTIFY, AUTHENTICATE, NEW_TRANSACTION } from '../../../uri.js'
+import { IDENTIFY, NEW_TRANSACTION, AUTHENTICATE } from '../../../uri.js'
 import pageRoute from '../../../routes/page-route.js'
 import Joi from 'joi'
 import { validation } from '@defra-fish/business-rules-lib'

package/src/pages/renewals/licence-not-found/__tests__/route.spec.js

@@ -0,0 +1,22 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { LICENCE_NOT_FOUND } from '../../../../uri.js'
+import '../route.js'
+
+jest.mock('../../../../routes/page-route.js', () => jest.fn())
+jest.mock('../../../../uri.js', () => ({
+  RENEWAL_PUBLIC: { uri: Symbol('renewal public uri') },
+  LICENCE_NOT_FOUND: {
+    page: Symbol('licence-not-found page'),
+    uri: Symbol('licence-not-found uri')
+  }
+}))
+
+describe('LICENCE_NOT_FOUND route', () => {
+  it('passes LICENCE_NOT_FOUND.page as the first argument to pageRoute', () => {
+    expect(pageRoute.mock.calls[0][0]).toBe(LICENCE_NOT_FOUND.page)
+  })
+
+  it('passes LICENCE_NOT_FOUND.uri as the second argument to pageRoute', () => {
+    expect(pageRoute.mock.calls[0][1]).toBe(LICENCE_NOT_FOUND.uri)
+  })
+})

package/src/pages/renewals/licence-not-found/licence-not-found.njk

@@ -0,0 +1,23 @@
+{% extends "layout.njk" %}
+{% extends "standard-form.njk" %}
+
+{% set title = mssgs.licence_not_found_title %}
+
+{% block content %}
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l">{{ mssgs.licence_not_found_title }}</h1>
+    <p class="govuk-body">
+      {{ mssgs.licence_not_found_body_1 }}
+      <a class="govuk-link" href="/buy/renew/identify">{{ mssgs.licence_not_found_body_previous_page }}</a>{{ mssgs.full_stop }}
+    </p>
+    <p class="govuk-body">
+      {{ mssgs.licence_not_found_body_2 }}
+      <a href="mailto:enquiries@environment-agency.gov.uk">{{ mssgs.licence_not_found_body_ea_link }}</a>
+      {{ mssgs.licence_not_found_body_3 }}
+      <a href="https://www.gov.uk/call-charges" target="_blank" rel="noopener">
+        {{ mssgs.licence_not_found_body_call_charges_link }}</a>{{ mssgs.full_stop }}
+    </p>
+  </div>
+</div>
+{% endblock %}

package/src/pages/renewals/licence-not-found/route.js

@@ -0,0 +1,4 @@
+import { LICENCE_NOT_FOUND } from '../../../uri.js'
+import pageRoute from '../../../routes/page-route.js'
+
+export default pageRoute(LICENCE_NOT_FOUND.page, LICENCE_NOT_FOUND.uri, null)

package/src/routes/journey-definition.js

@@ -28,7 +28,8 @@ import {
   RENEWAL_INACTIVE,
   RENEWAL_START_DATE,
   CHOOSE_PAYMENT,
-  SET_UP_PAYMENT
+  SET_UP_PAYMENT,
+  LICENCE_NOT_FOUND
 } from '../uri.js'
 
 import { CommonResults, CONTACT_SUMMARY_SEEN, ShowDigitalLicencePages } from '../constants.js'
@@ -416,6 +417,11 @@ export default [
     }
   },
 
+  {
+    current: LICENCE_NOT_FOUND,
+    backLink: IDENTIFY.uri
+  },
+
   // The change start time is handled directly - not via the controller, as it has dynamic validation
   {
     current: RENEWAL_START_DATE,

package/src/routes/routes.js

@@ -30,6 +30,7 @@ import paymentFailed from '../pages/payment/failed/route.js'
 import identify from '../pages/renewals/identify/route.js'
 import invalidLink from '../pages/renewals/renewal-inactive/route.js'
 import renewalStartDate from '../pages/renewals/renewal-start-date/route.js'
+import licenceNotFound from '../pages/renewals/licence-not-found/route.js'
 
 import staticAssets from './static-routes.js'
 import miscRoutes from './misc-routes.js'
@@ -71,7 +72,8 @@ const routes = [
   ...invalidLink,
   ...renewalStartDate,
   ...choosePayment,
-  ...setUpRecurring
+  ...setUpRecurring,
+  ...licenceNotFound
 ]
 
 if (process.env.CHANNEL === 'telesales') {

package/src/uri.js

@@ -48,6 +48,7 @@ export const IDENTIFY = { uri: '/buy/renew/identify', page: 'identify' }
 export const RENEWAL_INACTIVE = { uri: '/buy/renew/inactive', page: 'renewal-inactive' }
 export const AUTHENTICATE = { uri: '/buy/renew/authenticate' }
 export const RENEWAL_START_DATE = { uri: '/buy/renew/renewal-start-date', page: 'renewal-start-date' }
+export const LICENCE_NOT_FOUND = { uri: '/buy/renew/licence-not-found', page: 'licence-not-found' }
 
 export const CONTROLLER = { uri: '/buy' }
 export const NEW_TRANSACTION = { uri: '/buy/new' }