Upgrade axios (#389)

navikt · Jan 2, 2024 · 70c64a5 · 70c64a5
1 parent a9999f5
commit 70c64a5
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 59 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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<string, string> => {
+  const headers: Record<string, string> = {
     '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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}`)