@dwp/govuk-casa 8.10.2 → 8.11.0

package/dist/lib/utils.d.ts

@@ -38,6 +38,13 @@ export function resolveMiddlewareHooks(hookName: string, path: string, hooks?: H
  * @returns {string} The stringified input
  */
 export function stringifyInput(input: any, fallback: string, ...args: any[]): string;
+/**
+ * Coerce an input to an integer.
+ *
+ * @param {any} input Input to be coerced.
+ * @returns {number|undefined} The number as an integer or `undefined`.
+ */
+export function coerceInputToInteger(input: any): number | undefined;
 /**
  * Strip whitespace from a string.
  *

package/dist/lib/utils.js

@@ -4,7 +4,7 @@
  * @typedef {import('../casa').GlobalHook | import('../casa').PageHook} Hook
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateWaypoint = exports.validateView = exports.validateUrlPath = exports.validateHookPath = exports.validateHookName = exports.notProto = exports.stripWhitespace = exports.stringifyInput = exports.resolveMiddlewareHooks = exports.isStringable = exports.isEmpty = void 0;
+exports.validateWaypoint = exports.validateView = exports.validateUrlPath = exports.validateHookPath = exports.validateHookName = exports.notProto = exports.stripWhitespace = exports.coerceInputToInteger = exports.stringifyInput = exports.resolveMiddlewareHooks = exports.isStringable = exports.isEmpty = void 0;
 /**
  * Determine if value is empty. Recurse over objects.
  *
@@ -67,6 +67,16 @@ function stringifyInput(input, fallback) {
     return isStringable(input) ? String(input) : fb;
 }
 exports.stringifyInput = stringifyInput;
+/**
+ * Coerce an input to an integer.
+ *
+ * @param {any} input Input to be coerced.
+ * @returns {number|undefined} The number as an integer or `undefined`.
+ */
+function coerceInputToInteger(input) {
+    return Number.isNaN(Number(input)) ? undefined : Math.floor(Number(input));
+}
+exports.coerceInputToInteger = coerceInputToInteger;
 /**
  * Strip whitespace from a string.
  *

package/dist/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.js"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH;;;;;;GAMG;AACH,SAAgB,OAAO,CAAC,GAAG;IACzB,IACE,GAAG,KAAK,IAAI;WACT,OAAO,GAAG,KAAK,WAAW;WAC1B,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE,CAAC,EAC1C;QACA,OAAO,IAAI,CAAC;KACb;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QACjD,0EAA0E;QAC1E,+DAA+D;QAC/D,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;KACtE;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAdD,0BAcC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,KAAK;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AAChE,CAAC;AAFD,oCAEC;AAED;;;;;;;;;GASG;AACH,SAAgB,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,EAAE;IAC/D,sCAAsC;IACtC,MAAM,SAAS,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,IAAI,YAAY,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;IACpH,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;AAC7F,CAAC;AAJD,wDAIC;AAED;;;;;;;GAOG;AACH,SAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ;IAC5C,8EAA8E;IAC9E,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IACxG,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAClD,CAAC;AAJD,wCAIC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAC,KAAK;IACxC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7E,CAAC;AAFD,oDAEC;AAED;;;;;;;;GAQG;AACH,SAAgB,eAAe,CAAC,KAAK,EAAE,OAAO;IAC5C,MAAM,IAAI,mBACR,OAAO,EAAE,EAAE,EACX,QAAQ,EAAE,EAAE,EACZ,MAAM,EAAE,GAAG,IACR,OAAO,CACX,CAAC;IAEF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,MAAM,IAAI,SAAS,CAAC,wBAAwB,CAAC,CAAC;KAC/C;IAED,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE;QACpC,MAAM,IAAI,SAAS,CAAC,0BAA0B,CAAC,CAAC;KACjD;IAED,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE;QACrC,MAAM,IAAI,SAAS,CAAC,2BAA2B,CAAC,CAAC;KAClD;IAED,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE;QACnC,MAAM,IAAI,SAAS,CAAC,yBAAyB,CAAC,CAAC;KAChD;IAED,OAAO,KAAK;SACT,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC;SAC7B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC;SAC9B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;AAClC,CAAC;AA5BD,0CA4BC;AAED,gFAAgF;AAEhF;;;;;;;GAOG;AACH,SAAgB,QAAQ,CAAC,GAAG;IAC1B,IAAI,CAAC,WAAW,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE;QACjF,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;KAC5D;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AALD,4BAKC;AAED;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAAC,QAAQ;IACvC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAChC,MAAM,IAAI,SAAS,CAAC,4BAA4B,CAAC,CAAC;KACnD;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,MAAM,IAAI,WAAW,CAAC,6BAA6B,CAAC,CAAC;KACtD;IAED,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE;QAC7C,MAAM,IAAI,WAAW,CAAC,sEAAsE,CAAC,CAAC;KAC/F;AACH,CAAC;AAZD,4CAYC;AAED;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAAC,IAAI;IACnC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,YAAY,MAAM,CAAC,EAAE;QACzD,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;KAC7D;AACH,CAAC;AAJD,4CAIC;AAED;;;;;;;;GAQG;AACH,SAAgB,eAAe,CAAC,IAAI;IAClC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,IAAI,SAAS,CAAC,2BAA2B,CAAC,CAAC;KAClD;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;QAC9B,MAAM,IAAI,WAAW,CAAC,4DAA4D,CAAC,CAAC;KACrF;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;QACxB,MAAM,IAAI,WAAW,CAAC,yCAAyC,CAAC,CAAC;KAClE;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAdD,0CAcC;AAED;;;;;;;;GAQG;AACH,SAAgB,YAAY,CAAC,IAAI;IAC/B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,IAAI,SAAS,CAAC,uBAAuB,CAAC,CAAC;KAC9C;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,MAAM,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;KACjD;IAED,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE;QACvC,MAAM,IAAI,WAAW,CAAC,yEAAyE,CAAC,CAAC;KAClG;AACH,CAAC;AAZD,oCAYC;AAED;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAAC,QAAQ;IACvC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAChC,MAAM,IAAI,SAAS,CAAC,2BAA2B,CAAC,CAAC;KAClD;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,MAAM,IAAI,WAAW,CAAC,4BAA4B,CAAC,CAAC;KACrD;IAED,IAAI,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;QAClC,MAAM,IAAI,WAAW,CAAC,4DAA4D,CAAC,CAAC;KACrF;AACH,CAAC;AAZD,4CAYC"}

package/dist/lib/validators/index.d.ts

@@ -7,6 +7,7 @@ declare namespace _default {
     export { regex };
     export { required };
     export { strlen };
+    export { range };
     export { wordCount };
 }
 export default _default;
@@ -18,4 +19,5 @@ import postalAddressObject from './postalAddressObject.js';
 import regex from './regex.js';
 import required from './required.js';
 import strlen from './strlen.js';
+import range from './range.js';
 import wordCount from './wordCount.js';

package/dist/lib/validators/index.js

@@ -11,6 +11,7 @@ const postalAddressObject_js_1 = __importDefault(require("./postalAddressObject.
 const regex_js_1 = __importDefault(require("./regex.js"));
 const required_js_1 = __importDefault(require("./required.js"));
 const strlen_js_1 = __importDefault(require("./strlen.js"));
+const range_js_1 = __importDefault(require("./range.js"));
 const wordCount_js_1 = __importDefault(require("./wordCount.js"));
 /**
  * @namespace Validators
@@ -24,6 +25,7 @@ exports.default = {
     regex: regex_js_1.default,
     required: required_js_1.default,
     strlen: strlen_js_1.default,
+    range: range_js_1.default,
     wordCount: wordCount_js_1.default,
 };
 //# sourceMappingURL=index.js.map

package/dist/lib/validators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/validators/index.js"],"names":[],"mappings":";;;;;AAAA,oEAAyC;AACzC,0DAA+B;AAC/B,8DAAmC;AACnC,wDAA6B;AAC7B,sFAA2D;AAC3D,0DAA+B;AAC/B,gEAAqC;AACrC,4DAAiC;AACjC,kEAAuC;AAEvC;;GAEG;AACH,kBAAe;IACb,UAAU,EAAV,uBAAU;IACV,KAAK,EAAL,kBAAK;IACL,OAAO,EAAP,oBAAO;IACP,IAAI,EAAJ,iBAAI;IACJ,mBAAmB,EAAnB,gCAAmB;IACnB,KAAK,EAAL,kBAAK;IACL,QAAQ,EAAR,qBAAQ;IACR,MAAM,EAAN,mBAAM;IACN,SAAS,EAAT,sBAAS;CACV,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/validators/index.js"],"names":[],"mappings":";;;;;AAAA,oEAAyC;AACzC,0DAA+B;AAC/B,8DAAmC;AACnC,wDAA6B;AAC7B,sFAA2D;AAC3D,0DAA+B;AAC/B,gEAAqC;AACrC,4DAAiC;AACjC,0DAA+B;AAC/B,kEAAuC;AAEvC;;GAEG;AACH,kBAAe;IACb,UAAU,EAAV,uBAAU;IACV,KAAK,EAAL,kBAAK;IACL,OAAO,EAAP,oBAAO;IACP,IAAI,EAAJ,iBAAI;IACJ,mBAAmB,EAAnB,gCAAmB;IACnB,KAAK,EAAL,kBAAK;IACL,QAAQ,EAAR,qBAAQ;IACR,MAAM,EAAN,mBAAM;IACN,KAAK,EAAL,kBAAK;IACL,SAAS,EAAT,sBAAS;CACV,CAAA"}

package/dist/lib/validators/range.d.ts

@@ -0,0 +1,45 @@
+/**
+ * @access private
+ * @typedef {import('../../casa').ErrorMessageConfig} ErrorMessageConfig
+ */
+/**
+ * @typedef {object} RangeConfigOptions
+ * @property {ErrorMessageConfig} errorMsgMax Error message to use on max failure
+ * @property {ErrorMessageConfig} errorMsgMin Error message to use on min failure
+ * @property {number} max Maximum integer value
+ * @property {number} min Minimum integer value
+ */
+/**
+ * Test if an integer is within a provided range.
+ *
+ * See {@link RangeConfigOptions} for `make()` options.
+ *
+ * @memberof Validators
+ * @augments ValidatorFactory
+ */
+export default class Range extends ValidatorFactory {
+    name: string;
+    validate(inputValue: any, dataContext?: {}): ValidationError[];
+    sanitise(value: any): string | undefined;
+}
+export type ErrorMessageConfig = import('../../casa').ErrorMessageConfig;
+export type RangeConfigOptions = {
+    /**
+     * Error message to use on max failure
+     */
+    errorMsgMax: ErrorMessageConfig;
+    /**
+     * Error message to use on min failure
+     */
+    errorMsgMin: ErrorMessageConfig;
+    /**
+     * Maximum integer value
+     */
+    max: number;
+    /**
+     * Minimum integer value
+     */
+    min: number;
+};
+import ValidatorFactory from '../ValidatorFactory.js';
+import ValidationError from '../ValidationError.js';

package/dist/lib/validators/range.js

@@ -0,0 +1,66 @@
+"use strict";
+/* eslint-disable class-methods-use-this */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
+const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
+const utils_js_1 = require("../utils.js");
+/**
+ * @access private
+ * @typedef {import('../../casa').ErrorMessageConfig} ErrorMessageConfig
+ */
+/**
+ * @typedef {object} RangeConfigOptions
+ * @property {ErrorMessageConfig} errorMsgMax Error message to use on max failure
+ * @property {ErrorMessageConfig} errorMsgMin Error message to use on min failure
+ * @property {number} max Maximum integer value
+ * @property {number} min Minimum integer value
+ */
+/**
+ * Test if an integer is within a provided range.
+ *
+ * See {@link RangeConfigOptions} for `make()` options.
+ *
+ * @memberof Validators
+ * @augments ValidatorFactory
+ */
+class Range extends ValidatorFactory_js_1.default {
+    constructor() {
+        super(...arguments);
+        this.name = 'range';
+    }
+    validate(inputValue, dataContext = {}) {
+        const { errorMsgMax = {
+            inline: 'validation:rule.range.max.inline',
+            summary: 'validation:rule.range.max.summary',
+        }, errorMsgMin = {
+            inline: 'validation:rule.range.min.inline',
+            summary: 'validation:rule.range.min.summary',
+        }, min = Number.MIN_VALUE, max = Number.MAX_VALUE, } = this.config;
+        let errorMsg;
+        let valid = true;
+        if (inputValue > max) {
+            valid = false;
+            errorMsg = errorMsgMax;
+        }
+        if (inputValue < min) {
+            valid = false;
+            errorMsg = errorMsgMin;
+        }
+        return valid ? [] : [ValidationError_js_1.default.make({ errorMsg, dataContext })];
+    }
+    sanitise(value) {
+        var _a;
+        // treat an empty string as undefined
+        // when user submits empty form, it stores an empty string
+        if (value !== '' && value !== undefined) {
+            // add to custom validator docs to ensure not to return a falsy value as it doesn't show on screen
+            return (_a = (0, utils_js_1.coerceInputToInteger)(value)) === null || _a === void 0 ? void 0 : _a.toString();
+        }
+        return undefined;
+    }
+}
+exports.default = Range;
+//# sourceMappingURL=range.js.map

package/dist/lib/validators/range.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"range.js","sourceRoot":"","sources":["../../../src/lib/validators/range.js"],"names":[],"mappings":";AAAA,2CAA2C;;;;;AAE3C,iFAAsD;AACtD,+EAAoD;AACpD,0CAAmD;AAEnD;;;GAGG;AAEH;;;;;;GAMG;AAEH;;;;;;;GAOG;AACH,MAAqB,KAAM,SAAQ,6BAAgB;IAAnD;;QACE,SAAI,GAAG,OAAO,CAAC;IAyCjB,CAAC;IAvCC,QAAQ,CAAC,UAAU,EAAE,WAAW,GAAG,EAAE;QACnC,MAAM,EACJ,WAAW,GAAG;YACZ,MAAM,EAAE,kCAAkC;YAC1C,OAAO,EAAE,mCAAmC;SAC7C,EACD,WAAW,GAAG;YACZ,MAAM,EAAE,kCAAkC;YAC1C,OAAO,EAAE,mCAAmC;SAC7C,EACD,GAAG,GAAG,MAAM,CAAC,SAAS,EACtB,GAAG,GAAG,MAAM,CAAC,SAAS,GACvB,GAAG,IAAI,CAAC,MAAM,CAAC;QAEhB,IAAI,QAAQ,CAAC;QACb,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,IAAI,UAAU,GAAG,GAAG,EAAE;YACpB,KAAK,GAAG,KAAK,CAAC;YACd,QAAQ,GAAG,WAAW,CAAC;SACxB;QAED,IAAI,UAAU,GAAG,GAAG,EAAE;YACpB,KAAK,GAAG,KAAK,CAAC;YACd,QAAQ,GAAG,WAAW,CAAC;SACxB;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,4BAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,QAAQ,CAAC,KAAK;;QACZ,qCAAqC;QACrC,0DAA0D;QAC1D,IAAI,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,SAAS,EAAE;YACvC,kGAAkG;YAClG,OAAO,MAAA,IAAA,+BAAoB,EAAC,KAAK,CAAC,0CAAE,QAAQ,EAAE,CAAC;SAChD;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA1CD,wBA0CC"}

package/dist/middleware/csrf.d.ts

@@ -1 +1 @@
-export default function csrfMiddleware(): any[];
+export default function csrfMiddleware(): import("csrf-sync").CsrfSynchronisedProtection[];

package/dist/middleware/csrf.js

@@ -1,26 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const csurf_1 = __importDefault(require("csurf"));
+const csrf_sync_1 = require("csrf-sync");
 // 2 middleware: one to generate the csrf token and check its validity (POST
 // only), and one to provide that token to templates via the `casa.csrfToken`
 // variable.
 function csrfMiddleware() {
+    const { csrfSynchronisedProtection } = (0, csrf_sync_1.csrfSync)({
+        getTokenFromRequest: (req) => req.body._csrf,
+    });
     return [
-        (0, csurf_1.default)({
-            cookie: false,
-            sessionKey: 'session',
-            // value: (req) => {
-            //   // Here we clear the token after extracting to maintain cleaner data. It
-            //   // is only used for this CSRF purpose.
-            //   const token = String(req.body._csrf);
-            //   delete req.body._csrf;
-            //   return token;
-            //   /* eslint-enable no-underscore-dangle */
-            // },
-        }),
+        csrfSynchronisedProtection,
         (req, res, next) => {
             var _a;
             res.locals.casa = Object.assign(Object.assign({}, (_a = res.locals) === null || _a === void 0 ? void 0 : _a.casa), { csrfToken: req.csrfToken() });

package/dist/middleware/csrf.js.map

@@ -1 +1 @@
-{"version":3,"file":"csrf.js","sourceRoot":"","sources":["../../src/middleware/csrf.js"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,4EAA4E;AAC5E,6EAA6E;AAC7E,YAAY;AAEZ,SAAwB,cAAc;IACpC,OAAO;QACL,IAAA,eAAK,EAAC;YACJ,MAAM,EAAE,KAAK;YACb,UAAU,EAAE,SAAS;YACrB,oBAAoB;YACpB,6EAA6E;YAC7E,2CAA2C;YAC3C,0CAA0C;YAC1C,2BAA2B;YAC3B,kBAAkB;YAClB,6CAA6C;YAC7C,KAAK;SACN,CAAC;QACF,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;YACjB,GAAG,CAAC,MAAM,CAAC,IAAI,mCACV,MAAA,GAAG,CAAC,MAAM,0CAAE,IAAI,KACnB,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAC3B,CAAC;YACF,IAAI,EAAE,CAAC;QACT,CAAC;KACF,CAAC;AACJ,CAAC;AAtBD,iCAsBC"}
+{"version":3,"file":"csrf.js","sourceRoot":"","sources":["../../src/middleware/csrf.js"],"names":[],"mappings":";;AAAA,yCAAqC;AAErC,4EAA4E;AAC5E,6EAA6E;AAC7E,YAAY;AAEZ,SAAwB,cAAc;IACpC,MAAM,EAAE,0BAA0B,EAAE,GAAG,IAAA,oBAAQ,EAAC;QAC9C,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK;KAC7C,CAAC,CAAC;IACH,OAAO;QACL,0BAA0B;QAC1B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;YACjB,GAAG,CAAC,MAAM,CAAC,IAAI,mCACV,MAAA,GAAG,CAAC,MAAM,0CAAE,IAAI,KACnB,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAC3B,CAAC;YACF,IAAI,EAAE,CAAC;QACT,CAAC;KACF,CAAC;AACJ,CAAC;AAdD,iCAcC"}

package/locales/cy/validation.json

@@ -77,5 +77,16 @@
         "summary": "Mae gwerth yn rhy hir"
       }
     }
+  },
+
+  "range": {
+    "min": {
+      "inline": "Mae’r gwerth yn rhy fach",
+      "summary": "Mae’r gwerth yn rhy fach"
+    },
+    "max": {
+      "inline": "Mae’r gwerth yn rhy fawr",
+      "summary": "Mae’r gwerth yn rhy fawr"
+    }
   }
 }

package/locales/en/validation.json

@@ -77,6 +77,18 @@
         "summary": "Value is too long"
       }
     },
+
+    "range": {
+      "min": {
+        "inline": "Value is too small",
+        "summary": "Value is too small"
+      },
+      "max": {
+        "inline": "Value is too large",
+        "summary": "Value is too large"
+      }
+    },
+
     "wordCount": {
       "min": {
         "inline": "Value is too short",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwp/govuk-casa",
-  "version": "8.10.2",
+  "version": "8.11.0",
   "description": "A framework for building GOVUK Collect-And-Submit-Applications",
   "repository": {
     "type": "git",
@@ -48,18 +48,18 @@
   "license": "ISC",
   "type": "module",
   "dependencies": {
-    "@dagrejs/graphlib": "2.1.12",
+    "@dagrejs/graphlib": "2.1.13",
     "bytes": "3.1.2",
     "cookie-parser": "1.4.6",
-    "csurf": "1.11.0",
+    "csrf-sync": "4.0.1",
     "debug": "4.3.4",
     "deepmerge": "4.3.1",
     "express": "4.18.2",
     "express-session": "1.17.3",
     "govuk-frontend": "4.6.0",
-    "helmet": "6.2.0",
-    "i18next": "22.4.15",
-    "i18next-http-middleware": "3.3.0",
+    "helmet": "7.0.0",
+    "i18next": "22.5.0",
+    "i18next-http-middleware": "3.3.1",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
     "luxon": "3.3.0",
@@ -69,33 +69,33 @@
     "validator": "13.9.0"
   },
   "devDependencies": {
-    "@babel/core": "7.21.8",
+    "@babel/core": "7.22.1",
     "@babel/eslint-parser": "7.21.8",
-    "@babel/preset-env": "7.21.5",
+    "@babel/preset-env": "7.22.2",
     "@ckeditor/jsdoc-plugins": "37.0.1",
     "@commitlint/config-conventional": "17.6.3",
-    "@dwp/casa-spiderplan": "2.5.6",
+    "@dwp/casa-spiderplan": "3.1.1",
     "@dwp/casa-spiderplan-a11y-plugin": "0.1.12",
     "@dwp/casa-spiderplan-zap-plugin": "0.1.8",
     "@dwp/eslint-config-base": "6.1.1",
     "@types/express": "4.17.17",
-    "@types/node": "18.16.8",
+    "@types/node": "18.16.16",
     "@types/nunjucks": "3.2.2",
     "c8": "7.13.0",
     "chai": "4.3.7",
     "cheerio": "1.0.0-rc.12",
     "commitlint": "17.6.3",
     "docdash": "2.0.1",
-    "eslint": "8.40.0",
+    "eslint": "8.41.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.1",
+    "fast-check": "3.9.0",
     "jsdoc": "4.0.2",
     "jsdoc-tsimport-plugin": "1.0.5",
     "mocha": "10.2.0",
     "sass": "1.62.1",
-    "sinon": "15.0.4",
+    "sinon": "15.1.0",
     "sinon-chai": "3.7.0",
     "supertest": "6.3.3",
     "typescript": "5.0.4"

package/src/lib/utils.js

@@ -67,6 +67,16 @@ export function stringifyInput(input, fallback) {
   return isStringable(input) ? String(input) : fb;
 }
 
+/**
+ * Coerce an input to an integer.
+ *
+ * @param {any} input Input to be coerced.
+ * @returns {number|undefined} The number as an integer or `undefined`.
+ */
+export function coerceInputToInteger(input) {
+  return Number.isNaN(Number(input)) ? undefined : Math.floor(Number(input));
+}
+
 /**
  * Strip whitespace from a string.
  *

package/src/lib/validators/index.js

@@ -6,6 +6,7 @@ import postalAddressObject from './postalAddressObject.js';
 import regex from './regex.js';
 import required from './required.js';
 import strlen from './strlen.js';
+import range from './range.js';
 import wordCount from './wordCount.js';
 
 /**
@@ -20,5 +21,6 @@ export default {
   regex,
   required,
   strlen,
+  range,
   wordCount,
 }

package/src/lib/validators/range.js

@@ -0,0 +1,70 @@
+/* eslint-disable class-methods-use-this */
+
+import ValidatorFactory from '../ValidatorFactory.js';
+import ValidationError from '../ValidationError.js';
+import { coerceInputToInteger } from '../utils.js';
+
+/**
+ * @access private
+ * @typedef {import('../../casa').ErrorMessageConfig} ErrorMessageConfig
+ */
+
+/**
+ * @typedef {object} RangeConfigOptions
+ * @property {ErrorMessageConfig} errorMsgMax Error message to use on max failure
+ * @property {ErrorMessageConfig} errorMsgMin Error message to use on min failure
+ * @property {number} max Maximum integer value
+ * @property {number} min Minimum integer value
+ */
+
+/**
+ * Test if an integer is within a provided range.
+ *
+ * See {@link RangeConfigOptions} for `make()` options.
+ *
+ * @memberof Validators
+ * @augments ValidatorFactory
+ */
+export default class Range extends ValidatorFactory {
+  name = 'range';
+
+  validate(inputValue, dataContext = {}) {
+    const {
+      errorMsgMax = {
+        inline: 'validation:rule.range.max.inline',
+        summary: 'validation:rule.range.max.summary',
+      },
+      errorMsgMin = {
+        inline: 'validation:rule.range.min.inline',
+        summary: 'validation:rule.range.min.summary',
+      },
+      min = Number.MIN_VALUE,
+      max = Number.MAX_VALUE,
+    } = this.config;
+
+    let errorMsg;
+    let valid = true;
+
+    if (inputValue > max) {
+      valid = false;
+      errorMsg = errorMsgMax;
+    }
+
+    if (inputValue < min) {
+      valid = false;
+      errorMsg = errorMsgMin;
+    }
+
+    return valid ? [] : [ValidationError.make({ errorMsg, dataContext })];
+  }
+
+  sanitise(value) {
+    // treat an empty string as undefined
+    // when user submits empty form, it stores an empty string
+    if (value !== '' && value !== undefined) {
+      // add to custom validator docs to ensure not to return a falsy value as it doesn't show on screen
+      return coerceInputToInteger(value)?.toString();
+    }
+    return undefined;
+  }
+}

package/src/middleware/csrf.js

@@ -1,23 +1,15 @@
-import csurf from 'csurf';
+import { csrfSync } from 'csrf-sync';
 
 // 2 middleware: one to generate the csrf token and check its validity (POST
 // only), and one to provide that token to templates via the `casa.csrfToken`
 // variable.
 
 export default function csrfMiddleware() {
+  const { csrfSynchronisedProtection } = csrfSync({
+    getTokenFromRequest: (req) => req.body._csrf,
+  });
   return [
-    csurf({
-      cookie: false,
-      sessionKey: 'session',
-      // value: (req) => {
-      //   // Here we clear the token after extracting to maintain cleaner data. It
-      //   // is only used for this CSRF purpose.
-      //   const token = String(req.body._csrf);
-      //   delete req.body._csrf;
-      //   return token;
-      //   /* eslint-enable no-underscore-dangle */
-      // },
-    }),
+    csrfSynchronisedProtection,
     (req, res, next) => {
       res.locals.casa = {
         ...res.locals?.casa,