hof 21.0.20-axios-beta → 22.0.0-timeout-warning-beta.2

package/model/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "21.0.20-axios-beta",
+  "version": "22.0.0-timeout-warning-beta.2",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -32,12 +32,10 @@
     "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",
-    "test-single": "mocha"
+    "postversion": "git push && git push --tags"
   },
   "dependencies": {
     "aliasify": "^2.1.0",
-    "axios": "^1.5.1",
     "bluebird": "^3.7.2",
     "body-parser": "^1.15.1",
     "browserify": "^17.0.0",
@@ -50,6 +48,7 @@
     "csrf": "^3.1.0",
     "debug": "^4.3.1",
     "deprecate": "^1.0.0",
+    "dialog-polyfill": "^0.5.6",
     "dotenv": "^4.0.0",
     "duplexify": "^3.5.0",
     "express": "^4.17.1",
@@ -59,7 +58,7 @@
     "findup": "^0.1.5",
     "glob": "^7.2.0",
     "govuk-elements-sass": "^3.1.3",
-    "govuk-frontend": "3.14",
+    "govuk-frontend": "3.15",
     "govuk_template_mustache": "^0.26.0",
     "helmet": "^3.22.0",
     "hogan-express-strict": "^0.5.4",
@@ -68,7 +67,7 @@
     "i18n-future": "^2.0.0",
     "i18n-lookup": "^0.1.0",
     "is-pdf": "^1.0.0",
-    "libphonenumber-js": "^1.9.37",
+    "libphonenumber-js": "^1.9.44",
     "lodash": "^4.17.21",
     "markdown-it": "^12.3.2",
     "minimatch": "^3.0.7",
@@ -82,9 +81,9 @@
     "nodemailer-smtp-transport": "^2.7.4",
     "nodemailer-stub-transport": "^1.1.0",
     "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.56.2",
     "serve-static": "^1.14.1",

package/pull_request.md

@@ -0,0 +1,16 @@
+## What? 
+## Why? 
+## How? 
+## Testing?
+## Screenshots (optional)
+## Anything Else? (optional)
+## Check list
+
+- [ ] I have reviewed my own pull request for linting issues (e.g. adding new lines)
+- [ ] I have written tests (if relevant)
+- [ ] I have created a JIRA number for my branch
+- [ ] I have created a JIRA number for my commit
+- [ ] I have followed the chris beams method for my commit https://cbea.ms/git-commit/
+here is an [example commit](https://github.com/UKHomeOfficeForms/hof/commit/810959f391187c7c4af6db262bcd143b50093a6e)
+- [ ] Ensure drone builds are green especially tests
+- [ ] I will squash the commits before merging

package/sandbox/apps/sandbox/index.js

@@ -91,5 +91,6 @@ module.exports = {
       ],
       next: '/confirm'
     },
+    '/session-timeout': {}
   }
 };

package/sandbox/package.json

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

package/sandbox/public/css/app.css

@@ -5627,6 +5627,11 @@ input[type=number] {
   vertical-align: top;
 }
 
+.govuk-header__logotype-crown[width="32"] {
+  top: -3px;
+  margin-right: 2px;
+}
+
 .govuk-header__logotype-crown-fallback-image {
   width: 36px;
   height: 32px;
@@ -5634,6 +5639,11 @@ input[type=number] {
   vertical-align: bottom;
 }
 
+.govuk-header__logotype-crown-fallback-image[width="32"] {
+  width: 32px;
+  height: 30px;
+}
+
 .govuk-header__product-name {
   font-family: "GDS Transport", arial, sans-serif;
   -webkit-font-smoothing: antialiased;
@@ -6675,8 +6685,6 @@ input[type=number] {
   .js-enabled .govuk-tabs__tab:hover {
     color: rgba(11, 12, 12, 0.99);
   }
-}
-@media (min-width: 40.0625em) {
   .js-enabled .govuk-tabs__tab:active, .js-enabled .govuk-tabs__tab:focus {
     color: #0b0c0c;
   }
@@ -6695,8 +6703,6 @@ input[type=number] {
     bottom: 0;
     left: 0;
   }
-}
-@media (min-width: 40.0625em) {
   .js-enabled .govuk-tabs__panel {
     margin-bottom: 0;
     padding: 30px 20px;
@@ -6713,8 +6719,6 @@ input[type=number] {
   .js-enabled .govuk-tabs__panel > :last-child {
     margin-bottom: 0;
   }
-}
-@media (min-width: 40.0625em) {
   .js-enabled .govuk-tabs__panel--hidden {
     display: none;
   }
@@ -9169,6 +9173,247 @@ dl {
   padding-bottom: 0;
 }
 
+.modal-dialog {
+  display: none;
+}
+
+.modal-dialog--no-js-persistent {
+  display: inline-block;
+}
+
+.js-enabled .modal-dialog--no-js-persistent {
+  display: none;
+}
+.js-enabled .modal-dialog--no-js-persistent[open], .js-enabled .modal-dialog--no-js-persistent .dialog-button {
+  display: inline-block;
+}
+.js-enabled .modal-dialog[open] {
+  display: inline-block;
+}
+
+.modal-dialog[open] {
+  overflow-x: hidden;
+  overflow-y: auto;
+  max-height: 90vh;
+  padding: 0;
+  margin-bottom: 0;
+  margin-top: 0;
+  position: fixed;
+  top: 50% !important;
+  -webkit-transform: translate(0, -50%);
+  -ms-transform: translate(0, -50%);
+  transform: translate(0, -50%);
+}
+
+@media (min-width: 641px) {
+  .modal-dialog[open] {
+    padding: 0;
+  }
+}
+.modal-dialog__inner {
+  padding: 20px;
+}
+
+@media (min-width: 641px) {
+  .modal-dialog__inner {
+    padding: 30px;
+  }
+}
+.modal-dialog__inner__text {
+  font-family: "nta", Arial, sans-serif;
+  font-weight: 400;
+  text-transform: none;
+  font-size: 16px;
+  line-height: 1.25;
+  padding-top: 2px;
+  padding-bottom: 8px;
+  margin-bottom: 20px;
+}
+
+@media (min-width: 641px) {
+  .modal-dialog__inner__text {
+    font-size: 19px;
+    line-height: 1.31579;
+  }
+}
+@media (min-width: 641px) {
+  .modal-dialog__inner__text {
+    padding-top: 0;
+    padding-bottom: 5px;
+  }
+}
+.modal-dialog__inner__button {
+  font-size: 19px;
+  margin-top: 10px;
+}
+
+.modal-dialog__inner__link {
+  font-family: "nta", Arial, sans-serif;
+  font-weight: 400;
+  text-transform: none;
+  font-size: 16px;
+  line-height: 1.25;
+  padding-top: 2px;
+  padding-bottom: 8px;
+  background: none;
+  border: none;
+  vertical-align: middle;
+  margin-top: 20px;
+}
+.modal-dialog__inner__link:hover {
+  cursor: pointer;
+}
+
+@media (min-width: 641px) {
+  .modal-dialog__inner__link {
+    font-size: 19px;
+    line-height: 1.31579;
+  }
+}
+@media (min-width: 641px) {
+  .modal-dialog__inner__link {
+    padding-top: 0;
+    padding-bottom: 5px;
+  }
+}
+@media (max-width: 640px) {
+  .modal-dialog__inner__link {
+    text-align: center;
+    display: block;
+    margin-top: 25px;
+  }
+}
+@media (min-width: 641px) {
+  .modal-dialog__inner__link {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    padding: 0;
+    margin: 0 0 0 30px;
+  }
+}
+.modal-dialog__inner__block {
+  position: relative;
+}
+
+.modal-dialog #dialog-title {
+  margin-top: 0;
+}
+
+.dialog-is-open {
+  overflow: hidden;
+}
+
+dialog {
+  left: 0;
+  right: 0;
+  width: -moz-fit-content;
+  width: -webkit-fit-content;
+  width: fit-content;
+  height: -moz-fit-content;
+  height: -webkit-fit-content;
+  height: fit-content;
+  margin: auto;
+  border: solid;
+  padding: 1em;
+  background: white;
+  color: black;
+  display: none;
+  border: 5px solid black;
+}
+dialog + .backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.8);
+}
+dialog[open] {
+  display: block;
+  box-sizing: border-box;
+  margin: 0 auto;
+  padding: 15px;
+  width: 90%;
+}
+dialog[open] + .backdrop, dialog[open]::backdrop {
+  background: rgba(0, 0, 0, 0.8);
+}
+
+@media (min-width: 641px) {
+  dialog[open] {
+    padding: 30px;
+    margin: 30px auto;
+    max-width: 500px;
+  }
+}
+.tabular-numbers {
+  font-family: "ntatabularnumbers", "nta", Arial, sans-serif;
+}
+
+.dialog-sign-out-link {
+  font-family: "GDS Transport", arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-weight: 400;
+  font-size: 18px;
+  font-size: 1.125rem;
+  line-height: 1.1111111111;
+  display: inline-block;
+  margin: 5px;
+}
+@media print {
+  .dialog-sign-out-link {
+    font-family: sans-serif;
+  }
+}
+@media (min-width: 40.0625em) {
+  .dialog-sign-out-link {
+    font-size: 24px;
+    font-size: 1.5rem;
+    line-height: 1.25;
+  }
+}
+@media print {
+  .dialog-sign-out-link {
+    font-size: 18pt;
+    line-height: 1.15;
+  }
+}
+@media (min-width: 40.0625em) {
+  .dialog-sign-out-link {
+    font-family: "GDS Transport", arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    font-weight: 400;
+    font-size: 16px;
+    font-size: 1rem;
+    line-height: 1.25;
+    position: relative;
+    top: 2px;
+    padding: 0.526315em 0.789473em 0.263157em;
+    line-height: 1.5;
+  }
+}
+@media print and (min-width: 40.0625em) {
+  .dialog-sign-out-link {
+    font-family: sans-serif;
+  }
+}
+@media (min-width: 40.0625em) and (min-width: 40.0625em) {
+  .dialog-sign-out-link {
+    font-size: 19px;
+    font-size: 1.1875rem;
+    line-height: 1.3157894737;
+  }
+}
+@media print and (min-width: 40.0625em) {
+  .dialog-sign-out-link {
+    font-size: 14pt;
+    line-height: 1.15;
+  }
+}
+
 .validation-summary {
   padding-left: 11px;
   padding-right: 15px;