hof 22.11.0-frontend-v4-beta.2 → 22.11.0

package/frontend/themes/gov-uk/client-js/cookieSettings.js

@@ -1,22 +1,22 @@
-/* eslint-disable max-len, no-undef */
+/* eslint-disable max-len, no-var, vars-on-top, no-undef */
 'use strict';
 
 // TODO: update package.json(s)
 
 function hideFallbackContent(containerId) {
-  const container = document.getElementById(containerId);
+  var container = document.getElementById(containerId);
   if (container === null) return;
-  const fallbackContent = container.getElementsByClassName('js-disabled');
-  for (let i = 0; i < fallbackContent.length; i++) {
+  var fallbackContent = container.getElementsByClassName('js-disabled');
+  for (var i = 0; i < fallbackContent.length; i++) {
     fallbackContent[i].style.display = 'none';
   }
 }
 
 function showInteractiveContent(containerId) {
-  const container = document.getElementById(containerId);
+  var container = document.getElementById(containerId);
   if (container === null) return;
-  const interactiveContent = container.getElementsByClassName('js-enabled');
-  for (let i = 0; i < interactiveContent.length; i++) {
+  var interactiveContent = container.getElementsByClassName('js-enabled');
+  for (var i = 0; i < interactiveContent.length; i++) {
     interactiveContent[i].style.display = 'block';
   }
 }
@@ -34,53 +34,41 @@ function setCookiePreferences(preferences) {
 function showCookieBannerSubmitted() {
   document.getElementById('cookie-banner-info').style.display = 'none';
   document.getElementById('cookie-banner-actions').style.display = 'none';
-  let cookieBannerSubmitted;
-  const cookieBannerDiv = document.getElementById('cookie-banner-submitted-accepted');
-  if (cookieBannerDiv.dataset.acceptCookies === 'true') {
-    cookieBannerSubmitted = document.getElementById('cookie-banner-submitted-accepted');
-  } else {
-    cookieBannerSubmitted = document.getElementById('cookie-banner-submitted-rejected');
-  }
+  var cookieBannerSubmitted = document.getElementById('cookie-banner-submitted');
   cookieBannerSubmitted.style.display = 'block';
   cookieBannerSubmitted.focus();
 }
 
-function hideCookieBanner() {
-  document.getElementById('cookie-banner').style.display = 'none';
-}
-
 function initialiseBannerButtons() {
-  const acceptedCookieBannerDiv = document.getElementById('cookie-banner-submitted-accepted');
   document.getElementById('accept-cookies-button').addEventListener('click', function () {
-    setCookiePreferences({ essential: true, usage: true });
+    setCookiePreferences({essential: true, usage: true});
     showCookieBannerSubmitted();
     sessionStorage.setItem('reloading', 'true');
     window.location = document.URL;
   });
 
   document.getElementById('reject-cookies-button').addEventListener('click', function () {
-    setCookiePreferences({ essential: true, usage: false });
-    acceptedCookieBannerDiv.dataset.acceptCookies = 'false';
+    setCookiePreferences({essential: true, usage: false});
     showCookieBannerSubmitted();
   });
 
-  document.getElementById('hide-accept-cookie-banner').addEventListener('click', hideCookieBanner);
-
-  document.getElementById('hide-reject-cookie-banner').addEventListener('click', hideCookieBanner);
+  document.getElementById('hide-cookie-banner').addEventListener('click', function () {
+    document.getElementById('cookie-banner').style.display = 'none';
+  });
 }
 
 function initialiseCookieBanner() {
-  const preferences = GOVUK.cookie('cookie_preferences');
+  var preferences = GOVUK.cookie('cookie_preferences');
 
   if (preferences !== null) {
     return;
   }
 
   // the default cookie message container from hof-govuk-template
-  const bannerContainer = document.getElementById('global-cookie-message');
+  var bannerContainer = document.getElementById('global-cookie-message');
 
   // the cookie banner that will replace the container's default content if using google analytics
-  const cookieBanner = document.getElementById('cookie-banner');
+  var cookieBanner = document.getElementById('cookie-banner');
 
   if (bannerContainer !== null && cookieBanner !== null) {
     hideFallbackContent('global-cookie-message');
@@ -94,8 +82,8 @@ function handleSaveSettings(e) {
   e.preventDefault();
   setCookiePreferences({ essential: true, usage: document.getElementById('radio-1').checked });
 
-  const cookieNotification = document.getElementById('cookie-notification');
-  const cookieBanner = document.getElementById('cookie-banner');
+  var cookieNotification = document.getElementById('cookie-notification');
+  var cookieBanner = document.getElementById('cookie-banner');
 
   if (cookieBanner !== null) {
     cookieBanner.style.display = 'none';
@@ -108,8 +96,8 @@ function handleSaveSettings(e) {
 }
 
 function initialiseFormControls() {
-  const preferences = JSON.parse(GOVUK.cookie('cookie_preferences'));
-  let usage;
+  var preferences = JSON.parse(GOVUK.cookie('cookie_preferences'));
+  var usage;
 
   if (preferences !== null && preferences.usage !== undefined && typeof preferences.usage === 'boolean') {
     usage = preferences.usage;
@@ -123,7 +111,7 @@ function initialiseFormControls() {
 }
 
 function initialiseCookiePage() {
-  const shouldDisplayCookieControls = document.getElementById('cookie-settings') !== null;
+  var shouldDisplayCookieControls = document.getElementById('cookie-settings') !== null;
 
   if (shouldDisplayCookieControls) {
     hideFallbackContent('cookie-settings');
@@ -134,12 +122,12 @@ function initialiseCookiePage() {
 
 function onLoad() {
   window.onload = function () {
-    const reloading = sessionStorage.getItem('reloading');
+    var reloading = sessionStorage.getItem('reloading');
     if (reloading) {
       sessionStorage.removeItem('reloading');
 
-      const bannerContainer = document.getElementById('global-cookie-message');
-      const cookieBanner = document.getElementById('cookie-banner');
+      var bannerContainer = document.getElementById('global-cookie-message');
+      var cookieBanner = document.getElementById('cookie-banner');
 
       if (bannerContainer !== null && cookieBanner !== null) {
         bannerContainer.style.display = 'block';

package/index.js

@@ -156,7 +156,7 @@ function bootstrap(options) {
     res.locals.htmlLang = config.htmlLang;
     res.locals.cookieName = config.session.name;
     // session timeout warning configs
-    res.locals.sessionTimeOut = config.session.ttl;
+    res.locals.sessionTimeOut = process.env.CUSTOM_SESSION_EXPIRY || config.session.ttl;
     res.locals.sessionTimeOutWarning = config.sessionTimeOutWarning;
     res.locals.sessionTimeoutWarningContent = config.sessionTimeoutWarningContent;
     res.locals.exitFormContent = config.exitFormContent;
@@ -252,26 +252,32 @@ function bootstrap(options) {
 
   /**
    * Handles requests to the session timeout page.
+   * For custom session timeout handling that is not linked to the redis session ttl,
+   * set `CUSTOM_SESSION_EXPIRY` variables to the relevant time and `USE_CUSTOM_SESSION_TIMEOUT`variables to true.
+   * If `CUSTOM_SESSION_EXPIRY` and `USE_CUSTOM_SESSION_TIMEOUT` envs are set,
+   * include '/session-timeout' step in the project's index.js.
    * - If the user has a session cookie but their session is missing or inactive,
    *   this triggers a session timeout error handled by error middleware.
    * - Otherwise, responds with a 404 "Page Not Found" error.
    * This route ensures the timeout page only appears after an actual session expiry.
   */
-  app.get('/session-timeout', (req, res, next) => {
-    if ((req.cookies['hof-wizard-sc']) && (!req.session || req.session.exists !== true)) {
-      const err = new Error('Session expired');
-      err.code = 'SESSION_TIMEOUT';
-      return next(err);
-    }
-    const err = new Error('Not Found');
-    err.status = 404;
-    const locals = Object.assign({}, req.translate('errors'));
-    if (locals && locals['404']) {
-      return res.status(404).render('404', locals['404']);
-    }
-    // Fallback: render a basic 404 page if translation is missing
-    return res.status(404).send('Page Not Found');
-  });
+  if (!config.useCustomSessionTimeout) {
+    app.get('/session-timeout', (req, res, next) => {
+      if ((req.cookies['hof-wizard-sc']) && (!req.session || req.session.exists !== true)) {
+        const err = new Error('Session expired');
+        err.code = 'SESSION_TIMEOUT';
+        return next(err);
+      }
+      const err = new Error('Not Found');
+      err.status = 404;
+      const locals = Object.assign({}, req.translate('errors'));
+      if (locals && locals['404']) {
+        return res.status(404).render('404', locals['404']);
+      }
+      // Fallback: render a basic 404 page if translation is missing
+      return res.status(404).send('Page Not Found');
+    });
+  }
 
   if (config.getAccessibility === true) {
     deprecate(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "22.11.0-frontend-v4-beta.2",
+  "version": "22.11.0",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -36,99 +36,99 @@
   },
   "dependencies": {
     "aliasify": "^2.1.0",
-    "axios": "^1.11.0",
+    "axios": "^1.12.2",
     "bluebird": "^3.7.2",
-    "body-parser": "^1.15.1",
-    "browserify": "^17.0.0",
+    "body-parser": "^1.20.3",
+    "browserify": "^17.0.1",
     "callsite": "^1.0.0",
-    "chalk": "^2.0.0",
-    "chokidar": "^3.4.0",
+    "chalk": "^2.4.2",
+    "chokidar": "^3.6.0",
     "connect-redis": "^5.2.0",
-    "cookie-parser": "^1.4.6",
+    "cookie-parser": "^1.4.7",
     "cp": "^0.2.0",
     "csrf": "^3.1.0",
-    "debug": "^4.3.1",
-    "deprecate": "^1.0.0",
+    "debug": "^4.4.3",
+    "deprecate": "^1.1.1",
     "dialog-polyfill": "^0.5.6",
     "dotenv": "^4.0.0",
-    "duplexify": "^3.5.0",
+    "duplexify": "^3.7.1",
     "exorcist": "^2.0.0",
-    "express": "^4.17.1",
+    "express": "^4.21.2",
     "express-healthcheck": "^0.1.0",
     "express-partial-templates": "^0.2.1",
-    "express-session": "^1.13.0",
+    "express-session": "^1.18.2",
     "findup": "^0.1.5",
-    "glob": "^7.2.0",
+    "glob": "^7.2.3",
     "govuk-elements-sass": "^3.1.3",
-    "govuk-frontend": "4.10.1",
+    "govuk-frontend": "3.15.0",
     "govuk_template_mustache": "^0.26.0",
-    "helmet": "^3.22.0",
+    "helmet": "^3.23.3",
     "hogan-express-strict": "^0.5.4",
     "hogan.js": "^3.0.2",
     "homeoffice-countries": "^0.2.0",
-    "i18n-future": "^2.0.0",
+    "i18n-future": "^2.0.1",
     "i18n-lookup": "^0.1.0",
     "is-pdf": "^1.0.0",
-    "jquery": "^3.6.0",
-    "libphonenumber-js": "^1.9.44",
+    "jquery": "^3.7.1",
+    "libphonenumber-js": "^1.12.23",
     "lodash": "^4.17.21",
     "markdown-it": "^12.3.2",
-    "minimatch": "^3.0.7",
-    "minimist": "^1.2.6",
+    "minimatch": "^3.1.2",
+    "minimist": "^1.2.8",
     "mixwith": "^0.1.1",
-    "moment": "^2.29.4",
-    "morgan": "^1.10.0",
+    "moment": "^2.30.1",
+    "morgan": "^1.10.1",
     "mustache": "^4.2.0",
-    "nodemailer": "^6.6.3",
+    "nodemailer": "^6.10.1",
     "nodemailer-ses-transport": "^1.5.1",
     "nodemailer-stub-transport": "^1.1.0",
     "notifications-node-client": "^8.2.1",
     "redis": "^3.1.2",
     "reqres": "^3.0.1",
     "rimraf": "^3.0.2",
-    "sass": "^1.56.2",
-    "serve-static": "^1.14.1",
-    "uglify-js": "^3.14.3",
+    "sass": "^1.93.2",
+    "serve-static": "^1.16.2",
+    "uglify-js": "^3.19.3",
     "underscore": "^1.13.7",
     "urijs": "^1.19.11",
     "uuid": "^8.3.2",
-    "winston": "^3.7.2"
+    "winston": "^3.18.3"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "^7.3.0",
-    "@cucumber/pretty-formatter": "^1.0.0-alpha.1",
-    "@types/jest": "^26.0.14",
-    "@xmldom/xmldom": "~0.8.4",
+    "@cucumber/cucumber": "^7.3.2",
+    "@cucumber/pretty-formatter": "^1.0.1",
+    "@types/jest": "^26.0.24",
+    "@xmldom/xmldom": "~0.8.11",
     "chai": "^3.5.0",
-    "chai-as-promised": "^7.1.1",
+    "chai-as-promised": "^7.1.2",
     "chai-subset": "^1.6.0",
-    "concat-stream": "^1.4.7",
-    "csv": "^5.3.2",
-    "eslint": "^8.57.0",
+    "concat-stream": "^1.6.2",
+    "csv": "^5.5.3",
+    "eslint": "^8.57.1",
     "eslint-config-hof": "^1.3.4",
     "funkie": "0.0.5",
     "funkie-phantom": "0.0.1",
-    "istanbul": "^0.4.3",
-    "jest": "^26.5.0",
-    "jquery": "^3.6.0",
-    "karma": "^6.3.4",
-    "karma-browserify": "^8.0.0",
+    "istanbul": "^0.4.5",
+    "jest": "^26.6.3",
+    "jquery": "^3.7.1",
+    "karma": "^6.4.4",
+    "karma-browserify": "^8.1.0",
     "karma-chai": "^0.1.0",
     "karma-cli": "^2.0.0",
     "karma-mocha": "^2.0.1",
     "karma-phantomjs-launcher": "^1.0.4",
     "mocha": "^8.4.0",
     "mocha-sandbox": "^1.0.0",
-    "node-mocks-http": "^1.6.2",
-    "npm-run-all": "^3.1.1",
+    "node-mocks-http": "^1.17.2",
+    "npm-run-all": "^3.1.2",
     "nyc": "^15.1.0",
-    "playwright": "^1.16.3",
+    "playwright": "^1.56.0",
     "postcode": "0.2.2",
-    "proxyquire": "^1.7.11",
-    "release-it": "^16.2.1",
-    "sinon": "^11.1.1",
+    "proxyquire": "^1.8.0",
+    "release-it": "^16.3.0",
+    "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
-    "supertest": "^3.0.0",
+    "supertest": "^3.4.2",
     "travis-conditions": "0.0.0",
     "watchify": "^4.0.0",
     "webdriverio": "^4.14.4"

package/sandbox/package.json

@@ -15,7 +15,7 @@
   },
   "author": "",
   "dependencies": {
-    "govuk-frontend": "4.10.1",
+    "govuk-frontend": "3.14",
     "jquery": "^3.7.1",
     "sass": "^1.53.0",
     "typeahead-aria": "^1.0.4"