hof 22.0.0-timeout-warning-beta.1 → 22.0.0-timeout-warning-beta.3

package/model/index.js

@@ -2,10 +2,10 @@
 '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,10 +27,10 @@ module.exports = class Model extends EventEmitter {
     this.set(attributes, {
       silent: true
     });
-    this._request = request;
+    this._request = axios;
   }
 
-  save(options, callback) {
+  async save(options, callback) {
     if (typeof options === 'function' && arguments.length === 1) {
       callback = options;
       options = {};
@@ -38,21 +38,18 @@ module.exports = class Model extends EventEmitter {
       options = {};
     }
 
-    return this.prepare().then(data => {
-      data = JSON.stringify(data);
-      const reqConf = this.requestConfig(options);
-      reqConf.method = options.method || 'POST';
-
-      reqConf.headers = Object.assign({
-        'Content-Type': 'application/json',
-        'Content-Length': Buffer.byteLength(data)
-      }, reqConf.headers || {});
-
-      return this.request(reqConf, data, callback);
-    });
+    let data = await this.prepare();
+    data = JSON.stringify(data);
+    const reqConf = this.requestConfig(options);
+    reqConf.method = options.method || 'POST';
+    reqConf.headers = Object.assign({
+      'Content-Type': 'application/json',
+      'Content-Length': Buffer.byteLength(data)
+    }, reqConf.headers || {});
+    return await this.request(reqConf, data, callback);
   }
 
-  fetch(options, callback) {
+  async fetch(options, callback) {
     if (typeof options === 'function' && arguments.length === 1) {
       callback = options;
       options = {};
@@ -61,10 +58,10 @@ module.exports = class Model extends EventEmitter {
     }
     const reqConf = this.requestConfig(options);
     reqConf.method = options.method || 'GET';
-    return this.request(reqConf, callback);
+    return await this.request(reqConf, callback);
   }
 
-  delete(options, callback) {
+  async delete(options, callback) {
     if (typeof options === 'function' && arguments.length === 1) {
       callback = options;
       options = {};
@@ -73,7 +70,7 @@ module.exports = class Model extends EventEmitter {
     }
     const reqConf = this.requestConfig(options);
     reqConf.method = options.method || 'DELETE';
-    return this.request(reqConf, callback);
+    return await this.request(reqConf, callback);
   }
 
   requestConfig(options) {
@@ -86,7 +83,7 @@ module.exports = class Model extends EventEmitter {
     });
   }
 
-  request(originalSettings, body, callback) {
+  async request(originalSettings, body, callback) {
     if (typeof body === 'function' && arguments.length === 2) {
       callback = body;
       body = undefined;
@@ -94,96 +91,114 @@ 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 = {
-          user: auth.shift(),
-          pass: auth.join(':'),
+    try {
+      const authData = await this.auth();
+      let authVal = authData;
+      if (typeof authVal === 'string') {
+        const [user, ...rest] = authVal.split(':');
+        authVal = {
+          user,
+          pass: rest.join(':'),
           sendImmediately: true
         };
       }
-    })
-      .then(() => {
-        const startTime = process.hrtime();
-        let timeoutTimer;
-
-        return new Promise((resolve, reject) => {
-          const _callback = (err, data, statusCode) => {
-            if (timeoutTimer) {
-              clearTimeout(timeoutTimer);
-              timeoutTimer = null;
-            }
+      if (authVal) {
+        settings.headers = {
+          ...settings.headers,
+          Authorization: `Bearer ${authVal.bearer}`
+        };
+      }
 
-            const endTime = process.hrtime();
-            const responseTime = timeDiff(startTime, endTime);
+      const startTime = process.hrtime();
+      let timeoutTimer;
 
-            if (err) {
-              this.emit('fail', err, data, originalSettings, statusCode, responseTime);
-            } else {
-              this.emit('success', data, originalSettings, statusCode, responseTime);
-            }
-            if (err) {
-              reject(err);
-            } else {
-              resolve(data);
-            }
-          };
-
-          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 || (response && response.statusCode) || 503;
-              return _callback(err, null, err.status);
-            }
-            return this.handleResponse(response, (error, data, status) => {
-              if (error) {
+      if (timeoutTimer) {
+        clearTimeout(timeoutTimer);
+        timeoutTimer = null;
+      }
+
+      const data = await new Promise((resolve, reject) => {
+        const _callback = (err, responseData, statusCode) => {
+          if (timeoutTimer) {
+            clearTimeout(timeoutTimer);
+            timeoutTimer = null;
+          }
+
+          const endTime = process.hrtime();
+          const responseTime = timeDiff(startTime, endTime);
+          if (err) {
+            this.emit('fail', err, responseData, originalSettings, statusCode, responseTime);
+            reject(err);
+          } else {
+            this.emit('success', responseData, originalSettings, statusCode, responseTime);
+            resolve(responseData);
+          }
+        };
+
+        this._request(settings)
+          .then(response => {
+            return this.handleResponse(response)
+              .then(responseData => _callback(null, responseData, response.status))
+              .catch(error => {
                 error.headers = response.headers;
-              }
-              _callback(error, data, status);
-            });
+                _callback(error, null, response.status);
+              });
+          })
+          .catch(err => {
+            if (err.code === 'ETIMEDOUT' || err.code === 'ESOCKETTIMEDOUT') {
+              err.message = 'Connection timed out';
+              err.status = 504;
+            }
+            err.status = err.status || 503;
+            return _callback(err, null, err.status);
           });
-        });
       });
 
-    if (typeof callback === 'function') {
-      return promise.then(data => callback(null, data), callback);
+      if (typeof callback === 'function') {
+        callback(null, data);
+      }
+      return data;
+    } catch (error) {
+      if (typeof callback === 'function') {
+        callback(error);
+      }
+      return error;
     }
-    return promise;
   }
 
-  handleResponse(response, callback) {
-    let data = {};
+  async handleResponse(response) {
+    let data = null;
     try {
-      data = JSON.parse(response.body || '{}');
+      if (typeof response.data === 'object') {
+        data = response.data;
+      } else if (typeof response.data === 'string' && response.data.trim() !== '') {
+        data = JSON.parse(response.data);
+      } else {
+        data = {};
+      }
     } catch (err) {
-      err.status = response.statusCode;
-      err.body = response.body;
-      return callback(err, null, response.statusCode);
+      err.message = 'Failed to parse response data';
+      err.status = response.status;
+      err.body = response.data;
+      throw err;
     }
-    return this.parseResponse(response.statusCode, data, callback);
+    return await this.parseResponse(response.status, data);
   }
 
-  parseResponse(statusCode, data, callback) {
+  async parseResponse(statusCode, data) {
     if (statusCode < 400) {
       try {
-        data = this.parse(data);
-        callback(null, data, statusCode);
+        data = await this.parse(data);
+        return data;
       } catch (err) {
-        callback(err, null, statusCode);
+        throw err;
       }
     } else {
-      callback(this.parseError(statusCode, data), data, statusCode);
+      throw this.parseError(statusCode, data);
     }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "22.0.0-timeout-warning-beta.1",
+  "version": "22.0.0-timeout-warning-beta.3",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -21,13 +21,13 @@
     "url": "https://github.com/UKHomeOfficeForms/hof/issues"
   },
   "scripts": {
-    "test": "yarn run unit && yarn run test:cookie-banner && yarn run test:functional && yarn run test:client && yarn run test:lint",
+    "test": "yarn run unit && yarn run test:jest && 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 \"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 --timeout 20000 --exit",
     "test:client": "karma start test/frontend/toolkit/karma.conf.js",
-    "test:cookie-banner": "jest test/frontend/jest",
+    "test:jest": "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",
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "aliasify": "^2.1.0",
+    "axios": "^1.5.1",
     "bluebird": "^3.7.2",
     "body-parser": "^1.15.1",
     "browserify": "^17.0.0",
@@ -83,7 +84,6 @@
     "notifications-node-client": "^6.0.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/sandbox/public/js/bundle.js

@@ -286,7 +286,6 @@ var skipToMain = require('./skip-to-main');
 var cookie = require('./govuk-cookies');
 var cookieSettings = require('./cookieSettings');
 var sessionDialog = require('./session-timeout-dialog');
-GOVUK.sessionDialog.init();
 
 toolkit.detailsSummary();
 
@@ -299,6 +298,9 @@ helpers.documentReady(characterCount);
 helpers.documentReady(validation);
 
 },{"../../../toolkit":12,"./cookieSettings":1,"./govuk-cookies":2,"./session-timeout-dialog":4,"./skip-to-main":5,"govuk-frontend":13}],4:[function(require,module,exports){
+/* eslint max-len: 0 */
+'use strict';
+
 const $ = require('jquery');
 
 // Modal dialog prototype
@@ -318,8 +320,8 @@ window.GOVUK.sessionDialog = {
   $timer: $('#js-modal-dialog .timer'),
   $accessibleTimer: $('#js-modal-dialog .at-timer'),
 
-  secondsSessionTimeout: parseInt($('#js-modal-dialog').data('session-timeout') || 1800),
-  secondsTimeoutWarning: parseInt($('#js-modal-dialog').data('session-timeout-warning') || 300),
+  secondsSessionTimeout: parseInt($('#js-modal-dialog').data('session-timeout'), 10 || 1800),
+  secondsTimeoutWarning: parseInt($('#js-modal-dialog').data('session-timeout-warning'), 10 || 300),
   timeoutRedirectUrl: $('#js-modal-dialog').data('url-redirect'),
   timeSessionRefreshed: new Date(),
 
@@ -327,18 +329,18 @@ window.GOVUK.sessionDialog = {
     window.GOVUK.sessionDialog.$closeButton.on('click', function (e) {
       e.preventDefault();
       window.GOVUK.sessionDialog.closeDialog();
-    })
+    });
 
     // Close modal when ESC pressed
     $(document).keydown(function (e) {
       if (window.GOVUK.sessionDialog.isDialogOpen() && e.keyCode === 27) {
         window.GOVUK.sessionDialog.closeDialog();
       }
-    })
+    });
   },
 
   isDialogOpen: function () {
-    return window.GOVUK.sessionDialog.el['open'];
+    return window.GOVUK.sessionDialog.el && window.GOVUK.sessionDialog.el.open;
   },
 
   isConfigured: function () {
@@ -355,6 +357,8 @@ window.GOVUK.sessionDialog = {
       window.GOVUK.sessionDialog.saveLastFocusedEl();
       window.GOVUK.sessionDialog.makePageContentInert();
       window.GOVUK.sessionDialog.el.showModal();
+      window.GOVUK.sessionDialog.el.open = true;
+      console.log(window.GOVUK.sessionDialog.el)
     }
   },
 
@@ -362,6 +366,8 @@ window.GOVUK.sessionDialog = {
     if (window.GOVUK.sessionDialog.isDialogOpen()) {
       $('html, body').removeClass(window.GOVUK.sessionDialog.dialogIsOpenClass);
       window.GOVUK.sessionDialog.el.close();
+      window.GOVUK.sessionDialog.el.open = false;
+      console.log(window.GOVUK.sessionDialog.el)
       window.GOVUK.sessionDialog.setFocusOnLastFocusedEl();
       window.GOVUK.sessionDialog.removeInertFromPageContent();
       window.GOVUK.sessionDialog.refreshSession();
@@ -382,7 +388,7 @@ window.GOVUK.sessionDialog = {
     if (window.GOVUK.sessionDialog.$lastFocusedEl) {
       window.setTimeout(function () {
         window.GOVUK.sessionDialog.$lastFocusedEl.focus();
-      }, 0)
+      }, 0);
     }
   },
 
@@ -405,51 +411,46 @@ window.GOVUK.sessionDialog = {
   },
 
   numberToWords: function (n) {
-    let string = n.toString()
-    let units
-    let tens
-    let scales
-    let start
-    let end
-    let chunks
-    let chunksLen
-    let chunk
-    let ints
-    let i
-    let word
-    let words = 'and'
-
-    if (parseInt(string) === 0) {
+    const string = n.toString();
+    let start;
+    let end;
+    let chunk;
+    let ints;
+    let i;
+    let word;
+    let words = 'and';
+
+    if (parseInt(string, 10) === 0) {
       return 'zero';
     }
 
     /* Array of units as words */
-    units = ['', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen', 'seventeen', 'eighteen', 'nineteen'];
+    const units = ['', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen', 'seventeen', 'eighteen', 'nineteen'];
 
     /* Array of tens as words */
-    tens = ['', '', 'twenty', 'thirty', 'forty', 'fifty', 'sixty', 'seventy', 'eighty', 'ninety'];
+    const tens = ['', '', 'twenty', 'thirty', 'forty', 'fifty', 'sixty', 'seventy', 'eighty', 'ninety'];
 
     /* Array of scales as words */
-    scales = ['', 'thousand', 'million', 'billion', 'trillion', 'quadrillion', 'quintillion', 'sextillion', 'septillion', 'octillion', 'nonillion', 'decillion', 'undecillion', 'duodecillion', 'tredecillion', 'quatttuor-decillion', 'quindecillion', 'sexdecillion', 'septen-decillion', 'octodecillion', 'novemdecillion', 'vigintillion', 'centillion'];
+    const scales = ['', 'thousand', 'million', 'billion', 'trillion', 'quadrillion', 'quintillion', 'sextillion', 'septillion', 'octillion', 'nonillion', 'decillion', 'undecillion', 'duodecillion', 'tredecillion', 'quatttuor-decillion', 'quindecillion', 'sexdecillion', 'septen-decillion', 'octodecillion', 'novemdecillion', 'vigintillion', 'centillion'];
 
-    /* Split user arguemnt into 3 digit chunks from right to left */
+    /* Split user argument into 3 digit chunks from right to left */
     start = string.length;
-    chunks = [];
+    const chunks = [];
     while (start > 0) {
       end = start;
       chunks.push(string.slice((start = Math.max(0, start - 3)), end));
     }
 
     /* Check if function has enough scale words to be able to stringify the user argument */
-    chunksLen = chunks.length
+    const chunksLen = chunks.length;
     if (chunksLen > scales.length) {
       return '';
     }
 
     /* Stringify each integer in each chunk */
-    words = []
+    words = [];
     for (i = 0; i < chunksLen; i++) {
-      chunk = parseInt(chunks[i]);
+      chunk = parseInt(chunks[i], 10);
 
       if (chunk) {
         /* Split chunk into array of individual integers */
@@ -461,22 +462,22 @@ window.GOVUK.sessionDialog = {
         }
 
         /* Add scale word if chunk is not zero and array item exists */
-        if ((word = scales[i])) {
+        if ((word === scales[i])) {
           words.push(word);
         }
 
         /* Add unit word if array item exists */
-        if ((word = units[ints[0]])) {
+        if ((word === units[ints[0]])) {
           words.push(word);
         }
 
         /* Add tens word if array item exists */
-        if ((word = tens[ints[1]])) {
+        if ((word === tens[ints[1]])) {
           words.push(word);
         }
 
         /* Add hundreds word if array item exists */
-        if ((word = units[ints[2]])) {
+        if ((word === units[ints[2]])) {
           words.push(word + ' hundred');
         }
       }
@@ -502,7 +503,7 @@ window.GOVUK.sessionDialog = {
   },
 
   pluralise: function (n, unit) {
-    return n == 1 ? unit : unit + 's';
+    return n === 1 ? unit : unit + 's';
   },
 
   numericSpan: function (n, unit) {
@@ -518,7 +519,7 @@ window.GOVUK.sessionDialog = {
   countdownAtText: function (minutes, seconds) {
     const minutesText = window.GOVUK.sessionDialog.timeToWords(minutes, 'minute');
     const secondsText = window.GOVUK.sessionDialog.timeToWords(seconds, 'second');
-    return minutes > 0 ? minutesText :  secondsText;
+    return minutes > 0 ? minutesText : secondsText;
   },
 
   startCountdown: function () {
@@ -537,11 +538,8 @@ window.GOVUK.sessionDialog = {
       const timerExpired = secondsUntilSessionTimeout <= window.GOVUK.sessionDialog.secondsFinalWarning;
 
       if (!timerExpired) {
-
         const minutesLeft = parseInt(secondsUntilSessionTimeout / 60, 10);
         const secondsLeft = parseInt(secondsUntilSessionTimeout % 60, 10);
-
-        
         const atMinutesText = window.GOVUK.sessionDialog.timeToWords(minutesLeft, 'minute');
         const atSecondsText = window.GOVUK.sessionDialog.timeToWords(secondsLeft, 'second');
 
@@ -552,14 +550,13 @@ window.GOVUK.sessionDialog = {
         const countdownText = window.GOVUK.sessionDialog.countdownText(minutesLeft, secondsLeft);
         const text = window.GOVUK.sessionDialog.warningTextPrefix + '<strong>' + countdownText + '</strong>' + window.GOVUK.sessionDialog.warningTextSuffix;
         const countdownAtText = window.GOVUK.sessionDialog.countdownAtText(atMinutesText, atSecondsText);
-        const atText = window.GOVUK.sessionDialog.warningTextPrefix + countdownAtText + window.GOVUK.sessionDialog.warningTextSuffix  + 'bgbhj ' +  window.GOVUK.sessionDialog.warningText;
+        const atText = window.GOVUK.sessionDialog.warningTextPrefix + countdownAtText + window.GOVUK.sessionDialog.warningTextSuffix + 'bgbhj ' + window.GOVUK.sessionDialog.warningText;
         const extraText = '\n' + window.GOVUK.sessionDialog.warningTextExtra;
 
         $timer.html(text + ' ' + extraText);
 
         // Update screen reader friendly content every 20 secs
         if (secondsLeft % 20 === 0) {
-
           // Read out the extra content only once.
           // Don't read out on iOS VoiceOver which stalls on the longer text
           if (!timerRunOnce && !iOS) {
@@ -570,9 +567,9 @@ window.GOVUK.sessionDialog = {
           }
         }
 
-        window.GOVUK.sessionDialog.addTimer(countdown,20);
+        window.GOVUK.sessionDialog.addTimer(countdown, 20);
       }
-    })()
+    })();
   },
 
   // Clears all timers
@@ -583,7 +580,7 @@ window.GOVUK.sessionDialog = {
   },
 
   refreshSession: function () {
-    $.get("");
+    $.get('');
     window.GOVUK.sessionDialog.timeSessionRefreshed = new Date();
     window.GOVUK.sessionDialog.controller();
   },
@@ -616,20 +613,16 @@ window.GOVUK.sessionDialog = {
 
     const secondsUntilSessionTimeout = window.GOVUK.sessionDialog.secondsUntilSessionTimeout();
 
-    //timed out - redirect
     if (secondsUntilSessionTimeout <= 0) {
+      // timed out - redirect
       window.GOVUK.sessionDialog.redirect();
-    }
-
-    //timeout warning - show countdown and schedule redirect
-    else if (secondsUntilSessionTimeout <= window.GOVUK.sessionDialog.secondsTimeoutWarning) {
+    } else if (secondsUntilSessionTimeout <= window.GOVUK.sessionDialog.secondsTimeoutWarning) {
+      // timeout warning - show countdown and schedule redirect
       window.GOVUK.sessionDialog.openDialog();
       window.GOVUK.sessionDialog.startCountdown();
-      window.GOVUK.sessionDialog.addTimer(window.GOVUK.sessionDialog.controller,window.GOVUK.sessionDialog.secondsUntilSessionTimeout());
-    }
-
-    //wait for warning 
-    else {
+      window.GOVUK.sessionDialog.addTimer(window.GOVUK.sessionDialog.controller, window.GOVUK.sessionDialog.secondsUntilSessionTimeout());
+    } else {
+      // wait for warning
       window.GOVUK.sessionDialog.addTimer(window.GOVUK.sessionDialog.controller, window.GOVUK.sessionDialog.secondsUntilTimeoutWarning());
     }
   },
@@ -641,9 +634,8 @@ window.GOVUK.sessionDialog = {
       window.GOVUK.sessionDialog.controller();
     }
   }
-}
-
-window.GOVUK = GOVUK;
+};
+window.GOVUK.sessionDialog.init();
 
 },{"jquery":14}],5:[function(require,module,exports){
 const skipToMain = function () {