@defra-fish/gafl-webapp-service 1.63.0 → 1.64.0-rc.1

package/README.md

@@ -38,7 +38,8 @@ To run from this directory:
 | SHOW_WELSH_CONTENT                | Display option to change to welsh language                       |    no    |                                                           |                               |
 | ENABLE_ANALYTICS_OPT_IN_DEBUGGING | Set log if analytics been checked in non-production              |    no    |                                                           |                               |
 | ERROR_PAGE_ROUTE                  | Display error pages to support welsh language                    |    no    |                                                           |                               |
-| SHOW_RECURRING_PAYMENTS           | Display option to show recurring payments joruney           |    no    |                                                           |                               |
+| SHOW_RECURRING_PAYMENTS           | Display option to show recurring payments journey                |    no    |                                                           |                               |
+| SHOW_CANCELLATION_JOURNEY         | Display option to show recurring payments cancellation journey   |    no    |                                                           |                               |
 
 ## OS Places address lookup
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.63.0",
+  "version": "1.64.0-rc.1",
   "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",
-    "@defra-fish/connectors-lib": "1.63.0",
+    "@defra-fish/business-rules-lib": "1.64.0-rc.1",
+    "@defra-fish/connectors-lib": "1.64.0-rc.1",
     "@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": "7cfb8ef668002fc340b755dd3aaa4572063e115c"
+  "gitHead": "2d114ca497f84cd7ede12c2f93965a7044d2f39a"
 }

package/src/handlers/__tests__/cancel-rp-authentication-handler.spec.js

@@ -0,0 +1,18 @@
+import cancelRpAuthenticationHandler from '../cancel-rp-authentication-handler'
+import { CONTROLLER } from '../../uri.js'
+
+jest.mock('../../uri.js', () => ({
+  CONTROLLER: { uri: Symbol('controller-uri') }
+}))
+
+const getSampleResponseToolkit = () => ({
+  redirectWithLanguageCode: jest.fn()
+})
+
+describe('Cancel RP Authentication Handler', () => {
+  it('redirects with language code to CONTROLLER.uri', () => {
+    const sampleResponseToolkit = getSampleResponseToolkit()
+    cancelRpAuthenticationHandler(undefined, sampleResponseToolkit)
+    expect(sampleResponseToolkit.redirectWithLanguageCode).toHaveBeenCalledWith(CONTROLLER.uri)
+  })
+})

package/src/handlers/cancel-rp-authentication-handler.js

@@ -0,0 +1,6 @@
+import { CONTROLLER } from '../uri.js'
+
+export default async (_request, h) => {
+  console.log('cancel rp authenticate handler', h.redirectWithLanguageCode)
+  return h.redirectWithLanguageCode(CONTROLLER.uri)
+}

package/src/locales/cy.json

@@ -350,6 +350,7 @@
   "identify_title": "Adnewyddu eich trwydded bysgota?",
   "important_info_contact_content_salmon": "Byddwn yn defnyddio’r cyfeiriad e-bost neu’r rhif symudol hwn i anfon nodyn atgoffa i anfon adroddiad daliad. Mae’n bosibl y byddwn hefyd yn anfon gwybodaeth bwysig arall, megis newidiadau sy’n effeithio ar y drwydded neu is-ddeddfau pysgota.",
   "important_info_contact_content_not_salmon": "Mae’n bosibl y byddwn hefyd yn defnyddio’r cyfeiriad e-bost neu’r rhif symudol hwn i anfon gwybodaeth bwysig, megis newidiadau sy’n effeithio ar y drwydded neu’r is-ddeddfau pysgota.",
+  "important_info_contact_content_junior_12_months": "Byddwn hefyd yn defnyddio’r cyfeiriad e-bost neu’r rhif symudol hwn i anfon nodyn atgoffa am adnewyddu neu ddiweddariadau pwysig eraill, fel newidiadau i is-ddeddfau pysgota.",
   "important_info_contact_error_choose_short": "Dewiswch i ble y dylem anfon y drwydded bysgota",
   "important_info_contact_error_choose": "Dewiswch sut y dylem gysylltu â deiliad y drwydded",
   "important_info_contact_error_email": "Rhowch gyfeiriad e-bost yn y fformat cywir",
@@ -771,6 +772,10 @@
   "role_required_body_1": "You were successfully signed in but you do not have the correct role assigned to access the telesales application.",
   "role_required_body_2": "Please contact your Microsoft Dynamics administrator to request access.",
   "role_required_title": "Role required",
+  "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
+  "rp_cancel_confirm_title": "Cancel your recurring card payment agreement - confirm",
+  "rp_cancel_details_title": "Cancel your recurring card payment agreement - details",
+  "rp_cancel_identify_title": "Cancel your recurring card payment agreement - identify",
   "save_changes": "Cadw newidiadau",
   "server_error_title_suffix": " - GOV.UK",
   "server_error_bulletpoint_1": "Os ydych chi wedi gofyn am hysbysiad dros e-bost neu neges destun, dylai’r hysbysiad gyrraedd o fewn 3 awr os bydd y taliad wedi cael ei gymryd.",

package/src/locales/en.json

@@ -350,6 +350,7 @@
   "identify_title": "Renew your rod fishing licence?",
   "important_info_contact_content_salmon": "We will use this email or mobile number to send a reminder to report a catch return. We may also send other important information, such as changes affecting the licence or the fishing byelaws.",
   "important_info_contact_content_not_salmon": "We may also use this email or mobile number to send important information, such as changes affecting the licence or the fishing byelaws.",
+  "important_info_contact_content_junior_12_months": "We will also use this email or mobile number to send renewal reminders and other important updates, like changes to rod fishing byelaws.",
   "important_info_contact_error_choose_short": "Choose where we should send the fishing licence",
   "important_info_contact_error_choose": "Choose how we should contact the licence holder",
   "important_info_contact_error_email": "Enter an email address in the correct format",
@@ -771,6 +772,10 @@
   "role_required_body_1": "You were successfully signed in but you do not have the correct role assigned to access the telesales application.",
   "role_required_body_2": "Please contact your Microsoft Dynamics administrator to request access.",
   "role_required_title": "Role required",
+  "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
+  "rp_cancel_confirm_title": "Cancel your recurring card payment agreement - confirm",
+  "rp_cancel_details_title": "Cancel your recurring card payment agreement - details",
+  "rp_cancel_identify_title": "Cancel your recurring card payment agreement - identify",
   "save_changes": "Save changes",
   "server_error_title_suffix": " - GOV.UK",
   "server_error_bulletpoint_1": "If you have requested an email or text notification, this should be delivered in 3 hours if a payment has been taken.",

package/src/pages/contact/contact/__tests__/route.spec.js

@@ -56,7 +56,8 @@ describe('name > route', () => {
     important_info_contact_content_salmon: 'Salmon content',
     important_info_contact_content_not_salmon: 'Not salmon content',
     licence_confirm_method_where_title_you: 'Where send you',
-    licence_confirm_method_where_title_other: 'Where send other'
+    licence_confirm_method_where_title_other: 'Where send other',
+    important_info_contact_content_junior_12_months: 'Junior content'
   })
 
   describe('getData', () => {
@@ -149,10 +150,10 @@ describe('name > route', () => {
       [true, 'Trout and coarse', '8D', false, 'Not salmon content'],
       [false, 'Salmon and sea trout', '1D', false, 'Salmon content'],
       [false, 'Trout and coarse', '1D', false, 'Not salmon content'],
-      [true, 'Salmon and sea trout', '12M', true, 'Salmon content'],
-      [true, 'Trout and coarse', '12M', true, 'Not salmon content'],
-      [false, 'Salmon and sea trout', '12M', true, 'Salmon content'],
-      [false, 'Trout and coarse', '12M', true, 'Not salmon content']
+      [true, 'Salmon and sea trout', '12M', true, 'Junior content'],
+      [true, 'Trout and coarse', '12M', true, 'Junior content'],
+      [false, 'Salmon and sea trout', '12M', true, 'Junior content'],
+      [false, 'Trout and coarse', '12M', true, 'Junior content']
     ])(
       'content has correct value depending on isLicenceForYou is %s, licenceType is %s, licenceLength is %s and junior is %s',
       async (isLicenceForYou, licenceType, licenceLength, junior, expected) => {

package/src/pages/contact/contact/route.js

@@ -13,8 +13,7 @@ export const getData = async request => {
   const permission = await request.cache().helpers.transaction.getCurrentPermission()
   const mssgs = request.i18n.getCatalog()
 
-  // We need to have set the licence length, dob and start date here to determining the contact
-  // messaging
+  // We need to have set the licence length, dob and start date here to determine the contact messaging
   if (!permission.licensee.birthDate) {
     throw new GetDataRedirect(DATE_OF_BIRTH.uri)
   }
@@ -29,11 +28,12 @@ export const getData = async request => {
 
   const junior = hasJunior(permission)
   const twelveMonthNonJuniorLicence = !junior && permission.licenceLength === '12M'
+  const twelveMonthJuniorLicence = junior && permission.licenceLength === '12M'
 
   return {
     title: getTitle(permission, mssgs, twelveMonthNonJuniorLicence),
     postHint: getPostHint(permission, mssgs),
-    content: getContent(permission, mssgs, twelveMonthNonJuniorLicence),
+    content: getContent(permission, mssgs, twelveMonthNonJuniorLicence, twelveMonthJuniorLicence),
     emailConfirmation: permission.licensee.preferredMethodOfConfirmation === HOW_CONTACTED.email,
     emailText: getEmailText(permission, mssgs, twelveMonthNonJuniorLicence),
     mobileConfirmation: permission.licensee.preferredMethodOfConfirmation === HOW_CONTACTED.text,
@@ -41,7 +41,8 @@ export const getData = async request => {
     licensee: permission.licensee,
     isPhysical: isPhysical(permission),
     errorMessage: getErrorText(mssgs, twelveMonthNonJuniorLicence),
-    twelveMonthNonJuniorLicence
+    twelveMonthNonJuniorLicence,
+    twelveMonthJuniorLicence
   }
 }
 
@@ -55,8 +56,9 @@ const getTitle = (permission, messages, twelveMonthNonJuniorLicence) => {
 const getPostHint = (permission, messages) =>
   permission.isLicenceForYou ? messages.important_info_contact_post_hint_you : messages.important_info_contact_post_hint_other
 
-const getContent = (permission, messages, twelveMonthNonJuniorLicence) => {
+const getContent = (permission, messages, twelveMonthNonJuniorLicence, twelveMonthJuniorLicence) => {
   const isSalmonLicense = permission.licenceType === 'Salmon and sea trout'
+
   if (twelveMonthNonJuniorLicence) {
     if (isSalmonLicense) {
       return permission.isLicenceForYou
@@ -67,6 +69,11 @@ const getContent = (permission, messages, twelveMonthNonJuniorLicence) => {
       ? messages.important_info_contact_post_not_salmon_you
       : messages.important_info_contact_post_not_salmon_other
   }
+
+  if (twelveMonthJuniorLicence) {
+    return messages.important_info_contact_content_junior_12_months
+  }
+
   return isSalmonLicense ? messages.important_info_contact_content_salmon : messages.important_info_contact_content_not_salmon
 }
 

package/src/pages/recurring-payments/cancel/complete/__tests__/route.test.js

@@ -0,0 +1,80 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_COMPLETE } from '../../../../../uri.js'
+
+require('../route.js')
+// eslint-disable-next-line no-unused-vars
+const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
+
+jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_COMPLETE: { page: Symbol('cancel-rp-complete-page'), uri: Symbol('cancel-rp-complete-uri') }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+
+describe('pageRoute receives expected arguments', () => {
+  it('passes CANCEL_RP_COMPLETE.page as the view name', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        CANCEL_RP_COMPLETE.page,
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes CANCEL_RP_COMPLETE.uri as the path', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        CANCEL_RP_COMPLETE.uri,
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function as the validator', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to generate redirect location on completion', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to get the page data', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function)
+      )
+    })
+  })
+})

package/src/pages/recurring-payments/cancel/complete/cancel-rp-complete.njk

@@ -0,0 +1,16 @@
+{% extends "layout.njk" %}
+
+{% from "page-title.njk" import pageTitle %}
+
+{% set title = mssgs.rp_cancel_complete_title %}
+{% block pageTitle %}{{ pageTitle(title, error, mssgs) }}{% endblock %}
+
+{% block content %}
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <form method="post" class="govuk-!-margin-bottom-6">
+          {{ csrf() }}
+        </form>
+    </div>
+</div>
+{% endblock %}

package/src/pages/recurring-payments/cancel/complete/route.js

@@ -0,0 +1,10 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { CANCEL_RP_COMPLETE } from '../../../../uri.js'
+
+export default pageRoute(
+  CANCEL_RP_COMPLETE.page,
+  CANCEL_RP_COMPLETE.uri,
+  () => {},
+  () => {},
+  () => {}
+)

package/src/pages/recurring-payments/cancel/confirm/__tests__/route.test.js

@@ -0,0 +1,106 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE } from '../../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+
+require('../route.js')
+// eslint-disable-next-line no-unused-vars
+const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
+
+jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_CONFIRM: { page: Symbol('cancel-rp-confirm-page'), uri: Symbol('cancel-rp-confirm-uri') },
+  CANCEL_RP_COMPLETE: { uri: Symbol('cancel-rp-complete-uri') }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+
+describe('pageRoute receives expected arguments', () => {
+  it('passes CANCEL_RP_CONFIRM.page as the view name', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        CANCEL_RP_CONFIRM.page,
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes CANCEL_RP_CONFIRM.uri as the path', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        CANCEL_RP_CONFIRM.uri,
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function as the validator', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to generate redirect location on completion', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to get the page data', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function)
+      )
+    })
+  })
+})
+
+describe('completion function', () => {
+  beforeEach(jest.clearAllMocks)
+
+  it('calls addLanguageCodeToUri with request object', () => {
+    const sampleRequest = Symbol('sample request')
+    completion(sampleRequest)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_AUTHENTICATE uri', () => {
+    completion({})
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_COMPLETE.uri)
+  })
+
+  it('returns the value of addLanguageCodeToUri', () => {
+    const expectedCompletionRedirect = Symbol('expected-completion-redirect')
+    addLanguageCodeToUri.mockReturnValueOnce(expectedCompletionRedirect)
+
+    const completionRedirect = completion({})
+
+    expect(completionRedirect).toBe(expectedCompletionRedirect)
+  })
+})

package/src/pages/recurring-payments/cancel/confirm/cancel-rp-confirm.njk

@@ -0,0 +1,24 @@
+{% extends "layout.njk" %}
+
+{% from "button/macro.njk" import govukButton %}
+{% from "page-title.njk" import pageTitle %}
+
+{% set title = mssgs.rp_cancel_confirm_title %}
+{% block pageTitle %}{{ pageTitle(title, error, mssgs) }}{% endblock %}
+
+{% block content %}
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <form method="post" class="govuk-!-margin-bottom-6">
+          {{ govukButton({
+            attributes: { id: 'continue' },
+            preventDoubleClick: true,
+            name: "continue",
+            text: mssgs.continue,
+            classes: "govuk-!-margin-top-1"
+          }) }}
+          {{ csrf() }}
+        </form>
+    </div>
+</div>
+{% endblock %}

package/src/pages/recurring-payments/cancel/confirm/route.js

@@ -0,0 +1,11 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE } from '../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
+
+export default pageRoute(
+  CANCEL_RP_CONFIRM.page,
+  CANCEL_RP_CONFIRM.uri,
+  () => {},
+  request => addLanguageCodeToUri(request, CANCEL_RP_COMPLETE.uri),
+  () => {}
+)

package/src/pages/recurring-payments/cancel/details/__tests__/route.test.js

@@ -0,0 +1,106 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_DETAILS, CANCEL_RP_CONFIRM } from '../../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+
+require('../route.js')
+// eslint-disable-next-line no-unused-vars
+const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
+
+jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_DETAILS: { page: Symbol('cancel-rp-details-page'), uri: Symbol('cancel-rp-details-uri') },
+  CANCEL_RP_CONFIRM: { uri: Symbol('cancel-rp-confirm-uri') }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+
+describe('pageRoute receives expected arguments', () => {
+  it('passes CANCEL_RP_DETAILS.page as the view name', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        CANCEL_RP_DETAILS.page,
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes CANCEL_RP_DETAILS.uri as the path', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        CANCEL_RP_DETAILS.uri,
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function as the validator', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to generate redirect location on completion', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to get the page data', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function)
+      )
+    })
+  })
+})
+
+describe('completion function', () => {
+  beforeEach(jest.clearAllMocks)
+
+  it('calls addLanguageCodeToUri with request object', () => {
+    const sampleRequest = Symbol('sample request')
+    completion(sampleRequest)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_AUTHENTICATE uri', () => {
+    completion({})
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_CONFIRM.uri)
+  })
+
+  it('returns the value of addLanguageCodeToUri', () => {
+    const expectedCompletionRedirect = Symbol('expected-completion-redirect')
+    addLanguageCodeToUri.mockReturnValueOnce(expectedCompletionRedirect)
+
+    const completionRedirect = completion({})
+
+    expect(completionRedirect).toBe(expectedCompletionRedirect)
+  })
+})

package/src/pages/recurring-payments/cancel/details/cancel-rp-details.njk

@@ -0,0 +1,24 @@
+{% extends "layout.njk" %}
+
+{% from "button/macro.njk" import govukButton %}
+{% from "page-title.njk" import pageTitle %}
+
+{% set title = mssgs.rp_cancel_details_title %}
+{% block pageTitle %}{{ pageTitle(title, error, mssgs) }}{% endblock %}
+
+{% block content %}
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <form method="post" class="govuk-!-margin-bottom-6">
+          {{ govukButton({
+            attributes: { id: 'continue' },
+            preventDoubleClick: true,
+            name: "continue",
+            text: mssgs.continue,
+            classes: "govuk-!-margin-top-1"
+          }) }}
+          {{ csrf() }}
+        </form>
+    </div>
+</div>
+{% endblock %}

package/src/pages/recurring-payments/cancel/details/route.js

@@ -0,0 +1,11 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { CANCEL_RP_DETAILS, CANCEL_RP_CONFIRM } from '../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
+
+export default pageRoute(
+  CANCEL_RP_DETAILS.page,
+  CANCEL_RP_DETAILS.uri,
+  () => {},
+  request => addLanguageCodeToUri(request, CANCEL_RP_CONFIRM.uri),
+  () => {}
+)

package/src/pages/recurring-payments/cancel/identify/__tests__/route.test.js

@@ -0,0 +1,106 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_AUTHENTICATE, CANCEL_RP_IDENTIFY } from '../../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+
+require('../route.js')
+// eslint-disable-next-line no-unused-vars
+const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
+
+jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_IDENTIFY: { page: Symbol('cancel-rp-identify'), uri: Symbol('cancel-rp-identify-uri') },
+  CANCEL_RP_AUTHENTICATE: { uri: Symbol('cancel-rp-authenticate-uri') }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+
+describe('pageRoute receives expected arguments', () => {
+  it('passes CANCEL_RP_IDENTIFY.page as the view name', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        CANCEL_RP_IDENTIFY.page,
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes CANCEL_RP_IDENTIFY.uri as the path', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        CANCEL_RP_IDENTIFY.uri,
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function as the validator', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to generate redirect location on completion', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to get the page data', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function)
+      )
+    })
+  })
+})
+
+describe('completion function', () => {
+  beforeEach(jest.clearAllMocks)
+
+  it('calls addLanguageCodeToUri with request', () => {
+    const sampleRequest = Symbol('sample request')
+    completion(sampleRequest)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_AUTHENTICATE uri', () => {
+    completion({})
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_AUTHENTICATE.uri)
+  })
+
+  it('returns the value of addLanguageCodeToUri', () => {
+    const expectedCompletionRedirect = Symbol('expected-completion-redirect')
+    addLanguageCodeToUri.mockReturnValueOnce(expectedCompletionRedirect)
+
+    const completionRedirect = completion({})
+
+    expect(completionRedirect).toBe(expectedCompletionRedirect)
+  })
+})

package/src/pages/recurring-payments/cancel/identify/cancel-rp-identify.njk

@@ -0,0 +1,24 @@
+{% extends "layout.njk" %}
+
+{% from "button/macro.njk" import govukButton %}
+{% from "page-title.njk" import pageTitle %}
+
+{% set title = mssgs.rp_cancel_identify_title %}
+{% block pageTitle %}{{ pageTitle(title, error, mssgs) }}{% endblock %}
+
+{% block content %}
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <form method="post" class="govuk-!-margin-bottom-6">
+          {{ govukButton({
+            attributes: { id: 'continue' },
+            preventDoubleClick: true,
+            name: "continue",
+            text: mssgs.continue,
+            classes: "govuk-!-margin-top-1"
+          }) }}
+          {{ csrf() }}
+        </form>
+    </div>
+</div>
+{% endblock %}

package/src/pages/recurring-payments/cancel/identify/route.js

@@ -0,0 +1,13 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { CANCEL_RP_AUTHENTICATE, CANCEL_RP_IDENTIFY } from '../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
+
+export default pageRoute(
+  CANCEL_RP_IDENTIFY.page,
+  CANCEL_RP_IDENTIFY.uri,
+  () => {},
+  request => {
+    return addLanguageCodeToUri(request, CANCEL_RP_AUTHENTICATE.uri)
+  },
+  () => {}
+)

package/src/routes/__tests__/__snapshots__/telesales-routes.spec.js.snap

@@ -0,0 +1,185 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`cancellation route journey behaves as expected adds the cancellation route journey if SHOW_CANCELLATION_JOURNEY is set to true 1`] = `
+Object {
+  "default": Array [
+    Object {
+      "handler": [Function],
+      "method": Array [
+        "POST",
+      ],
+      "options": Object {
+        "auth": false,
+        "plugins": Object {
+          "crumb": false,
+        },
+      },
+      "path": "/oidc/signin",
+    },
+    Object {
+      "handler": [Function],
+      "method": Array [
+        "GET",
+      ],
+      "options": Object {
+        "auth": false,
+      },
+      "path": "/oidc/account-disabled",
+    },
+    Object {
+      "handler": [Function],
+      "method": Array [
+        "GET",
+      ],
+      "options": Object {
+        "auth": false,
+      },
+      "path": "/oidc/role-required",
+    },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/cancel-recurring-payment/identify",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "path": "/buy/cancel-recurring-payment/identify",
+    },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/cancel-recurring-payment/details",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "path": "/buy/cancel-recurring-payment/details",
+    },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/cancel-recurring-payment/confirm",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "path": "/buy/cancel-recurring-payment/confirm",
+    },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/cancel-recurring-payment/complete",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "path": "/buy/cancel-recurring-payment/complete",
+    },
+  ],
+}
+`;
+
+exports[`cancellation route journey behaves as expected omits the cancellation route journey if SHOW_CANCELLATION_JOURNEY is not present 1`] = `
+Object {
+  "default": Array [
+    Object {
+      "handler": [Function],
+      "method": Array [
+        "POST",
+      ],
+      "options": Object {
+        "auth": false,
+        "plugins": Object {
+          "crumb": false,
+        },
+      },
+      "path": "/oidc/signin",
+    },
+    Object {
+      "handler": [Function],
+      "method": Array [
+        "GET",
+      ],
+      "options": Object {
+        "auth": false,
+      },
+      "path": "/oidc/account-disabled",
+    },
+    Object {
+      "handler": [Function],
+      "method": Array [
+        "GET",
+      ],
+      "options": Object {
+        "auth": false,
+      },
+      "path": "/oidc/role-required",
+    },
+  ],
+}
+`;
+
+exports[`cancellation route journey behaves as expected omits the cancellation route journey if SHOW_CANCELLATION_JOURNEY is set to false 1`] = `
+Object {
+  "default": Array [
+    Object {
+      "handler": [Function],
+      "method": Array [
+        "POST",
+      ],
+      "options": Object {
+        "auth": false,
+        "plugins": Object {
+          "crumb": false,
+        },
+      },
+      "path": "/oidc/signin",
+    },
+    Object {
+      "handler": [Function],
+      "method": Array [
+        "GET",
+      ],
+      "options": Object {
+        "auth": false,
+      },
+      "path": "/oidc/account-disabled",
+    },
+    Object {
+      "handler": [Function],
+      "method": Array [
+        "GET",
+      ],
+      "options": Object {
+        "auth": false,
+      },
+      "path": "/oidc/role-required",
+    },
+  ],
+}
+`;

package/src/routes/__tests__/telesales-routes.spec.js

@@ -1,4 +1,5 @@
 import { setupEnvironment } from '../../__mocks__/openid-client.js'
+
 jest.mock('@defra-fish/connectors-lib')
 
 let TestUtils = null
@@ -43,3 +44,31 @@ describe('Telesales route handlers', () => {
     expect(data.statusCode).toBe(200)
   })
 })
+
+describe('cancellation route journey behaves as expected', () => {
+  beforeEach(jest.clearAllMocks)
+
+  it('adds the cancellation route journey if SHOW_CANCELLATION_JOURNEY is set to true', () => {
+    process.env.SHOW_CANCELLATION_JOURNEY = 'true'
+    jest.isolateModules(() => {
+      const telesalesRoutes = require('../telesales-routes.js')
+      expect(telesalesRoutes).toMatchSnapshot()
+    })
+  })
+
+  it('omits the cancellation route journey if SHOW_CANCELLATION_JOURNEY is set to false', () => {
+    process.env.SHOW_CANCELLATION_JOURNEY = 'false'
+    jest.isolateModules(() => {
+      const telesalesRoutes = require('../telesales-routes.js')
+      expect(telesalesRoutes).toMatchSnapshot()
+    })
+  })
+
+  it('omits the cancellation route journey if SHOW_CANCELLATION_JOURNEY is not present', () => {
+    delete process.env.SHOW_CANCELLATION_JOURNEY
+    jest.isolateModules(() => {
+      const telesalesRoutes = require('../telesales-routes.js')
+      expect(telesalesRoutes).toMatchSnapshot()
+    })
+  })
+})

package/src/routes/journey-definition.js

@@ -29,7 +29,11 @@ import {
   RENEWAL_START_DATE,
   CHOOSE_PAYMENT,
   SET_UP_PAYMENT,
-  LICENCE_NOT_FOUND
+  LICENCE_NOT_FOUND,
+  CANCEL_RP_IDENTIFY,
+  CANCEL_RP_DETAILS,
+  CANCEL_RP_CONFIRM,
+  CANCEL_RP_COMPLETE
 } from '../uri.js'
 
 import { CommonResults, CONTACT_SUMMARY_SEEN, ShowDigitalLicencePages } from '../constants.js'
@@ -426,5 +430,31 @@ export default [
   {
     current: RENEWAL_START_DATE,
     backLink: LICENCE_SUMMARY.uri
+  },
+
+  // cancel RP journey
+  {
+    current: CANCEL_RP_IDENTIFY,
+    next: {
+      [CommonResults.OK]: {
+        page: CANCEL_RP_DETAILS
+      }
+    }
+  },
+  {
+    current: CANCEL_RP_DETAILS,
+    next: {
+      [CommonResults.OK]: {
+        page: CANCEL_RP_CONFIRM
+      }
+    }
+  },
+  {
+    current: CANCEL_RP_CONFIRM,
+    next: {
+      [CommonResults.OK]: {
+        page: CANCEL_RP_COMPLETE
+      }
+    }
   }
 ]

package/src/routes/misc-routes.js

@@ -13,7 +13,8 @@ import {
   OS_TERMS,
   PROCESS_ANALYTICS_PREFERENCES,
   NEW_PRICES,
-  RECURRING_TERMS_CONDITIONS
+  RECURRING_TERMS_CONDITIONS,
+  CANCEL_RP_AUTHENTICATE
 } from '../uri.js'
 
 import {
@@ -32,6 +33,7 @@ import authenticationHandler from '../handlers/authentication-handler.js'
 import { addLanguageCodeToUri } from '../processors/uri-helper.js'
 import analytics, { checkAnalyticsCookiesPage } from '../handlers/analytics-handler.js'
 import { welshEnabledAndApplied } from '../processors/page-language-helper.js'
+import cancelRPAuthenticationhander from '../handlers/cancel-rp-authentication-handler.js'
 
 const gtmContainerIdOrNull = () => process.env.GTM_CONTAINER_ID || false
 
@@ -221,6 +223,11 @@ export default [
       })
     }
   },
+  {
+    method: 'GET',
+    path: CANCEL_RP_AUTHENTICATE.uri,
+    handler: cancelRPAuthenticationhander
+  },
   simpleView(ACCESSIBILITY_STATEMENT),
   simpleView(REFUND_POLICY),
   simpleView(OS_TERMS)

package/src/routes/telesales-routes.js

@@ -1,7 +1,11 @@
 import { OIDC_SIGNIN, OIDC_ACCOUNT_DISABLED, OIDC_ROLE_REQUIRED, CONTROLLER } from '../uri.js'
 import { signIn } from '../handlers/oidc-handler.js'
+import cancelRPIdentify from '../pages/recurring-payments/cancel/identify/route.js'
+import cancelRPDetails from '../pages/recurring-payments/cancel/details/route.js'
+import cancelRPConfirm from '../pages/recurring-payments/cancel/confirm/route.js'
+import cancelRPComplete from '../pages/recurring-payments/cancel/complete/route.js'
 
-export default [
+const telesalesRoutes = [
   {
     method: ['POST'],
     path: OIDC_SIGNIN.uri,
@@ -26,3 +30,11 @@ export default [
     options: { auth: false }
   }
 ]
+
+if (process.env.SHOW_CANCELLATION_JOURNEY === 'true') {
+  telesalesRoutes.push(...cancelRPIdentify)
+  telesalesRoutes.push(...cancelRPDetails)
+  telesalesRoutes.push(...cancelRPConfirm)
+  telesalesRoutes.push(...cancelRPComplete)
+}
+export default telesalesRoutes

package/src/uri.js

@@ -62,6 +62,12 @@ export const ERROR_TESTING = { uri: '/buy/throw-error' }
 export const CHOOSE_PAYMENT = { uri: '/buy/choose-payment', page: 'choose-payment' }
 export const SET_UP_PAYMENT = { uri: '/buy/set-up-recurring-card-payment', page: 'set-up-payment' }
 
+export const CANCEL_RP_IDENTIFY = { uri: '/buy/cancel-recurring-payment/identify', page: 'cancel-rp-identify' }
+export const CANCEL_RP_AUTHENTICATE = { uri: '/buy/cancel-recurring-payment/authenticate' }
+export const CANCEL_RP_DETAILS = { uri: '/buy/cancel-recurring-payment/details', page: 'cancel-rp-details' }
+export const CANCEL_RP_CONFIRM = { uri: '/buy/cancel-recurring-payment/confirm', page: 'cancel-rp-confirm' }
+export const CANCEL_RP_COMPLETE = { uri: '/buy/cancel-recurring-payment/complete', page: 'cancel-rp-complete' }
+
 /**
  * These are informational static pages
  */