@dwp/govuk-casa 8.16.2 → 8.16.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwp/govuk-casa",
-  "version": "8.16.2",
+  "version": "8.16.3",
   "description": "A framework for building GOVUK Collect-And-Submit-Applications",
   "repository": {
     "type": "git",
@@ -20,8 +20,8 @@
     "views/**/*"
   ],
   "engines": {
-    "node": "^18.0.0 || ^20.0.0",
-    "npm": "^8.0.0 || ^9.0.0 || ^10.0.0"
+    "node": ">=18 <=22",
+    "npm": ">=8 <=10"
   },
   "scripts": {
     "pipeline": "npm run coverage && npm run lint",
@@ -31,7 +31,7 @@
     "test:e2e": "spiderplan --worker-init ./tests/e2e/worker-init.js --language en ./tests/e2e/personas/**/*.yaml",
     "test:dast": "spiderplan --worker-init ./tests/e2e/worker-init.js --language en ./tests/e2e/personas/**/traversal.yaml --workers 1 --zap --zap-proxy 'http://localhost:8080/' --zap-target-hostname 'host.docker.internal'",
     "test:dast:report": "curl -s --header 'X-ZAP-Api-Key: secret' http://localhost:8080/OTHER/core/other/htmlreport > gl-dast-report.html",
-    "test:dast:setup": "docker run --rm --name casa-dast -d -u zap -p 8080:8080 -i owasp/zap2docker-stable zap.sh -daemon -host 0.0.0.0 -port 8080 -config api.addrs.addr.name=\".*\" -config api.addrs.addr.regex=true -config api.key=secret; npm run test:dast:ready-check",
+    "test:dast:setup": "docker run --rm --name casa-dast -d -u zap -p 8080:8080 -i ghcr.io/zaproxy/zaproxy:bare@sha256:24a4037a3e8607d9fedbd75e4a7f1336d11998e1c331aab9991ef074f5de4b22 zap.sh -daemon -host 0.0.0.0 -port 8080 -config api.addrs.addr.name=\".*\" -config api.addrs.addr.regex=true -config api.key=secret -notel; npm run test:dast:ready-check",
     "test:dast:ready-check": "while [ \"$(curl -Is -o /dev/null -w %{response_code} http://localhost:8080/)\" -ne \"200\" ]; do sleep 1; echo 'Waiting for ZAP to start ...'; done",
     "test:dast:teardown": "docker stop casa-dast",
     "lint": "eslint .",
@@ -52,14 +52,14 @@
     "bytes": "3.1.2",
     "cookie-parser": "1.4.7",
     "csrf-sync": "4.0.3",
-    "debug": "4.3.7",
+    "debug": "4.4.0",
     "deepmerge": "4.3.1",
-    "express": "4.21.1",
+    "express": "4.21.2",
     "express-session": "1.18.1",
     "govuk-frontend": "4.9.0",
-    "helmet": "7.1.0",
-    "i18next": "23.15.2",
-    "i18next-http-middleware": "3.6.0",
+    "helmet": "8.0.0",
+    "i18next": "24.2.0",
+    "i18next-http-middleware": "3.7.0",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
     "luxon": "3.5.0",
@@ -68,37 +68,34 @@
     "validator": "13.12.0"
   },
   "devDependencies": {
-    "@babel/core": "7.24.9",
-    "@babel/eslint-parser": "7.24.8",
-    "@babel/preset-env": "7.24.8",
-    "@ckeditor/jsdoc-plugins": "39.6.3",
-    "@commitlint/config-conventional": "18.4.3",
-    "@dwp/casa-spiderplan": "3.1.3",
-    "@dwp/casa-spiderplan-a11y-plugin": "0.1.14",
-    "@dwp/casa-spiderplan-zap-plugin": "0.1.10",
-    "@dwp/eslint-config-base": "7.0.0",
+    "@ckeditor/jsdoc-plugins": "43.0.1",
+    "@commitlint/config-conventional": "19.6.0",
+    "@dwp/casa-spiderplan": "4.1.1",
+    "@dwp/casa-spiderplan-a11y-plugin": "1.0.2",
+    "@dwp/casa-spiderplan-zap-plugin": "1.0.2",
+    "@dwp/eslint-config-base": "9.0.2",
     "@types/express": "4.17.21",
-    "@types/node": "20.14.11",
+    "@types/node": "22.10.2",
     "@types/nunjucks": "3.2.6",
-    "c8": "8.0.1",
-    "chai": "4.3.10",
-    "cheerio": "1.0.0-rc.12",
-    "commitlint": "18.4.3",
+    "c8": "10.1.3",
+    "chai": "5.1.2",
+    "cheerio": "1.0.0",
+    "commitlint": "19.6.1",
     "docdash": "2.0.2",
-    "eslint": "8.57.0",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-jsdoc": "46.9.1",
+    "eslint": "9.17.0",
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-jsdoc": "50.6.1",
     "eslint-plugin-no-unsafe-regex": "1.0.0",
-    "eslint-plugin-security": "1.7.1",
-    "eslint-plugin-sonarjs": "0.25.1",
-    "fast-check": "3.20.0",
-    "jsdoc": "4.0.3",
+    "eslint-plugin-security": "3.0.1",
+    "eslint-plugin-sonarjs": "3.0.1",
+    "fast-check": "3.23.2",
+    "jsdoc": "4.0.4",
     "jsdoc-tsimport-plugin": "1.0.5",
-    "mocha": "10.6.0",
-    "sass": "1.77.8",
-    "sinon": "17.0.1",
-    "sinon-chai": "3.7.0",
-    "supertest": "6.3.4",
-    "typescript": "5.5.3"
+    "mocha": "11.0.1",
+    "sass": "1.83.0",
+    "sinon": "19.0.2",
+    "sinon-chai": "4.0.0",
+    "supertest": "7.0.0",
+    "typescript": "5.7.2"
   }
 }

package/src/casa.js

@@ -1,17 +1,17 @@
 // NOTE: Any changes made here must be reflected in `scripts/esm-wrapper.js`
-import configure from './lib/configure.js';
-import validators from './lib/validators/index.js';
-import field from './lib/field.js';
-import Plan from './lib/Plan.js';
-import JourneyContext from './lib/JourneyContext.js';
-import ValidatorFactory from './lib/ValidatorFactory.js';
-import ValidationError from './lib/ValidationError.js';
-import MutableRouter from './lib/MutableRouter.js';
-import waypointUrl from './lib/waypoint-url.js';
-import endSession from './lib/end-session.js';
-import * as nunjucksFilters from './lib/nunjucks-filters.js';
-import * as constants from './lib/constants.js';
-import * as contextIdGenerators from './lib/context-id-generators.js';
+import configure from "./lib/configure.js";
+import validators from "./lib/validators/index.js";
+import field from "./lib/field.js";
+import Plan from "./lib/Plan.js";
+import JourneyContext from "./lib/JourneyContext.js";
+import ValidatorFactory from "./lib/ValidatorFactory.js";
+import ValidationError from "./lib/ValidationError.js";
+import MutableRouter from "./lib/MutableRouter.js";
+import waypointUrl from "./lib/waypoint-url.js";
+import endSession from "./lib/end-session.js";
+import * as nunjucksFilters from "./lib/nunjucks-filters.js";
+import * as constants from "./lib/constants.js";
+import * as contextIdGenerators from "./lib/context-id-generators.js";
 
 /** @module @dwp/govuk-casa */
 export {

package/src/lib/CasaTemplateLoader.js

@@ -1,4 +1,4 @@
-import { FileSystemLoader } from 'nunjucks';
+import { FileSystemLoader } from "nunjucks";
 
 /**
  * @access private
@@ -11,19 +11,19 @@ import { FileSystemLoader } from 'nunjucks';
  */
 
 const VALID_BLOCKS = [
-  'beforeContent',
-  'bodyEnd',
-  'bodyStart',
-  'casaPageTitle',
-  'content',
-  'footer',
-  'head',
-  'header',
-  'headIcons',
-  'journey_form',
-  'main',
-  'pageTitle',
-  'skipLink',
+  "beforeContent",
+  "bodyEnd",
+  "bodyStart",
+  "casaPageTitle",
+  "content",
+  "footer",
+  "head",
+  "header",
+  "headIcons",
+  "journey_form",
+  "main",
+  "pageTitle",
+  "skipLink",
 ];
 
 /**
@@ -73,7 +73,9 @@ export default class CasaTemplateLoader extends FileSystemLoader {
   modifyBlock(block, modifier) {
     // Limit to only known block so the user can't do general string replacements
     if (!VALID_BLOCKS.includes(block)) {
-      throw new Error(`Block "${String(block)}" is not a recognised template block.`);
+      throw new Error(
+        `Block "${String(block)}" is not a recognised template block.`,
+      );
     }
 
     this.#blockModifiers.push({
@@ -95,8 +97,10 @@ export default class CasaTemplateLoader extends FileSystemLoader {
       /* eslint-disable-next-line security/detect-object-injection */
       const { block, modifier } = this.#blockModifiers[i];
       if (source.src.indexOf(`block ${block}`) > -1) {
-        /* eslint-disable-next-line no-param-reassign */
-        source.src = source.src.replace(`block ${block} %}`, `block ${block} %}${modifier(name)}`);
+        source.src = source.src.replace(
+          `block ${block} %}`,
+          `block ${block} %}${modifier(name)}`,
+        );
       }
     }
     return source;

package/src/lib/JourneyContext.js

@@ -6,17 +6,15 @@
  * - Validation errors on that data
  * - Navigation information about how the user got where they are.
  */
-import lodash from 'lodash';
-import ValidationError from './ValidationError.js';
-import logger from './logger.js';
-import { notProto } from './utils.js';
-import { uuid as uuidGenerator } from './context-id-generators.js';
+import lodash from "lodash";
+import ValidationError from "./ValidationError.js";
+import logger from "./logger.js";
+import { notProto } from "./utils.js";
+import { uuid as uuidGenerator } from "./context-id-generators.js";
 
-const {
-  isPlainObject, isObject, has, isEqual,
-} = lodash; // CommonJS
+const { isPlainObject, isObject, has, isEqual } = lodash; // CommonJS
 
-const log = logger('lib:journey-context');
+const log = logger("lib:journey-context");
 
 const uuid = uuidGenerator();
 
@@ -50,9 +48,19 @@ const uuid = uuidGenerator();
  * @typedef {import('express').Request} ExpressRequest
  */
 
-export function validateObjectKey(key = '') {
+/**
+ *
+ * @param {string} key Object key
+ * @returns {string} stringified key
+ * @throws {SyntaxError} for invalid keys
+ */
+export function validateObjectKey(key = "") {
   const keyLower = String.prototype.toLowerCase.call(key);
-  if (keyLower === 'prototype' || keyLower === '__proto__' || keyLower === 'constructor') {
+  if (
+    keyLower === "prototype" ||
+    keyLower === "__proto__" ||
+    keyLower === "constructor"
+  ) {
     throw new SyntaxError(`Invalid object key used, ${key}`);
   }
   return String(key);
@@ -75,17 +83,17 @@ export default class JourneyContext {
 
   #eventListenerPreState;
 
-  static DEFAULT_CONTEXT_ID = 'default';
+  static DEFAULT_CONTEXT_ID = "default";
 
   /**
    * @type {symbol}
    */
-  static ID_GENERATOR_REQ_LOG = Symbol('generatedContextIds');
+  static ID_GENERATOR_REQ_LOG = Symbol("generatedContextIds");
 
   /**
    * @type {symbol}
    */
-  static ID_GENERATOR_REQ_KEY = Symbol('generateContextId');
+  static ID_GENERATOR_REQ_KEY = Symbol("generateContextId");
 
   /**
    * Constructor.
@@ -152,7 +160,9 @@ export default class JourneyContext {
       let dErrors = errors;
 
       if (Array.isArray(errors)) {
-        dErrors = errors.map((e) => (e instanceof ValidationError ? e : new ValidationError(e)));
+        dErrors = errors.map((e) =>
+          e instanceof ValidationError ? e : new ValidationError(e),
+        );
       }
 
       deserialisedValidation[notProto(waypoint)] = dErrors;
@@ -189,13 +199,15 @@ export default class JourneyContext {
    * @throws {TypeError} When page is invalid.
    */
   getDataForPage(page) {
-    if (typeof page === 'string') {
+    if (typeof page === "string") {
       return this.#data[validateObjectKey(page)];
     }
     if (isPlainObject(page)) {
       return this.#data[validateObjectKey(page.waypoint)];
     }
-    throw new TypeError(`Page must be a string or Page object. Got ${typeof page}`);
+    throw new TypeError(
+      `Page must be a string or Page object. Got ${typeof page}`,
+    );
   }
 
   /**
@@ -227,12 +239,14 @@ export default class JourneyContext {
    * @throws {TypeError} When page is invalid.
    */
   setDataForPage(page, webFormData) {
-    if (typeof page === 'string') {
+    if (typeof page === "string") {
       this.#data[validateObjectKey(page)] = webFormData;
     } else if (isPlainObject(page)) {
       this.#data[validateObjectKey(page.waypoint)] = webFormData;
     } else {
-      throw new TypeError(`Page must be a string or Page object. Got ${typeof page}`)
+      throw new TypeError(
+        `Page must be a string or Page object. Got ${typeof page}`,
+      );
     }
 
     return this;
@@ -256,7 +270,7 @@ export default class JourneyContext {
    * @returns {JourneyContext} Chain.
    */
   removeValidationStateForPage(pageId) {
-    /* eslint-disable-next-line no-unused-vars */
+    /* eslint-disable-next-line sonarjs/no-unused-vars,no-unused-vars */
     const { [pageId]: dummy, ...remaining } = this.#validation;
     this.#validation = { ...remaining };
     return this;
@@ -286,12 +300,14 @@ export default class JourneyContext {
    */
   setValidationErrorsForPage(pageId, errors = []) {
     if (!Array.isArray(errors)) {
-      throw new SyntaxError(`Errors must be an Array. Received ${Object.prototype.toString.call(errors)}`);
+      throw new SyntaxError(
+        `Errors must be an Array. Received ${Object.prototype.toString.call(errors)}`,
+      );
     }
 
     errors.forEach((error) => {
       if (!(error instanceof ValidationError)) {
-        throw new SyntaxError('Field errors must be a ValidationError');
+        throw new SyntaxError("Field errors must be a ValidationError");
       }
     });
 
@@ -353,7 +369,7 @@ export default class JourneyContext {
    * @param {string} language Language to set (ISO 639-1 2-letter code).
    * @returns {JourneyContext} Chain.
    */
-  setNavigationLanguage(language = 'en') {
+  setNavigationLanguage(language = "en") {
     this.#nav.language = language;
     return this;
   }
@@ -376,7 +392,9 @@ export default class JourneyContext {
   purge(waypoints = []) {
     const newData = Object.create(null);
     const newValidation = Object.create(null);
-    const toKeep = Object.keys(this.#data).filter((w) => !waypoints.includes(w));
+    const toKeep = Object.keys(this.#data).filter(
+      (w) => !waypoints.includes(w),
+    );
 
     // ESLint disabled as `i` is an integer
     /* eslint-disable security/detect-object-injection */
@@ -439,7 +457,9 @@ export default class JourneyContext {
       return this;
     }
 
-    const previousContext = JourneyContext.fromObject(this.#eventListenerPreState);
+    const previousContext = JourneyContext.fromObject(
+      this.#eventListenerPreState,
+    );
     const listeners = this.#eventListeners.filter((l) => l.event === event);
 
     // ESLint disabled as `listeners[i]` uses an integer key, and the other keys
@@ -453,20 +473,21 @@ export default class JourneyContext {
       let runHandler = false;
 
       if (!waypoint && !field) {
-        logMessage = 'Calling generic event handler';
+        logMessage = "Calling generic event handler";
         runHandler = true;
       } else if (waypoint && !field) {
         logMessage = `Calling waypoint-specific event handler on "${waypoint}"`;
-        runHandler = previousContext.data?.[waypoint] !== undefined && !isEqual(
-          this.data?.[waypoint],
-          previousContext.data?.[waypoint],
-        );
+        runHandler =
+          previousContext.data?.[waypoint] !== undefined &&
+          !isEqual(this.data?.[waypoint], previousContext.data?.[waypoint]);
       } else if (waypoint && field) {
         logMessage = `Calling field-specific event handler on "${waypoint} : ${field}"`;
-        runHandler = previousContext.data?.[waypoint]?.[field] !== undefined && !isEqual(
-          this.data?.[waypoint]?.[field],
-          previousContext.data?.[waypoint]?.[field],
-        );
+        runHandler =
+          previousContext.data?.[waypoint]?.[field] !== undefined &&
+          !isEqual(
+            this.data?.[waypoint]?.[field],
+            previousContext.data?.[waypoint]?.[field],
+          );
       }
 
       if (runHandler) {
@@ -514,7 +535,7 @@ export default class JourneyContext {
    */
   static fromContext(context, req) {
     if (!(context instanceof JourneyContext)) {
-      throw new TypeError('Source context must be a JourneyContext');
+      throw new TypeError("Source context must be a JourneyContext");
     }
 
     const newContextObj = context.toObject();
@@ -543,15 +564,17 @@ export default class JourneyContext {
     // being remodelled as an array, we need to convert the "legacy" structure
     // into an equivalent array.
     if (isPlainObject(session?.journeyContextList)) {
-      log.trace('Session context list already initialised as an object (legacy structure). Will convert from object to array.');
-      /* eslint-disable-next-line no-param-reassign */
+      log.trace(
+        "Session context list already initialised as an object (legacy structure). Will convert from object to array.",
+      );
+
       session.journeyContextList = Object.entries(session.journeyContextList);
     }
 
     // Initialise new context list in the session
-    if (!has(session, 'journeyContextList')) {
-      log.trace('Initialising session with a default journey context list');
-      /* eslint-disable-next-line no-param-reassign */
+    if (!has(session, "journeyContextList")) {
+      log.trace("Initialising session with a default journey context list");
+
       session.journeyContextList = [];
 
       const defaultContext = new JourneyContext();
@@ -575,10 +598,10 @@ export default class JourneyContext {
       return JourneyContext.DEFAULT_CONTEXT_ID;
     }
 
-    if (typeof id !== 'string') {
-      throw new TypeError('Context ID must be a string');
+    if (typeof id !== "string") {
+      throw new TypeError("Context ID must be a string");
     } else if (!id.match(/^[a-z0-9-]{1,64}$/)) {
-      throw new SyntaxError('Context ID is not in the correct format');
+      throw new SyntaxError("Context ID is not in the correct format");
     }
 
     return id;
@@ -599,7 +622,9 @@ export default class JourneyContext {
     // Can't generate custom ID when no request object is provided, because the
     // custom generator function itself exists on that object.
     if (!req) {
-      log.warn('Generating a context ID without a given request object. Reverting to uuid().');
+      log.warn(
+        "Generating a context ID without a given request object. Reverting to uuid().",
+      );
       return uuid();
     }
 
@@ -611,14 +636,18 @@ export default class JourneyContext {
       .map((c) => c.identity.id)
       .filter((id) => id !== JourneyContext.DEFAULT_CONTEXT_ID);
     const inRequestIds = req[JourneyContext.ID_GENERATOR_REQ_LOG] ?? [];
-    const reservedIds = Array.from(new Set([...inSessionIds, ...inRequestIds]).values());
+    const reservedIds = Array.from(
+      new Set([...inSessionIds, ...inRequestIds]).values(),
+    );
 
     // Generate and log the ID
     const id = JourneyContext.validateContextId(
       req[JourneyContext.ID_GENERATOR_REQ_KEY].call(null, { req, reservedIds }),
     );
     if (reservedIds.includes(id)) {
-      throw new Error(`Regenerated a context ID, ${String(id)}. It has likely not yet been used to store a new context in session using JourneyContext.putContext().`);
+      throw new Error(
+        `Regenerated a context ID, ${String(id)}. It has likely not yet been used to store a new context in session using JourneyContext.putContext().`,
+      );
     }
 
     if (!req[JourneyContext.ID_GENERATOR_REQ_LOG]) {
@@ -641,7 +670,10 @@ export default class JourneyContext {
    * @returns {JourneyContext} The default Journey Context
    */
   static getDefaultContext(session) {
-    return JourneyContext.getContextById(session, JourneyContext.DEFAULT_CONTEXT_ID);
+    return JourneyContext.getContextById(
+      session,
+      JourneyContext.DEFAULT_CONTEXT_ID,
+    );
   }
 
   /**
@@ -655,7 +687,7 @@ export default class JourneyContext {
     const list = new Map(session?.journeyContextList);
     if (list.has(id)) {
       // ESLint disabled as `id` has been verified as an "own" property
-      /* eslint-disable-next-line security/detect-object-injection */
+
       return JourneyContext.fromObject(list.get(id));
     }
 
@@ -672,9 +704,7 @@ export default class JourneyContext {
   static getContextByName(session, name) {
     if (session) {
       const list = new Map(session?.journeyContextList);
-      const context = [...list.values()].find(
-        (c) => (c.identity.name === name),
-      );
+      const context = [...list.values()].find((c) => c.identity.name === name);
       if (context) {
         return JourneyContext.fromObject(context);
       }
@@ -693,9 +723,9 @@ export default class JourneyContext {
   static getContextsByTag(session, tag) {
     if (session) {
       const list = new Map(session?.journeyContextList);
-      return [...list.values()].filter(
-        (c) => (c.identity.tags?.includes(tag)),
-      ).map((c) => (JourneyContext.fromObject(c)));
+      return [...list.values()]
+        .filter((c) => c.identity.tags?.includes(tag))
+        .map((c) => JourneyContext.fromObject(c));
     }
 
     return undefined;
@@ -708,10 +738,10 @@ export default class JourneyContext {
    * @returns {Array} Array of contexts
    */
   static getContexts(session) {
-    if (has(session, 'journeyContextList')) {
-      return session.journeyContextList.map(([, contextObj]) => (
-        JourneyContext.fromObject(contextObj)
-      ));
+    if (has(session, "journeyContextList")) {
+      return session.journeyContextList.map(([, contextObj]) =>
+        JourneyContext.fromObject(contextObj),
+      );
     }
 
     return [];
@@ -729,15 +759,15 @@ export default class JourneyContext {
    */
   static putContext(session, context, options = {}) {
     if (!isObject(session)) {
-      throw new TypeError('Session must be an object');
+      throw new TypeError("Session must be an object");
     } else if (!(context instanceof JourneyContext)) {
-      throw new TypeError('Context must be a valid JourneyContext');
+      throw new TypeError("Context must be a valid JourneyContext");
     } else if (context.identity.id === undefined) {
-      throw new TypeError('Context must have an ID before storing in session');
+      throw new TypeError("Context must have an ID before storing in session");
     }
 
     // Initialise the session if necessary
-    if (!has(session, 'journeyContextList')) {
+    if (!has(session, "journeyContextList")) {
       JourneyContext.initContextStore(session);
     }
 
@@ -745,20 +775,20 @@ export default class JourneyContext {
     const { userInfo = undefined } = options;
 
     context.applyEventListeners({
-      event: 'waypoint-change',
+      event: "waypoint-change",
       session,
       userInfo,
     });
 
     context.applyEventListeners({
-      event: 'context-change',
+      event: "context-change",
       session,
       userInfo,
     });
 
     const list = new Map(session.journeyContextList);
     list.set(context.identity.id, context.toObject());
-    /* eslint-disable-next-line no-param-reassign */
+
     session.journeyContextList = [...list.entries()];
   }
 
@@ -783,7 +813,9 @@ export default class JourneyContext {
    * @returns {void}
    */
   static removeContextById(session, id) {
-    const index = (session?.journeyContextList ?? []).findIndex(([contextId]) => contextId === id);
+    const index = (session?.journeyContextList ?? []).findIndex(
+      ([contextId]) => contextId === id,
+    );
     if (index > -1) {
       session.journeyContextList.splice(index, 1);
     }
@@ -811,8 +843,8 @@ export default class JourneyContext {
    * @returns {void}
    */
   static removeContextsByTag(session, tag) {
-    JourneyContext.getContextsByTag(session, tag).forEach(
-      (c) => JourneyContext.removeContext(session, c),
+    JourneyContext.getContextsByTag(session, tag).forEach((c) =>
+      JourneyContext.removeContext(session, c),
     );
   }
 
@@ -823,7 +855,9 @@ export default class JourneyContext {
    * @returns {void}
    */
   static removeContexts(session) {
-    JourneyContext.getContexts(session).forEach((c) => JourneyContext.removeContext(session, c));
+    JourneyContext.getContexts(session).forEach((c) =>
+      JourneyContext.removeContext(session, c),
+    );
   }
 
   /**
@@ -840,17 +874,19 @@ export default class JourneyContext {
     JourneyContext.initContextStore(req.session);
 
     let contextId;
-    if (has(req?.params, 'contextid')) {
-      log.trace('Context ID found in req.params.contextid');
+    if (has(req?.params, "contextid")) {
+      log.trace("Context ID found in req.params.contextid");
       contextId = String(req.params.contextid);
-    } else if (has(req.query, 'contextid')) {
-      log.trace('Context ID found in req.query.contextid');
+    } else if (has(req.query, "contextid")) {
+      log.trace("Context ID found in req.query.contextid");
       contextId = String(req.query.contextid);
-    } else if (has(req?.body, 'contextid')) {
-      log.trace('Context ID found in req.body.contextid');
+    } else if (has(req?.body, "contextid")) {
+      log.trace("Context ID found in req.body.contextid");
       contextId = String(req.body.contextid);
     } else {
-      log.trace('Context ID not specified or not found; will attempt to use default');
+      log.trace(
+        "Context ID not specified or not found; will attempt to use default",
+      );
       contextId = JourneyContext.DEFAULT_CONTEXT_ID;
     }
 
@@ -858,13 +894,16 @@ export default class JourneyContext {
       contextId = JourneyContext.validateContextId(contextId);
       const context = JourneyContext.getContextById(req.session, contextId);
       if (!context) {
-        throw (new Error(`Could not find a context with id, ${contextId}`));
+        throw new Error(`Could not find a context with id, ${contextId}`);
       }
       return context;
     } catch (err) {
       log.debug(err.message);
-      log.trace('Falling back to default context');
-      return JourneyContext.getContextById(req.session, JourneyContext.DEFAULT_CONTEXT_ID);
+      log.trace("Falling back to default context");
+      return JourneyContext.getContextById(
+        req.session,
+        JourneyContext.DEFAULT_CONTEXT_ID,
+      );
     }
   }
 }