@defra-fish/gafl-webapp-service 1.22.0-rc.21 → 1.22.0-rc.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.22.0-rc.21",
+  "version": "1.22.0-rc.25",
   "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.22.0-rc.21",
-    "@defra-fish/connectors-lib": "1.22.0-rc.21",
+    "@defra-fish/business-rules-lib": "1.22.0-rc.25",
+    "@defra-fish/connectors-lib": "1.22.0-rc.25",
     "@defra/hapi-gapi": "^1.1.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -76,5 +76,5 @@
     "gulp-sourcemaps": "^3.0.0",
     "node-sass": "^6.0.0"
   },
-  "gitHead": "ccd35f787ff3e22bf4ebfacabaa2896a0a824031"
+  "gitHead": "9fd368085a0574ed74a88ba476a2bff69e8554e2"
 }

package/src/handlers/__tests__/url-handler.spec.js

@@ -0,0 +1,79 @@
+import { UTM, QUERYSTRING_LICENCE_KEY } from '../../constants'
+import urlHandler from '../url-handler'
+import { ATTRIBUTION, IDENTIFY } from '../../uri'
+
+jest.mock('../../constants', () => ({
+  UTM: {
+    CAMPAIGN: 'utmcampaign',
+    MEDIUM: 'utmmedium',
+    CONTENT: 'utmcontent',
+    SOURCE: 'utmsource',
+    TERM: 'utmterm'
+  }
+}))
+
+jest.mock('../../uri', () => ({
+  ATTRIBUTION: { uri: '/attribution-url' },
+  IDENTIFY: { uri: '/renewal-url' }
+}))
+
+describe('The url handler', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('returns identify if no licence key', async () => {
+    const query = {
+      [UTM.CAMPAIGN]: 'renewals',
+      [QUERYSTRING_LICENCE_KEY]: null
+    }
+    const responseToolkit = generateResponseToolkitMock()
+    await urlHandler(generateRequestMock(query), responseToolkit)
+    expect(responseToolkit.redirect).toHaveBeenCalledWith(IDENTIFY.uri)
+  })
+
+  it.each([
+    ['B2F11U'],
+    ['AH56F6'],
+    ['GH330P']
+  ])('6 digit reference number exists and returns ATTRIBUTION', async licenceKey => {
+    const query = {
+      [UTM.CAMPAIGN]: 'renewals',
+      [QUERYSTRING_LICENCE_KEY]: licenceKey
+    }
+    const responseToolkit = generateResponseToolkitMock()
+    await urlHandler(generateRequestMock(query), responseToolkit)
+    const regExMatch = new RegExp(`^${ATTRIBUTION.uri}/${licenceKey}$`)
+    expect(responseToolkit.redirect).toHaveBeenCalledWith(expect.stringMatching(regExMatch))
+  })
+
+  it.each([
+    ['B2F11UH5D'],
+    ['AH56'],
+    ['GH330PPTD']
+  ])('reference number is not 6 digits and returns back to IDENTIFY', async licenceKey => {
+    const query = {
+      [UTM.CAMPAIGN]: 'renewals',
+      [QUERYSTRING_LICENCE_KEY]: licenceKey
+    }
+    const responseToolkit = generateResponseToolkitMock()
+    await urlHandler(generateRequestMock(query), responseToolkit)
+    expect(responseToolkit.redirect).toHaveBeenCalledWith(IDENTIFY.uri)
+  })
+
+  const generateRequestMock = (query, status = {}) => ({
+    query,
+    cache: jest.fn(() => ({
+      helpers: {
+        status: {
+          get: jest.fn(() => status),
+          set: jest.fn()
+        }
+      }
+    }))
+  })
+
+  const generateResponseToolkitMock = () => ({
+    redirect: jest.fn()
+  })
+})

package/src/handlers/url-handler.js

@@ -0,0 +1,21 @@
+import { QUERYSTRING_LICENCE_KEY } from '../constants.js'
+import { initialiseAnalyticsSessionData } from '../processors/analytics.js'
+import { IDENTIFY, ATTRIBUTION } from '../uri.js'
+
+/**
+ * Attribution route handler
+ * @param request
+ * @param h
+ * @returns {Promise}
+ */
+export default async (request, h) => {
+  await initialiseAnalyticsSessionData(request)
+  if (request.query[QUERYSTRING_LICENCE_KEY]) {
+    const refNumber = request.query[QUERYSTRING_LICENCE_KEY]
+    const sixDigit = /^[A-Za-z0-9]{6}$/.test(refNumber)
+    if (sixDigit) {
+      return h.redirect(`${ATTRIBUTION.uri}/${refNumber}`)
+    }
+  }
+  return h.redirect(IDENTIFY.uri)
+}

package/src/locales/cy.json

@@ -129,7 +129,7 @@
   "cookie_banner_preamble": "Mae'r wefan hon ond yn storio'r cwcis sy'n hanfodol i wneud iddi weithio. Darllenwch fwy am ",
   "cookies_body_how_we_manage_1": "Find out ",
   "cookies_body_how_we_manage_link": "how to manage cookies on the Information Commissioners' website",
-  "cookies_body_small_files": "When you use the Get a Fishing Licence service, we put small files known as 'cookies' onto your computer.",
+  "cookies_body_small_files": "When you use the Get a Fishing Licence service, we put small files known as cookies onto your computer.",
   "cookies_body_used_for_bulletpoint_1": "remember what notifications you've seen so that you're not shown them more than once",
   "cookies_body_used_for_bulletpoint_2": "to protect the service against malicious activity",
   "cookies_body_used_for_bulletpoint_3": "to ensure that you have a consistent experience when we make changes to the service",

package/src/locales/en.json

@@ -130,7 +130,7 @@
   "cookie_banner_preamble": "This website only stores the cookies that are essential to make it work. Read more about ",
   "cookies_body_how_we_manage_1": "Find out ",
   "cookies_body_how_we_manage_link": "how to manage cookies on the Information Commissioners' website",
-  "cookies_body_small_files": "When you use the Get a Fishing Licence service, we put small files known as 'cookies' onto your computer.",
+  "cookies_body_small_files": "When you use the Get a Fishing Licence service, we put small files known as cookies onto your computer.",
   "cookies_body_used_for_bulletpoint_1": "remember what notifications you've seen so that you're not shown them more than once",
   "cookies_body_used_for_bulletpoint_2": "to protect the service against malicious activity",
   "cookies_body_used_for_bulletpoint_3": "to ensure that you have a consistent experience when we make changes to the service",