@dwp/govuk-casa 8.12.0 → 8.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/casa.d.ts +4 -0
- package/dist/casa.js +1 -0
- package/dist/casa.js.map +1 -1
- package/dist/lib/configuration-ingestor.d.ts +10 -1
- package/dist/lib/configuration-ingestor.js +25 -1
- package/dist/lib/configuration-ingestor.js.map +1 -1
- package/dist/lib/configure.js +4 -1
- package/dist/lib/configure.js.map +1 -1
- package/dist/lib/constants.d.ts +2 -0
- package/dist/lib/constants.js +3 -1
- package/dist/lib/constants.js.map +1 -1
- package/dist/routes/journey.d.ts +1 -1
- package/dist/routes/journey.js +35 -10
- package/dist/routes/journey.js.map +1 -1
- package/package.json +1 -1
- package/src/casa.js +1 -0
- package/src/lib/configuration-ingestor.js +26 -0
- package/src/lib/configure.js +5 -0
- package/src/lib/constants.js +2 -0
- package/src/routes/journey.js +36 -9
package/dist/casa.d.ts
CHANGED
|
@@ -212,6 +212,10 @@ export type ConfigurationOptions = {
|
|
|
212
212
|
* Custom context ID generator
|
|
213
213
|
*/
|
|
214
214
|
contextIdGenerator?: ContextIdGenerator | undefined;
|
|
215
|
+
/**
|
|
216
|
+
* option to keep page errors active on GET request
|
|
217
|
+
*/
|
|
218
|
+
errorVisibility?: symbol | Function | undefined;
|
|
215
219
|
};
|
|
216
220
|
/**
|
|
217
221
|
* Result of a call to configure() function
|
package/dist/casa.js
CHANGED
|
@@ -165,6 +165,7 @@ exports.contextIdGenerators = contextIdGenerators;
|
|
|
165
165
|
* @property {number} [formMaxParams=25] Max number of form parameters to ingest
|
|
166
166
|
* @property {number|string} [formMaxBytes="50KB"] Max total form payload size to ingest
|
|
167
167
|
* @property {ContextIdGenerator} [contextIdGenerator] Custom context ID generator
|
|
168
|
+
* @property {symbol|Function} [errorVisibility] option to keep page errors active on GET request
|
|
168
169
|
*/
|
|
169
170
|
/**
|
|
170
171
|
* @typedef {object} ConfigureResult Result of a call to configure() function
|
package/dist/casa.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"casa.js","sourceRoot":"","sources":["../src/casa.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAA4E;AAC5E,sEAA2C;AAgBzC,oBAhBK,sBAAS,CAgBL;AAfX,yEAAmD;AAgBjD,qBAhBK,kBAAU,CAgBL;AAfZ,8DAAmC;AAgBjC,gBAhBK,kBAAK,CAgBL;AAfP,4DAAiC;AAgB/B,eAhBK,iBAAI,CAgBL;AAfN,gFAAqD;AAgBnD,yBAhBK,2BAAc,CAgBL;AAfhB,oFAAyD;AAgBvD,2BAhBK,6BAAgB,CAgBL;AAflB,kFAAuD;AAgBrD,0BAhBK,4BAAe,CAgBL;AAfjB,8EAAmD;AAgBjD,wBAhBK,0BAAa,CAgBL;AAff,4EAAgD;AAkB9C,sBAlBK,yBAAW,CAkBL;AAjBb,0EAA8C;AAkB5C,qBAlBK,wBAAU,CAkBL;AAjBZ,2EAA6D;AAoB3D,0CAAe;AAnBjB,8DAAgD;AAsB9C,8BAAS;AArBX,oFAAsE;AAwBpE,kDAAmB;AAGrB,gFAAgF;AAChF,qEAAqE;AAErE;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AAEH;;;;;;;;;;GAUG;AAEH;;;;GAIG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;;;GAcG;AAEH
|
|
1
|
+
{"version":3,"file":"casa.js","sourceRoot":"","sources":["../src/casa.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAA4E;AAC5E,sEAA2C;AAgBzC,oBAhBK,sBAAS,CAgBL;AAfX,yEAAmD;AAgBjD,qBAhBK,kBAAU,CAgBL;AAfZ,8DAAmC;AAgBjC,gBAhBK,kBAAK,CAgBL;AAfP,4DAAiC;AAgB/B,eAhBK,iBAAI,CAgBL;AAfN,gFAAqD;AAgBnD,yBAhBK,2BAAc,CAgBL;AAfhB,oFAAyD;AAgBvD,2BAhBK,6BAAgB,CAgBL;AAflB,kFAAuD;AAgBrD,0BAhBK,4BAAe,CAgBL;AAfjB,8EAAmD;AAgBjD,wBAhBK,0BAAa,CAgBL;AAff,4EAAgD;AAkB9C,sBAlBK,yBAAW,CAkBL;AAjBb,0EAA8C;AAkB5C,qBAlBK,wBAAU,CAkBL;AAjBZ,2EAA6D;AAoB3D,0CAAe;AAnBjB,8DAAgD;AAsB9C,8BAAS;AArBX,oFAAsE;AAwBpE,kDAAmB;AAGrB,gFAAgF;AAChF,qEAAqE;AAErE;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AAEH;;;;;;;;;;GAUG;AAEH;;;;GAIG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;;;;;;;;;;;GAeG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH;;;;;;;GAOG;AAEH;;;;GAIG;AAEH;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAEH;;;;;;;GAOG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;;GAYG"}
|
|
@@ -128,7 +128,16 @@ export function validateSessionCookiePath(cookiePath: string, defaultPath?: stri
|
|
|
128
128
|
* @returns {boolean} cookie path
|
|
129
129
|
* @throws {TypeError} When invalid arguments are provided
|
|
130
130
|
*/
|
|
131
|
-
|
|
131
|
+
/**
|
|
132
|
+
* Validates errorVisibility.
|
|
133
|
+
*
|
|
134
|
+
* @access private
|
|
135
|
+
* @param {string} errorVisibility sets visibility flag for page validation error
|
|
136
|
+
* @throws {SyntaxError} For invalid errorVisibility flag.
|
|
137
|
+
* @returns {symbol | Function} flag for error visibility.
|
|
138
|
+
*/
|
|
139
|
+
export function validateErrorVisibility(errorVisibility?: string): symbol | Function;
|
|
140
|
+
export function validateSessionCookieSameSite(cookieSameSite: any, defaultFlag: any): any;
|
|
132
141
|
export function validatePageHooks(hooks: any): any[];
|
|
133
142
|
export function validateFields(fields: any): any[];
|
|
134
143
|
export function validatePages(pages?: any[]): any[];
|
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.validateContextIdGenerator = exports.validateFormMaxBytes = exports.validateFormMaxParams = exports.validateHelmetConfigurator = exports.validateEvents = exports.validatePlugins = exports.validateGlobalHooks = exports.validatePlan = exports.validatePages = exports.validateFields = exports.validatePageHooks = exports.validateSessionCookieSameSite = exports.validateSessionCookiePath = exports.validateSessionStore = exports.validateSessionSecure = exports.validateSessionName = exports.validateSessionTtl = exports.validateSessionSecret = exports.validateViews = exports.validateSessionObject = exports.validateMountUrl = exports.validateI18nLocales = exports.validateI18nDirs = exports.validateI18nObject = void 0;
|
|
29
|
+
exports.validateContextIdGenerator = exports.validateFormMaxBytes = exports.validateFormMaxParams = exports.validateHelmetConfigurator = exports.validateEvents = exports.validatePlugins = exports.validateGlobalHooks = exports.validatePlan = exports.validatePages = exports.validateFields = exports.validatePageHooks = exports.validateSessionCookieSameSite = exports.validateErrorVisibility = exports.validateSessionCookiePath = exports.validateSessionStore = exports.validateSessionSecure = exports.validateSessionName = exports.validateSessionTtl = exports.validateSessionSecret = exports.validateViews = exports.validateSessionObject = exports.validateMountUrl = exports.validateI18nLocales = exports.validateI18nDirs = exports.validateI18nObject = void 0;
|
|
30
30
|
/* eslint-disable sonarjs/no-duplicate-string */
|
|
31
31
|
const bytes_1 = __importDefault(require("bytes"));
|
|
32
32
|
const field_js_1 = require("./field.js");
|
|
@@ -34,6 +34,7 @@ const Plan_js_1 = __importDefault(require("./Plan.js"));
|
|
|
34
34
|
const logger_js_1 = __importDefault(require("./logger.js"));
|
|
35
35
|
const utils_js_1 = require("./utils.js");
|
|
36
36
|
const contextIdGenerators = __importStar(require("./context-id-generators.js"));
|
|
37
|
+
const constants_js_1 = require("./constants.js");
|
|
37
38
|
/**
|
|
38
39
|
* @access private
|
|
39
40
|
* @typedef {import('../casa').ConfigurationOptions} ConfigurationOptions
|
|
@@ -274,6 +275,24 @@ exports.validateSessionCookiePath = validateSessionCookiePath;
|
|
|
274
275
|
* @returns {boolean} cookie path
|
|
275
276
|
* @throws {TypeError} When invalid arguments are provided
|
|
276
277
|
*/
|
|
278
|
+
/**
|
|
279
|
+
* Validates errorVisibility.
|
|
280
|
+
*
|
|
281
|
+
* @access private
|
|
282
|
+
* @param {string} errorVisibility sets visibility flag for page validation error
|
|
283
|
+
* @throws {SyntaxError} For invalid errorVisibility flag.
|
|
284
|
+
* @returns {symbol | Function} flag for error visibility.
|
|
285
|
+
*/
|
|
286
|
+
function validateErrorVisibility(errorVisibility = constants_js_1.CONFIG_ERROR_VISIBILITY_ONSUBMIT) {
|
|
287
|
+
if (errorVisibility === undefined) {
|
|
288
|
+
return undefined;
|
|
289
|
+
}
|
|
290
|
+
if (errorVisibility === constants_js_1.CONFIG_ERROR_VISIBILITY_ALWAYS || errorVisibility === constants_js_1.CONFIG_ERROR_VISIBILITY_ONSUBMIT || typeof errorVisibility === 'function') {
|
|
291
|
+
return errorVisibility;
|
|
292
|
+
}
|
|
293
|
+
throw new TypeError('errorVisibility must be casa constant CONFIG_ERROR_VISIBILITY_ALWAYS | CONFIG_ERROR_VISIBILITY_ONSUBMIT or function');
|
|
294
|
+
}
|
|
295
|
+
exports.validateErrorVisibility = validateErrorVisibility;
|
|
277
296
|
function validateSessionCookieSameSite(cookieSameSite, defaultFlag) {
|
|
278
297
|
const validValues = [true, false, 'Strict', 'Lax', 'None'];
|
|
279
298
|
if (defaultFlag === undefined) {
|
|
@@ -338,6 +357,9 @@ const validatePage = (page, index) => {
|
|
|
338
357
|
if (page.hooks !== undefined) {
|
|
339
358
|
validatePageHooks(page.hooks);
|
|
340
359
|
}
|
|
360
|
+
if (page.errorVisibility !== undefined) {
|
|
361
|
+
validateErrorVisibility(page.errorVisibility);
|
|
362
|
+
}
|
|
341
363
|
}
|
|
342
364
|
catch (err) {
|
|
343
365
|
err.message = `Page at index ${index} is invalid: ${err.message}`;
|
|
@@ -469,6 +491,8 @@ function ingest(config = {}) {
|
|
|
469
491
|
})),
|
|
470
492
|
// URL that will prefix all URLs in the browser address bar
|
|
471
493
|
mountUrl: validateMountUrl(config.mountUrl),
|
|
494
|
+
// flag to make validation error visible on get requests
|
|
495
|
+
errorVisibility: validateErrorVisibility(config.errorVisibility),
|
|
472
496
|
// Session
|
|
473
497
|
session: validateSessionObject(config.session, (session) => ({
|
|
474
498
|
name: validateSessionName(session.name),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration-ingestor.js","sourceRoot":"","sources":["../../src/lib/configuration-ingestor.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"configuration-ingestor.js","sourceRoot":"","sources":["../../src/lib/configuration-ingestor.js"],"names":[],"mappings":"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"}
|
package/dist/lib/configure.js
CHANGED
|
@@ -21,6 +21,7 @@ const i18n_js_1 = __importDefault(require("../middleware/i18n.js"));
|
|
|
21
21
|
const data_js_1 = __importDefault(require("../middleware/data.js"));
|
|
22
22
|
const body_parser_js_1 = __importDefault(require("../middleware/body-parser.js"));
|
|
23
23
|
const csrf_js_1 = __importDefault(require("../middleware/csrf.js"));
|
|
24
|
+
const constants_js_1 = require("./constants.js");
|
|
24
25
|
/**
|
|
25
26
|
* @access private
|
|
26
27
|
* @typedef {import('../casa').ConfigurationOptions} ConfigurationOptions
|
|
@@ -49,7 +50,7 @@ function configure(config = {}) {
|
|
|
49
50
|
});
|
|
50
51
|
// Extract config
|
|
51
52
|
const ingestedConfig = (0, configuration_ingestor_js_1.default)(config);
|
|
52
|
-
const { mountUrl, views = [], session = {
|
|
53
|
+
const { mountUrl, errorVisibility = constants_js_1.CONFIG_ERROR_VISIBILITY_ONSUBMIT, views = [], session = {
|
|
53
54
|
secret: 'secret',
|
|
54
55
|
name: 'casasession',
|
|
55
56
|
secure: false,
|
|
@@ -120,11 +121,13 @@ function configure(config = {}) {
|
|
|
120
121
|
sessionTtl: session.ttl,
|
|
121
122
|
});
|
|
122
123
|
// Setup waypoint router, which includes routes for every defined waypoint
|
|
124
|
+
const globalErrorVisibility = errorVisibility;
|
|
123
125
|
const journeyRouter = (0, journey_js_1.default)({
|
|
124
126
|
globalHooks: hooks,
|
|
125
127
|
pages,
|
|
126
128
|
plan,
|
|
127
129
|
csrfMiddleware,
|
|
130
|
+
globalErrorVisibility,
|
|
128
131
|
});
|
|
129
132
|
// Create the mounting function
|
|
130
133
|
const mount = (0, mount_js_1.default)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../src/lib/configure.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../src/lib/configure.js"],"names":[],"mappings":"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"}
|
package/dist/lib/constants.d.ts
CHANGED
|
@@ -7,3 +7,5 @@ export const REQUEST_PHASE_GATHER: unique symbol;
|
|
|
7
7
|
export const REQUEST_PHASE_VALIDATE: unique symbol;
|
|
8
8
|
export const REQUEST_PHASE_REDIRECT: unique symbol;
|
|
9
9
|
export const REQUEST_PHASE_RENDER: unique symbol;
|
|
10
|
+
export const CONFIG_ERROR_VISIBILITY_ONSUBMIT: unique symbol;
|
|
11
|
+
export const CONFIG_ERROR_VISIBILITY_ALWAYS: unique symbol;
|
package/dist/lib/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.REQUEST_PHASE_RENDER = exports.REQUEST_PHASE_REDIRECT = exports.REQUEST_PHASE_VALIDATE = exports.REQUEST_PHASE_GATHER = exports.REQUEST_PHASE_SANITISE = exports.REQUEST_PHASE_STEER = void 0;
|
|
3
|
+
exports.CONFIG_ERROR_VISIBILITY_ALWAYS = exports.CONFIG_ERROR_VISIBILITY_ONSUBMIT = exports.REQUEST_PHASE_RENDER = exports.REQUEST_PHASE_REDIRECT = exports.REQUEST_PHASE_VALIDATE = exports.REQUEST_PHASE_GATHER = exports.REQUEST_PHASE_SANITISE = exports.REQUEST_PHASE_STEER = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* General-purpose references to the different request lifecycle phases.
|
|
6
6
|
*/
|
|
@@ -10,4 +10,6 @@ exports.REQUEST_PHASE_GATHER = Symbol('gather');
|
|
|
10
10
|
exports.REQUEST_PHASE_VALIDATE = Symbol('validate');
|
|
11
11
|
exports.REQUEST_PHASE_REDIRECT = Symbol('redirect');
|
|
12
12
|
exports.REQUEST_PHASE_RENDER = Symbol('render');
|
|
13
|
+
exports.CONFIG_ERROR_VISIBILITY_ONSUBMIT = Symbol('onsubmit');
|
|
14
|
+
exports.CONFIG_ERROR_VISIBILITY_ALWAYS = Symbol('always');
|
|
13
15
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/lib/constants.js"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AACtC,QAAA,sBAAsB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAC5C,QAAA,oBAAoB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AACxC,QAAA,sBAAsB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAC5C,QAAA,sBAAsB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAC5C,QAAA,oBAAoB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/lib/constants.js"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AACtC,QAAA,sBAAsB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAC5C,QAAA,oBAAoB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AACxC,QAAA,sBAAsB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAC5C,QAAA,sBAAsB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAC5C,QAAA,oBAAoB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AACxC,QAAA,gCAAgC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACtD,QAAA,8BAA8B,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC"}
|
package/dist/routes/journey.d.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* @param {JourneyRouterOptions} opts Options
|
|
7
7
|
* @returns {MutableRouter} Router
|
|
8
8
|
*/
|
|
9
|
-
export default function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, }: JourneyRouterOptions): MutableRouter;
|
|
9
|
+
export default function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVisibility, }: JourneyRouterOptions): MutableRouter;
|
|
10
10
|
/**
|
|
11
11
|
* Options to configure static router
|
|
12
12
|
*/
|
package/dist/routes/journey.js
CHANGED
|
@@ -14,6 +14,7 @@ const progress_journey_js_1 = __importDefault(require("../middleware/progress-jo
|
|
|
14
14
|
const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
|
|
15
15
|
const logger_js_1 = __importDefault(require("../lib/logger.js"));
|
|
16
16
|
const utils_js_1 = require("../lib/utils.js");
|
|
17
|
+
const constants_js_1 = require("../lib/constants.js");
|
|
17
18
|
const log = (0, logger_js_1.default)('routes:journey');
|
|
18
19
|
/**
|
|
19
20
|
* @access private
|
|
@@ -48,6 +49,25 @@ const renderMiddlewareFactory = (view, contextFactory) => [
|
|
|
48
49
|
});
|
|
49
50
|
},
|
|
50
51
|
];
|
|
52
|
+
/**
|
|
53
|
+
* generate page validation error
|
|
54
|
+
*
|
|
55
|
+
* @param {object} errors object of page validation error
|
|
56
|
+
* @param {object} req casa request object
|
|
57
|
+
* @returns {object[]} array of error objects
|
|
58
|
+
*/
|
|
59
|
+
const generateGovukErrors = (errors, req) => Object.values(errors || {}).map(([error]) => ({
|
|
60
|
+
text: req.t(error.summary, error.variables),
|
|
61
|
+
href: error.fieldHref,
|
|
62
|
+
}));
|
|
63
|
+
/**
|
|
64
|
+
* handle errorVisibility flag and function and return boolean
|
|
65
|
+
*
|
|
66
|
+
* @param {symbol | Function} errorVisibility errorVisibility config option
|
|
67
|
+
* @param {object} req casa request object
|
|
68
|
+
* @returns {boolean} true if errorVisibility is "always" or function condition true
|
|
69
|
+
*/
|
|
70
|
+
const resolveErrorVisibility = (req, errorVisibility) => (typeof errorVisibility === 'function' ? errorVisibility({ req }) : errorVisibility === constants_js_1.CONFIG_ERROR_VISIBILITY_ALWAYS);
|
|
51
71
|
/**
|
|
52
72
|
* Create an instance of the router for all waypoints visited during a Journey
|
|
53
73
|
* through the Plan.
|
|
@@ -56,7 +76,7 @@ const renderMiddlewareFactory = (view, contextFactory) => [
|
|
|
56
76
|
* @param {JourneyRouterOptions} opts Options
|
|
57
77
|
* @returns {MutableRouter} Router
|
|
58
78
|
*/
|
|
59
|
-
function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, }) {
|
|
79
|
+
function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVisibility, }) {
|
|
60
80
|
// Router
|
|
61
81
|
const router = new MutableRouter_js_1.default();
|
|
62
82
|
// Special "_" route which handles redirecting the user between sub-apps
|
|
@@ -102,7 +122,7 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, }) {
|
|
|
102
122
|
...csrfMiddleware,
|
|
103
123
|
];
|
|
104
124
|
pages.forEach((page) => {
|
|
105
|
-
const { waypoint, view, hooks: pageHooks = [], fields } = page;
|
|
125
|
+
const { waypoint, view, hooks: pageHooks = [], fields, errorVisibility } = page;
|
|
106
126
|
const waypointPath = `/${waypoint}`;
|
|
107
127
|
let commonWaypointMiddleware = [
|
|
108
128
|
(req, res, next) => {
|
|
@@ -118,10 +138,18 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, }) {
|
|
|
118
138
|
...(0, skip_waypoint_js_1.default)({ waypoint }),
|
|
119
139
|
];
|
|
120
140
|
}
|
|
121
|
-
router.get(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)('journey.presteer', waypointPath, [...globalHooks, ...pageHooks]), ...(0, steer_journey_js_1.default)({ waypoint, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.poststeer', waypointPath, [...globalHooks, ...pageHooks]), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.prerender', waypointPath, [...globalHooks, ...pageHooks]), renderMiddlewareFactory(view, (req) =>
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
141
|
+
router.get(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)('journey.presteer', waypointPath, [...globalHooks, ...pageHooks]), ...(0, steer_journey_js_1.default)({ waypoint, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.poststeer', waypointPath, [...globalHooks, ...pageHooks]), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.prerender', waypointPath, [...globalHooks, ...pageHooks]), renderMiddlewareFactory(view, (req) => {
|
|
142
|
+
var _a;
|
|
143
|
+
const displayErrors = resolveErrorVisibility(req, globalErrorVisibility) || resolveErrorVisibility(req, errorVisibility);
|
|
144
|
+
const errors = displayErrors && ((_a = req.casa.journeyContext.getValidationErrorsForPageByField(waypoint)) !== null && _a !== void 0 ? _a : Object.create(null));
|
|
145
|
+
const govukErrors = displayErrors && generateGovukErrors(errors, req);
|
|
146
|
+
return ({
|
|
147
|
+
formUrl: (0, waypoint_url_js_1.default)({ mountUrl: `${req.baseUrl}/`, waypoint }),
|
|
148
|
+
formData: req.casa.journeyContext.getDataForPage(waypoint),
|
|
149
|
+
formErrors: (Object.keys(errors).length && displayErrors) ? errors : null,
|
|
150
|
+
formErrorsGovukArray: (govukErrors.length && displayErrors) ? govukErrors : null,
|
|
151
|
+
});
|
|
152
|
+
}));
|
|
125
153
|
router.post(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)('journey.presteer', waypointPath, [...globalHooks, ...pageHooks]), ...(0, steer_journey_js_1.default)({ waypoint, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.poststeer', waypointPath, [...globalHooks, ...pageHooks]), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.presanitise', waypointPath, [...globalHooks, ...pageHooks]), ...(0, sanitise_fields_js_1.default)({ waypoint, fields }), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.postsanitise', waypointPath, [...globalHooks, ...pageHooks]), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.pregather', waypointPath, [...globalHooks, ...pageHooks]), ...(0, gather_fields_js_1.default)({ waypoint, fields }), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.postgather', waypointPath, [...globalHooks, ...pageHooks]), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.prevalidate', waypointPath, [...globalHooks, ...pageHooks]), ...(0, validate_fields_js_1.default)({ waypoint, fields, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)('journey.postvalidate', waypointPath, [...globalHooks, ...pageHooks]),
|
|
126
154
|
// If there were validation errors, jump out of this route and into the
|
|
127
155
|
// next, where the errors will be rendered
|
|
@@ -136,10 +164,7 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, }) {
|
|
|
136
164
|
// first one is shown.
|
|
137
165
|
// Disabling security/detect-object-injection rule because both `errors`
|
|
138
166
|
// and the `k` property are known entities
|
|
139
|
-
const govukErrors =
|
|
140
|
-
text: req.t(errors[k][0].summary, errors[k][0].variables),
|
|
141
|
-
href: errors[k][0].fieldHref, /* eslint-disable-line security/detect-object-injection */
|
|
142
|
-
}));
|
|
167
|
+
const govukErrors = generateGovukErrors(errors, req);
|
|
143
168
|
return {
|
|
144
169
|
formUrl: (0, waypoint_url_js_1.default)({ mountUrl: `${req.baseUrl}/`, waypoint }),
|
|
145
170
|
formData: req.body,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":";;;;;AAAA,iDAAiD;AACjD,+EAAoD;AACpD,sFAA2E;AAC3E,sFAA2E;AAC3E,0FAA+E;AAC/E,sFAA2E;AAC3E,0FAA+E;AAC/E,4FAAiF;AACjF,6EAAiD;AACjD,iEAAsC;AACtC,8CAAyD;
|
|
1
|
+
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/casa.js
CHANGED
|
@@ -165,6 +165,7 @@ export {
|
|
|
165
165
|
* @property {number} [formMaxParams=25] Max number of form parameters to ingest
|
|
166
166
|
* @property {number|string} [formMaxBytes="50KB"] Max total form payload size to ingest
|
|
167
167
|
* @property {ContextIdGenerator} [contextIdGenerator] Custom context ID generator
|
|
168
|
+
* @property {symbol|Function} [errorVisibility] option to keep page errors active on GET request
|
|
168
169
|
*/
|
|
169
170
|
|
|
170
171
|
/**
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
validateView,
|
|
11
11
|
} from './utils.js';
|
|
12
12
|
import * as contextIdGenerators from './context-id-generators.js';
|
|
13
|
+
import { CONFIG_ERROR_VISIBILITY_ALWAYS, CONFIG_ERROR_VISIBILITY_ONSUBMIT } from './constants.js';
|
|
13
14
|
|
|
14
15
|
/**
|
|
15
16
|
* @access private
|
|
@@ -256,6 +257,25 @@ export function validateSessionCookiePath(cookiePath, defaultPath = '/') {
|
|
|
256
257
|
* @returns {boolean} cookie path
|
|
257
258
|
* @throws {TypeError} When invalid arguments are provided
|
|
258
259
|
*/
|
|
260
|
+
|
|
261
|
+
/**
|
|
262
|
+
* Validates errorVisibility.
|
|
263
|
+
*
|
|
264
|
+
* @access private
|
|
265
|
+
* @param {string} errorVisibility sets visibility flag for page validation error
|
|
266
|
+
* @throws {SyntaxError} For invalid errorVisibility flag.
|
|
267
|
+
* @returns {symbol | Function} flag for error visibility.
|
|
268
|
+
*/
|
|
269
|
+
export function validateErrorVisibility(errorVisibility = CONFIG_ERROR_VISIBILITY_ONSUBMIT) {
|
|
270
|
+
if (errorVisibility === undefined) {
|
|
271
|
+
return undefined;
|
|
272
|
+
}
|
|
273
|
+
if (errorVisibility === CONFIG_ERROR_VISIBILITY_ALWAYS || errorVisibility === CONFIG_ERROR_VISIBILITY_ONSUBMIT || typeof errorVisibility === 'function') {
|
|
274
|
+
return errorVisibility;
|
|
275
|
+
}
|
|
276
|
+
throw new TypeError('errorVisibility must be casa constant CONFIG_ERROR_VISIBILITY_ALWAYS | CONFIG_ERROR_VISIBILITY_ONSUBMIT or function');
|
|
277
|
+
}
|
|
278
|
+
|
|
259
279
|
export function validateSessionCookieSameSite(cookieSameSite, defaultFlag) {
|
|
260
280
|
const validValues = [true, false, 'Strict', 'Lax', 'None'];
|
|
261
281
|
|
|
@@ -322,6 +342,9 @@ const validatePage = (page, index) => {
|
|
|
322
342
|
if (page.hooks !== undefined) {
|
|
323
343
|
validatePageHooks(page.hooks);
|
|
324
344
|
}
|
|
345
|
+
if (page.errorVisibility !== undefined) {
|
|
346
|
+
validateErrorVisibility(page.errorVisibility)
|
|
347
|
+
}
|
|
325
348
|
} catch (err) {
|
|
326
349
|
err.message = `Page at index ${index} is invalid: ${err.message}`;
|
|
327
350
|
throw err;
|
|
@@ -467,6 +490,9 @@ export default function ingest(config = {}) {
|
|
|
467
490
|
// URL that will prefix all URLs in the browser address bar
|
|
468
491
|
mountUrl: validateMountUrl(config.mountUrl),
|
|
469
492
|
|
|
493
|
+
// flag to make validation error visible on get requests
|
|
494
|
+
errorVisibility: validateErrorVisibility(config.errorVisibility),
|
|
495
|
+
|
|
470
496
|
// Session
|
|
471
497
|
session: validateSessionObject(config.session, (session) => ({
|
|
472
498
|
name: validateSessionName(session.name),
|
package/src/lib/configure.js
CHANGED
|
@@ -22,6 +22,8 @@ import dataMiddlewareFactory from '../middleware/data.js';
|
|
|
22
22
|
import bodyParserMiddlewareFactory from '../middleware/body-parser.js';
|
|
23
23
|
import csrfMiddlewareFactory from '../middleware/csrf.js';
|
|
24
24
|
|
|
25
|
+
import { CONFIG_ERROR_VISIBILITY_ONSUBMIT } from './constants.js';
|
|
26
|
+
|
|
25
27
|
/**
|
|
26
28
|
* @access private
|
|
27
29
|
* @typedef {import('../casa').ConfigurationOptions} ConfigurationOptions
|
|
@@ -55,6 +57,7 @@ export default function configure(config = {}) {
|
|
|
55
57
|
const ingestedConfig = configurationIngestor(config);
|
|
56
58
|
const {
|
|
57
59
|
mountUrl,
|
|
60
|
+
errorVisibility = CONFIG_ERROR_VISIBILITY_ONSUBMIT,
|
|
58
61
|
views = [],
|
|
59
62
|
session = {
|
|
60
63
|
secret: 'secret',
|
|
@@ -145,11 +148,13 @@ export default function configure(config = {}) {
|
|
|
145
148
|
});
|
|
146
149
|
|
|
147
150
|
// Setup waypoint router, which includes routes for every defined waypoint
|
|
151
|
+
const globalErrorVisibility = errorVisibility
|
|
148
152
|
const journeyRouter = journeyRoutes({
|
|
149
153
|
globalHooks: hooks,
|
|
150
154
|
pages,
|
|
151
155
|
plan,
|
|
152
156
|
csrfMiddleware,
|
|
157
|
+
globalErrorVisibility,
|
|
153
158
|
});
|
|
154
159
|
|
|
155
160
|
// Create the mounting function
|
package/src/lib/constants.js
CHANGED
|
@@ -7,3 +7,5 @@ export const REQUEST_PHASE_GATHER = Symbol('gather');
|
|
|
7
7
|
export const REQUEST_PHASE_VALIDATE = Symbol('validate');
|
|
8
8
|
export const REQUEST_PHASE_REDIRECT = Symbol('redirect');
|
|
9
9
|
export const REQUEST_PHASE_RENDER = Symbol('render');
|
|
10
|
+
export const CONFIG_ERROR_VISIBILITY_ONSUBMIT = Symbol('onsubmit');
|
|
11
|
+
export const CONFIG_ERROR_VISIBILITY_ALWAYS = Symbol('always');
|
package/src/routes/journey.js
CHANGED
|
@@ -9,6 +9,7 @@ import progressJourneyMiddlewareFactory from '../middleware/progress-journey.js'
|
|
|
9
9
|
import waypointUrl from '../lib/waypoint-url.js';
|
|
10
10
|
import logger from '../lib/logger.js';
|
|
11
11
|
import { resolveMiddlewareHooks } from '../lib/utils.js';
|
|
12
|
+
import { CONFIG_ERROR_VISIBILITY_ALWAYS } from '../lib/constants.js';
|
|
12
13
|
|
|
13
14
|
const log = logger('routes:journey');
|
|
14
15
|
|
|
@@ -53,6 +54,26 @@ const renderMiddlewareFactory = (view, contextFactory) => [
|
|
|
53
54
|
},
|
|
54
55
|
];
|
|
55
56
|
|
|
57
|
+
/**
|
|
58
|
+
* generate page validation error
|
|
59
|
+
*
|
|
60
|
+
* @param {object} errors object of page validation error
|
|
61
|
+
* @param {object} req casa request object
|
|
62
|
+
* @returns {object[]} array of error objects
|
|
63
|
+
*/
|
|
64
|
+
const generateGovukErrors = (errors, req) => Object.values(errors || {}).map(([error]) => ({
|
|
65
|
+
text: req.t(error.summary, error.variables),
|
|
66
|
+
href: error.fieldHref,
|
|
67
|
+
}))
|
|
68
|
+
/**
|
|
69
|
+
* handle errorVisibility flag and function and return boolean
|
|
70
|
+
*
|
|
71
|
+
* @param {symbol | Function} errorVisibility errorVisibility config option
|
|
72
|
+
* @param {object} req casa request object
|
|
73
|
+
* @returns {boolean} true if errorVisibility is "always" or function condition true
|
|
74
|
+
*/
|
|
75
|
+
const resolveErrorVisibility = (req, errorVisibility) => (typeof errorVisibility === 'function' ? errorVisibility({ req }) : errorVisibility === CONFIG_ERROR_VISIBILITY_ALWAYS)
|
|
76
|
+
|
|
56
77
|
/**
|
|
57
78
|
* Create an instance of the router for all waypoints visited during a Journey
|
|
58
79
|
* through the Plan.
|
|
@@ -66,6 +87,7 @@ export default function journeyRouter({
|
|
|
66
87
|
pages,
|
|
67
88
|
plan,
|
|
68
89
|
csrfMiddleware,
|
|
90
|
+
globalErrorVisibility,
|
|
69
91
|
}) {
|
|
70
92
|
// Router
|
|
71
93
|
const router = new MutableRouter();
|
|
@@ -116,7 +138,7 @@ export default function journeyRouter({
|
|
|
116
138
|
];
|
|
117
139
|
|
|
118
140
|
pages.forEach((page) => {
|
|
119
|
-
const { waypoint, view, hooks: pageHooks = [], fields } = page;
|
|
141
|
+
const { waypoint, view, hooks: pageHooks = [], fields, errorVisibility } = page;
|
|
120
142
|
const waypointPath = `/${waypoint}`;
|
|
121
143
|
|
|
122
144
|
let commonWaypointMiddleware = [
|
|
@@ -145,10 +167,18 @@ export default function journeyRouter({
|
|
|
145
167
|
...resolveMiddlewareHooks('journey.poststeer', waypointPath, [...globalHooks, ...pageHooks]),
|
|
146
168
|
|
|
147
169
|
...resolveMiddlewareHooks('journey.prerender', waypointPath, [...globalHooks, ...pageHooks]),
|
|
148
|
-
renderMiddlewareFactory(view, (req) =>
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
170
|
+
renderMiddlewareFactory(view, (req) => {
|
|
171
|
+
const displayErrors = resolveErrorVisibility(req, globalErrorVisibility) || resolveErrorVisibility(req, errorVisibility);
|
|
172
|
+
const errors = displayErrors && (req.casa.journeyContext.getValidationErrorsForPageByField(waypoint) ?? Object.create(null));
|
|
173
|
+
const govukErrors = displayErrors && generateGovukErrors(errors, req);
|
|
174
|
+
|
|
175
|
+
return ({
|
|
176
|
+
formUrl: waypointUrl({ mountUrl: `${req.baseUrl}/`, waypoint }),
|
|
177
|
+
formData: req.casa.journeyContext.getDataForPage(waypoint),
|
|
178
|
+
formErrors: (Object.keys(errors).length && displayErrors) ? errors : null,
|
|
179
|
+
formErrorsGovukArray: (govukErrors.length && displayErrors) ? govukErrors : null,
|
|
180
|
+
})
|
|
181
|
+
}),
|
|
152
182
|
);
|
|
153
183
|
|
|
154
184
|
router.post(
|
|
@@ -193,10 +223,7 @@ export default function journeyRouter({
|
|
|
193
223
|
// first one is shown.
|
|
194
224
|
// Disabling security/detect-object-injection rule because both `errors`
|
|
195
225
|
// and the `k` property are known entities
|
|
196
|
-
const govukErrors =
|
|
197
|
-
text: req.t(errors[k][0].summary, errors[k][0].variables), /* eslint-disable-line security/detect-object-injection */
|
|
198
|
-
href: errors[k][0].fieldHref, /* eslint-disable-line security/detect-object-injection */
|
|
199
|
-
}));
|
|
226
|
+
const govukErrors = generateGovukErrors(errors, req)
|
|
200
227
|
|
|
201
228
|
return {
|
|
202
229
|
formUrl: waypointUrl({ mountUrl: `${req.baseUrl}/`, waypoint }),
|