@dwp/govuk-casa 8.8.0 → 8.9.1

package/dist/lib/waypoint-url.js

@@ -14,6 +14,31 @@ const reUrlProtocolExtract = /^url:\/\/(.+)$/i;
  * @returns {string} Sanitised waypoint
  */
 const sanitiseWaypoint = (w) => w.replace(/[^/a-z0-9_-]/ig, '').replace(/\/+/g, '/');
+/**
+ * Sanitise a waypoint string, with allowed URL parameters:
+ * contextid = JourneyContext ID
+ *
+ * @access private
+ * @param {string} w Waypoint and potential URL parameters
+ * @returns {string} Sanitised waypoint
+ */
+const sanitiseWaypointWithAllowedParams = (w) => {
+    // Extract URL params
+    const parts = w.split('?');
+    if (parts.length !== 2) {
+        return sanitiseWaypoint(w);
+    }
+    const [waypoint, rawParams] = parts;
+    const urlSearchParams = new URLSearchParams(rawParams);
+    // Strip all but those parameters allowed
+    const validatedUrlSearchParams = new URLSearchParams();
+    for (const pk of ['contextid']) {
+        if (urlSearchParams.has(pk)) {
+            validatedUrlSearchParams.set(pk, urlSearchParams.get(pk));
+        }
+    }
+    return `${sanitiseWaypoint(waypoint)}?${validatedUrlSearchParams.toString()}`.replace(/\?$/, '');
+};
 /**
  * Generate a URL pointing at a particular waypoint.
  *
@@ -42,13 +67,18 @@ function waypointUrl({ waypoint = '', mountUrl = '/', journeyContext, edit = fal
     // - This will generate a link to the root handler "_" for the given mount path
     if (String(waypoint).substr(0, 7) === 'url:///') {
         const m = waypoint.match(reUrlProtocolExtract);
-        const u = new URL(m[1], 'https://placeholder.test/');
+        const u = new URL(sanitiseWaypointWithAllowedParams(m[1]), 'https://placeholder.test/');
         url.pathname = `${sanitiseWaypoint(u.pathname)}/_/`;
-        url.searchParams.append('refmount', `url://${mountUrl}`);
-        url.searchParams.append('route', routeName);
+        url.searchParams.set('refmount', `url://${mountUrl}`);
+        url.searchParams.set('route', routeName);
+        for (const [uk, uv] of u.searchParams.entries()) {
+            url.searchParams.append(uk, uv);
+        }
     }
     else {
-        url.pathname = `${mountUrl}${waypoint}`;
+        const u = new URL(sanitiseWaypointWithAllowedParams(`${mountUrl}${waypoint}`), 'https://placeholder.test/');
+        url.pathname = u.pathname;
+        url.search = u.search;
     }
     // Attach context ID as query parameter for non-default contexts.
     // To avoid messy URLs with duplicated content, this parameter will _not_ be
@@ -57,19 +87,19 @@ function waypointUrl({ waypoint = '', mountUrl = '/', journeyContext, edit = fal
     if (journeyContext
         && !journeyContext.isDefault()
         && journeyContext.identity.id
-        && !mountUrl.includes(journeyContext.identity.id)) {
-        url.searchParams.append('contextid', journeyContext.identity.id);
+        && !mountUrl.includes(`/${journeyContext.identity.id}/`)) {
+        url.searchParams.set('contextid', journeyContext.identity.id);
     }
     // Attach edit mode flag
     if (edit === true) {
-        url.searchParams.append('edit', 'true');
+        url.searchParams.set('edit', 'true');
     }
     if (edit && editOrigin) {
-        url.searchParams.append('editorigin', sanitiseWaypoint(editOrigin));
+        url.searchParams.set('editorigin', sanitiseWaypointWithAllowedParams(editOrigin));
     }
     // Skipto
     if (skipTo) {
-        url.searchParams.append('skipto', sanitiseWaypoint(skipTo));
+        url.searchParams.set('skipto', sanitiseWaypointWithAllowedParams(skipTo));
     }
     return `${sanitiseWaypoint(url.pathname)}${url.search}`;
 }

package/dist/lib/waypoint-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"waypoint-url.js","sourceRoot":"","sources":["../../src/lib/waypoint-url.js"],"names":[],"mappings":";AAAA;;;GAGG;;AAEH,sBAAsB;AACtB,MAAM,oBAAoB,GAAG,iBAAiB,CAAA;AAE9C;;;;;;GAMG;AACH,MAAM,gBAAgB,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAErF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAwB,WAAW,CAAC,EAClC,QAAQ,GAAG,EAAE,EACb,QAAQ,GAAG,GAAG,EACd,cAAc,EACd,IAAI,GAAG,KAAK,EACZ,UAAU,EACV,MAAM,EACN,SAAS,GAAG,MAAM,GACnB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;IACrB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAEhD,yBAAyB;IACzB,+EAA+E;IAC/E,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,EAAE;QAC/C,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAE/C,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,2BAA2B,CAAC,CAAC;QACrD,GAAG,CAAC,QAAQ,GAAG,GAAG,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QAEpD,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,QAAQ,EAAE,CAAC,CAAC;QACzD,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;KAC7C;SAAM;QACL,GAAG,CAAC,QAAQ,GAAG,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAAC;KACzC;IAED,iEAAiE;IACjE,4EAA4E;IAC5E,yEAAyE;IACzE,2DAA2D;IAC3D,IACE,cAAc;WACX,CAAC,cAAc,CAAC,SAAS,EAAE;WAC3B,cAAc,CAAC,QAAQ,CAAC,EAAE;WAC1B,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,EACjD;QACA,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;KAClE;IAED,wBAAwB;IACxB,IAAI,IAAI,KAAK,IAAI,EAAE;QACjB,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACzC;IAED,IAAI,IAAI,IAAI,UAAU,EAAE;QACtB,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;KACrE;IAED,SAAS;IACT,IAAI,MAAM,EAAE;QACV,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;KAC7D;IAED,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;AAC1D,CAAC;AArDD,8BAqDC"}
+{"version":3,"file":"waypoint-url.js","sourceRoot":"","sources":["../../src/lib/waypoint-url.js"],"names":[],"mappings":"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"}

package/dist/middleware/gather-fields.js

@@ -8,6 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
+const constants_js_1 = require("../lib/constants.js");
 /**
  * @access private
  * @typedef {import('../lib/field').PageField} PageField
@@ -38,10 +39,16 @@ exports.default = ({ waypoint, fields = [], }) => [
             }
         }
         /* eslint-enable security/detect-object-injection */
-        // Update data and validation context in the current request, and store
+        // Update data and validation context in the current request, and store.
+        // The validation state is removed here because we must assume the gathered
+        // data is invalid until proven otherwise when the validation step is run.
         req.casa.journeyContext.setDataForPage(waypoint, persistentBody);
         req.casa.journeyContext.removeValidationStateForPage(waypoint);
-        JourneyContext_js_1.default.putContext(req.session, req.casa.journeyContext);
+        JourneyContext_js_1.default.putContext(req.session, req.casa.journeyContext, {
+            userInfo: {
+                casaRequestPhase: constants_js_1.REQUEST_PHASE_GATHER,
+            },
+        });
         next();
     },
 ];

package/dist/middleware/gather-fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"gather-fields.js","sourceRoot":"","sources":["../../src/middleware/gather-fields.js"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,iCAAiC;AACjC,wDAAwD;AACxD,mEAAmE;;;;;AAEnE,iFAAsD;AAEtD;;;GAGG;AAEH;;;;;;;;;;GAUG;AACH,kBAAe,CAAC,EACd,QAAQ,EACR,MAAM,GAAG,EAAE,GACZ,EAAE,EAAE,CAAC;IACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjB,0EAA0E;QAC1E,qEAAqE;QACrE,GAAG,CAAC,IAAI,CAAC,sBAAsB,GAAG,2BAAc,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEtF,4CAA4C;QAC5C,iEAAiE;QACjE,qDAAqD;QACrD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7C,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;gBACxE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAC/D;SACF;QACD,oDAAoD;QAEpD,uEAAuE;QACvE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACjE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;QAC/D,2BAAc,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEhE,IAAI,EAAE,CAAC;IACT,CAAC;CACF,CAAC"}
+{"version":3,"file":"gather-fields.js","sourceRoot":"","sources":["../../src/middleware/gather-fields.js"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,iCAAiC;AACjC,wDAAwD;AACxD,mEAAmE;;;;;AAEnE,iFAAsD;AACtD,sDAA2D;AAE3D;;;GAGG;AAEH;;;;;;;;;;GAUG;AACH,kBAAe,CAAC,EACd,QAAQ,EACR,MAAM,GAAG,EAAE,GACZ,EAAE,EAAE,CAAC;IACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjB,0EAA0E;QAC1E,qEAAqE;QACrE,GAAG,CAAC,IAAI,CAAC,sBAAsB,GAAG,2BAAc,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEtF,4CAA4C;QAC5C,iEAAiE;QACjE,qDAAqD;QACrD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7C,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;gBACxE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAC/D;SACF;QACD,oDAAoD;QAEpD,wEAAwE;QACxE,2EAA2E;QAC3E,0EAA0E;QAC1E,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACjE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;QAC/D,2BAAc,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE;YAC9D,QAAQ,EAAE;gBACR,gBAAgB,EAAE,mCAAoB;aACvC;SACF,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC;CACF,CAAC"}

package/dist/middleware/progress-journey.js

@@ -10,9 +10,14 @@ const Plan_js_1 = __importDefault(require("../lib/Plan.js"));
 const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
 const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
 const logger_js_1 = __importDefault(require("../lib/logger.js"));
+const constants_js_1 = require("../lib/constants.js");
 const log = (0, logger_js_1.default)('middleware:progress-journey');
 const saveAndRedirect = (session, journeyContext, url, res, next) => {
-    JourneyContext_js_1.default.putContext(session, journeyContext);
+    JourneyContext_js_1.default.putContext(session, journeyContext, {
+        userInfo: {
+            casaRequestPhase: constants_js_1.REQUEST_PHASE_REDIRECT,
+        },
+    });
     session.save((err) => {
         if (err) {
             next(err);
@@ -63,7 +68,6 @@ exports.default = ({ waypoint, plan, }) => [
         if (Plan_js_1.default.isExitNode(nextWaypoint)) {
             log.trace(`Next waypoint is an exit node; clearing validation state on ${nextWaypoint}`);
             req.casa.journeyContext.clearValidationErrorsForPage(nextWaypoint);
-            JourneyContext_js_1.default.putContext(req.session, req.casa.journeyContext);
         }
         // Construct the next url
         const nextUrl = (0, waypoint_url_js_1.default)({

package/dist/middleware/progress-journey.js.map

@@ -1 +1 @@
-{"version":3,"file":"progress-journey.js","sourceRoot":"","sources":["../../src/middleware/progress-journey.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"progress-journey.js","sourceRoot":"","sources":["../../src/middleware/progress-journey.js"],"names":[],"mappings":";AAAA,wCAAwC;AACxC,wEAAwE;AACxE,cAAc;;;;;AAEd,6DAAkC;AAClC,iFAAsD;AACtD,6EAAiD;AACjD,iEAAsC;AACtC,sDAA6D;AAE7D,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,6BAA6B,CAAC,CAAC;AAElD,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAClE,2BAAc,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE;QACjD,QAAQ,EAAE;YACR,gBAAgB,EAAE,qCAAsB;SACzC;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;QACnB,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,GAAG,CAAC,CAAC;SACX;QACD,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,kBAAe,CAAC,EACd,QAAQ,EACR,IAAI,GACL,EAAE,EAAE,CAAC;IACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjB,8DAA8D;QAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CACxB,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAC3C,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CACjD,CAAC;QACF,MAAM,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QACxD,GAAG,CAAC,KAAK,CAAC,kBAAkB,YAAY,iBAAiB,SAAS,uBAAuB,QAAQ,oBAAoB,YAAY,EAAE,CAAC,CAAC;QAErI,YAAY;QACZ,sEAAsE;QACtE,wEAAwE;QACxE,yEAAyE;QACzE,yEAAyE;QACzE,oCAAoC;QACpC,EAAE;QACF,yEAAyE;QACzE,yEAAyE;QACzE,4BAA4B;QAC5B,EAAE;QACF,yEAAyE;QACzE,2EAA2E;QAC3E,mBAAmB;QACnB,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE;YAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC;YACtE,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACxC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC3D,MAAM,WAAW,GAAG,IAAA,yBAAW,EAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAEpF,GAAG,CAAC,KAAK,CAAC,sCAAsC,WAAW,EAAE,CAAC,CAAC;YAE/D,OAAO,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;SACtF;QAED,kEAAkE;QAClE,yEAAyE;QACzE,uDAAuD;QACvD,0EAA0E;QAC1E,oDAAoD;QACpD,yEAAyE;QACzE,gCAAgC;QAChC,wBAAwB;QACxB,sCAAsC;QACtC,8EAA8E;QAC9E,IAAI,iBAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YACjC,GAAG,CAAC,KAAK,CAAC,+DAA+D,YAAY,EAAE,CAAC,CAAC;YACzF,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,4BAA4B,CAAC,YAAY,CAAC,CAAC;SACpE;QAED,yBAAyB;QACzB,MAAM,OAAO,GAAG,IAAA,yBAAW,EAAC;YAC1B,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,GAAG,GAAG,CAAC,OAAO,GAAG;YAC3B,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;YACvC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU;SAChC,CAAC,CAAC;QAEH,mBAAmB;QACnB,GAAG,CAAC,KAAK,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAC;QACvC,OAAO,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACnF,CAAC;CACF,CAAC"}

package/dist/middleware/steer-journey.js

@@ -59,6 +59,7 @@ exports.default = ({ waypoint, plan, }) => [
         });
         res.locals.casa.journeyPreviousUrl = prevRoute.target ? (0, waypoint_url_js_1.default)({
             mountUrl,
+            journeyContext: req.casa.journeyContext,
             waypoint: prevRoute.target,
             routeName: 'prev',
             edit: req.casa.editMode,

package/dist/middleware/steer-journey.js.map

@@ -1 +1 @@
-{"version":3,"file":"steer-journey.js","sourceRoot":"","sources":["../../src/middleware/steer-journey.js"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,+BAA+B;;;;;AAE/B,6EAAiD;AACjD,iEAAsC;AAEtC,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,0BAA0B,CAAC,CAAC;AAE/C;;;GAGG;AAEH;;;;;;;;GAQG;AACH,kBAAe,CAAC,EACd,QAAQ,EACR,IAAI,GACL,EAAE,EAAE,CAAC;IACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjB,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,GAAG,CAAC;QAEnC,yEAAyE;QACzE,2CAA2C;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;YACtC,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACnD,GAAG,CAAC,KAAK,CAAC,wBAAwB,QAAQ,8CAA8C,UAAU,GAAG,CAAC,CAAC;YAEvG,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAA,yBAAW,EAAC;gBACnC,QAAQ,EAAE,UAAU;gBACpB,QAAQ;gBACR,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;gBACvC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU;aAChC,CAAC,CAAC,CAAC;SACL;QAED,YAAY;QACZ,kEAAkE;QAClE,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;YACrB,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,2BAA2B,CAAC,CAAC;YAE5F,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,eAAe,EAAE;gBAC3C,GAAG,CAAC,KAAK,CAAC,qDAAqD,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;gBACvF,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC1B,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;aACjC;SACF;QAED,yEAAyE;QACzE,4EAA4E;QAC5E,4EAA4E;QAC5E,gEAAgE;QAEhE,oCAAoC;QACpC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE;YACnE,aAAa,EAAE,QAAQ;YACvB,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,wBAAwB;SACtD,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC;YAClE,QAAQ;YACR,QAAQ,EAAE,SAAS,CAAC,MAAM;YAC1B,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU;SAChC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEf,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF,CAAC"}
+{"version":3,"file":"steer-journey.js","sourceRoot":"","sources":["../../src/middleware/steer-journey.js"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,+BAA+B;;;;;AAE/B,6EAAiD;AACjD,iEAAsC;AAEtC,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,0BAA0B,CAAC,CAAC;AAE/C;;;GAGG;AAEH;;;;;;;;GAQG;AACH,kBAAe,CAAC,EACd,QAAQ,EACR,IAAI,GACL,EAAE,EAAE,CAAC;IACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjB,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,GAAG,CAAC;QAEnC,yEAAyE;QACzE,2CAA2C;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;YACtC,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACnD,GAAG,CAAC,KAAK,CAAC,wBAAwB,QAAQ,8CAA8C,UAAU,GAAG,CAAC,CAAC;YAEvG,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAA,yBAAW,EAAC;gBACnC,QAAQ,EAAE,UAAU;gBACpB,QAAQ;gBACR,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;gBACvC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU;aAChC,CAAC,CAAC,CAAC;SACL;QAED,YAAY;QACZ,kEAAkE;QAClE,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;YACrB,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,2BAA2B,CAAC,CAAC;YAE5F,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,eAAe,EAAE;gBAC3C,GAAG,CAAC,KAAK,CAAC,qDAAqD,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;gBACvF,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC1B,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;aACjC;SACF;QAED,yEAAyE;QACzE,4EAA4E;QAC5E,4EAA4E;QAC5E,gEAAgE;QAEhE,oCAAoC;QACpC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE;YACnE,aAAa,EAAE,QAAQ;YACvB,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,wBAAwB;SACtD,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC;YAClE,QAAQ;YACR,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;YACvC,QAAQ,EAAE,SAAS,CAAC,MAAM;YAC1B,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU;SAChC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEf,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF,CAAC"}

package/dist/middleware/validate-fields.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 // Validate the data captured in the journey context
 const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
+const constants_js_1 = require("../lib/constants.js");
 const updateContext = ({ waypoint, errors = null, journeyContext, session, }) => {
     // Set validation state
     if (errors === null) {
@@ -14,7 +15,11 @@ const updateContext = ({ waypoint, errors = null, journeyContext, session, }) =>
         journeyContext.setValidationErrorsForPage(waypoint, errors);
     }
     // Save to session
-    JourneyContext_js_1.default.putContext(session, journeyContext);
+    JourneyContext_js_1.default.putContext(session, journeyContext, {
+        userInfo: {
+            casaRequestPhase: constants_js_1.REQUEST_PHASE_VALIDATE,
+        },
+    });
 };
 exports.default = ({ waypoint, fields = [], plan, }) => [
     (req, res, next) => {

package/dist/middleware/validate-fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-fields.js","sourceRoot":"","sources":["../../src/middleware/validate-fields.js"],"names":[],"mappings":";;;;;AAAA,oDAAoD;AACpD,iFAAsD;AAEtD,MAAM,aAAa,GAAG,CAAC,EACrB,QAAQ,EACR,MAAM,GAAG,IAAI,EACb,cAAc,EACd,OAAO,GACR,EAAE,EAAE;IACH,uBAAuB;IACvB,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,cAAc,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;KACvD;SAAM;QACL,cAAc,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;KAC7D;IAED,kBAAkB;IAClB,2BAAc,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AACrD,CAAC,CAAA;AAED,kBAAe,CAAC,EACd,QAAQ,EACR,MAAM,GAAG,EAAE,EACX,IAAI,GACL,EAAE,EAAE,CAAC;IACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QACjB,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,GAAG,CAAC;QAEnC,uEAAuE;QACvE,2CAA2C;QAC3C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7C,qDAAqD;YACrD,yEAAyE;YACzE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;YAC7B,MAAM,UAAU,GAAG,MAAA,MAAA,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,0CAAG,QAAQ,CAAC,0CAAG,SAAS,CAAC,CAAC;YAEzE,2BAA2B;YAC3B,MAAM,OAAO,GAAG;gBACd,SAAS;gBACT,UAAU;gBACV,QAAQ;gBACR,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;aACxC,CAAC;YACF,oDAAoD;YAEpD,MAAM,GAAG;gBACP,GAAG,MAAM;gBACT,GAAG,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC;aAC5C,CAAC;SACH;QAED,mCAAmC;QACnC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,aAAa,CAAC;gBACZ,QAAQ;gBACR,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,QAAQ;gBACR,IAAI;gBACJ,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;aACxC,CAAC,CAAC;YACH,OAAO,IAAI,EAAE,CAAC;SACf;QAED,0EAA0E;QAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC;QAC3D,IAAI,WAAW,EAAE;YACf,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;SAC1B;QAED,qDAAqD;QACrD,aAAa,CAAC;YACZ,MAAM;YACN,QAAQ;YACR,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,QAAQ;YACR,IAAI;YACJ,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;SACxC,CAAC,CAAC;QAEH,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF,CAAC"}
+{"version":3,"file":"validate-fields.js","sourceRoot":"","sources":["../../src/middleware/validate-fields.js"],"names":[],"mappings":";;;;;AAAA,oDAAoD;AACpD,iFAAsD;AACtD,sDAA6D;AAE7D,MAAM,aAAa,GAAG,CAAC,EACrB,QAAQ,EACR,MAAM,GAAG,IAAI,EACb,cAAc,EACd,OAAO,GACR,EAAE,EAAE;IACH,uBAAuB;IACvB,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,cAAc,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;KACvD;SAAM;QACL,cAAc,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;KAC7D;IAED,kBAAkB;IAClB,2BAAc,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE;QACjD,QAAQ,EAAE;YACR,gBAAgB,EAAE,qCAAsB;SACzC;KACF,CAAC,CAAC;AACL,CAAC,CAAA;AAED,kBAAe,CAAC,EACd,QAAQ,EACR,MAAM,GAAG,EAAE,EACX,IAAI,GACL,EAAE,EAAE,CAAC;IACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QACjB,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,GAAG,CAAC;QAEnC,uEAAuE;QACvE,2CAA2C;QAC3C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7C,qDAAqD;YACrD,yEAAyE;YACzE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;YAC7B,MAAM,UAAU,GAAG,MAAA,MAAA,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,0CAAG,QAAQ,CAAC,0CAAG,SAAS,CAAC,CAAC;YAEzE,2BAA2B;YAC3B,MAAM,OAAO,GAAG;gBACd,SAAS;gBACT,UAAU;gBACV,QAAQ;gBACR,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;aACxC,CAAC;YACF,oDAAoD;YAEpD,MAAM,GAAG;gBACP,GAAG,MAAM;gBACT,GAAG,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC;aAC5C,CAAC;SACH;QAED,mCAAmC;QACnC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,aAAa,CAAC;gBACZ,QAAQ;gBACR,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,QAAQ;gBACR,IAAI;gBACJ,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;aACxC,CAAC,CAAC;YACH,OAAO,IAAI,EAAE,CAAC;SACf;QAED,0EAA0E;QAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC;QAC3D,IAAI,WAAW,EAAE;YACf,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;SAC1B;QAED,qDAAqD;QACrD,aAAa,CAAC;YACZ,MAAM;YACN,QAAQ;YACR,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,QAAQ;YACR,IAAI;YACJ,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;SACxC,CAAC,CAAC;QAEH,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF,CAAC"}

package/dist/mjs/esm-wrapper.js

@@ -9,6 +9,7 @@ export const { Plan } = casa;
 export const { ValidationError } = casa;
 export const { ValidatorFactory } = casa;
 export const { configure } = casa;
+export const { constants } = casa;
 export const { endSession } = casa;
 export const { field } = casa;
 export const { nunjucksFilters } = casa;

package/dist/routes/ancillary.d.ts

@@ -19,4 +19,4 @@ export type AncillaryRouterOptions = {
      */
     sessionTtl: number;
 };
-import MutableRouter from "../lib/MutableRouter.js";
+import MutableRouter from '../lib/MutableRouter.js';

package/dist/routes/journey.d.ts

@@ -28,4 +28,4 @@ export type JourneyRouterOptions = {
      */
     csrfMiddleware: Function[];
 };
-import MutableRouter from "../lib/MutableRouter.js";
+import MutableRouter from '../lib/MutableRouter.js';

package/dist/routes/static.d.ts

@@ -19,4 +19,4 @@ export type StaticOptions = {
      */
     maxAge?: number | undefined;
 };
-import MutableRouter from "../lib/MutableRouter.js";
+import MutableRouter from '../lib/MutableRouter.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwp/govuk-casa",
-  "version": "8.8.0",
+  "version": "8.9.1",
   "description": "A framework for building GOVUK Collect-And-Submit-Applications",
   "repository": {
     "type": "git",
@@ -20,8 +20,8 @@
     "views/**/*"
   ],
   "engines": {
-    "node": "^14.0.0 || ^16.0.0 || ^18.0.0",
-    "npm": "^8.0.0"
+    "node": "^16.0.0 || ^18.0.0 || ^20.0.0",
+    "npm": "^8.0.0 || ^9.0.0"
   },
   "scripts": {
     "pipeline": "npm run coverage && npm run lint",
@@ -55,48 +55,48 @@
     "deepmerge": "4.3.1",
     "express": "4.18.2",
     "express-session": "1.17.3",
-    "govuk-frontend": "4.5.0",
-    "helmet": "6.0.1",
-    "i18next": "22.4.13",
+    "govuk-frontend": "4.6.0",
+    "helmet": "6.1.5",
+    "i18next": "22.4.15",
     "i18next-http-middleware": "3.3.0",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
     "luxon": "3.3.0",
-    "nunjucks": "3.2.3",
+    "nunjucks": "3.2.4",
     "path-to-regexp": "6.2.1",
     "uuid": "9.0.0",
     "validator": "13.9.0"
   },
   "devDependencies": {
-    "@babel/core": "7.21.4",
+    "@babel/core": "7.21.5",
     "@babel/eslint-parser": "7.21.3",
-    "@babel/preset-env": "7.21.4",
-    "@ckeditor/jsdoc-plugins": "36.0.0",
-    "@commitlint/config-conventional": "17.4.4",
+    "@babel/preset-env": "7.21.5",
+    "@ckeditor/jsdoc-plugins": "37.0.1",
+    "@commitlint/config-conventional": "17.6.1",
     "@dwp/casa-spiderplan": "2.5.4",
     "@dwp/casa-spiderplan-a11y-plugin": "0.1.10",
     "@dwp/casa-spiderplan-zap-plugin": "0.1.6",
     "@dwp/eslint-config-base": "6.1.1",
     "@types/express": "4.17.17",
-    "@types/node": "18.15.11",
+    "@types/node": "18.16.3",
     "@types/nunjucks": "3.2.2",
     "c8": "7.13.0",
     "chai": "4.3.7",
     "cheerio": "1.0.0-rc.12",
-    "commitlint": "17.5.1",
+    "commitlint": "17.6.1",
     "docdash": "2.0.1",
-    "eslint": "8.37.0",
+    "eslint": "8.39.0",
     "eslint-plugin-no-unsafe-regex": "1.0.0",
     "eslint-plugin-security": "1.7.1",
     "eslint-plugin-sonarjs": "0.19.0",
-    "fast-check": "3.8.0",
+    "fast-check": "3.8.1",
     "jsdoc": "4.0.2",
     "jsdoc-tsimport-plugin": "1.0.5",
     "mocha": "10.2.0",
-    "sass": "1.60.0",
-    "sinon": "15.0.3",
+    "sass": "1.62.1",
+    "sinon": "15.0.4",
     "sinon-chai": "3.7.0",
     "supertest": "6.3.3",
-    "typescript": "4.9.5"
+    "typescript": "5.0.4"
   }
 }

package/src/casa.js

@@ -10,6 +10,7 @@ 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';
 
 /** @module @dwp/govuk-casa */
 export {
@@ -28,6 +29,9 @@ export {
 
   // Nunjucks filters
   nunjucksFilters,
+
+  // Constants
+  constants,
 };
 
 /* ----------------------------------------------------------------- Typedefs */
@@ -42,6 +46,7 @@ export {
  * @property {JourneyContext} journeyContext Context including changes
  * @property {JourneyContext} previousContext Context prior to changes
  * @property {object} session Request session object
+ * @property {ContextEventUserInfo} userInfo User-space information pass-through
  */
 
 /**
@@ -50,6 +55,11 @@ export {
  * @returns {void}
  */
 
+/**
+ * @typedef {object} ContextEventUserInfo
+ * @property {symbol} [casaRequestPhase] Request phase at which event is triggered
+ */
+
 /**
  * @typedef {object} ContextEvent
  * @property {string} waypoint Waypoint to watch for changes

package/src/lib/JourneyContext.js

@@ -358,7 +358,7 @@ 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 */
@@ -367,7 +367,6 @@ export default class JourneyContext {
       newValidation[toKeep[i]] = this.#validation[toKeep[i]];
     }
     /* eslint-enable security/detect-object-injection */
-
     this.#data = { ...newData };
     this.#validation = { ...newValidation };
   }
@@ -408,12 +407,16 @@ export default class JourneyContext {
   /**
    * Execute all listeners for the given event.
    *
+   * The `userInfo` parameter is simply passed straight through to the event
+   * listeners.
+   *
    * @param {object} params Params
    * @param {string} params.event Event (waypoint-change | context-change)
    * @param {object} params.session Session
+   * @param {ContextEventUserInfo|object} [params.userInfo] Pass-through info
    * @returns {JourneyContext} Chain
    */
-  applyEventListeners({ event, session }) {
+  applyEventListeners({ event, session, userInfo }) {
     if (!this.#eventListeners.length) {
       return this;
     }
@@ -450,7 +453,12 @@ export default class JourneyContext {
 
       if (runHandler) {
         log.trace(logMessage);
-        handler({ journeyContext: this, previousContext, session });
+        handler({
+          journeyContext: this,
+          previousContext,
+          session,
+          userInfo,
+        });
       }
     }
     /* eslint-enable security/detect-object-injection */
@@ -641,10 +649,12 @@ export default class JourneyContext {
    *
    * @param {object} session Request session
    * @param {JourneyContext} context Context
+   * @param {object} options Options
+   * @param {ContextEventUserInfo|object} [options.userInfo] Pass-through event info
    * @returns {void}
    * @throws {TypeError} When session is not a valid type, or context has no ID
    */
-  static putContext(session, context) {
+  static putContext(session, context, options = {}) {
     if (!isObject(session)) {
       throw new TypeError('Session must be an object');
     } else if (!(context instanceof JourneyContext)) {
@@ -659,14 +669,18 @@ export default class JourneyContext {
     }
 
     // Apply context events
+    const { userInfo = undefined } = options;
+
     context.applyEventListeners({
       event: 'waypoint-change',
       session,
+      userInfo,
     });
 
     context.applyEventListeners({
       event: 'context-change',
       session,
+      userInfo,
     });
 
     const list = new Map(session.journeyContextList);

package/src/lib/Plan.js

@@ -24,11 +24,6 @@ const log = logger('lib:plan');
  * @typedef {import('../casa').PlanArbiter} PlanArbiter
  */
 
-/**
- * @access private
- * @typedef {import('@dagrejs/graphlib').Graph} Graph
- */
-
 /**
  * @typedef {object} PlanConstructorOptions
  * @property {boolean} [validateBeforeRouteCondition=true] Check page validity before conditions
@@ -567,7 +562,7 @@ export default class Plan {
           target = arbiter({
             targets: target.map((t) => makeRouteObject(self.dgraph, t)),
             journeyContext: context,
-            traverseOptions: options,
+            travereOptions: options,
           });
           target = target.map((r) => ({ v: r.source, w: r.target, name: r.name }));
         } else {

package/src/lib/constants.js

@@ -0,0 +1,9 @@
+/**
+ * General-purpose references to the different request lifecycle phases.
+ */
+export const REQUEST_PHASE_STEER = Symbol('steer');
+export const REQUEST_PHASE_SANITISE = Symbol('sanitise');
+export const REQUEST_PHASE_GATHER = Symbol('gather');
+export const REQUEST_PHASE_VALIDATE = Symbol('validate');
+export const REQUEST_PHASE_REDIRECT = Symbol('redirect');
+export const REQUEST_PHASE_RENDER = Symbol('render');

package/src/lib/waypoint-url.js

@@ -15,6 +15,34 @@ const reUrlProtocolExtract = /^url:\/\/(.+)$/i
  */
 const sanitiseWaypoint = (w) => w.replace(/[^/a-z0-9_-]/ig, '').replace(/\/+/g, '/');
 
+/**
+ * Sanitise a waypoint string, with allowed URL parameters:
+ * contextid = JourneyContext ID
+ *
+ * @access private
+ * @param {string} w Waypoint and potential URL parameters
+ * @returns {string} Sanitised waypoint
+ */
+const sanitiseWaypointWithAllowedParams = (w) => {
+  // Extract URL params
+  const parts = w.split('?');
+  if (parts.length !== 2) {
+    return sanitiseWaypoint(w);
+  }
+  const [waypoint, rawParams] = parts;
+  const urlSearchParams = new URLSearchParams(rawParams);
+
+  // Strip all but those parameters allowed
+  const validatedUrlSearchParams = new URLSearchParams();
+  for (const pk of ['contextid']) {
+    if (urlSearchParams.has(pk)) {
+      validatedUrlSearchParams.set(pk, urlSearchParams.get(pk));
+    }
+  }
+
+  return `${sanitiseWaypoint(waypoint)}?${validatedUrlSearchParams.toString()}`.replace(/\?$/, '');
+}
+
 /**
  * Generate a URL pointing at a particular waypoint.
  *
@@ -53,13 +81,18 @@ export default function waypointUrl({
   if (String(waypoint).substr(0, 7) === 'url:///') {
     const m = waypoint.match(reUrlProtocolExtract);
 
-    const u = new URL(m[1], 'https://placeholder.test/');
+    const u = new URL(sanitiseWaypointWithAllowedParams(m[1]), 'https://placeholder.test/');
     url.pathname = `${sanitiseWaypoint(u.pathname)}/_/`;
 
-    url.searchParams.append('refmount', `url://${mountUrl}`);
-    url.searchParams.append('route', routeName);
+    url.searchParams.set('refmount', `url://${mountUrl}`);
+    url.searchParams.set('route', routeName);
+    for (const [uk, uv] of u.searchParams.entries()) {
+      url.searchParams.append(uk, uv);
+    }
   } else {
-    url.pathname = `${mountUrl}${waypoint}`;
+    const u = new URL(sanitiseWaypointWithAllowedParams(`${mountUrl}${waypoint}`), 'https://placeholder.test/');
+    url.pathname = u.pathname;
+    url.search = u.search;
   }
 
   // Attach context ID as query parameter for non-default contexts.
@@ -70,23 +103,23 @@ export default function waypointUrl({
     journeyContext
     && !journeyContext.isDefault()
     && journeyContext.identity.id
-    && !mountUrl.includes(journeyContext.identity.id)
+    && !mountUrl.includes(`/${journeyContext.identity.id}/`)
   ) {
-    url.searchParams.append('contextid', journeyContext.identity.id);
+    url.searchParams.set('contextid', journeyContext.identity.id);
   }
 
   // Attach edit mode flag
   if (edit === true) {
-    url.searchParams.append('edit', 'true');
+    url.searchParams.set('edit', 'true');
   }
 
   if (edit && editOrigin) {
-    url.searchParams.append('editorigin', sanitiseWaypoint(editOrigin));
+    url.searchParams.set('editorigin', sanitiseWaypointWithAllowedParams(editOrigin));
   }
 
   // Skipto
   if (skipTo) {
-    url.searchParams.append('skipto', sanitiseWaypoint(skipTo));
+    url.searchParams.set('skipto', sanitiseWaypointWithAllowedParams(skipTo));
   }
 
   return `${sanitiseWaypoint(url.pathname)}${url.search}`;

package/src/middleware/gather-fields.js

@@ -4,6 +4,7 @@
 // - Remove validation date of JourneyContext so it can re-evaluted
 
 import JourneyContext from '../lib/JourneyContext.js';
+import { REQUEST_PHASE_GATHER } from '../lib/constants.js';
 
 /**
  * @access private
@@ -41,10 +42,16 @@ export default ({
     }
     /* eslint-enable security/detect-object-injection */
 
-    // Update data and validation context in the current request, and store
+    // Update data and validation context in the current request, and store.
+    // The validation state is removed here because we must assume the gathered
+    // data is invalid until proven otherwise when the validation step is run.
     req.casa.journeyContext.setDataForPage(waypoint, persistentBody);
     req.casa.journeyContext.removeValidationStateForPage(waypoint);
-    JourneyContext.putContext(req.session, req.casa.journeyContext);
+    JourneyContext.putContext(req.session, req.casa.journeyContext, {
+      userInfo: {
+        casaRequestPhase: REQUEST_PHASE_GATHER,
+      },
+    });
 
     next();
   },

package/src/middleware/progress-journey.js

@@ -6,11 +6,16 @@ import Plan from '../lib/Plan.js';
 import JourneyContext from '../lib/JourneyContext.js';
 import waypointUrl from '../lib/waypoint-url.js';
 import logger from '../lib/logger.js';
+import { REQUEST_PHASE_REDIRECT } from '../lib/constants.js';
 
 const log = logger('middleware:progress-journey');
 
 const saveAndRedirect = (session, journeyContext, url, res, next) => {
-  JourneyContext.putContext(session, journeyContext);
+  JourneyContext.putContext(session, journeyContext, {
+    userInfo: {
+      casaRequestPhase: REQUEST_PHASE_REDIRECT,
+    },
+  });
 
   session.save((err) => {
     if (err) {
@@ -73,7 +78,6 @@ export default ({
     if (Plan.isExitNode(nextWaypoint)) {
       log.trace(`Next waypoint is an exit node; clearing validation state on ${nextWaypoint}`);
       req.casa.journeyContext.clearValidationErrorsForPage(nextWaypoint);
-      JourneyContext.putContext(req.session, req.casa.journeyContext);
     }
 
     // Construct the next url

package/src/middleware/steer-journey.js

@@ -67,6 +67,7 @@ export default ({
     });
     res.locals.casa.journeyPreviousUrl = prevRoute.target ? waypointUrl({
       mountUrl,
+      journeyContext: req.casa.journeyContext,
       waypoint: prevRoute.target,
       routeName: 'prev',
       edit: req.casa.editMode,