hof 20.2.11-upgrade-redis-beta → 20.2.13

package/config/hof-defaults.js

@@ -26,11 +26,8 @@ const defaults = {
   loglevel: process.env.LOG_LEVEL || 'info',
   ignoreMiddlewareLogs: ['/healthz'],
   redis: {
-    socket: {
-      port: process.env.REDIS_PORT || '6379',
-      host: process.env.REDIS_HOST || '127.0.0.1'
-    },
-    legacyMode: true
+    port: process.env.REDIS_PORT || '6379',
+    host: process.env.REDIS_HOST || '127.0.0.1'
   },
   session: {
     ttl: process.env.SESSION_TTL || 1800,

package/frontend/template-mixins/partials/forms/checkbox-group.html

@@ -29,7 +29,7 @@
                 type="{{type}}"
                 name="{{key}}"
                 id="{{key}}-{{value}}"
-                value="{{value}}"
+                value="{{value}}"                
                 {{#toggle}} data-toggle="{{toggle}}"{{/toggle}}
                 {{#selected}} checked="checked"{{/selected}}
                 {{^error}}{{#optionHint}} aria-describedby="{{key}}-{{value}}-hint"{{/optionHint}}{{^optionHint}}{{#hint}} aria-describedby="{{key}}-hint"{{/hint}}{{/optionHint}}{{/error}}

package/frontend/template-mixins/partials/forms/option-group.html

@@ -28,7 +28,7 @@
               value="{{value}}"
               {{#toggle}} data-toggle="{{toggle}}"{{/toggle}}
               {{#selected}} checked="checked"{{/selected}}
-              {{^error}}{{#optionHint}} aria-describedby="{{key}}-{{value}}-item-hint"{{/optionHint}}{{^optionHint}}{{#hint}} aria-describedby="{{key}}-item-hint"{{/hint}}{{/optionHint}}{{/error}}
+              {{^error}}{{#optionHint}} aria-describedby="{{key}}-{{value}}-item-hint"{{/optionHint}}{{^optionHint}}{{#hint}} aria-describedby="{{key}}-hint"{{/hint}}{{/optionHint}}{{/error}}
               {{#error}} aria-describedby="{{key}}-error" aria-invalid="true"{{/error}}
           >
           <label class="govuk-label govuk-radios__label" for="{{key}}-{{value}}">

package/frontend/template-mixins/partials/forms/textarea-group.html

@@ -17,9 +17,9 @@
         {{#renderChild}}{{/renderChild}}
         <textarea name="{{id}}" id="{{id}}"
             class="govuk-textarea {{#isMaxlengthOrMaxword}}govuk-js-character-count{{/isMaxlengthOrMaxword}} {{#className}}{{className}}{{/className}} {{#error}}govuk-input--error{{/error}}"
-            aria-describedby="{{id}}-info"
-            {{#attributes}}
-                {{attribute}}="{{value}}"
+            aria-describedby="{{id}}-info" 
+            {{#attributes}} 
+                {{attribute}}="{{value}}" 
             {{/attributes}}
             {{^error}}{{#hintId}}{{#maxlength}} aria-describedby="{{id}}-maxlength-hint {{hintId}}"{{/maxlength}}{{/hintId}}{{/error}}
             {{^error}}{{#hintId}}{{^maxlength}} aria-describedby="{{hintId}}"{{/maxlength}}{{/hintId}}{{/error}}

package/frontend/template-partials/views/layout.html

@@ -19,7 +19,7 @@
 				<span  class="govuk-phase-banner__text">This is a new service – your <a href="{{feedbackUrl}}{{^feedbackUrl}}https://eforms.homeoffice.gov.uk/outreach/feedback.ofml{{/feedbackUrl}}" class="govuk-link" id="feedback-link" target="_blank">feedback</a> will help us to improve it.</span>
 				</p>
 			</div>
-		{{/feedbackUrl}}
+		{{/feedbackUrl}}      
       <span id="step">
         {{> partials-back}} <span>{{$step}}{{/step}}</span>
       </span>

package/frontend/template-partials/views/partials/cookie-banner.html

@@ -10,9 +10,9 @@
 				</div>
 			</div>
 		</div>
-		<div id="cookie-banner-actions" class="govuk-button-group">
+		<div id="cookie-banner-actions" class="govuk-button-group">         
 				<button id="accept-cookies-button" class="gem-c-button govuk-button" type="submit" data-module="gem-track-click" data-accept-cookies="true" data-track-category="cookieBanner" data-track-action="Cookie banner accepted" data-cookie-types="all">Accept additional cookies</button>
-
+	
 				<button id="reject-cookies-button" class="gem-c-button govuk-button" type="submit" data-module="gem-track-click" data-reject-cookies="true" data-track-category="cookieBanner" data-track-action="Cookie banner rejected">Reject additional cookies</button>
 
 				<a class="govuk-link" href="/cookies">View cookies</a>

package/index.js

@@ -78,8 +78,16 @@ const getContentSecurityPolicy = (config, res) => {
     styleSrc: ['www.googletagmanager.com', 'fonts.googleapis.com', 'tagmanager.google.com'],
     fontSrc: ['fonts.gstatic.com '],
     scriptSrc: ['www.google-analytics.com', 'ssl.google-analytics.com'],
-    imgSrc: ['www.google-analytics.com', 'ssl.gstatic.com'],
-    connectSrc: ['https://www.google-analytics.com', 'https://region1.google-analytics.com']
+    imgSrc: [
+      'www.google-analytics.com',
+      'ssl.gstatic.com',
+      'www.google.co.uk/ads/ga-audiences'
+    ],
+    connectSrc: [
+      'https://www.google-analytics.com',
+      'https://region1.google-analytics.com',
+      'https://region1.analytics.google.com'
+    ]
   };
 
   if (config.gaTagId) {

package/lib/health.js

@@ -15,7 +15,7 @@ module.exports = redis => {
 
   router.get('/readiness', healthCheck({
     test: () => {
-      if (!redis.isOpen && !redis.isReady) {
+      if (!redis.connected && !redis.ready) {
         return new Error('Session store unhealthy');
       }
       return 0;

package/lib/sessions.js

@@ -51,8 +51,6 @@ module.exports = (app, config) => {
     });
   }
 
-  client.connect();
-
   const store = new RedisStore({
     client: client,
     ttl: config.session.ttl,

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.2.11-upgrade-redis-beta",
+  "version": "20.2.13",
   "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",

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}`
   }
 };

package/sandbox/server.js

@@ -2,7 +2,6 @@
 'use strict';
 
 const bootstrap = require('../');
-const config = require('./config')
 
 bootstrap({
   translations: './apps/sandbox/translations',
@@ -15,7 +14,5 @@ bootstrap({
     }
   },
   getAccessibility: true,
-  "port": config.port
+  "port": 8082
 });
-
-console.log(`Running on port ${config.port}`);