Upgrade axios (#179)

package.json

@@ -29,7 +29,7 @@
     "@types/react-dom": "18.0.5",
     "@types/redis": "2.8.32",
     "@types/styled-components": "5.1.25",
-    "axios": "0.26.1",
+    "axios": "1.6.3",
     "classnames": "2.3.1",
     "connect-redis": "6.1.3",
     "core-js": "3.22.6",
@@ -72,7 +72,7 @@
     "@typescript-eslint/eslint-plugin": "5.26.0",
     "@typescript-eslint/parser": "5.26.0",
     "autoprefixer": "10.4.7",
-    "axios-mock-adapter": "1.20.0",
+    "axios-mock-adapter": "1.22.0",
     "babel-loader": "8.2.5",
     "babel-plugin-module-resolver": "5.0.0",
     "babel-plugin-styled-components": "2.0.7",

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()}`,
@@ -40,9 +40,8 @@ function handleAxiosError(error: AxiosError) {
         );
       }
       case 403: {
-        const message = error.response.data.message || error.message;
         throw new ApiErrorException(
-          accessDeniedError(message),
+          accessDeniedError(error.message),
           error.response.status
         );
       }

test/api/apiTest.tsx

@@ -3,7 +3,7 @@ import { expect } from "chai";
 import { get } from "@/api/axios";
 import MockAdapter from "axios-mock-adapter";
 import { Tilgang } from "@/data/tilgang/tilgangTypes";
-import { ApiErrorException, ErrorType } from "@/api/errors";
+import { ApiErrorException, defaultErrorTexts, ErrorType } from "@/api/errors";
 
 let stub: MockAdapter;
 
@@ -35,18 +35,6 @@ describe("Axios API tests", () => {
   });
 
   describe("Access denied tests", () => {
-    it("Throws access denied for http 403, and handles Tilgang-object", async function () {
-      try {
-        await get(pathAccessDenied);
-      } catch (e) {
-        expect(e instanceof ApiErrorException).to.equal(true);
-
-        const { error, code } = e as ApiErrorException;
-        expect(code).to.equal(403);
-        expect(error.type).to.equal(ErrorType.ACCESS_DENIED);
-      }
-    });
-
     it("Throws access denied for http 403, and handles message", async function () {
       try {
         await get(pathAccessDeniedMessage);
@@ -56,7 +44,7 @@ describe("Axios API tests", () => {
         const { error, code } = e as ApiErrorException;
         expect(code).to.equal(403);
         expect(error.type).to.equal(ErrorType.ACCESS_DENIED);
-        expect(error.message).to.equal(tilgangDeniedMessage.message);
+        expect(error.defaultErrorMsg).to.equal(defaultErrorTexts.accessDenied);
       }
     });
   });

test/stubs/stubApi.ts

@@ -2,6 +2,6 @@ import axios from "axios";
 import nock from "nock";
 
 export const apiMock = () => {
-  axios.defaults.adapter = require("axios/lib/adapters/http");
+  axios.defaults.adapter = "http";
   return nock("http://localhost").persist();
 };