fix: fix handler

Author: alexmagikov

hwproj.front/src/App.tsx

@@ -24,8 +24,6 @@ import PasswordRecovery from "components/Auth/PasswordRecovery";
 import AuthLayout from "./AuthLayout";
 import ExpertAuthLayout from "./components/Experts/AuthLayout";
 import TrackPageChanges from "TrackPageChanges";
-import {Alert, Button} from "@mui/material";
-import {Snackbar} from "@material-ui/core";
 
 // TODO: add flux
 

hwproj.front/src/api/ApiSingleton.ts

@@ -69,17 +69,6 @@ function getApiBase(): string {
     return `${protocol}//${hostname}${effectivePort ? `:${effectivePort}` : ""}`
 }
 
-let skipRedirect = false;
-
-export async function runWithoutAuthRedirect(functionToRun: () => Promise<any>) {
-    skipRedirect = true;
-    try {
-        return await functionToRun();
-    } finally {
-        skipRedirect = false;
-    }
-}
-
 const cookieFetch = async (url: string, init: any) => {
     const response = await fetch(url, {
         ...init,
@@ -90,20 +79,30 @@ const cookieFetch = async (url: string, init: any) => {
 
     if (response.status === 401 &&
         !path.includes("login") &&
-        !path.includes("register") &&
-        !skipRedirect){
+        !path.includes("register")){
         window.location.href = `/login?returnUrl=${window.location.pathname}`;
     }
 
     return response;
 }
 
+const cookieFetchWithoutRedirect = async (url: string, init: any) => {
+    const response = await fetch(url, {
+        ...init,
+        credentials: "include"
+    });
+
+    return response;
+}
+
 const basePath = getApiBase()
 const authService = new AuthService()
 const apiConfig = {
     basePath: basePath,
 }
 
+export const accountApiWithoutRedirect = new AccountApi(apiConfig, undefined, cookieFetchWithoutRedirect);
+
 let ApiSingleton: Api;
 ApiSingleton = new Api(
     new AccountApi(apiConfig, undefined, cookieFetch),

hwproj.front/src/services/AuthService.ts

@@ -1,5 +1,5 @@
 import {LoginViewModel, RegisterViewModel} from '../api';
-import ApiSingleton, {runWithoutAuthRedirect} from "../api/ApiSingleton";
+import ApiSingleton, {accountApiWithoutRedirect} from "../api/ApiSingleton";
 import decode from "jwt-decode";
 
 
@@ -29,8 +29,7 @@ export default class AuthService {
 
     public async getUser() {
         try {
-            const accountData = await runWithoutAuthRedirect(() =>
-                ApiSingleton.accountApi.accountGetUserSummary());
+            const accountData = await accountApiWithoutRedirect.accountGetUserSummary();
             if (accountData) {
                 this._user = {
                     id: accountData.userId!,