@dwp/govuk-casa 8.16.2 → 8.16.3
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/assets/css/casa-ie8.css +1 -1
- package/dist/assets/css/casa.css +1 -1
- package/dist/casa.d.ts +13 -13
- package/dist/casa.js +17 -7
- package/dist/casa.js.map +1 -1
- package/dist/lib/CasaTemplateLoader.d.ts +1 -1
- package/dist/lib/CasaTemplateLoader.js +13 -14
- package/dist/lib/CasaTemplateLoader.js.map +1 -1
- package/dist/lib/JourneyContext.d.ts +10 -4
- package/dist/lib/JourneyContext.js +57 -47
- package/dist/lib/JourneyContext.js.map +1 -1
- package/dist/lib/MutableRouter.d.ts +1 -1
- package/dist/lib/MutableRouter.js +22 -23
- package/dist/lib/MutableRouter.js.map +1 -1
- package/dist/lib/Plan.d.ts +5 -5
- package/dist/lib/Plan.js +49 -36
- package/dist/lib/Plan.js.map +1 -1
- package/dist/lib/ValidationError.d.ts +1 -1
- package/dist/lib/ValidationError.js +9 -9
- package/dist/lib/ValidationError.js.map +1 -1
- package/dist/lib/ValidatorFactory.js +4 -7
- package/dist/lib/ValidatorFactory.js.map +1 -1
- package/dist/lib/configuration-ingestor.d.ts +75 -14
- package/dist/lib/configuration-ingestor.js +156 -64
- package/dist/lib/configuration-ingestor.js.map +1 -1
- package/dist/lib/configure.js +11 -10
- package/dist/lib/configure.js.map +1 -1
- package/dist/lib/constants.js +8 -8
- package/dist/lib/context-id-generators.d.ts +1 -1
- package/dist/lib/context-id-generators.js +7 -4
- package/dist/lib/context-id-generators.js.map +1 -1
- package/dist/lib/end-session.js +2 -2
- package/dist/lib/field.d.ts +6 -6
- package/dist/lib/field.js +15 -21
- package/dist/lib/field.js.map +1 -1
- package/dist/lib/index.d.ts +13 -13
- package/dist/lib/index.js +17 -7
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/logger.js +7 -7
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/mount.js +3 -3
- package/dist/lib/mount.js.map +1 -1
- package/dist/lib/nunjucks-filters.d.ts +5 -1
- package/dist/lib/nunjucks-filters.js +37 -23
- package/dist/lib/nunjucks-filters.js.map +1 -1
- package/dist/lib/nunjucks.d.ts +2 -2
- package/dist/lib/nunjucks.js +6 -7
- package/dist/lib/nunjucks.js.map +1 -1
- package/dist/lib/utils.js +52 -42
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/validators/dateObject.d.ts +3 -3
- package/dist/lib/validators/dateObject.js +44 -37
- package/dist/lib/validators/dateObject.js.map +1 -1
- package/dist/lib/validators/email.d.ts +2 -2
- package/dist/lib/validators/email.js +4 -5
- package/dist/lib/validators/email.js.map +1 -1
- package/dist/lib/validators/inArray.d.ts +2 -2
- package/dist/lib/validators/inArray.js +5 -6
- package/dist/lib/validators/inArray.js.map +1 -1
- package/dist/lib/validators/index.d.ts +10 -10
- package/dist/lib/validators/index.js.map +1 -1
- package/dist/lib/validators/nino.d.ts +2 -2
- package/dist/lib/validators/nino.js +10 -7
- package/dist/lib/validators/nino.js.map +1 -1
- package/dist/lib/validators/postalAddressObject.d.ts +2 -2
- package/dist/lib/validators/postalAddressObject.js +52 -39
- package/dist/lib/validators/postalAddressObject.js.map +1 -1
- package/dist/lib/validators/range.d.ts +2 -2
- package/dist/lib/validators/range.js +6 -7
- package/dist/lib/validators/range.js.map +1 -1
- package/dist/lib/validators/regex.d.ts +2 -2
- package/dist/lib/validators/regex.js +4 -5
- package/dist/lib/validators/regex.js.map +1 -1
- package/dist/lib/validators/required.d.ts +2 -2
- package/dist/lib/validators/required.js +6 -9
- package/dist/lib/validators/required.js.map +1 -1
- package/dist/lib/validators/strlen.d.ts +2 -2
- package/dist/lib/validators/strlen.js +8 -9
- package/dist/lib/validators/strlen.js.map +1 -1
- package/dist/lib/validators/wordCount.d.ts +2 -2
- package/dist/lib/validators/wordCount.js +10 -9
- package/dist/lib/validators/wordCount.js.map +1 -1
- package/dist/lib/waypoint-url.d.ts +4 -4
- package/dist/lib/waypoint-url.js +23 -23
- package/dist/lib/waypoint-url.js.map +1 -1
- package/dist/middleware/body-parser.d.ts +27 -5
- package/dist/middleware/body-parser.js +37 -6
- package/dist/middleware/body-parser.js.map +1 -1
- package/dist/middleware/csrf.d.ts +3 -0
- package/dist/middleware/csrf.js +3 -0
- package/dist/middleware/csrf.js.map +1 -1
- package/dist/middleware/data.d.ts +22 -5
- package/dist/middleware/data.js +37 -7
- package/dist/middleware/data.js.map +1 -1
- package/dist/middleware/gather-fields.d.ts +1 -1
- package/dist/middleware/gather-fields.js +4 -3
- package/dist/middleware/gather-fields.js.map +1 -1
- package/dist/middleware/i18n.d.ts +11 -2
- package/dist/middleware/i18n.js +26 -17
- package/dist/middleware/i18n.js.map +1 -1
- package/dist/middleware/post.d.ts +3 -1
- package/dist/middleware/post.js +35 -18
- package/dist/middleware/post.js.map +1 -1
- package/dist/middleware/pre.d.ts +1 -1
- package/dist/middleware/pre.js +44 -21
- package/dist/middleware/pre.js.map +1 -1
- package/dist/middleware/progress-journey.d.ts +1 -1
- package/dist/middleware/progress-journey.js +5 -5
- package/dist/middleware/progress-journey.js.map +1 -1
- package/dist/middleware/sanitise-fields.d.ts +2 -2
- package/dist/middleware/sanitise-fields.js +13 -11
- package/dist/middleware/sanitise-fields.js.map +1 -1
- package/dist/middleware/serve-first-waypoint.d.ts +1 -1
- package/dist/middleware/serve-first-waypoint.js +6 -4
- package/dist/middleware/serve-first-waypoint.js.map +1 -1
- package/dist/middleware/session.d.ts +27 -8
- package/dist/middleware/session.js +53 -25
- package/dist/middleware/session.js.map +1 -1
- package/dist/middleware/skip-waypoint.d.ts +1 -1
- package/dist/middleware/skip-waypoint.js +3 -3
- package/dist/middleware/skip-waypoint.js.map +1 -1
- package/dist/middleware/steer-journey.d.ts +1 -1
- package/dist/middleware/steer-journey.js +15 -13
- package/dist/middleware/steer-journey.js.map +1 -1
- package/dist/middleware/strip-proxy-path.d.ts +1 -1
- package/dist/middleware/strip-proxy-path.js +3 -3
- package/dist/middleware/strip-proxy-path.js.map +1 -1
- package/dist/middleware/validate-fields.d.ts +2 -2
- package/dist/middleware/validate-fields.js +2 -5
- package/dist/middleware/validate-fields.js.map +1 -1
- package/dist/routes/ancillary.d.ts +2 -2
- package/dist/routes/ancillary.js +3 -3
- package/dist/routes/ancillary.js.map +1 -1
- package/dist/routes/journey.d.ts +1 -1
- package/dist/routes/journey.js +85 -31
- package/dist/routes/journey.js.map +1 -1
- package/dist/routes/static.d.ts +2 -2
- package/dist/routes/static.js +18 -18
- package/dist/routes/static.js.map +1 -1
- package/package.json +33 -36
- package/src/casa.js +13 -13
- package/src/lib/CasaTemplateLoader.js +21 -17
- package/src/lib/JourneyContext.js +118 -79
- package/src/lib/MutableRouter.js +30 -26
- package/src/lib/Plan.js +109 -62
- package/src/lib/ValidationError.js +13 -10
- package/src/lib/ValidatorFactory.js +7 -8
- package/src/lib/configuration-ingestor.js +200 -74
- package/src/lib/configure.js +31 -30
- package/src/lib/constants.js +8 -8
- package/src/lib/context-id-generators.js +39 -38
- package/src/lib/end-session.js +3 -3
- package/src/lib/field.js +48 -32
- package/src/lib/index.js +12 -12
- package/src/lib/logger.js +9 -9
- package/src/lib/mount.js +68 -73
- package/src/lib/nunjucks-filters.js +57 -44
- package/src/lib/nunjucks.js +20 -16
- package/src/lib/utils.js +69 -44
- package/src/lib/validators/dateObject.js +57 -48
- package/src/lib/validators/email.js +8 -9
- package/src/lib/validators/inArray.js +8 -9
- package/src/lib/validators/index.js +11 -11
- package/src/lib/validators/nino.js +25 -12
- package/src/lib/validators/postalAddressObject.js +73 -55
- package/src/lib/validators/range.js +9 -11
- package/src/lib/validators/regex.js +7 -8
- package/src/lib/validators/required.js +13 -14
- package/src/lib/validators/strlen.js +11 -12
- package/src/lib/validators/wordCount.js +17 -12
- package/src/lib/waypoint-url.js +48 -33
- package/src/middleware/body-parser.js +44 -10
- package/src/middleware/csrf.js +4 -1
- package/src/middleware/data.js +62 -25
- package/src/middleware/gather-fields.js +8 -8
- package/src/middleware/i18n.js +49 -39
- package/src/middleware/post.js +47 -21
- package/src/middleware/pre.js +60 -35
- package/src/middleware/progress-journey.js +32 -18
- package/src/middleware/sanitise-fields.js +43 -20
- package/src/middleware/serve-first-waypoint.js +12 -10
- package/src/middleware/session.js +97 -65
- package/src/middleware/skip-waypoint.js +7 -9
- package/src/middleware/steer-journey.js +39 -27
- package/src/middleware/strip-proxy-path.js +8 -7
- package/src/middleware/validate-fields.js +5 -12
- package/src/routes/ancillary.js +4 -6
- package/src/routes/journey.js +158 -78
- package/src/routes/static.js +61 -28
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skip-waypoint.js","sourceRoot":"","sources":["../../src/middleware/skip-waypoint.js"],"names":[],"mappings":";AAAA,6BAA6B;;;;;AAE7B,oDAA4B;AAC5B,iFAAsD;AACtD,6EAAiD;AACjD,iEAAsC;AAEtC,MAAM,EAAE,GAAG,EAAE,GAAG,gBAAM,CAAC;AAEvB,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,0BAA0B,CAAC,CAAC;AAE/C,kBAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"skip-waypoint.js","sourceRoot":"","sources":["../../src/middleware/skip-waypoint.js"],"names":[],"mappings":";AAAA,6BAA6B;;;;;AAE7B,oDAA4B;AAC5B,iFAAsD;AACtD,6EAAiD;AACjD,iEAAsC;AAEtC,MAAM,EAAE,GAAG,EAAE,GAAG,gBAAM,CAAC;AAEvB,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,0BAA0B,CAAC,CAAC;AAE/C,kBAAe,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC/B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAExC,qEAAqE;QACrE,GAAG,CAAC,IAAI,CAAC,qBAAqB,QAAQ,cAAc,CAAC,CAAC;QACtD,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;QAC/D,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,EAAE;YAC/C,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,2BAAc,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEhE,MAAM,WAAW,GAAG,IAAA,yBAAW,EAAC;YAC9B,QAAQ,EAAE,GAAG,GAAG,CAAC,OAAO,GAAG;YAC3B,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU;YAC/B,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;SACxC,CAAC,CAAC;QACH,GAAG,CAAC,KAAK,CAAC,qBAAqB,WAAW,qBAAqB,QAAQ,GAAG,CAAC,CAAC;QAE5E,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9B,IAAI,GAAG,EAAE,CAAC;gBACR,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YACjC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
|
|
@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
|
|
9
9
|
const logger_js_1 = __importDefault(require("../lib/logger.js"));
|
|
10
|
-
const log = (0, logger_js_1.default)(
|
|
10
|
+
const log = (0, logger_js_1.default)("middleware:steer-journey");
|
|
11
11
|
/**
|
|
12
12
|
* @access private
|
|
13
13
|
* @typedef {import('../lib/Plan')} Plan
|
|
@@ -21,7 +21,7 @@ const log = (0, logger_js_1.default)('middleware:steer-journey');
|
|
|
21
21
|
* @param {Plan} obj.plan CASA Plan
|
|
22
22
|
* @returns {void}
|
|
23
23
|
*/
|
|
24
|
-
exports.default = ({ waypoint, plan
|
|
24
|
+
exports.default = ({ waypoint, plan }) => [
|
|
25
25
|
(req, res, next) => {
|
|
26
26
|
const mountUrl = `${req.baseUrl}/`;
|
|
27
27
|
// If the requested waypoint doesn't exist in the traversed journey, send
|
|
@@ -41,8 +41,8 @@ exports.default = ({ waypoint, plan, }) => [
|
|
|
41
41
|
// Edit mode
|
|
42
42
|
// Cannot be in edit mode if we're already on the `editorigin` URL
|
|
43
43
|
if (req.casa.editMode) {
|
|
44
|
-
const { pathname: currentPathname } = new URL(req.originalUrl,
|
|
45
|
-
const { pathname: editOriginPathname } = new URL(req.casa.editOrigin,
|
|
44
|
+
const { pathname: currentPathname } = new URL(req.originalUrl, "https://placeholder.test/");
|
|
45
|
+
const { pathname: editOriginPathname } = new URL(req.casa.editOrigin, "https://placeholder.test/");
|
|
46
46
|
if (editOriginPathname === currentPathname) {
|
|
47
47
|
log.debug(`Disabling edit mode as we are on the edit origin (${req.casa.editOrigin})`);
|
|
48
48
|
req.casa.editMode = false;
|
|
@@ -56,16 +56,18 @@ exports.default = ({ waypoint, plan, }) => [
|
|
|
56
56
|
// Calculate URL for the "back" link
|
|
57
57
|
const [prevRoute] = plan.traversePrevRoutes(req.casa.journeyContext, {
|
|
58
58
|
startWaypoint: waypoint,
|
|
59
|
-
stopCondition: () =>
|
|
59
|
+
stopCondition: () => true, // stop at the first one
|
|
60
60
|
});
|
|
61
|
-
res.locals.casa.journeyPreviousUrl = prevRoute.target
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
61
|
+
res.locals.casa.journeyPreviousUrl = prevRoute.target
|
|
62
|
+
? (0, waypoint_url_js_1.default)({
|
|
63
|
+
mountUrl,
|
|
64
|
+
journeyContext: req.casa.journeyContext,
|
|
65
|
+
waypoint: prevRoute.target,
|
|
66
|
+
routeName: "prev",
|
|
67
|
+
edit: req.casa.editMode,
|
|
68
|
+
editOrigin: req.casa.editOrigin,
|
|
69
|
+
})
|
|
70
|
+
: undefined;
|
|
69
71
|
return next();
|
|
70
72
|
},
|
|
71
73
|
];
|
|
@@ -1 +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,
|
|
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,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;IACrC,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,CAAC;YACvC,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACnD,GAAG,CAAC,KAAK,CACP,wBAAwB,QAAQ,8CAA8C,UAAU,GAAG,CAC5F,CAAC;YAEF,OAAO,GAAG,CAAC,QAAQ,CACjB,GAAG,EACH,IAAA,yBAAW,EAAC;gBACV,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,CACH,CAAC;QACJ,CAAC;QAED,YAAY;QACZ,kEAAkE;QAClE,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtB,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,IAAI,GAAG,CAC3C,GAAG,CAAC,WAAW,EACf,2BAA2B,CAC5B,CAAC;YACF,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,GAAG,IAAI,GAAG,CAC9C,GAAG,CAAC,IAAI,CAAC,UAAU,EACnB,2BAA2B,CAC5B,CAAC;YAEF,IAAI,kBAAkB,KAAK,eAAe,EAAE,CAAC;gBAC3C,GAAG,CAAC,KAAK,CACP,qDAAqD,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAC5E,CAAC;gBACF,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC1B,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YAClC,CAAC;QACH,CAAC;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,IAAI,EAAE,wBAAwB;SACpD,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC,MAAM;YACnD,CAAC,CAAC,IAAA,yBAAW,EAAC;gBACV,QAAQ;gBACR,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc;gBACvC,QAAQ,EAAE,SAAS,CAAC,MAAM;gBAC1B,SAAS,EAAE,MAAM;gBACjB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU;aAChC,CAAC;YACJ,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF,CAAC"}
|
|
@@ -19,8 +19,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
19
19
|
};
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
const logger_js_1 = __importDefault(require("../lib/logger.js"));
|
|
22
|
-
const log = (0, logger_js_1.default)(
|
|
23
|
-
exports.default = ({ mountUrl =
|
|
22
|
+
const log = (0, logger_js_1.default)("casa:middleware:strip-proxy-path");
|
|
23
|
+
exports.default = ({ mountUrl = "/" }) => [
|
|
24
24
|
(req, res, next) => {
|
|
25
25
|
// TODO:
|
|
26
26
|
// We _may_ have to start tracking the various prefix in order to differentiate
|
|
@@ -28,7 +28,7 @@ exports.default = ({ mountUrl = '/', }) => [
|
|
|
28
28
|
var _a;
|
|
29
29
|
// Assume everything before `mountUrl` is the proxy path prefix and remove it
|
|
30
30
|
req.originalBaseUrl = (_a = req.originalBaseUrl) !== null && _a !== void 0 ? _a : req.baseUrl;
|
|
31
|
-
req.baseUrl = mountUrl.replace(/\/$/,
|
|
31
|
+
req.baseUrl = mountUrl.replace(/\/$/, "");
|
|
32
32
|
// If the app has been mounted directly on the specific `mountUrl`, then
|
|
33
33
|
// there's nothing we need to do and can let this request pass-through.
|
|
34
34
|
if (req.baseUrl === req.originalBaseUrl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strip-proxy-path.js","sourceRoot":"","sources":["../../src/middleware/strip-proxy-path.js"],"names":[],"mappings":";AAAA,2DAA2D;AAC3D,EAAE;AACF,uEAAuE;AACvE,sEAAsE;AACtE,iEAAiE;AACjE,EAAE;AACF,wEAAwE;AACxE,gEAAgE;AAChE,sEAAsE;AACtE,4CAA4C;AAC5C,EAAE;AACF,wEAAwE;AACxE,oEAAoE;AACpE,EAAE;AACF,oDAAoD;;;;;AAEpD,iEAAsC;AAEtC,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,kCAAkC,CAAC,CAAC;AAEvD,kBAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"strip-proxy-path.js","sourceRoot":"","sources":["../../src/middleware/strip-proxy-path.js"],"names":[],"mappings":";AAAA,2DAA2D;AAC3D,EAAE;AACF,uEAAuE;AACvE,sEAAsE;AACtE,iEAAiE;AACjE,EAAE;AACF,wEAAwE;AACxE,gEAAgE;AAChE,sEAAsE;AACtE,4CAA4C;AAC5C,EAAE;AACF,wEAAwE;AACxE,oEAAoE;AACpE,EAAE;AACF,oDAAoD;;;;;AAEpD,iEAAsC;AAEtC,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,kCAAkC,CAAC,CAAC;AAEvD,kBAAe,CAAC,EAAE,QAAQ,GAAG,GAAG,EAAE,EAAE,EAAE,CAAC;IACrC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjB,QAAQ;QACR,+EAA+E;QAC/E,mDAAmD;;QAEnD,6EAA6E;QAC7E,GAAG,CAAC,eAAe,GAAG,MAAA,GAAG,CAAC,eAAe,mCAAI,GAAG,CAAC,OAAO,CAAC;QACzD,GAAG,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAE1C,wEAAwE;QACxE,uEAAuE;QACvE,IAAI,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,eAAe,EAAE,CAAC;YACxC,IAAI,EAAE,CAAC;QACT,CAAC;aAAM,IAAI,GAAG,CAAC,2BAA2B,EAAE,CAAC;YAC3C,OAAO,GAAG,CAAC,2BAA2B,CAAC;YACvC,IAAI,EAAE,CAAC;QACT,CAAC;aAAM,CAAC;YACN,4DAA4D;YAC5D,wEAAwE;YACxE,mEAAmE;YACnE,uDAAuD;YACvD,GAAG,CAAC,KAAK,CAAC,2CAA2C,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;YACxE,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC,OAAO,CACvC,IAAI,MAAM,CAAC,QAAQ,QAAQ,EAAE,CAAC,EAC9B,QAAQ,CACT,CAAC;YACF,GAAG,CAAC,KAAK,CAAC,0CAA0C,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;YACvE,sDAAsD;YAEtD,qEAAqE;YACrE,2DAA2D;YAC3D,GAAG,CAAC,2BAA2B,GAAG,IAAI,CAAC;YACvC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;CACF,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
declare function _default({ waypoint, fields, plan
|
|
1
|
+
declare function _default({ waypoint, fields, plan }: {
|
|
2
2
|
waypoint: any;
|
|
3
|
-
fields?:
|
|
3
|
+
fields?: never[] | undefined;
|
|
4
4
|
plan: any;
|
|
5
5
|
}): ((req: any, res: any, next: any) => any)[];
|
|
6
6
|
export default _default;
|
|
@@ -21,7 +21,7 @@ const updateContext = ({ waypoint, errors = null, journeyContext, session, }) =>
|
|
|
21
21
|
},
|
|
22
22
|
});
|
|
23
23
|
};
|
|
24
|
-
exports.default = ({ waypoint, fields = [], plan
|
|
24
|
+
exports.default = ({ waypoint, fields = [], plan }) => [
|
|
25
25
|
(req, res, next) => {
|
|
26
26
|
var _a, _b;
|
|
27
27
|
const mountUrl = `${req.baseUrl}/`;
|
|
@@ -42,10 +42,7 @@ exports.default = ({ waypoint, fields = [], plan, }) => [
|
|
|
42
42
|
journeyContext: req.casa.journeyContext,
|
|
43
43
|
};
|
|
44
44
|
/* eslint-enable security/detect-object-injection */
|
|
45
|
-
errors = [
|
|
46
|
-
...errors,
|
|
47
|
-
...field.runValidators(fieldValue, context),
|
|
48
|
-
];
|
|
45
|
+
errors = [...errors, ...field.runValidators(fieldValue, context)];
|
|
49
46
|
}
|
|
50
47
|
// Validation passed with no errors
|
|
51
48
|
if (!errors.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,CAAC;QACpB,cAAc,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,cAAc,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,kBAAkB;IAClB,2BAAc,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE;QACjD,QAAQ,EAAE;YACR,gBAAgB,EAAE,qCAAsB;SACzC;KACF,CAAC,CAAC;AACL,CAAC,
|
|
1
|
+
{"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,CAAC;QACpB,cAAc,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,cAAc,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,kBAAkB;IAClB,2BAAc,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE;QACjD,QAAQ,EAAE;YACR,gBAAgB,EAAE,qCAAsB;SACzC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,kBAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;IAClD,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,CAAC;YAC9C,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,CAAC,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,mCAAmC;QACnC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,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;QAChB,CAAC;QAED,0EAA0E;QAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC;QAC3D,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3B,CAAC;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"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
* @param {AncillaryRouterOptions} options Options
|
|
10
10
|
* @returns {MutableRouter} ExpressJS Router instance
|
|
11
11
|
*/
|
|
12
|
-
export default function ancillaryRouter({ sessionTtl
|
|
12
|
+
export default function ancillaryRouter({ sessionTtl }: AncillaryRouterOptions): MutableRouter;
|
|
13
13
|
/**
|
|
14
14
|
* Options to configure static router
|
|
15
15
|
*/
|
|
@@ -19,4 +19,4 @@ export type AncillaryRouterOptions = {
|
|
|
19
19
|
*/
|
|
20
20
|
sessionTtl: number;
|
|
21
21
|
};
|
|
22
|
-
import MutableRouter from
|
|
22
|
+
import MutableRouter from "../lib/MutableRouter.js";
|
package/dist/routes/ancillary.js
CHANGED
|
@@ -16,12 +16,12 @@ const MutableRouter_js_1 = __importDefault(require("../lib/MutableRouter.js"));
|
|
|
16
16
|
* @param {AncillaryRouterOptions} options Options
|
|
17
17
|
* @returns {MutableRouter} ExpressJS Router instance
|
|
18
18
|
*/
|
|
19
|
-
function ancillaryRouter({ sessionTtl
|
|
19
|
+
function ancillaryRouter({ sessionTtl }) {
|
|
20
20
|
// Router
|
|
21
21
|
const router = new MutableRouter_js_1.default();
|
|
22
22
|
// Session timeout
|
|
23
|
-
router.all(
|
|
24
|
-
res.render(
|
|
23
|
+
router.all("/session-timeout", (req, res) => {
|
|
24
|
+
res.render("casa/session-timeout.njk", {
|
|
25
25
|
sessionTtl: Math.floor(sessionTtl / 60),
|
|
26
26
|
});
|
|
27
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ancillary.js","sourceRoot":"","sources":["../../src/routes/ancillary.js"],"names":[],"mappings":";;;;;AAcA,
|
|
1
|
+
{"version":3,"file":"ancillary.js","sourceRoot":"","sources":["../../src/routes/ancillary.js"],"names":[],"mappings":";;;;;AAcA,kCAYC;AA1BD,+EAAoD;AAEpD;;;GAGG;AAEH;;;;;;GAMG;AACH,SAAwB,eAAe,CAAC,EAAE,UAAU,EAAE;IACpD,SAAS;IACT,MAAM,MAAM,GAAG,IAAI,0BAAa,EAAE,CAAC;IAEnC,kBAAkB;IAClB,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC1C,GAAG,CAAC,MAAM,CAAC,0BAA0B,EAAE;YACrC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,EAAE,CAAC;SACxC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/routes/journey.d.ts
CHANGED
package/dist/routes/journey.js
CHANGED
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.default = journeyRouter;
|
|
7
|
-
/* eslint-disable object-curly-newline,max-len */
|
|
8
7
|
const MutableRouter_js_1 = __importDefault(require("../lib/MutableRouter.js"));
|
|
9
8
|
const skip_waypoint_js_1 = __importDefault(require("../middleware/skip-waypoint.js"));
|
|
10
9
|
const steer_journey_js_1 = __importDefault(require("../middleware/steer-journey.js"));
|
|
@@ -16,7 +15,11 @@ const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
|
|
|
16
15
|
const logger_js_1 = __importDefault(require("../lib/logger.js"));
|
|
17
16
|
const utils_js_1 = require("../lib/utils.js");
|
|
18
17
|
const constants_js_1 = require("../lib/constants.js");
|
|
19
|
-
const log = (0, logger_js_1.default)(
|
|
18
|
+
const log = (0, logger_js_1.default)("routes:journey");
|
|
19
|
+
/**
|
|
20
|
+
* @access private
|
|
21
|
+
* @param {import('express').RequestHandler} RequestHandler
|
|
22
|
+
*/
|
|
20
23
|
/**
|
|
21
24
|
* @access private
|
|
22
25
|
* @param {import('../casa.js').GlobalHook} GlobalHook
|
|
@@ -62,18 +65,20 @@ const generateGovukErrors = (errors, req) => Object.values(errors || {}).map(([e
|
|
|
62
65
|
href: error.fieldHref,
|
|
63
66
|
}));
|
|
64
67
|
const generateEditCancelUrl = (editOrigin, waypoint) => {
|
|
65
|
-
const url = new URL(editOrigin,
|
|
66
|
-
url.searchParams.set(
|
|
68
|
+
const url = new URL(editOrigin, "https://placeholder.test/");
|
|
69
|
+
url.searchParams.set("editcancel", waypoint);
|
|
67
70
|
return `${url.pathname}${url.search}`;
|
|
68
71
|
};
|
|
69
72
|
/**
|
|
70
73
|
* handle errorVisibility flag and function and return boolean
|
|
71
74
|
*
|
|
75
|
+
* @param {RequestHandler} req casa request object
|
|
72
76
|
* @param {symbol | Function} errorVisibility errorVisibility config option
|
|
73
|
-
* @param {object} req casa request object
|
|
74
77
|
* @returns {boolean} true if errorVisibility is "always" or function condition true
|
|
75
78
|
*/
|
|
76
|
-
const resolveErrorVisibility = (req, errorVisibility) =>
|
|
79
|
+
const resolveErrorVisibility = (req, errorVisibility) => typeof errorVisibility === "function"
|
|
80
|
+
? errorVisibility({ req })
|
|
81
|
+
: errorVisibility === constants_js_1.CONFIG_ERROR_VISIBILITY_ALWAYS;
|
|
77
82
|
/**
|
|
78
83
|
* Create an instance of the router for all waypoints visited during a Journey
|
|
79
84
|
* through the Plan.
|
|
@@ -87,7 +92,7 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVi
|
|
|
87
92
|
const router = new MutableRouter_js_1.default();
|
|
88
93
|
// Special "_" route which handles redirecting the user between sub-apps
|
|
89
94
|
// /app1/_/?refmount=app2&route=prev
|
|
90
|
-
router.all(
|
|
95
|
+
router.all("/_", (req, res) => {
|
|
91
96
|
var _a, _b;
|
|
92
97
|
const mountUrl = `${req.baseUrl}/`;
|
|
93
98
|
const refmount = (_a = req.query) === null || _a === void 0 ? void 0 : _a.refmount;
|
|
@@ -97,7 +102,7 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVi
|
|
|
97
102
|
const fallback = (0, waypoint_url_js_1.default)({
|
|
98
103
|
mountUrl,
|
|
99
104
|
waypoint: plan.traverse(req.casa.journeyContext, {
|
|
100
|
-
stopCondition: () =>
|
|
105
|
+
stopCondition: () => true, // we only need one; stop at the first
|
|
101
106
|
})[0],
|
|
102
107
|
});
|
|
103
108
|
// If the refmount doesn't exist in our Plan, we can assume that the two
|
|
@@ -106,35 +111,41 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVi
|
|
|
106
111
|
if (!plan.getWaypoints().includes(refmount)) {
|
|
107
112
|
redirectTo = fallback;
|
|
108
113
|
}
|
|
109
|
-
else if (route ===
|
|
110
|
-
const routes = plan.traversePrevRoutes(req.casa.journeyContext, {
|
|
111
|
-
|
|
114
|
+
else if (route === "prev") {
|
|
115
|
+
const routes = plan.traversePrevRoutes(req.casa.journeyContext, {
|
|
116
|
+
startWaypoint: refmount,
|
|
117
|
+
});
|
|
118
|
+
redirectTo = routes.length
|
|
119
|
+
? (0, waypoint_url_js_1.default)({ mountUrl, waypoint: routes[0].target })
|
|
120
|
+
: fallback;
|
|
112
121
|
}
|
|
113
122
|
else {
|
|
114
|
-
const routes = plan.traverseNextRoutes(req.casa.journeyContext, {
|
|
123
|
+
const routes = plan.traverseNextRoutes(req.casa.journeyContext, {
|
|
124
|
+
startWaypoint: refmount,
|
|
125
|
+
});
|
|
115
126
|
if (routes[0].target !== null) {
|
|
116
|
-
redirectTo = routes.length
|
|
127
|
+
redirectTo = routes.length
|
|
128
|
+
? (0, waypoint_url_js_1.default)({ mountUrl, waypoint: routes[0].target })
|
|
129
|
+
: fallback;
|
|
117
130
|
}
|
|
118
131
|
else {
|
|
119
132
|
redirectTo = fallback;
|
|
120
133
|
}
|
|
121
134
|
}
|
|
122
135
|
// Carry over any params
|
|
123
|
-
const url = new URL(redirectTo,
|
|
136
|
+
const url = new URL(redirectTo, "https://placeholder.test/");
|
|
124
137
|
const searchParams = new URLSearchParams(req.query);
|
|
125
|
-
searchParams.delete(
|
|
126
|
-
searchParams.delete(
|
|
138
|
+
searchParams.delete("refmount");
|
|
139
|
+
searchParams.delete("route");
|
|
127
140
|
url.search = searchParams.toString();
|
|
128
|
-
redirectTo = `${url.pathname.replace(/\/+/g,
|
|
141
|
+
redirectTo = `${url.pathname.replace(/\/+/g, "/")}${url.search}`;
|
|
129
142
|
log.trace(`Redirect to ${redirectTo}`);
|
|
130
143
|
return res.redirect(redirectTo);
|
|
131
144
|
});
|
|
132
145
|
// Create GET / POST routes for each page
|
|
133
|
-
const commonMiddleware = [
|
|
134
|
-
...csrfMiddleware,
|
|
135
|
-
];
|
|
146
|
+
const commonMiddleware = [...csrfMiddleware];
|
|
136
147
|
pages.forEach((page) => {
|
|
137
|
-
const { waypoint, view, hooks: pageHooks = [], fields, errorVisibility } = page;
|
|
148
|
+
const { waypoint, view, hooks: pageHooks = [], fields, errorVisibility, } = page;
|
|
138
149
|
const waypointPath = `/${waypoint}`;
|
|
139
150
|
let commonWaypointMiddleware = [
|
|
140
151
|
(req, res, next) => {
|
|
@@ -150,23 +161,66 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVi
|
|
|
150
161
|
...(0, skip_waypoint_js_1.default)({ waypoint }),
|
|
151
162
|
];
|
|
152
163
|
}
|
|
153
|
-
router.get(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)(
|
|
164
|
+
router.get(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)("journey.presteer", waypointPath, [
|
|
165
|
+
...globalHooks,
|
|
166
|
+
...pageHooks,
|
|
167
|
+
]), ...(0, steer_journey_js_1.default)({ waypoint, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.poststeer", waypointPath, [
|
|
168
|
+
...globalHooks,
|
|
169
|
+
...pageHooks,
|
|
170
|
+
]), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.prerender", waypointPath, [
|
|
171
|
+
...globalHooks,
|
|
172
|
+
...pageHooks,
|
|
173
|
+
]), renderMiddlewareFactory(view, (req) => {
|
|
154
174
|
var _a;
|
|
155
|
-
const displayErrors = resolveErrorVisibility(req, globalErrorVisibility) ||
|
|
156
|
-
|
|
175
|
+
const displayErrors = resolveErrorVisibility(req, globalErrorVisibility) ||
|
|
176
|
+
resolveErrorVisibility(req, errorVisibility);
|
|
177
|
+
const errors = displayErrors &&
|
|
178
|
+
((_a = req.casa.journeyContext.getValidationErrorsForPageByField(waypoint)) !== null && _a !== void 0 ? _a : Object.create(null));
|
|
157
179
|
const govukErrors = displayErrors && generateGovukErrors(errors, req);
|
|
158
|
-
return
|
|
180
|
+
return {
|
|
159
181
|
formUrl: (0, waypoint_url_js_1.default)({ mountUrl: `${req.baseUrl}/`, waypoint }),
|
|
160
182
|
formData: req.casa.journeyContext.getDataForPage(waypoint),
|
|
161
|
-
formErrors:
|
|
162
|
-
formErrorsGovukArray:
|
|
163
|
-
}
|
|
183
|
+
formErrors: Object.keys(errors).length && displayErrors ? errors : null,
|
|
184
|
+
formErrorsGovukArray: govukErrors.length && displayErrors ? govukErrors : null,
|
|
185
|
+
};
|
|
164
186
|
}));
|
|
165
|
-
router.post(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)(
|
|
187
|
+
router.post(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)("journey.presteer", waypointPath, [
|
|
188
|
+
...globalHooks,
|
|
189
|
+
...pageHooks,
|
|
190
|
+
]), ...(0, steer_journey_js_1.default)({ waypoint, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.poststeer", waypointPath, [
|
|
191
|
+
...globalHooks,
|
|
192
|
+
...pageHooks,
|
|
193
|
+
]), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.presanitise", waypointPath, [
|
|
194
|
+
...globalHooks,
|
|
195
|
+
...pageHooks,
|
|
196
|
+
]), ...(0, sanitise_fields_js_1.default)({ waypoint, fields }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.postsanitise", waypointPath, [
|
|
197
|
+
...globalHooks,
|
|
198
|
+
...pageHooks,
|
|
199
|
+
]), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.pregather", waypointPath, [
|
|
200
|
+
...globalHooks,
|
|
201
|
+
...pageHooks,
|
|
202
|
+
]), ...(0, gather_fields_js_1.default)({ waypoint, fields }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.postgather", waypointPath, [
|
|
203
|
+
...globalHooks,
|
|
204
|
+
...pageHooks,
|
|
205
|
+
]), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.prevalidate", waypointPath, [
|
|
206
|
+
...globalHooks,
|
|
207
|
+
...pageHooks,
|
|
208
|
+
]), ...(0, validate_fields_js_1.default)({ waypoint, fields, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.postvalidate", waypointPath, [
|
|
209
|
+
...globalHooks,
|
|
210
|
+
...pageHooks,
|
|
211
|
+
]),
|
|
166
212
|
// If there were validation errors, jump out of this route and into the
|
|
167
213
|
// next, where the errors will be rendered
|
|
168
|
-
(req, res, next) =>
|
|
169
|
-
|
|
214
|
+
(req, res, next) => req.casa.journeyContext.hasValidationErrorsForPage(waypoint)
|
|
215
|
+
? next("route")
|
|
216
|
+
: next(), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.preredirect", waypointPath, [
|
|
217
|
+
...globalHooks,
|
|
218
|
+
...pageHooks,
|
|
219
|
+
]), ...(0, progress_journey_js_1.default)({ waypoint, plan }));
|
|
220
|
+
router.post(waypointPath, ...(0, utils_js_1.resolveMiddlewareHooks)("journey.prerender", waypointPath, [
|
|
221
|
+
...globalHooks,
|
|
222
|
+
...pageHooks,
|
|
223
|
+
]), renderMiddlewareFactory(view, (req) => {
|
|
170
224
|
var _a;
|
|
171
225
|
const errors = (_a = req.casa.journeyContext.getValidationErrorsForPageByField(waypoint)) !== null && _a !== void 0 ? _a : Object.create(null);
|
|
172
226
|
// This is a convenience for the template. The `govukErrorSummary` macro
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":"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"}
|
package/dist/routes/static.d.ts
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
* @param {StaticOptions} options Options
|
|
10
10
|
* @returns {MutableRouter} ExpressJS Router instance
|
|
11
11
|
*/
|
|
12
|
-
export default function staticRouter({ maxAge
|
|
12
|
+
export default function staticRouter({ maxAge }?: StaticOptions): MutableRouter;
|
|
13
13
|
/**
|
|
14
14
|
* Options to configure static router
|
|
15
15
|
*/
|
|
@@ -19,4 +19,4 @@ export type StaticOptions = {
|
|
|
19
19
|
*/
|
|
20
20
|
maxAge?: number | undefined;
|
|
21
21
|
};
|
|
22
|
-
import MutableRouter from
|
|
22
|
+
import MutableRouter from "../lib/MutableRouter.js";
|
package/dist/routes/static.js
CHANGED
|
@@ -25,21 +25,21 @@ const oneDay = 86400000;
|
|
|
25
25
|
* @param {StaticOptions} options Options
|
|
26
26
|
* @returns {MutableRouter} ExpressJS Router instance
|
|
27
27
|
*/
|
|
28
|
-
function staticRouter({ maxAge = 3600000
|
|
28
|
+
function staticRouter({ maxAge = 3600000 } = {}) {
|
|
29
29
|
const router = new MutableRouter_js_1.default();
|
|
30
30
|
const notFoundHandler = (req, res, next) => {
|
|
31
31
|
// Fall through to a general purpose error handler
|
|
32
|
-
next(new Error(
|
|
32
|
+
next(new Error("404"));
|
|
33
33
|
};
|
|
34
34
|
const setHeaders = (req, res, next) => {
|
|
35
35
|
var _a;
|
|
36
|
-
res.set(
|
|
37
|
-
res.set(
|
|
38
|
-
res.set(
|
|
39
|
-
const { pathname } = new url_1.URL((_a = req === null || req === void 0 ? void 0 : req.originalUrl) !== null && _a !== void 0 ? _a :
|
|
40
|
-
if (pathname.substr(-4) ===
|
|
36
|
+
res.set("cache-control", "public");
|
|
37
|
+
res.set("pragma", "cache");
|
|
38
|
+
res.set("expires", new Date(Date.now() + oneDay).toUTCString());
|
|
39
|
+
const { pathname } = new url_1.URL((_a = req === null || req === void 0 ? void 0 : req.originalUrl) !== null && _a !== void 0 ? _a : "", "https://placeholder.test/");
|
|
40
|
+
if (pathname.substr(-4) === ".css") {
|
|
41
41
|
// Just needed for our in-memory CSS assets
|
|
42
|
-
res.set(
|
|
42
|
+
res.set("content-type", "text/css");
|
|
43
43
|
}
|
|
44
44
|
next();
|
|
45
45
|
};
|
|
@@ -55,19 +55,19 @@ function staticRouter({ maxAge = 3600000, } = {}) {
|
|
|
55
55
|
// must be replaced with the dynamic `mountUrl` to ensure govuk-frontend
|
|
56
56
|
// assets are served from the correct location.
|
|
57
57
|
/* eslint-disable security/detect-non-literal-fs-filename */
|
|
58
|
-
const casaCss = (0, fs_1.readFileSync)((0, path_1.resolve)(dirname_cjs_1.default,
|
|
59
|
-
const casaCssIe8 = (0, fs_1.readFileSync)((0, path_1.resolve)(dirname_cjs_1.default,
|
|
58
|
+
const casaCss = (0, fs_1.readFileSync)((0, path_1.resolve)(dirname_cjs_1.default, "../../dist/assets/css/casa.css"), { encoding: "utf8" });
|
|
59
|
+
const casaCssIe8 = (0, fs_1.readFileSync)((0, path_1.resolve)(dirname_cjs_1.default, "../../dist/assets/css/casa-ie8.css"), { encoding: "utf8" });
|
|
60
60
|
/* eslint-enable security/detect-non-literal-fs-filename */
|
|
61
61
|
// The static middleware will only server GET/HEAD requests, so we can mount
|
|
62
62
|
// the middleware using `use()` rather than resorting to `get()`
|
|
63
|
-
const govukFrontendDirectory = (0, path_1.resolve)((0, module_1.createRequire)(dirname_cjs_1.default).resolve(
|
|
64
|
-
router.use(
|
|
65
|
-
router.use(
|
|
66
|
-
router.use(
|
|
67
|
-
router.use(
|
|
68
|
-
router.get(
|
|
69
|
-
router.get(
|
|
70
|
-
router.use(
|
|
63
|
+
const govukFrontendDirectory = (0, path_1.resolve)((0, module_1.createRequire)(dirname_cjs_1.default).resolve("govuk-frontend"), "../../");
|
|
64
|
+
router.use("/govuk/assets/js/all.js", ExpressStatic(`${govukFrontendDirectory}/govuk/all.js`, staticConfig));
|
|
65
|
+
router.use("/govuk/assets/js/all.js.map", ExpressStatic(`${govukFrontendDirectory}/govuk/all.js.map`, staticConfig));
|
|
66
|
+
router.use("/govuk/assets", ExpressStatic(`${govukFrontendDirectory}/govuk/assets`, staticConfig));
|
|
67
|
+
router.use("/govuk/assets", notFoundHandler);
|
|
68
|
+
router.get("/casa/assets/css/casa.css", setHeaders, (req, res) => res.send(casaCss.replace(/~~~CASA_MOUNT_URL~~~/g, (0, utils_js_1.validateUrlPath)(`${req.baseUrl}/`))));
|
|
69
|
+
router.get("/casa/assets/css/casa-ie8.css", setHeaders, (req, res) => res.send(casaCssIe8.replace(/~~~CASA_MOUNT_URL~~~/g, (0, utils_js_1.validateUrlPath)(`${req.baseUrl}/`))));
|
|
70
|
+
router.use("/casa/assets", notFoundHandler);
|
|
71
71
|
return router;
|
|
72
72
|
}
|
|
73
73
|
//# sourceMappingURL=static.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static.js","sourceRoot":"","sources":["../../src/routes/static.js"],"names":[],"mappings":";;;;;AA0BA,+
|
|
1
|
+
{"version":3,"file":"static.js","sourceRoot":"","sources":["../../src/routes/static.js"],"names":[],"mappings":";;;;;AA0BA,+BAsFC;AAhHD,sDAAgC;AAChC,2BAAkC;AAClC,6BAA0B;AAC1B,+BAA+B;AAC/B,mCAAuC;AAEvC,gEAAoC;AACpC,+EAAoD;AACpD,8CAAkD;AAElD,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAS,CAAC,CAAC,WAAW;AAExD,MAAM,MAAM,GAAG,QAAQ,CAAC;AAExB;;;GAGG;AAEH;;;;;;GAMG;AACH,SAAwB,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,GAAG,EAAE;IAC5D,MAAM,MAAM,GAAG,IAAI,0BAAa,EAAE,CAAC;IAEnC,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACzC,kDAAkD;QAClD,IAAI,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QACpC,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QACnC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3B,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAChE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,SAAG,CAC1B,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,mCAAI,EAAE,EACtB,2BAA2B,CAC5B,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;YACnC,2CAA2C;YAC3C,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG;QACnB,IAAI,EAAE,IAAI;QACV,YAAY,EAAE,KAAK;QACnB,MAAM;QACN,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE;YAClB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAClC,CAAC;KACF,CAAC;IAEF,4EAA4E;IAC5E,wEAAwE;IACxE,+CAA+C;IAC/C,4DAA4D;IAC5D,MAAM,OAAO,GAAG,IAAA,iBAAY,EAC1B,IAAA,cAAO,EAAC,qBAAO,EAAE,gCAAgC,CAAC,EAClD,EAAE,QAAQ,EAAE,MAAM,EAAE,CACrB,CAAC;IACF,MAAM,UAAU,GAAG,IAAA,iBAAY,EAC7B,IAAA,cAAO,EAAC,qBAAO,EAAE,oCAAoC,CAAC,EACtD,EAAE,QAAQ,EAAE,MAAM,EAAE,CACrB,CAAC;IACF,2DAA2D;IAE3D,4EAA4E;IAC5E,gEAAgE;IAChE,MAAM,sBAAsB,GAAG,IAAA,cAAO,EACpC,IAAA,sBAAa,EAAC,qBAAO,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAChD,QAAQ,CACT,CAAC;IAEF,MAAM,CAAC,GAAG,CACR,yBAAyB,EACzB,aAAa,CAAC,GAAG,sBAAsB,eAAe,EAAE,YAAY,CAAC,CACtE,CAAC;IACF,MAAM,CAAC,GAAG,CACR,6BAA6B,EAC7B,aAAa,CAAC,GAAG,sBAAsB,mBAAmB,EAAE,YAAY,CAAC,CAC1E,CAAC;IACF,MAAM,CAAC,GAAG,CACR,eAAe,EACf,aAAa,CAAC,GAAG,sBAAsB,eAAe,EAAE,YAAY,CAAC,CACtE,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAE7C,MAAM,CAAC,GAAG,CAAC,2BAA2B,EAAE,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAC/D,GAAG,CAAC,IAAI,CACN,OAAO,CAAC,OAAO,CACb,uBAAuB,EACvB,IAAA,0BAAe,EAAC,GAAG,GAAG,CAAC,OAAO,GAAG,CAAC,CACnC,CACF,CACF,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CACnE,GAAG,CAAC,IAAI,CACN,UAAU,CAAC,OAAO,CAChB,uBAAuB,EACvB,IAAA,0BAAe,EAAC,GAAG,GAAG,CAAC,OAAO,GAAG,CAAC,CACnC,CACF,CACF,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC;AAChB,CAAC"}
|