r - committer resten av refaktor

Det gikk ikke så bra å dele opp de to
navikt · Jun 19, 2024 · fe5e1f8 · fe5e1f8
1 parent 6e206f7
commit fe5e1f8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/src/lib/api/axiosInstance.ts b/src/lib/api/axiosInstance.ts
@@ -1,9 +1,9 @@
 import Axios, {AxiosError, AxiosRequestConfig, AxiosResponse, isCancel} from "axios";
 import {isLocalhost, isMockAlt} from "../utils";
-import {UnauthorizedMelding} from "../../generated/model";
 import {logError, logInfo, logWarning} from "../log/loggerUtils";
 import {baseURL, linkPagePath} from "../config";
-import {buildGotoSearchParameter} from "./auth/buildGotoSearchParameter";
+import {isLoginError} from "./error/isLoginError";
+import {getGotoParameter} from "./auth/getGotoParameter";
 
 const AXIOS_INSTANCE = Axios.create({
     baseURL,
@@ -25,6 +25,8 @@ export type DigisosAxiosConfig = {
     digisosIgnoreErrors?: boolean;
 };
 
+const neverResolves = <T>() => new Promise<T>(() => {});
+
 /**
  * Digisos Axios client
  *
@@ -52,29 +54,30 @@ export const axiosInstance = <T>(
         .catch(async (e) => {
             if (!(e instanceof AxiosError)) await logWarning(`non-axioserror error ${e} in axiosinstance`);
 
-            if (isCancel(e) || options?.digisosIgnoreErrors) return new Promise<T>(() => {});
+            if (isCancel(e) || options?.digisosIgnoreErrors) return neverResolves();
+
+            const {response} = e;
 
-            if (!e.response) {
+            if (!response) {
                 await logWarning(`Nettverksfeil i axiosInstance: ${config.method} ${config.url} ${e}`);
                 console.warn(e);
                 throw e;
             }
 
-            const {status, data} = e.response;
-
-            if (status === 401) {
-                const {loginUrl} = data as UnauthorizedMelding;
-                const loginPage = new URL(loginUrl);
-                const redirectUrl = `${origin}${linkPagePath}?${buildGotoSearchParameter(window.location)}`;
-                loginPage.searchParams.set("redirect", redirectUrl);
-                window.location.assign(loginPage);
-                return new Promise<T>(() => {});
+            if (isLoginError(response)) {
+                const loginUrl = new URL(response.data.loginUrl);
+                const redirect = `${origin}${linkPagePath}?goto=${getGotoParameter(window.location)}`;
+                loginUrl.searchParams.set("redirect", redirect);
+                window.location.assign(loginUrl);
+                return neverResolves();
             }
 
+            const {status, data} = response;
+
             // 403 burde gi feilmelding, men visse HTTP-kall som burde returnere 404 gir 403
             if ([403, 404, 410].includes(status)) {
                 window.location.href = `/sosialhjelp/soknad/informasjon?reason=axios${status}`;
-                return new Promise<T>(() => {});
+                return neverResolves();
             }
 
             // Conflict -- try again

diff --git a/src/lib/api/error/isLoginError.ts b/src/lib/api/error/isLoginError.ts
@@ -0,0 +1,7 @@
+import {AxiosResponse} from "axios";
+import {UnauthorizedMelding} from "../../../generated/model";
+
+export const isLoginError = (response: AxiosResponse): response is AxiosResponse<UnauthorizedMelding> => {
+    if (!response.data?.loginUrl) throw new Error("Missing loginUrl in 401 response");
+    return response.status === 401;
+};