@dwp/govuk-casa 9.3.2 → 9.3.4

package/src/middleware/data.js

@@ -1,18 +1,15 @@
 // Decorates the request with some contextual data about the user's journey
 // through the application. This is used by downstream middleware and templates.
 
-import lodash from "lodash";
 import JourneyContext from "../lib/JourneyContext.js";
 import { validateUrlPath } from "../lib/utils.js";
 import waypointUrl from "../lib/waypoint-url.js";
 
-const { has } = lodash;
-
 const editOrigin = (req) => {
-  if (has(req.query, "editorigin")) {
+  if (Object.hasOwn(req.query, "editorigin")) {
     return waypointUrl({ waypoint: req.query.editorigin });
   }
-  if (has(req?.body, "editorigin")) {
+  if (req.body && Object.hasOwn(req.body, "editorigin")) {
     return waypointUrl({ waypoint: req.body.editorigin });
   }
   return "";
@@ -39,8 +36,8 @@ export default function dataMiddleware({ plan, events, contextIdGenerator }) {
 
         // Edit mode
         editMode:
-          (has(req?.query, "edit") && has(req?.query, "editorigin")) ||
-          (has(req?.body, "edit") && has(req?.body, "editorigin")),
+          (Object.hasOwn(req.query, "edit") && Object.hasOwn(req.query, "editorigin")) ||
+          (Object.hasOwn(req.body, "edit") && Object.hasOwn(req.body, "editorigin")),
         editOrigin: editOrigin(req),
       };
 

package/src/middleware/i18n.js

@@ -1,7 +1,7 @@
 import { createInstance } from "i18next";
 import { LanguageDetector, handle } from "i18next-http-middleware";
-import { resolve, basename } from "path";
-import { existsSync, readFileSync, readdirSync } from "fs";
+import { resolve, basename } from "node:path";
+import { existsSync, readFileSync, readdirSync } from "node:fs";
 import deepmerge from "deepmerge";
 import yaml from "js-yaml";
 import logger from "../lib/logger.js";
@@ -32,22 +32,22 @@ const extract = (file) => {
 const loadResources = (languages, directories) => {
   const store = Object.create(null);
 
-  languages.forEach((language) => {
+  for (const language of languages) {
     // ESLint disabled as `store`, `language` and `ns` are all dev-controlled,
     // and this function is only called once, at boot-time.
     /* eslint-disable security/detect-object-injection */
     store[language] = Object.create(null);
 
-    directories.forEach((basedir) => {
+    for (const basedir of directories) {
       const dir = resolve(basedir, language);
       /* eslint-disable-next-line security/detect-non-literal-fs-filename */
       if (!existsSync(dir)) {
-        return;
+        continue;
       }
 
       log.info("Loading %s language from %s ...", language, dir);
       /* eslint-disable-next-line security/detect-non-literal-fs-filename */
-      readdirSync(dir).forEach((file) => {
+      for (const file of readdirSync(dir)) {
         const { ns, data } = extract(resolve(dir, file));
 
         if (store[language][ns] === undefined) {
@@ -55,10 +55,10 @@ const loadResources = (languages, directories) => {
         }
 
         store[language][ns] = deepmerge(store[language][ns], data);
-      });
-    });
+      }
+    }
     /* eslint-enable security/detect-object-injection */
-  });
+  }
 
   return store;
 };

package/src/middleware/pre.js

@@ -1,4 +1,4 @@
-import { randomBytes } from "crypto";
+import { randomBytes } from "node:crypto";
 import helmet from "helmet";
 
 /**

package/src/middleware/sanitise-fields.js

@@ -2,7 +2,6 @@
 // - Coerce each field to its correct type
 // - Remove an extraneous fields that are not know to the application
 
-import _ from "lodash";
 import fieldFactory from "../lib/field.js";
 import JourneyContext from "../lib/JourneyContext.js";
 
@@ -39,7 +38,7 @@ export default ({ waypoint, fields = [] }) => {
       const prunedBody = Object.create(null);
       for (let i = 0, l = fields.length; i < l; i++) {
         if (
-          _.has(req.body, fields[i].name) &&
+          Object.hasOwn(req.body, fields[i].name) &&
           req.body[fields[i].name] !== undefined
         ) {
           prunedBody[fields[i].name] = req.body[fields[i].name];

package/src/routes/ancillary.js

@@ -14,7 +14,7 @@ import MutableRouter from "../lib/MutableRouter.js";
  */
 export default function ancillaryRouter({ sessionTtl }) {
   // Router
-  const router = new MutableRouter();
+  const router = new MutableRouter({ mergeParams: true });
 
   // Session timeout
   router.all("/session-timeout", (req, res) => {

package/src/routes/journey.js

@@ -107,7 +107,7 @@ export default function journeyRouter({
   globalErrorVisibility,
 }) {
   // Router
-  const router = new MutableRouter();
+  const router = new MutableRouter({ mergeParams: true });
 
   // Special "_" route which handles redirecting the user between sub-apps
   // /app1/_/?refmount=app2&route=prev
@@ -165,7 +165,7 @@ export default function journeyRouter({
   // Create GET / POST routes for each page
   const commonMiddleware = [...csrfMiddleware];
 
-  pages.forEach((page) => {
+  for (const page of pages) {
     const {
       waypoint,
       view,
@@ -320,7 +320,7 @@ export default function journeyRouter({
         };
       }),
     );
-  });
+  }
 
   return router;
 }

package/src/routes/static.js

@@ -1,8 +1,8 @@
 import ExpressJS from "express";
-import { readFileSync } from "fs";
-import { URL } from "url";
-import { resolve } from "path";
-import { createRequire } from "module";
+import { readFileSync } from "node:fs";
+import { URL } from "node:url";
+import { resolve } from "node:path";
+import { createRequire } from "node:module";
 
 import dirname from "./dirname.cjs";
 import MutableRouter from "../lib/MutableRouter.js";