From 70c64a5126e5ef9cde03e581b6820abd17ace5be Mon Sep 17 00:00:00 2001 From: Anders Rognstad <79838644+andersrognstad@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:11:23 +0100 Subject: [PATCH] Upgrade axios (#389) --- package-lock.json | 104 ++++++++++++++++--------------- package.json | 2 +- src/api/axios.ts | 6 +- test/stubs/stubAktivVeileder.ts | 2 +- test/stubs/stubChangelogs.ts | 2 +- test/stubs/stubModiaContext.ts | 2 +- test/stubs/stubPersonoversikt.ts | 2 +- test/stubs/stubPersonregister.ts | 2 +- test/stubs/stubVeiledere.ts | 2 +- 9 files changed, 65 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5098baf7..d2f36584 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "@types/styled-components": "5.1.26", "amplitude-js": "8.21.3", "autoprefixer": "10.4.13", - "axios": "0.26.1", + "axios": "1.6.3", "classnames": "2.3.2", "connect-redis": "4.0.4", "core-js": "3.27.1", @@ -4694,8 +4694,7 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "node_modules/at-least-node": { "version": "1.0.0", @@ -4750,11 +4749,13 @@ } }, "node_modules/axios": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", - "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", + "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", "dependencies": { - "follow-redirects": "^1.14.8" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/babel-loader": { @@ -5705,7 +5706,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -6340,7 +6340,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -8154,9 +8153,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.14.8", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", - "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "funding": [ { "type": "individual", @@ -8181,6 +8180,19 @@ "is-callable": "^1.1.3" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -9657,20 +9669,6 @@ "node": ">=12" } }, - "node_modules/jsdom/node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/jsdom/node_modules/html-encoding-sniffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", @@ -12993,6 +12991,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -19702,8 +19705,7 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "at-least-node": { "version": "1.0.0", @@ -19730,11 +19732,13 @@ "dev": true }, "axios": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", - "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz", + "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==", "requires": { - "follow-redirects": "^1.14.8" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "babel-loader": { @@ -20477,7 +20481,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -20928,8 +20931,7 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "denque": { "version": "1.5.1", @@ -22309,9 +22311,9 @@ "dev": true }, "follow-redirects": { - "version": "1.14.8", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", - "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==" + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==" }, "for-each": { "version": "0.3.3", @@ -22322,6 +22324,16 @@ "is-callable": "^1.1.3" } }, + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -23358,17 +23370,6 @@ "webidl-conversions": "^7.0.0" } }, - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, "html-encoding-sniffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", @@ -25682,6 +25683,11 @@ "ipaddr.js": "1.9.1" } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", diff --git a/package.json b/package.json index b61357d7..df9a80b0 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@types/styled-components": "5.1.26", "amplitude-js": "8.21.3", "autoprefixer": "10.4.13", - "axios": "0.26.1", + "axios": "1.6.3", "classnames": "2.3.2", "connect-redis": "4.0.4", "core-js": "3.27.1", diff --git a/src/api/axios.ts b/src/api/axios.ts index b7d7ef4e..a6c9ef19 100644 --- a/src/api/axios.ts +++ b/src/api/axios.ts @@ -1,4 +1,4 @@ -import axios, { AxiosError, AxiosRequestHeaders } from 'axios'; +import axios, { AxiosError } from 'axios'; import { accessDeniedError, ApiErrorException, @@ -15,8 +15,8 @@ export const NAV_PERSONIDENT_HEADER = 'nav-personident'; export const defaultRequestHeaders = ( personIdent?: string -): AxiosRequestHeaders => { - const headers: AxiosRequestHeaders = { +): Record => { + const headers: Record = { 'Content-Type': 'application/json', [NAV_CONSUMER_ID_HEADER]: NAV_CONSUMER_ID, [NAV_CALL_ID_HEADER]: `${NAV_CONSUMER_ID}-${generateUUID()}`, diff --git a/test/stubs/stubAktivVeileder.ts b/test/stubs/stubAktivVeileder.ts index d65b1754..94a607d4 100644 --- a/test/stubs/stubAktivVeileder.ts +++ b/test/stubs/stubAktivVeileder.ts @@ -5,7 +5,7 @@ import axios from 'axios'; import { nockBasePath } from './nockDefaults'; export const stubAktivVeileder = () => { - axios.defaults.adapter = require('axios/lib/adapters/http'); + axios.defaults.adapter = 'http'; nock(nockBasePath) .get(`${SYFOVEILEDER_ROOT}/veileder/self`) diff --git a/test/stubs/stubChangelogs.ts b/test/stubs/stubChangelogs.ts index bf012787..da8681be 100644 --- a/test/stubs/stubChangelogs.ts +++ b/test/stubs/stubChangelogs.ts @@ -5,7 +5,7 @@ import { changelogsMock } from '../../mock/data/changelogsMock'; import { nockBasePath } from './nockDefaults'; export const stubChangelogs = () => { - axios.defaults.adapter = require('axios/lib/adapters/http'); + axios.defaults.adapter = 'http'; nock(nockBasePath) .get(CHANGELOG_ROOT) diff --git a/test/stubs/stubModiaContext.ts b/test/stubs/stubModiaContext.ts index 7ac1f17e..82f0265a 100644 --- a/test/stubs/stubModiaContext.ts +++ b/test/stubs/stubModiaContext.ts @@ -5,7 +5,7 @@ import axios from 'axios'; import { nockBasePath } from './nockDefaults'; export const stubModiaContext = () => { - axios.defaults.adapter = require('axios/lib/adapters/http'); + axios.defaults.adapter = 'http'; nock(nockBasePath) .get(`${MODIACONTEXTHOLDER_ROOT}/context/aktivenhet`) diff --git a/test/stubs/stubPersonoversikt.ts b/test/stubs/stubPersonoversikt.ts index 3202acda..8556c192 100644 --- a/test/stubs/stubPersonoversikt.ts +++ b/test/stubs/stubPersonoversikt.ts @@ -6,7 +6,7 @@ import axios from 'axios'; import { nockBasePath } from './nockDefaults'; export const stubPersonoversikt = () => { - axios.defaults.adapter = require('axios/lib/adapters/http'); + axios.defaults.adapter = 'http'; nock(nockBasePath) .get(`${PERSONOVERSIKT_ROOT}/enhet/${aktivEnhetMock.aktivEnhet}`) diff --git a/test/stubs/stubPersonregister.ts b/test/stubs/stubPersonregister.ts index ef7da39f..599b2f55 100644 --- a/test/stubs/stubPersonregister.ts +++ b/test/stubs/stubPersonregister.ts @@ -5,7 +5,7 @@ import axios from 'axios'; import { nockBasePath } from './nockDefaults'; export const stubPersonregister = () => { - axios.defaults.adapter = require('axios/lib/adapters/http'); + axios.defaults.adapter = 'http'; nock(nockBasePath) .post(`${SYFOPERSON_ROOT}/person/info`) diff --git a/test/stubs/stubVeiledere.ts b/test/stubs/stubVeiledere.ts index c0293362..06b4834b 100644 --- a/test/stubs/stubVeiledere.ts +++ b/test/stubs/stubVeiledere.ts @@ -6,7 +6,7 @@ import axios from 'axios'; import { nockBasePath } from './nockDefaults'; export const stubVeiledere = () => { - axios.defaults.adapter = require('axios/lib/adapters/http'); + axios.defaults.adapter = 'http'; nock(nockBasePath) .get(`${SYFOVEILEDER_ROOT}/veiledere/enhet/${aktivEnhetMock.aktivEnhet}`)