hof 21.0.1-axios-beta → 21.0.1-beta-payload-too-large

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

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

package/model/index.js

@@ -2,7 +2,7 @@
 'use strict';
 
 const _ = require('lodash');
-const axios = require('axios').default;
+const request = require('request');
 const url = require('url');
 const EventEmitter = require('events').EventEmitter;
 
@@ -27,7 +27,7 @@ module.exports = class Model extends EventEmitter {
     this.set(attributes, {
       silent: true
     });
-    this._request = axios;
+    this._request = request;
   }
 
   save(options, callback) {
@@ -47,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);
     });
   }
@@ -90,26 +91,25 @@ module.exports = class Model extends EventEmitter {
       callback = body;
       body = undefined;
     }
+
     let settings = Object.assign({}, originalSettings);
     settings.timeout = settings.timeout || this.options.timeout;
-    settings.url = settings.uri || settings.url || url.format(settings);
-    settings.data = settings.body || body || settings.data;
-    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();
@@ -124,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 {
@@ -136,22 +137,22 @@ module.exports = class Model extends EventEmitter {
             }
           };
 
-          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);
             });
+          });
         });
       });
 
@@ -164,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.1-axios-beta",
+  "version": "21.0.1-beta-payload-too-large",
   "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",
@@ -59,7 +57,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 +66,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",
@@ -84,6 +82,7 @@
     "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",
@@ -97,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",
@@ -123,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/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/translations/en/default.json

@@ -2,6 +2,7 @@
   "fields": {
     "landing-page-radio": {
       "legend": "Which form would you like to explore?",
+      "hint": "Choose one of the options below and press continue.",
       "options": {
         "basic-form": {
           "label": "Basic form"
@@ -18,7 +19,7 @@
       "label": "Full name"
     },
     "dateOfBirth": {
-      "legend": "Date of birth",
+      "legend": "What is your date of birth?",
       "hint": "For example, 31 10 1990"
     },
     "building": {
@@ -56,7 +57,7 @@
       }
     },
     "countryOfHearing": {
-      "label": "Country of hearing",
+      "legend": "What country was the appeal lodged?",
       "options": {
         "englandAndWales": {
           "label": "England and Wales"
@@ -80,49 +81,45 @@
       "legend": "International phone number"
     },
     "complaintDetails": {
-      "label": "Complaint details"
+      "label": "Complaint details",
+      "hint": "Briefly summarise your complaint. Include anything that can help our investigation."
+    },
+    "whatHappened": {
+      "label": "What happened",
+      "hint": "Briefly summarise what happened."
     },
     "countrySelect": {
-      "label": "Select a country",
+      "label": "Which country are you based in?",
       "hint": "Start to type the country name and options will appear"
     },
     "appealStages": {
       "label": "Appeal stage",
+      "hint": "Choose an appeal stage from the drop down menu",
       "options": {
         "null": "Select..."
       }
     }
   },
   "journey": {
-    "header": "HOF Bootstrap Sandbox Form"
+    "header": "HOF Bootstrap Sandbox Form",
+    "confirmation": {
+      "details": "Your reference number <br><strong>HDJ2123F</strong>"
+    }
   },
   "pages": {
     "landing-page": {
-      "header": "Landing page",
-      "intro": "Choose one of the options below and press continue."
+      "header": "Landing page"
     },
     "build-your-own-form": {
       "title": "Build your own form",
       "subheader": "Access the build your own form guidance link"
     },
-    "name": {
-      "header": "What is your full name?"
-    },
-    "dob": {
-      "header": "What is your date of birth?"
-    },
     "address": {
       "header": "What is your address in the UK?",
       "intro": "If you have no fixed address, enter an address where we can contact you."
     },
-    "checkboxes": {
-      "header": "Where does your money come from each month?"
-    },
-    "radio": {
-      "header": "What country was the appeal lodged?"
-    },
-    "country-select": {
-      "header": "What country is your address located?"
+    "name": {
+      "header": "What is your full name?"
     },
     "email": {
       "header": "Enter your email address"
@@ -130,14 +127,6 @@
     "phone-number": {
       "header": "Enter your phone number"
     },
-    "text-input-area": {
-      "header": "What are the details of your complaint?",
-      "intro": "Briefly summarise your complaint. Include anything that can help our investigation."
-    },
-    "select": {
-      "header": "What is the appeal stage?",
-      "intro": "Choose an appeal stage from the drop down menu"
-    },
     "confirm": {
       "header": "Check your answers before submitting your application.",
       "sections": {
@@ -161,6 +150,9 @@
         },
         "complaintDetails": {
           "header": "Complaint details"
+        },
+        "whatHappened": {
+          "header": "What happened"
         }
       }
     },
@@ -215,7 +207,11 @@
     },
     "complaintDetails": {
       "default": "Enter details about why you are making a complaint",
-      "maxlength": "Keep to the 5000 character limit"
+      "maxlength": "Keep to the {{maxlength}} character limit"
+    },
+    "whatHappened": {
+      "default": "Enter details about what happened",
+      "maxword": "Keep to the {{maxword}} word limit"
     },
     "appealStages": {
       "required": "Select an appeal stage from the list"

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"
   },