hof 20.3.11 → 20.4.0-beta-session-timeout

package/middleware/cookies.js

@@ -22,6 +22,8 @@ module.exports = options => {
     const reqIsCookieCheckRedirect = req.query[paramName] !== undefined;
 
     if (reqIncludesCookies || isHealthcheckUrl(req.path, healthcheckUrls)) {
+      const prefs = 'cookie_preferences' in req.cookies ? JSON.parse(req.cookies.cookie_preferences) : {};
+      res.locals.cookiesAccepted = Boolean(prefs.usage);
       next();
     } else if (req.cookies === undefined || (!Object.keys(req.cookies).length && reqIsCookieCheckRedirect)) {
       const err = new Error('Cookies required');

package/middleware/rate-limiter.js

@@ -25,11 +25,9 @@ module.exports = (options, rateLimitType) => {
     }
 
     const closeConnection = async err => {
-      await redisClient.v4.QUIT();
+      await redisClient.quit();
       return next(err);
     };
-    redisClient.on('error', err => logger.log('error', err));
-    await redisClient.connect();
 
     try {
       // fetch records of current user using IP address, returns null when no record is found

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "20.3.11",
+  "version": "20.4.0-beta-session-timeout",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -80,7 +80,7 @@
     "nodemailer-smtp-transport": "^2.7.4",
     "nodemailer-stub-transport": "^1.1.0",
     "notifications-node-client": "^6.0.0",
-    "redis": "^4.6.6",
+    "redis": "^3.1.2",
     "reqres": "^3.0.1",
     "request": "^2.79.0",
     "rimraf": "^3.0.2",
@@ -96,6 +96,7 @@
     "@cucumber/cucumber": "^7.3.0",
     "@cucumber/pretty-formatter": "^1.0.0-alpha.1",
     "@types/jest": "^26.0.14",
+    "@xmldom/xmldom": "~0.8.4",
     "chai": "^3.5.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
@@ -122,14 +123,13 @@
     "playwright": "^1.16.3",
     "postcode": "0.2.2",
     "proxyquire": "^1.7.11",
-    "release-it": "^14.10.0",
+    "release-it": "^16.2.1",
     "sinon": "^11.1.1",
     "sinon-chai": "^3.7.0",
     "supertest": "^3.0.0",
     "travis-conditions": "0.0.0",
     "watchify": "^4.0.0",
-    "webdriverio": "^4.14.4",
-    "xmldom": "^0.6.0"
+    "webdriverio": "^4.14.4"
   },
   "mocha": {
     "reporter": "spec",

package/sandbox/apps/sandbox/fields.js

@@ -16,9 +16,6 @@ module.exports = {
   },
   name: {
     validate: ['required', 'notUrl', { type: 'maxlength', arguments: 200 }],
-    // need to remove this for the heading to go
-    labelClassName: ['govuk-label--l'],
-    isPageHeading: 'true'
   },
   'dateOfBirth': dateComponent('dateOfBirth', {
     mixin: 'input-date',
@@ -70,8 +67,6 @@ module.exports = {
     ]
   },
   email: {
-    isPageHeading: 'true',
-    labelClassName: ['govuk-label--l'],
     validate: ['required', 'email']
   },
   phone: {
@@ -114,7 +109,6 @@ module.exports = {
     // apply the other default formatters
     formatter: ['trim', 'hyphens'],
     isPageHeading: 'true',
-    labelClassName: ['govuk-label--l'],
     // attributes here are passed to the field element
     validate: ['required', { type: 'maxword', arguments: 10 }],
     attributes: [{

package/sandbox/apps/sandbox/translations/src/en/fields.json

@@ -18,7 +18,7 @@
     "label": "Full name"
   },
   "dateOfBirth": {
-    "legend": "Date of birth",
+    "legend": "What is your date of birth?",
     "hint": "For example, 31 10 1990"
   },
   "building": {
@@ -29,8 +29,8 @@
   },
   "townOrCity": {
     "label": "Town or city"
-   },
-  "postcode": {
+   }, 
+  "postcode": { 
     "label": "Postcode"
   },
   "incomeTypes" : {
@@ -66,8 +66,8 @@
       },
       "northernIreland": {
         "label": "Northern Ireland"
-      }
-    }
+      } 
+    } 
   },
   "email" : {
     "label": "Email address"

package/sandbox/apps/sandbox/translations/src/en/pages.json

@@ -50,7 +50,7 @@
   },
   "confirmation": {
     "title": "Application sent",
-    "alert": "Application sent",
+    "alert": "Application sent", 
     "subheader": "What happens next",
     "content": "We’ll contact you with the decision of your application or if we need more information from you."
   }

package/sandbox/config.js

@@ -2,7 +2,6 @@
 
 /* eslint no-process-env: 0 */
 module.exports = {
-  port: 8082,
   email: {
     caseworker: process.env.CASEWORKER_EMAIL || '',
     from: process.env.FROM_ADDRESS || '',
@@ -13,6 +12,6 @@ module.exports = {
     region: process.env.EMAIL_REGION || ''
   },
   hosts: {
-    acceptanceTests: process.env.ACCEPTANCE_HOST_NAME || `http://localhost:${process.env.PORT || 8082}`
+    acceptanceTests: process.env.ACCEPTANCE_HOST_NAME || `http://localhost:${process.env.PORT || 8080}`
   }
 };