AUT-2393: Axios upgrade WIP

govuk-one-login · Apr 18, 2024 · bf459a7 · bf459a7
1 parent ac8653f
commit bf459a7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "@otplib/core": "^12.0.1",
     "@otplib/plugin-base32-enc-dec": "^12.0.1",
     "aws-sdk": "^2.1356.0",
-    "axios": "^0.25.0",
+    "axios": "^0.28.0",
     "connect-redis": "^7.1.1",
     "cookie-parser": "^1.4.5",
     "copyfiles": "^2.4.1",

diff --git a/src/assets/javascript/cookies.js b/src/assets/javascript/cookies.js
@@ -70,7 +70,7 @@ var cookies = function (trackingId, analyticsCookieDomain) {
       setCookie(
         COOKIES_HISTORY_LENGTH,
         window.history.length
-        );
+      );
     }
     document.querySelector("#go-back-link").onclick = function() {
       var chl = getCookie(COOKIES_HISTORY_LENGTH);
@@ -95,7 +95,7 @@ var cookies = function (trackingId, analyticsCookieDomain) {
 
   function pushLanguageToDataLayer() {
     var languageCode = document.querySelector('html') &&
-        document.querySelector('html').getAttribute('lang');
+      document.querySelector('html').getAttribute('lang');
 
     var languageNames = {
       'en':'english',

diff --git a/src/utils/http.ts b/src/utils/http.ts
@@ -97,7 +97,7 @@ export class Http {
       apiError = new ApiError(
         error.message,
         error.response.status,
-        error.response.data
+        error.response.data as string
       );
     } else {
       apiError = new ApiError(error.message);

diff --git a/yarn.lock b/yarn.lock
@@ -1816,12 +1816,14 @@ aws-sdk@^2.1356.0:
     uuid "8.0.0"
     xml2js "0.6.2"
 
-axios@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"
-  integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
+axios@^0.28.0:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.28.1.tgz#2a7bcd34a3837b71ee1a5ca3762214b86b703e70"
+  integrity sha512-iUcGA5a7p0mVb4Gm/sy+FSECNkPFT4y7wt6OM/CDpO/OnNCvSs3PoMG8ibrC9jRoGYU0gUK5pXVC4NPXq6lHRQ==
   dependencies:
-    follow-redirects "^1.14.7"
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -2882,7 +2884,7 @@ flatted@^3.1.0:
   resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"
   integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
 
-follow-redirects@^1.14.7:
+follow-redirects@^1.15.0:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
@@ -4200,6 +4202,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"