hof 21.0.0-instrumentation-beta.0 → 21.0.2-axios-beta

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) {
@@ -120,6 +128,8 @@ const getContentSecurityPolicy = (config, res) => {
  * @param options.getTerms {boolean} Optional boolean - whether to mount the /terms endpoint
  * @param options.getCookies {boolean} Optional boolean - whether to mount the /cookies endpoint
  * @param options.noCache {boolean} Optional boolean - whether to disable caching
+ * @param options.getAccessibilityStatement {boolean} Optional boolean - whether to mount the
+ * /accessibility-statement endpoint
  *
  * @returns {object} A new HOF application using the configuration supplied in options
  */
@@ -209,6 +219,9 @@ function bootstrap(options) {
     app.use(hofMiddleware.rateLimiter(config, 'requests'));
   }
 
+  // Set up routing so <YOUR-SITE-URL>/assets are served from /node_modules/govuk-frontend/govuk/assets
+  app.use('/assets', express.static(path.join(__dirname, '/node_modules/govuk-frontend/govuk/assets')));
+
   if (config.getAccessibility === true) {
     deprecate(
       '`getAccessibility` option is deprecated and may be removed in future versions.',

package/lib/ga-tag.js

@@ -45,7 +45,7 @@ module.exports = (app, config) => {
   const gaCrossDomainTrackingTagId = config.gaCrossDomainTrackingTagId;
   const routes = config.routes;
 
-  if (gaTagId) {
+  if (gaTagId || ga4TagId) {
     const pageMap = setupPageMap(routes);
 
     app.use((req, res, next) => {

package/lib/settings.js

@@ -7,7 +7,22 @@ const hoganExpressStrict = require('hogan-express-strict');
 const expressPartialTemplates = require('express-partial-templates');
 const bodyParser = require('body-parser');
 
-module.exports = (app, config) => {
+const dirExists = dir => {
+  try {
+    if (fs.existsSync(dir)) {
+      return true;
+    }
+    return false;
+  } catch(err) {
+    throw new Error(`${err}: Cannot check if the directory path exists`);
+  }
+};
+
+const filterEmptyViews = views => {
+  return views.filter(view => dirExists(view));
+};
+
+module.exports = async (app, config) => {
   const viewEngine = config.viewEngine || 'html';
 
   app.use((req, res, next) => {
@@ -17,7 +32,8 @@ module.exports = (app, config) => {
 
   app.use(config.theme());
 
-  const viewPaths = [].concat(config.theme.views);
+  const filteredViews = filterEmptyViews(config.theme.views);
+  const viewPaths = [].concat(filteredViews);
   app.set('view engine', viewEngine);
   app.enable('view cache');
 

package/middleware/errors.js

@@ -2,7 +2,6 @@
 'use strict';
 
 const rateLimitsConfig = require('../config/rate-limits');
-const monitor = require('./monitor');
 
 const errorTitle = code => `${code}_ERROR`;
 const errorMsg = code => `There is a ${code}_ERROR`;
@@ -13,6 +12,8 @@ const getContent = (err, translate) => {
   if (err.code === 'SESSION_TIMEOUT') {
     err.status = 401;
     err.template = 'session-timeout';
+    err.title = (translate && translate('errors.session.title'));
+    err.message = (translate && translate('errors.session.message'));
     content.title = (translate && translate('errors.session.title'));
     content.message = (translate && translate('errors.session.message'));
   }
@@ -90,8 +91,6 @@ module.exports = options => {
       baseUrl: returnBaseUrl(req.path)
     };
 
-    monitor(req, res, err.status);
-
     if (logger && logger.error) {
       logger.error(err.message || err.error, err);
     }

package/middleware/not-found.js

@@ -1,5 +1,4 @@
 'use strict';
-const monitor = require('./monitor');
 
 const getTranslations = translate => {
   const translations = {
@@ -27,8 +26,6 @@ module.exports = options => {
       logger.warn(`Cannot find: ${req.url}`);
     }
 
-    monitor(req, res, '404');
-
     res.status(404).render('404', {
       title: translations.title,
       description: translations.description,

package/middleware/rate-limiter.js

@@ -4,6 +4,7 @@ const redis = require('redis');
 const config = require('./../config/hof-defaults');
 
 module.exports = (options, rateLimitType) => {
+  // eslint-disable-next-line no-console
   const logger = options.logger || { log: (func, msg) => console[func](msg) };
   const rateLimits = options.rateLimits[rateLimitType];
   const timestampName = `${rateLimitType}TimeStamp`;

package/model/apis/axios-settings.js

@@ -0,0 +1,9 @@
+'use strict';
+const url = require('url');
+
+module.exports = (settings, body)=>{
+    return Object.assign({}, settings, {    
+    'url' : settings.uri || settings.url || url.format(settings),
+    'data': settings.body || body || settings.data,
+  });
+}

package/model/apis/html-to-pdf-converter.js

@@ -17,17 +17,18 @@ module.exports = class PDFModel extends Model {
   }
 
   handleResponse(response, callback) {
-    if (isPdf(Buffer.from(response.body))) {
-      return this.parseResponse(response.statusCode, response.body, callback);
+    if (isPdf(Buffer.from(response.data))) {
+      return this.parseResponse(response.status, response.data, callback);
     }
     const err = new Error();
-    if (parseInt(response.statusCode, 10) === 400) {
-      err.title = response.body.code;
-      err.message = response.body.message;
+
+    if (parseInt(response.status, 10) === 400) {
+      err.title = response.status;
+      err.message = response.statusText;
     } else {
-      err.body = response.body;
+      err.body = response.data;
     }
-    err.status = response.statusCode;
-    return callback(err, null, response.statusCode);
+    err.status = response.status;
+    return callback(err, null, response.status);
   }
 };

package/model/index.js

@@ -2,10 +2,12 @@
 'use strict';
 
 const _ = require('lodash');
-const request = require('request');
+const axios = require('axios').default;
 const url = require('url');
 const EventEmitter = require('events').EventEmitter;
 
+const axiosSetting = require('./apis/axios-settings')
+
 const REFERENCE = /^\$ref:/;
 
 function timeDiff(from, to, d) {
@@ -27,7 +29,7 @@ module.exports = class Model extends EventEmitter {
     this.set(attributes, {
       silent: true
     });
-    this._request = request;
+    this._request = axios;
   }
 
   save(options, callback) {
@@ -47,7 +49,6 @@ module.exports = class Model extends EventEmitter {
         'Content-Type': 'application/json',
         'Content-Length': Buffer.byteLength(data)
       }, reqConf.headers || {});
-
       return this.request(reqConf, data, callback);
     });
   }
@@ -94,22 +95,23 @@ module.exports = class Model extends EventEmitter {
 
     let settings = Object.assign({}, originalSettings);
     settings.timeout = settings.timeout || this.options.timeout;
-    settings.uri = settings.uri || settings.url || url.format(settings);
-    settings.body = settings.body || body || settings.data;
-
-    settings = _.omit(settings, urlKeys, 'data', 'url');
+    settings = axiosSetting(settings, body)
+    settings = _.omit(settings, urlKeys);
     this.emit('sync', originalSettings);
 
     const promise = Promise.resolve().then(() => this.auth()).then(authData => {
-      settings.auth = authData;
-      if (typeof settings.auth === 'string') {
-        const auth = settings.auth.split(':');
-        settings.auth = {
+      let authVal = authData;
+      if (typeof authVal === 'string') {
+        const auth = authVal.split(':');
+        authVal = {
           user: auth.shift(),
           pass: auth.join(':'),
           sendImmediately: true
         };
       }
+      if(authVal) {
+        settings.headers = Object.assign({}, settings.headers, {Authorization: `Bearer ${authVal.bearer}`});
+      }
     })
       .then(() => {
         const startTime = process.hrtime();
@@ -124,7 +126,6 @@ module.exports = class Model extends EventEmitter {
 
             const endTime = process.hrtime();
             const responseTime = timeDiff(startTime, endTime);
-
             if (err) {
               this.emit('fail', err, data, originalSettings, statusCode, responseTime);
             } else {
@@ -136,23 +137,23 @@ module.exports = class Model extends EventEmitter {
               resolve(data);
             }
           };
-
-          this._request(settings, (err, response) => {
-            if (err) {
+          console.log("settings ::", settings);
+          this._request(settings)
+            .then(response => {
+              return this.handleResponse(response, (error, data, status) => {
+                if (error) {
+                  error.headers = response.headers;
+                }
+                _callback(error, data, status);
+              });
+            }).catch(err => {
               if (err.code === 'ETIMEDOUT' || err.code === 'ESOCKETTIMEDOUT') {
                 err.message = 'Connection timed out';
                 err.status = 504;
               }
-              err.status = err.status || (response && response.statusCode) || 503;
+              err.status = err.status || 503;
               return _callback(err, null, err.status);
-            }
-            return this.handleResponse(response, (error, data, status) => {
-              if (error) {
-                error.headers = response.headers;
-              }
-              _callback(error, data, status);
             });
-          });
         });
       });
 
@@ -165,13 +166,13 @@ module.exports = class Model extends EventEmitter {
   handleResponse(response, callback) {
     let data = {};
     try {
-      data = JSON.parse(response.body || '{}');
+      data = typeof response.data === 'object' ? response.data : JSON.parse(response.data || '{}');
     } catch (err) {
-      err.status = response.statusCode;
-      err.body = response.body;
-      return callback(err, null, response.statusCode);
+      err.status = response.status;
+      err.body = response.data;
+      return callback(err, null, response.status);
     }
-    return this.parseResponse(response.statusCode, data, callback);
+    return this.parseResponse(response.status, data, callback);
   }
 
   parseResponse(statusCode, data, callback) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "21.0.0-instrumentation-beta.0",
+  "version": "21.0.2-axios-beta",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -23,19 +23,21 @@
   "scripts": {
     "test": "yarn run unit && yarn run test:cookie-banner && yarn run test:functional && yarn run test:client && yarn run test:lint",
     "unit": "LOG_LEVEL=error nyc _mocha \"test/**/*.spec.js\" \"sandbox/test/**/*.spec.js\"",
-    "unit:nocov": "LOG_LEVEL=error mocha",
+    "unit:nocov": "LOG_LEVEL=error mocha \"test/**/*.spec.js\" \"sandbox/test/**/*.spec.js\"",
     "test:lint": "eslint . --config ./node_modules/eslint-config-hof/default.js",
-    "test:functional": "funkie mocha ./test/functional-tests --exit",
+    "test:functional": "funkie mocha ./test/functional-tests --timeout 20000 --exit",
     "test:client": "karma start test/frontend/toolkit/karma.conf.js",
     "test:cookie-banner": "jest test/frontend/jest",
     "test:acceptance": "TAGS=\"${TAGS:=@feature}\" yarn run test:cucumber",
     "test:acceptance_browser": "ACCEPTANCE_WITH_BROWSER=true TAGS=\"${TAGS:=@feature}\" yarn run test:cucumber",
     "test:cucumber": "cucumber-js -f @cucumber/pretty-formatter \"sandbox/test/_features/**/*.feature\" --require sandbox/test/_features/test.setup.js --require \"sandbox/test/_features/step_definitions/**/*.js\" --tags $TAGS",
     "ci": "travis-conditions",
-    "postversion": "git push && git push --tags"
+    "postversion": "git push && git push --tags",
+    "test-single": "mocha"
   },
   "dependencies": {
     "aliasify": "^2.1.0",
+    "axios": "^1.5.1",
     "bluebird": "^3.7.2",
     "body-parser": "^1.15.1",
     "browserify": "^17.0.0",
@@ -45,7 +47,7 @@
     "connect-redis": "^5.2.0",
     "cookie-parser": "^1.4.6",
     "cp": "^0.2.0",
-    "csrf": "^3.0.2",
+    "csrf": "^3.1.0",
     "debug": "^4.3.1",
     "deprecate": "^1.0.0",
     "dotenv": "^4.0.0",
@@ -57,6 +59,7 @@
     "findup": "^0.1.5",
     "glob": "^7.2.0",
     "govuk-elements-sass": "^3.1.3",
+    "govuk-frontend": "3.14",
     "govuk_template_mustache": "^0.26.0",
     "helmet": "^3.22.0",
     "hogan-express-strict": "^0.5.4",
@@ -68,27 +71,27 @@
     "libphonenumber-js": "^1.9.37",
     "lodash": "^4.17.21",
     "markdown-it": "^12.3.2",
-    "minimatch": "^3.0.3",
+    "minimatch": "^3.0.7",
     "minimist": "^1.2.6",
     "mixwith": "^0.1.1",
     "moment": "^2.29.4",
     "morgan": "^1.10.0",
-    "mustache": "^2.3.0",
+    "mustache": "^4.2.0",
     "nodemailer": "^6.6.3",
-    "nodemailer-ses-transport": "^1.5.0",
+    "nodemailer-ses-transport": "^1.5.1",
     "nodemailer-smtp-transport": "^2.7.4",
     "nodemailer-stub-transport": "^1.1.0",
-    "notifications-node-client": "^5.1.1",
-    "prom-client": "^14.0.1",
+    "notifications-node-client": "^6.0.0",
+    "object-mapper": "^6.2.0",
     "redis": "^3.1.2",
     "reqres": "^3.0.1",
-    "request": "^2.79.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.35.2",
+    "sass": "^1.56.2",
     "serve-static": "^1.14.1",
     "uglify-js": "^3.14.3",
-    "underscore": "^1.12.1",
+    "underscore": "^1.13.6",
     "urijs": "^1.19.11",
+    "uuid": "^8.3.2",
     "winston": "^3.7.2"
   },
   "devDependencies": {
@@ -134,7 +137,7 @@
     "reporter": "spec",
     "require": "test/common.js",
     "recursive": "true",
-    "timeout": "6000",
+    "timeout": "9000",
     "exit": "true"
   },
   "resolutions": {

package/sandbox/README.md

@@ -45,10 +45,10 @@ Install the dependencies
 yarn
 ```
 
-Move into the example folder 
+Move into the sandbox folder 
 
 ```bash
-cd example
+cd sandbox
 ```
 
 Install any example app specific dependencies 
@@ -63,4 +63,4 @@ Run in development mode
 yarn start:dev
 ```
 
-go to http://localhost:8080/
+go to http://localhost:8082/

package/sandbox/apps/sandbox/fields.js

@@ -8,16 +8,23 @@ module.exports = {
   'landing-page-radio': {
     mixin: 'radio-group',
     validate: ['required'],
-    legend: {
-      className: 'visuallyhidden'
-    },
+    isPageHeading: true,
+    // Design system says to avoid in-line unless it's two options,
+    // so just added as an example below but by default it isn't
+    className: ['govuk-radios--inline'],
     options: ['basic-form', 'complex-form', 'build-your-own-form']
   },
   name: {
     validate: ['required', 'notUrl', { type: 'maxlength', arguments: 200 }],
   },
-  dateOfBirth: dateComponent('dateOfBirth', {
-    validate: ['required', 'before', { type: 'after', arguments: ['1900'] }]
+  'dateOfBirth': dateComponent('dateOfBirth', {
+    mixin: 'input-date',
+    isPageHeading: 'true',
+    validate: [
+      'required',
+      'date',
+      { type: 'after', arguments: ['1900'] }
+    ]
   }),
   building: {
     validate: ['required', 'notUrl', { type: 'maxlength', arguments: 100 }]
@@ -37,6 +44,7 @@ module.exports = {
     formatter: ['removespaces', 'uppercase']
   },
   incomeTypes: {
+    isPageHeading: 'true',
     mixin: 'checkbox-group',
     labelClassName: 'visuallyhidden',
     validate: ['required'],
@@ -49,11 +57,9 @@ module.exports = {
     ]
   },
   countryOfHearing: {
+    isPageHeading: 'true',
     mixin: 'radio-group',
     validate: ['required'],
-    legend: {
-      className: 'visuallyhidden'
-    },
     options: [
       'englandAndWales',
       'scotland',
@@ -72,6 +78,7 @@ module.exports = {
   },
   countrySelect: {
     mixin: 'select',
+    isPageHeading: 'true',
     className: ['typeahead'],
     options:[''].concat(require('homeoffice-countries').allCountries),
     legend: {
@@ -81,14 +88,29 @@ module.exports = {
   },
   complaintDetails: {
     mixin: 'textarea',
-    labelClassName: 'visuallyhidden',
     // we want to ignore default formatters as we want
     // to preserve white space
     'ignore-defaults': true,
     // apply the other default formatters
     formatter: ['trim', 'hyphens'],
+    isPageHeading: 'true',
     // attributes here are passed to the field element
-    validate: ['required', { type: 'maxlength', arguments: 5000 }],
+    validate: ['required', { type: 'maxlength', arguments: 10 }],
+    attributes: [{
+      attribute: 'rows',
+      value: 8
+    }]
+  },
+  whatHappened: {
+    mixin: 'textarea',
+    // we want to ignore default formatters as we want
+    // to preserve white space
+    'ignore-defaults': true,
+    // apply the other default formatters
+    formatter: ['trim', 'hyphens'],
+    isPageHeading: 'true',
+    // attributes here are passed to the field element
+    validate: ['required', { type: 'maxword', arguments: 10 }],
     attributes: [{
       attribute: 'rows',
       value: 8
@@ -96,7 +118,7 @@ module.exports = {
   },
   appealStages: {
     mixin: 'select',
-    labelClassName: 'visuallyhidden',
+    isPageHeading: 'true',
     validate: ['required'],
     options: [{
       value: '',

package/sandbox/apps/sandbox/index.js

@@ -66,6 +66,10 @@ module.exports = {
     },
     '/text-input-area': {
       fields: ['complaintDetails'],
+      next: '/word-count'
+    },
+    '/word-count': {
+      fields: ['whatHappened'],
       next: '/select'
     },
     '/select':{ 

package/sandbox/apps/sandbox/sections/summary-data-sections.js

@@ -36,5 +36,8 @@ module.exports = {
   ],
   complaintDetails: [
     'complaintDetails'
+  ],
+  whatHappened: [
+    'whatHappened'
   ]
 };