@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.27.0 → 4.28.0

package/dpr/middleware/reportAuthoriser.js

@@ -1,2 +1,64 @@
-"use strict";var S=Object.create;var n=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var w=(e,t)=>{for(var r in t)n(e,r,{get:t[r],enumerable:!0})},p=(e,t,r,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of P(t))!D.call(e,i)&&i!==r&&n(e,i,{get:()=>t[i],enumerable:!(o=v(t,i))||o.enumerable});return e};var H=(e,t,r)=>(r=e!=null?S(R(e)):{},p(t||!e||!e.__esModule?n(r,"default",{value:e,enumerable:!0}):r,e)),b=e=>p(n({},"__esModule",{value:!0}),e);var I={};w(I,{default:()=>x,reportAuthoriser:()=>m});module.exports=b(I);var c=H(require("../utils/localsHelper")),f=require("../types/UserReports");const m=(e,t)=>async(r,o,i)=>{const{token:a}=c.default.getValues(o),{reportId:d,id:l,variantId:y,type:g}=r.params,s=r.query.dataProductDefinitionsPath,u=await e.reportingService.getDefinitionSummary(a,d,s),h=g===f.ReportType.REPORT?e.reportingService:e.dashboardService;o.locals.definition=await h.getDefinition(a,d,y||l,s),u?.authorised!==void 0&&!u.authorised?o.render("dpr/routes/journeys/view-report/unauthorised",{layoutPath:t,...r.body}):i()};var x=m;0&&(module.exports={reportAuthoriser});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var reportAuthoriser_exports = {};
+__export(reportAuthoriser_exports, {
+  default: () => reportAuthoriser_default,
+  reportAuthoriser: () => reportAuthoriser
+});
+module.exports = __toCommonJS(reportAuthoriser_exports);
+var import_localsHelper = __toESM(require("../utils/localsHelper"));
+var import_UserReports = require("../types/UserReports");
+const reportAuthoriser = (services, layoutPath) => {
+  return async (req, res, next) => {
+    const { token } = import_localsHelper.default.getValues(res);
+    const { reportId, id, variantId, type } = req.params;
+    const dataProductDefinitionsPath = req.query["dataProductDefinitionsPath"];
+    const definitionSummary = await services.reportingService.getDefinitionSummary(
+      token,
+      reportId,
+      dataProductDefinitionsPath
+    );
+    const service = type === import_UserReports.ReportType.REPORT ? services.reportingService : services.dashboardService;
+    res.locals["definition"] = await service.getDefinition(token, reportId, variantId || id, dataProductDefinitionsPath);
+    if (definitionSummary?.authorised !== void 0 && !definitionSummary.authorised) {
+      res.render(`dpr/routes/journeys/view-report/unauthorised`, {
+        layoutPath,
+        ...req.body
+      });
+    } else {
+      next();
+    }
+  };
+};
+var reportAuthoriser_default = reportAuthoriser;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  reportAuthoriser
+});
 //# sourceMappingURL=reportAuthoriser.js.map

package/dpr/middleware/reportAuthoriser.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/middleware/reportAuthoriser.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../utils/localsHelper'\nimport { Services } from '../types/Services'\nimport { ReportType } from '../types/UserReports'\n\nexport const reportAuthoriser = (services: Services, layoutPath: string): RequestHandler => {\n  return async (req, res, next) => {\n    const { token } = LocalsHelper.getValues(res)\n    const { reportId, id, variantId, type } = req.params\n    const dataProductDefinitionsPath = <string | undefined>req.query['dataProductDefinitionsPath']\n\n    const definitionSummary = await services.reportingService.getDefinitionSummary(\n      token,\n      reportId,\n      dataProductDefinitionsPath,\n    )\n\n    const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService\n    res.locals['definition'] = await service.getDefinition(token, reportId, variantId || id, dataProductDefinitionsPath)\n\n    if (definitionSummary?.authorised !== undefined && !definitionSummary.authorised) {\n      res.render(`dpr/routes/journeys/view-report/unauthorised`, {\n        layoutPath,\n        ...req.body,\n      })\n    } else {\n      next()\n    }\n  }\n}\n\nexport default reportAuthoriser\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,qBAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,oCAEzBC,EAA2B,gCAEpB,MAAMH,EAAmB,CAACI,EAAoBC,IAC5C,MAAOC,EAAKC,EAAKC,IAAS,CAC/B,KAAM,CAAE,MAAAC,CAAM,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACtC,CAAE,SAAAI,EAAU,GAAAC,EAAI,UAAAC,EAAW,KAAAC,CAAK,EAAIR,EAAI,OACxCS,EAAiDT,EAAI,MAAM,2BAE3DU,EAAoB,MAAMZ,EAAS,iBAAiB,qBACxDK,EACAE,EACAI,CACF,EAEME,EAAUH,IAAS,aAAW,OAASV,EAAS,iBAAmBA,EAAS,iBAClFG,EAAI,OAAO,WAAgB,MAAMU,EAAQ,cAAcR,EAAOE,EAAUE,GAAaD,EAAIG,CAA0B,EAE/GC,GAAmB,aAAe,QAAa,CAACA,EAAkB,WACpET,EAAI,OAAO,+CAAgD,CACzD,WAAAF,EACA,GAAGC,EAAI,IACT,CAAC,EAEDE,EAAK,CAET,EAGF,IAAOT,EAAQC",
-  "names": ["reportAuthoriser_exports", "__export", "reportAuthoriser_default", "reportAuthoriser", "__toCommonJS", "import_localsHelper", "import_UserReports", "services", "layoutPath", "req", "res", "next", "token", "LocalsHelper", "reportId", "id", "variantId", "type", "dataProductDefinitionsPath", "definitionSummary", "service"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,0BAAyB;AAEzB,yBAA2B;AAEpB,MAAM,mBAAmB,CAAC,UAAoB,eAAuC;AAC1F,SAAO,OAAO,KAAK,KAAK,SAAS;AAC/B,UAAM,EAAE,MAAM,IAAI,oBAAAA,QAAa,UAAU,GAAG;AAC5C,UAAM,EAAE,UAAU,IAAI,WAAW,KAAK,IAAI,IAAI;AAC9C,UAAM,6BAAiD,IAAI,MAAM,4BAA4B;AAE7F,UAAM,oBAAoB,MAAM,SAAS,iBAAiB;AAAA,MACxD;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAEA,UAAM,UAAU,SAAS,8BAAW,SAAS,SAAS,mBAAmB,SAAS;AAClF,QAAI,OAAO,YAAY,IAAI,MAAM,QAAQ,cAAc,OAAO,UAAU,aAAa,IAAI,0BAA0B;AAEnH,QAAI,mBAAmB,eAAe,UAAa,CAAC,kBAAkB,YAAY;AAChF,UAAI,OAAO,gDAAgD;AAAA,QACzD;AAAA,QACA,GAAG,IAAI;AAAA,MACT,CAAC;AAAA,IACH,OAAO;AACL,WAAK;AAAA,IACP;AAAA,EACF;AACF;AAEA,IAAO,2BAAQ;",
+  "names": ["LocalsHelper"]
 }

package/dpr/middleware/setUpDprResources.js

@@ -1,2 +1,174 @@
-"use strict";var q=Object.create;var d=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,U=Object.prototype.hasOwnProperty;var x=(t,e)=>{for(var o in e)d(t,o,{get:e[o],enumerable:!0})},S=(t,e,o,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of v(e))!U.call(t,a)&&a!==o&&d(t,a,{get:()=>e[a],enumerable:!(r=y(e,a))||r.enumerable});return t};var P=(t,e,o)=>(o=t!=null?q(C(t)):{},S(e||!t||!t.__esModule?d(o,"default",{value:t,enumerable:!0}):o,t)),H=t=>S(d({},"__esModule",{value:!0}),t);var L={};x(L,{default:()=>B,errorRequestHandler:()=>b,populateDefinitions:()=>F,populateRequestedReports:()=>E,setupResources:()=>k});module.exports=H(L);var h=require("@sentry/node"),c=P(require("../utils/definitionUtils")),m=P(require("../utils/localsHelper")),D=require("../services/featureFlagService");const Q=(t,e)=>t[e]?t[e].toString():null,V=t=>Q(t,"dataProductDefinitionsPath"),I=t=>{const e=V(t);return e||null},b=t=>(e,o,r,a)=>e.status===401||e.status===403?r.render("dpr/routes/authError.njk",{layoutPath:t,message:"Sorry, there is a problem with authenticating your request"}):((0,h.captureException)(e),e.status>=400?r.render("dpr/routes/serviceProblem.njk",{layoutPath:t}):a(e)),k=(t,e,o,r)=>async(a,i,s)=>{A(a,i);try{return await j(i,t.featureFlagService),await F(t,a,i,r),await E(t,i),T(o,i),s()}catch(n){return b(e)(n,a,i,s)}},T=(t,e)=>{t.addGlobal("getLocals",()=>({locals:{...e.locals,...e.app.locals}}))},j=async(t,e)=>{t.app.locals.featureFlags===void 0&&(t.app.locals.featureFlags={flags:{},lastUpdated:new Date().getTime()-601*1e3});const{featureFlags:o}=t.app.locals,r=new Date().getTime();if((r-o.lastUpdated)/1e3>600){t.app.locals.featureFlags.lastUpdated=r;const s=await e.getFlags().catch(n=>{throw t.app.locals.featureFlags.lastUpdated=r-601*1e3,n});t.app.locals.featureFlags.flags=Object.fromEntries(s.flags.map(n=>[n.key,n]))}},A=(t,e)=>{const o=t.flash("DPR_ERRORS");o&&o[0]&&(e.locals.validationErrors=JSON.parse(o[0]))},F=async(t,e,o,r)=>{const{token:a,dprUser:i}=m.default.getValues(o),s=I(e.query),n=e.body?.dataProductDefinitionsPath,l=s||n;l&&(o.locals.dpdPathFromQuery=!0);const g=r?.dataProductDefinitionsPath;g&&(o.locals.dpdPathFromConfig=!0),o.locals.definitionsPath=l||g,o.locals.pathSuffix=`?dataProductDefinitionsPath=${o.locals.definitionsPath}`;let p;a&&(p=await t.productCollectionStoreService.getSelectedProductCollectionId(i.id)),o.locals.definitions=await Promise.all([t.reportingService.getDefinitions(a,o.locals.definitionsPath),p&&t.productCollectionService.getProductCollection(a,p)]).then(([R,u])=>{if(u&&u){const w=u.products.map(f=>f.productId);return R.filter(f=>w.includes(f.id))}return R})??[]},E=async(t,e)=>{const{dprUser:o}=m.default.getValues(e);if(o.id){const{definitions:r,definitionsPath:a}=e.locals,i=await t.recentlyViewedService.getAllReports(o.id);await t.requestedReportService.cleanList(o.id,i);const s=await t.requestedReportService.getAllReports(o.id);if(e.locals.requestedReports=a?s.filter(n=>c.default.getCurrentVariantDefinition(r,n.reportId,n.id)):s,e.locals.recentlyViewedReports=a?i.filter(n=>c.default.getCurrentVariantDefinition(r,n.reportId,n.id)):i,e.locals.downloadingEnabled=t.downloadPermissionService.enabled,e.locals.bookmarkingEnabled=t.bookmarkService.enabled,e.locals.collectionsEnabled=t.productCollectionService.enabled,e.locals.requestMissingEnabled=t.missingReportService.enabled,e.locals.saveDefaultsEnabled=(0,D.isBooleanFlagEnabled)("saveDefaultsEnabled",e.app),e.locals.bookmarkingEnabled){const n=await t.bookmarkService.getAllBookmarks(o.id);e.locals.bookmarks=a?n.filter(l=>c.default.getCurrentVariantDefinition(r,l.reportId,l.id)):n}}};var B=k;0&&(module.exports={errorRequestHandler,populateDefinitions,populateRequestedReports,setupResources});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var setUpDprResources_exports = {};
+__export(setUpDprResources_exports, {
+  default: () => setUpDprResources_default,
+  errorRequestHandler: () => errorRequestHandler,
+  populateDefinitions: () => populateDefinitions,
+  populateRequestedReports: () => populateRequestedReports,
+  setupResources: () => setupResources
+});
+module.exports = __toCommonJS(setUpDprResources_exports);
+var import_node = require("@sentry/node");
+var import_definitionUtils = __toESM(require("../utils/definitionUtils"));
+var import_localsHelper = __toESM(require("../utils/localsHelper"));
+var import_featureFlagService = require("../services/featureFlagService");
+const getQueryParamAsString = (query, name) => query[name] ? query[name].toString() : null;
+const getDefinitionsPath = (query) => getQueryParamAsString(query, "dataProductDefinitionsPath");
+const deriveDefinitionsPath = (query) => {
+  const definitionsPath = getDefinitionsPath(query);
+  if (definitionsPath) {
+    return definitionsPath;
+  }
+  return null;
+};
+const errorRequestHandler = (layoutPath) => (error, _req, res, next) => {
+  if (error.status === 401 || error.status === 403) {
+    return res.render("dpr/routes/authError.njk", {
+      layoutPath,
+      message: "Sorry, there is a problem with authenticating your request"
+    });
+  }
+  (0, import_node.captureException)(error);
+  if (error.status >= 400) {
+    return res.render("dpr/routes/serviceProblem.njk", {
+      layoutPath
+    });
+  }
+  return next(error);
+};
+const setupResources = (services, layoutPath, env, config) => {
+  return async (req, res, next) => {
+    populateValidationErrors(req, res);
+    try {
+      await setFeatures(res, services.featureFlagService);
+      await populateDefinitions(services, req, res, config);
+      await populateRequestedReports(services, res);
+      setupRequestAwareNunjucks(env, res);
+      return next();
+    } catch (error) {
+      return errorRequestHandler(layoutPath)(error, req, res, next);
+    }
+  };
+};
+const setupRequestAwareNunjucks = (env, res) => {
+  env.addGlobal("getLocals", () => ({ locals: { ...res.locals, ...res.app.locals } }));
+};
+const setFeatures = async (res, featureFlagService) => {
+  if (res.app.locals.featureFlags === void 0) {
+    res.app.locals.featureFlags = {
+      flags: {},
+      lastUpdated: (/* @__PURE__ */ new Date()).getTime() - 601 * 1e3
+    };
+  }
+  const { featureFlags } = res.app.locals;
+  const currentTime = (/* @__PURE__ */ new Date()).getTime();
+  const timeSinceLastUpdatedSeconds = (currentTime - featureFlags.lastUpdated) / 1e3;
+  const shouldUpdate = timeSinceLastUpdatedSeconds > 600;
+  if (shouldUpdate) {
+    res.app.locals.featureFlags.lastUpdated = currentTime;
+    const flags = await featureFlagService.getFlags().catch((e) => {
+      res.app.locals.featureFlags.lastUpdated = currentTime - 601 * 1e3;
+      throw e;
+    });
+    res.app.locals.featureFlags.flags = Object.fromEntries(flags.flags.map((flag) => [flag.key, flag]));
+  }
+};
+const populateValidationErrors = (req, res) => {
+  const errors = req.flash(`DPR_ERRORS`);
+  if (errors && errors[0]) {
+    res.locals["validationErrors"] = JSON.parse(errors[0]);
+  }
+};
+const populateDefinitions = async (services, req, res, config) => {
+  const { token, dprUser } = import_localsHelper.default.getValues(res);
+  const dpdPathFromQuery = deriveDefinitionsPath(req.query);
+  const dpdPathFromBody = req.body?.dataProductDefinitionsPath;
+  const definitionsPathFromQuery = dpdPathFromQuery || dpdPathFromBody;
+  if (definitionsPathFromQuery) {
+    res.locals["dpdPathFromQuery"] = true;
+  }
+  const dpdPathFromConfig = config?.dataProductDefinitionsPath;
+  if (dpdPathFromConfig) {
+    res.locals["dpdPathFromConfig"] = true;
+  }
+  res.locals["definitionsPath"] = definitionsPathFromQuery || dpdPathFromConfig;
+  res.locals["pathSuffix"] = `?dataProductDefinitionsPath=${res.locals["definitionsPath"]}`;
+  let selectedProductCollectionId;
+  if (token) {
+    selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(
+      dprUser.id
+    );
+  }
+  res.locals["definitions"] = await Promise.all([
+    services.reportingService.getDefinitions(token, res.locals["definitionsPath"]),
+    selectedProductCollectionId && services.productCollectionService.getProductCollection(token, selectedProductCollectionId)
+  ]).then(([defs, selectedProductCollection]) => {
+    if (selectedProductCollection && selectedProductCollection) {
+      const productIds = selectedProductCollection.products.map((product) => product.productId);
+      return defs.filter((def) => productIds.includes(def.id));
+    }
+    return defs;
+  }) ?? [];
+};
+const populateRequestedReports = async (services, res) => {
+  const { dprUser } = import_localsHelper.default.getValues(res);
+  if (dprUser.id) {
+    const { definitions, definitionsPath } = res.locals;
+    const recent = await services.recentlyViewedService.getAllReports(dprUser.id);
+    await services.requestedReportService.cleanList(dprUser.id, recent);
+    const requested = await services.requestedReportService.getAllReports(dprUser.id);
+    res.locals["requestedReports"] = !definitionsPath ? requested : requested.filter((report) => {
+      return import_definitionUtils.default.getCurrentVariantDefinition(definitions, report.reportId, report.id);
+    });
+    res.locals["recentlyViewedReports"] = !definitionsPath ? recent : recent.filter((report) => {
+      return import_definitionUtils.default.getCurrentVariantDefinition(definitions, report.reportId, report.id);
+    });
+    res.locals["downloadingEnabled"] = services.downloadPermissionService.enabled;
+    res.locals["bookmarkingEnabled"] = services.bookmarkService.enabled;
+    res.locals["collectionsEnabled"] = services.productCollectionService.enabled;
+    res.locals["requestMissingEnabled"] = services.missingReportService.enabled;
+    res.locals["saveDefaultsEnabled"] = (0, import_featureFlagService.isBooleanFlagEnabled)("saveDefaultsEnabled", res.app);
+    if (res.locals["bookmarkingEnabled"]) {
+      const bookmarks = await services.bookmarkService.getAllBookmarks(dprUser.id);
+      res.locals["bookmarks"] = !definitionsPath ? bookmarks : bookmarks.filter((bookmark) => {
+        return import_definitionUtils.default.getCurrentVariantDefinition(definitions, bookmark.reportId, bookmark.id);
+      });
+    }
+  }
+};
+var setUpDprResources_default = setupResources;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  errorRequestHandler,
+  populateDefinitions,
+  populateRequestedReports,
+  setupResources
+});
 //# sourceMappingURL=setUpDprResources.js.map

package/dpr/middleware/setUpDprResources.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/middleware/setUpDprResources.ts"],
   "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { RequestHandler, Response, Request, ErrorRequestHandler, NextFunction } from 'express'\nimport type { ParsedQs } from 'qs'\nimport { HTTPError } from 'superagent'\nimport type { Environment } from 'nunjucks'\nimport { captureException } from '@sentry/node'\nimport { Services } from '../types/Services'\nimport { RequestedReport, StoredReportData } from '../types/UserReports'\nimport DefinitionUtils from '../utils/definitionUtils'\nimport { BookmarkStoreData } from '../types/Bookmark'\nimport { DprConfig } from '../types/DprConfig'\nimport localsHelper from '../utils/localsHelper'\nimport { FeatureFlagService, isBooleanFlagEnabled } from '../services/featureFlagService'\n\nconst getQueryParamAsString = (query: ParsedQs, name: string) => (query[name] ? query[name].toString() : null)\nconst getDefinitionsPath = (query: ParsedQs) => getQueryParamAsString(query, 'dataProductDefinitionsPath')\n\nconst deriveDefinitionsPath = (query: ParsedQs): string | null => {\n  const definitionsPath = getDefinitionsPath(query)\n  if (definitionsPath) {\n    return definitionsPath\n  }\n\n  return null\n}\n\nexport const errorRequestHandler =\n  (layoutPath: string): ErrorRequestHandler =>\n  (error: HTTPError, _req: Request, res: Response, next: NextFunction) => {\n    if (error.status === 401 || error.status === 403) {\n      return res.render('dpr/routes/authError.njk', {\n        layoutPath,\n        message: 'Sorry, there is a problem with authenticating your request',\n      })\n    }\n    captureException(error)\n    if (error.status >= 400) {\n      return res.render('dpr/routes/serviceProblem.njk', {\n        layoutPath,\n      })\n    }\n    return next(error)\n  }\n\nexport const setupResources = (\n  services: Services,\n  layoutPath: string,\n  env: Environment,\n  config?: DprConfig,\n): RequestHandler => {\n  return async (req, res, next) => {\n    populateValidationErrors(req, res)\n    try {\n      await setFeatures(res, services.featureFlagService)\n      await populateDefinitions(services, req, res, config)\n      await populateRequestedReports(services, res)\n      setupRequestAwareNunjucks(env, res)\n      return next()\n    } catch (error) {\n      return errorRequestHandler(layoutPath)(error, req, res, next)\n    }\n  }\n}\n\nconst setupRequestAwareNunjucks = (env: Environment, res: Response) => {\n  env.addGlobal('getLocals', () => ({ locals: { ...res.locals, ...res.app.locals } }))\n}\n\nconst setFeatures = async (res: Response, featureFlagService: FeatureFlagService) => {\n  if (res.app.locals.featureFlags === undefined) {\n    res.app.locals.featureFlags = {\n      flags: {},\n      lastUpdated: new Date().getTime() - 601 * 1000,\n    }\n  }\n  const { featureFlags } = res.app.locals\n  const currentTime = new Date().getTime()\n  const timeSinceLastUpdatedSeconds = (currentTime - featureFlags.lastUpdated) / 1000\n  const shouldUpdate = timeSinceLastUpdatedSeconds > 600\n  if (shouldUpdate) {\n    // Refresh every 10 mins\n    res.app.locals.featureFlags.lastUpdated = currentTime\n    const flags = await featureFlagService.getFlags().catch((e) => {\n      res.app.locals.featureFlags.lastUpdated = currentTime - 601 * 1000\n      throw e\n    })\n    res.app.locals.featureFlags.flags = Object.fromEntries(flags.flags.map((flag) => [flag.key, flag]))\n  }\n}\n\nconst populateValidationErrors = (req: Request, res: Response) => {\n  const errors = req.flash(`DPR_ERRORS`)\n  if (errors && errors[0]) {\n    res.locals['validationErrors'] = JSON.parse(errors[0])\n  }\n}\n\nexport const populateDefinitions = async (services: Services, req: Request, res: Response, config?: DprConfig) => {\n  // Get the DPD path from the query\n  const { token, dprUser } = localsHelper.getValues(res)\n\n  const dpdPathFromQuery = deriveDefinitionsPath(req.query)\n  const dpdPathFromBody = req.body?.dataProductDefinitionsPath\n  const definitionsPathFromQuery = dpdPathFromQuery || dpdPathFromBody\n\n  if (definitionsPathFromQuery) {\n    res.locals['dpdPathFromQuery'] = true\n  }\n\n  // Get the DPD path from the config\n  const dpdPathFromConfig = config?.dataProductDefinitionsPath\n  if (dpdPathFromConfig) {\n    res.locals['dpdPathFromConfig'] = true\n  }\n\n  // query takes presedence over config\n  res.locals['definitionsPath'] = definitionsPathFromQuery || dpdPathFromConfig\n  res.locals['pathSuffix'] = `?dataProductDefinitionsPath=${res.locals['definitionsPath']}`\n\n  let selectedProductCollectionId: string | undefined\n  if (token) {\n    selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(\n      dprUser.id,\n    )\n  }\n\n  res.locals['definitions'] =\n    (await Promise.all([\n      services.reportingService.getDefinitions(token, res.locals['definitionsPath']),\n      selectedProductCollectionId &&\n        services.productCollectionService.getProductCollection(token, selectedProductCollectionId),\n    ]).then(([defs, selectedProductCollection]) => {\n      if (selectedProductCollection && selectedProductCollection) {\n        const productIds = selectedProductCollection.products.map((product) => product.productId)\n        return defs.filter((def) => productIds.includes(def.id))\n      }\n      return defs\n    })) ?? []\n}\n\nexport const populateRequestedReports = async (services: Services, res: Response) => {\n  const { dprUser } = localsHelper.getValues(res)\n  if (dprUser.id) {\n    const { definitions, definitionsPath } = res.locals\n\n    const recent = await services.recentlyViewedService.getAllReports(dprUser.id)\n    await services.requestedReportService.cleanList(dprUser.id, recent)\n    const requested = await services.requestedReportService.getAllReports(dprUser.id)\n\n    res.locals['requestedReports'] = !definitionsPath\n      ? requested\n      : requested.filter((report: RequestedReport) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    res.locals['recentlyViewedReports'] = !definitionsPath\n      ? recent\n      : recent.filter((report: StoredReportData) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    res.locals['downloadingEnabled'] = services.downloadPermissionService.enabled\n    res.locals['bookmarkingEnabled'] = services.bookmarkService.enabled\n    res.locals['collectionsEnabled'] = services.productCollectionService.enabled\n    res.locals['requestMissingEnabled'] = services.missingReportService.enabled\n    res.locals['saveDefaultsEnabled'] = isBooleanFlagEnabled('saveDefaultsEnabled', res.app)\n\n    if (res.locals['bookmarkingEnabled']) {\n      const bookmarks = await services.bookmarkService.getAllBookmarks(dprUser.id)\n      res.locals['bookmarks'] = !definitionsPath\n        ? bookmarks\n        : bookmarks.filter((bookmark: BookmarkStoreData) => {\n            return DefinitionUtils.getCurrentVariantDefinition(definitions, bookmark.reportId, bookmark.id)\n          })\n    }\n  }\n}\n\nexport default setupResources\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,wBAAAC,EAAA,wBAAAC,EAAA,6BAAAC,EAAA,mBAAAC,IAAA,eAAAC,EAAAP,GAKA,IAAAQ,EAAiC,wBAGjCC,EAA4B,uCAG5BC,EAAyB,oCACzBC,EAAyD,0CAEzD,MAAMC,EAAwB,CAACC,EAAiBC,IAAkBD,EAAMC,CAAI,EAAID,EAAMC,CAAI,EAAE,SAAS,EAAI,KACnGC,EAAsBF,GAAoBD,EAAsBC,EAAO,4BAA4B,EAEnGG,EAAyBH,GAAmC,CAChE,MAAMI,EAAkBF,EAAmBF,CAAK,EAChD,OAAII,GAIG,IACT,EAEad,EACVe,GACD,CAACC,EAAkBC,EAAeC,EAAeC,IAC3CH,EAAM,SAAW,KAAOA,EAAM,SAAW,IACpCE,EAAI,OAAO,2BAA4B,CAC5C,WAAAH,EACA,QAAS,4DACX,CAAC,MAEH,oBAAiBC,CAAK,EAClBA,EAAM,QAAU,IACXE,EAAI,OAAO,gCAAiC,CACjD,WAAAH,CACF,CAAC,EAEII,EAAKH,CAAK,GAGRb,EAAiB,CAC5BiB,EACAL,EACAM,EACAC,IAEO,MAAOC,EAAKL,EAAKC,IAAS,CAC/BK,EAAyBD,EAAKL,CAAG,EACjC,GAAI,CACF,aAAMO,EAAYP,EAAKE,EAAS,kBAAkB,EAClD,MAAMnB,EAAoBmB,EAAUG,EAAKL,EAAKI,CAAM,EACpD,MAAMpB,EAAyBkB,EAAUF,CAAG,EAC5CQ,EAA0BL,EAAKH,CAAG,EAC3BC,EAAK,CACd,OAASH,EAAO,CACd,OAAOhB,EAAoBe,CAAU,EAAEC,EAAOO,EAAKL,EAAKC,CAAI,CAC9D,CACF,EAGIO,EAA4B,CAACL,EAAkBH,IAAkB,CACrEG,EAAI,UAAU,YAAa,KAAO,CAAE,OAAQ,CAAE,GAAGH,EAAI,OAAQ,GAAGA,EAAI,IAAI,MAAO,CAAE,EAAE,CACrF,EAEMO,EAAc,MAAOP,EAAeS,IAA2C,CAC/ET,EAAI,IAAI,OAAO,eAAiB,SAClCA,EAAI,IAAI,OAAO,aAAe,CAC5B,MAAO,CAAC,EACR,YAAa,IAAI,KAAK,EAAE,QAAQ,EAAI,IAAM,GAC5C,GAEF,KAAM,CAAE,aAAAU,CAAa,EAAIV,EAAI,IAAI,OAC3BW,EAAc,IAAI,KAAK,EAAE,QAAQ,EAGvC,IAFqCA,EAAcD,EAAa,aAAe,IAC5B,IACjC,CAEhBV,EAAI,IAAI,OAAO,aAAa,YAAcW,EAC1C,MAAMC,EAAQ,MAAMH,EAAmB,SAAS,EAAE,MAAOI,GAAM,CAC7D,MAAAb,EAAI,IAAI,OAAO,aAAa,YAAcW,EAAc,IAAM,IACxDE,CACR,CAAC,EACDb,EAAI,IAAI,OAAO,aAAa,MAAQ,OAAO,YAAYY,EAAM,MAAM,IAAKE,GAAS,CAACA,EAAK,IAAKA,CAAI,CAAC,CAAC,CACpG,CACF,EAEMR,EAA2B,CAACD,EAAcL,IAAkB,CAChE,MAAMe,EAASV,EAAI,MAAM,YAAY,EACjCU,GAAUA,EAAO,CAAC,IACpBf,EAAI,OAAO,iBAAsB,KAAK,MAAMe,EAAO,CAAC,CAAC,EAEzD,EAEahC,EAAsB,MAAOmB,EAAoBG,EAAcL,EAAeI,IAAuB,CAEhH,KAAM,CAAE,MAAAY,EAAO,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUlB,CAAG,EAE/CmB,EAAmBxB,EAAsBU,EAAI,KAAK,EAClDe,EAAkBf,EAAI,MAAM,2BAC5BgB,EAA2BF,GAAoBC,EAEjDC,IACFrB,EAAI,OAAO,iBAAsB,IAInC,MAAMsB,EAAoBlB,GAAQ,2BAC9BkB,IACFtB,EAAI,OAAO,kBAAuB,IAIpCA,EAAI,OAAO,gBAAqBqB,GAA4BC,EAC5DtB,EAAI,OAAO,WAAgB,+BAA+BA,EAAI,OAAO,eAAkB,GAEvF,IAAIuB,EACAP,IACFO,EAA8B,MAAMrB,EAAS,8BAA8B,+BACzEe,EAAQ,EACV,GAGFjB,EAAI,OAAO,YACR,MAAM,QAAQ,IAAI,CACjBE,EAAS,iBAAiB,eAAec,EAAOhB,EAAI,OAAO,eAAkB,EAC7EuB,GACErB,EAAS,yBAAyB,qBAAqBc,EAAOO,CAA2B,CAC7F,CAAC,EAAE,KAAK,CAAC,CAACC,EAAMC,CAAyB,IAAM,CAC7C,GAAIA,GAA6BA,EAA2B,CAC1D,MAAMC,EAAaD,EAA0B,SAAS,IAAKE,GAAYA,EAAQ,SAAS,EACxF,OAAOH,EAAK,OAAQI,GAAQF,EAAW,SAASE,EAAI,EAAE,CAAC,CACzD,CACA,OAAOJ,CACT,CAAC,GAAM,CAAC,CACZ,EAEaxC,EAA2B,MAAOkB,EAAoBF,IAAkB,CACnF,KAAM,CAAE,QAAAiB,CAAQ,EAAI,EAAAC,QAAa,UAAUlB,CAAG,EAC9C,GAAIiB,EAAQ,GAAI,CACd,KAAM,CAAE,YAAAY,EAAa,gBAAAjC,CAAgB,EAAII,EAAI,OAEvC8B,EAAS,MAAM5B,EAAS,sBAAsB,cAAce,EAAQ,EAAE,EAC5E,MAAMf,EAAS,uBAAuB,UAAUe,EAAQ,GAAIa,CAAM,EAClE,MAAMC,EAAY,MAAM7B,EAAS,uBAAuB,cAAce,EAAQ,EAAE,EAoBhF,GAlBAjB,EAAI,OAAO,iBAAuBJ,EAE9BmC,EAAU,OAAQC,GACT,EAAAC,QAAgB,4BAA4BJ,EAAaG,EAAO,SAAUA,EAAO,EAAE,CAC3F,EAHDD,EAKJ/B,EAAI,OAAO,sBAA4BJ,EAEnCkC,EAAO,OAAQE,GACN,EAAAC,QAAgB,4BAA4BJ,EAAaG,EAAO,SAAUA,EAAO,EAAE,CAC3F,EAHDF,EAKJ9B,EAAI,OAAO,mBAAwBE,EAAS,0BAA0B,QACtEF,EAAI,OAAO,mBAAwBE,EAAS,gBAAgB,QAC5DF,EAAI,OAAO,mBAAwBE,EAAS,yBAAyB,QACrEF,EAAI,OAAO,sBAA2BE,EAAS,qBAAqB,QACpEF,EAAI,OAAO,uBAAyB,wBAAqB,sBAAuBA,EAAI,GAAG,EAEnFA,EAAI,OAAO,mBAAuB,CACpC,MAAMkC,EAAY,MAAMhC,EAAS,gBAAgB,gBAAgBe,EAAQ,EAAE,EAC3EjB,EAAI,OAAO,UAAgBJ,EAEvBsC,EAAU,OAAQC,GACT,EAAAF,QAAgB,4BAA4BJ,EAAaM,EAAS,SAAUA,EAAS,EAAE,CAC/F,EAHDD,CAIN,CACF,CACF,EAEA,IAAOrD,EAAQI",
-  "names": ["setUpDprResources_exports", "__export", "setUpDprResources_default", "errorRequestHandler", "populateDefinitions", "populateRequestedReports", "setupResources", "__toCommonJS", "import_node", "import_definitionUtils", "import_localsHelper", "import_featureFlagService", "getQueryParamAsString", "query", "name", "getDefinitionsPath", "deriveDefinitionsPath", "definitionsPath", "layoutPath", "error", "_req", "res", "next", "services", "env", "config", "req", "populateValidationErrors", "setFeatures", "setupRequestAwareNunjucks", "featureFlagService", "featureFlags", "currentTime", "flags", "e", "flag", "errors", "token", "dprUser", "localsHelper", "dpdPathFromQuery", "dpdPathFromBody", "definitionsPathFromQuery", "dpdPathFromConfig", "selectedProductCollectionId", "defs", "selectedProductCollection", "productIds", "product", "def", "definitions", "recent", "requested", "report", "DefinitionUtils", "bookmarks", "bookmark"]
+  "mappings": "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",
+  "names": ["localsHelper", "DefinitionUtils"]
 }

package/dpr/middleware/setUpNestedRoute.js

@@ -1,2 +1,36 @@
-"use strict";var a=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var d=Object.prototype.hasOwnProperty;var p=(t,e)=>{for(var r in e)a(t,r,{get:e[r],enumerable:!0})},c=(t,e,r,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of u(e))!d.call(t,s)&&s!==r&&a(t,s,{get:()=>e[s],enumerable:!(l=n(e,s))||l.enumerable});return t};var R=t=>c(a({},"__esModule",{value:!0}),t);var m={};p(m,{default:()=>f,setupNestedRoute:()=>o});module.exports=R(m);const o=()=>async(t,e,r)=>{e.locals.nestedBaseUrl=t.baseUrl,r()};var f=o;0&&(module.exports={setupNestedRoute});
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var setUpNestedRoute_exports = {};
+__export(setUpNestedRoute_exports, {
+  default: () => setUpNestedRoute_default,
+  setupNestedRoute: () => setupNestedRoute
+});
+module.exports = __toCommonJS(setUpNestedRoute_exports);
+const setupNestedRoute = () => {
+  return async (req, res, next) => {
+    res.locals["nestedBaseUrl"] = req.baseUrl;
+    next();
+  };
+};
+var setUpNestedRoute_default = setupNestedRoute;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  setupNestedRoute
+});
 //# sourceMappingURL=setUpNestedRoute.js.map

package/dpr/middleware/setUpNestedRoute.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/middleware/setUpNestedRoute.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\n\nexport const setupNestedRoute = (): RequestHandler => {\n  return async (req, res, next) => {\n    res.locals['nestedBaseUrl'] = req.baseUrl\n    next()\n  }\n}\n\nexport default setupNestedRoute\n"],
-  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,qBAAAC,IAAA,eAAAC,EAAAJ,GAEO,MAAMG,EAAmB,IACvB,MAAOE,EAAKC,EAAKC,IAAS,CAC/BD,EAAI,OAAO,cAAmBD,EAAI,QAClCE,EAAK,CACP,EAGF,IAAOL,EAAQC",
-  "names": ["setUpNestedRoute_exports", "__export", "setUpNestedRoute_default", "setupNestedRoute", "__toCommonJS", "req", "res", "next"]
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,mBAAmB,MAAsB;AACpD,SAAO,OAAO,KAAK,KAAK,SAAS;AAC/B,QAAI,OAAO,eAAe,IAAI,IAAI;AAClC,SAAK;AAAA,EACP;AACF;AAEA,IAAO,2BAAQ;",
+  "names": []
 }

package/dpr/routes/index.js

@@ -1,2 +1,51 @@
-"use strict";var l=Object.create;var i=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var d=(e,r)=>{for(var t in r)i(e,t,{get:r[t],enumerable:!0})},m=(e,r,t,u)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of y(r))!v.call(e,o)&&o!==t&&i(e,o,{get:()=>r[o],enumerable:!(u=g(r,o))||u.enumerable});return e};var s=(e,r,t)=>(t=e!=null?l(R(e)):{},m(r||!e||!e.__esModule?i(t,"default",{value:e,enumerable:!0}):t,e)),P=e=>m(i({},"__esModule",{value:!0}),e);var q={};d(q,{default:()=>h});module.exports=P(q);var n=require("express"),f=s(require("../utils/logger")),p=s(require("./journeys/routes")),a=s(require("../middleware/setUpNestedRoute")),c=require("../middleware/setUpDprResources");function S(e){f.default.info("Initialiasing DPR routes...");const r=(0,n.Router)({mergeParams:!0});return r.use("/",(0,a.default)(),(0,p.default)(e),(0,c.errorRequestHandler)(e.layoutPath)),r}var h=S;
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var routes_exports = {};
+__export(routes_exports, {
+  default: () => routes_default
+});
+module.exports = __toCommonJS(routes_exports);
+var import_express = require("express");
+var import_logger = __toESM(require("../utils/logger"));
+var import_routes = __toESM(require("./journeys/routes"));
+var import_setUpNestedRoute = __toESM(require("../middleware/setUpNestedRoute"));
+var import_setUpDprResources = require("../middleware/setUpDprResources");
+function routes(routeImportParams) {
+  import_logger.default.info("Initialiasing DPR routes...");
+  const router = (0, import_express.Router)({ mergeParams: true });
+  router.use(
+    "/",
+    (0, import_setUpNestedRoute.default)(),
+    (0, import_routes.default)(routeImportParams),
+    (0, import_setUpDprResources.errorRequestHandler)(routeImportParams.layoutPath)
+  );
+  return router;
+}
+var routes_default = routes;
 //# sourceMappingURL=index.js.map

package/dpr/routes/index.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/routes/index.ts"],
   "sourcesContent": ["import { Router } from 'express'\nimport type { Services } from '../types/Services'\nimport logger from '../utils/logger'\nimport JourneyRoutes from './journeys/routes'\n// middleware\nimport setUpNestedRoute from '../middleware/setUpNestedRoute'\nimport { errorRequestHandler } from '../middleware/setUpDprResources'\n\nfunction routes(routeImportParams: { services: Services; layoutPath: string }) {\n  logger.info('Initialiasing DPR routes...')\n  const router = Router({ mergeParams: true })\n  router.use(\n    '/',\n    setUpNestedRoute(),\n    JourneyRoutes(routeImportParams),\n    errorRequestHandler(routeImportParams.layoutPath),\n  )\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,IAAA,eAAAC,EAAAH,GAAA,IAAAI,EAAuB,mBAEvBC,EAAmB,8BACnBC,EAA0B,gCAE1BC,EAA6B,6CAC7BC,EAAoC,2CAEpC,SAASC,EAAOC,EAA+D,CAC7E,EAAAC,QAAO,KAAK,6BAA6B,EACzC,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IACL,OACA,EAAAC,SAAiB,KACjB,EAAAC,SAAcJ,CAAiB,KAC/B,uBAAoBA,EAAkB,UAAU,CAClD,EACOE,CACT,CAEA,IAAOV,EAAQO",
-  "names": ["routes_exports", "__export", "routes_default", "__toCommonJS", "import_express", "import_logger", "import_routes", "import_setUpNestedRoute", "import_setUpDprResources", "routes", "routeImportParams", "logger", "router", "setUpNestedRoute", "JourneyRoutes"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAuB;AAEvB,oBAAmB;AACnB,oBAA0B;AAE1B,8BAA6B;AAC7B,+BAAoC;AAEpC,SAAS,OAAO,mBAA+D;AAC7E,gBAAAA,QAAO,KAAK,6BAA6B;AACzC,QAAM,aAAS,uBAAO,EAAE,aAAa,KAAK,CAAC;AAC3C,SAAO;AAAA,IACL;AAAA,QACA,wBAAAC,SAAiB;AAAA,QACjB,cAAAC,SAAc,iBAAiB;AAAA,QAC/B,8CAAoB,kBAAkB,UAAU;AAAA,EAClD;AACA,SAAO;AACT;AAEA,IAAO,iBAAQ;",
+  "names": ["logger", "setUpNestedRoute", "JourneyRoutes"]
 }