feat: add 401 error handler

Author: alexmagikov

hwproj.front/src/App.tsx

@@ -16,14 +16,16 @@ import Register from "./components/Auth/Register";
 import ExpertsNotebook from "./components/Experts/Notebook";
 import StudentSolutionsPage from "./components/Solutions/StudentSolutionsPage";
 import EditProfile from "./components/EditProfile";
-import ApiSingleton, {setAunauthorizedHandler} from "./api/ApiSingleton";
+import ApiSingleton from "./api/ApiSingleton";
 import SystemInfoComponent from "./components/System/SystemInfoComponent";
 import WrongPath from "./components/WrongPath";
 import ResetPassword from "components/Auth/ResetPassword";
 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
 
@@ -34,7 +36,6 @@ interface AppState {
     newNotificationsCount: number;
     appBarContextAction: AppBarContextAction;
     authReady: boolean;
-    needAuth: boolean;
 }
 
 const withRouter = (Component: any) => {
@@ -59,15 +60,12 @@ class App extends Component<{ navigate: any }, AppState> {
             isExpert: ApiSingleton.authService.isExpert(),
             newNotificationsCount: 0,
             appBarContextAction: "Default",
-            authReady: false,
-            needAuth: false,
+            authReady: false
         };
         appBarStateManager.setOnContextActionChange(appBarState => this.setState({appBarContextAction: appBarState}))
     }
 
     componentDidMount = async () => {
-        setUnauthorizedHandler(() => this.setState({needAuth: true}));
-
         const user = await ApiSingleton.authService.getProfile();
         this.setState(
             {
@@ -94,8 +92,7 @@ class App extends Component<{ navigate: any }, AppState> {
         this.setState({
             loggedIn: true,
             isLecturer: isLecturer,
-            isExpert: isExpert,
-            needAuth: false,
+            isExpert: isExpert
         })
         if (!isExpert) {
             await this.updatedNewNotificationsCount()
@@ -105,7 +102,7 @@ class App extends Component<{ navigate: any }, AppState> {
 
     logout = async () => {
         await ApiSingleton.authService.logout();
-        this.setState({loggedIn: false, isLecturer: false, isExpert: false, newNotificationsCount: 0, authReady: true, needAuth: false});
+        this.setState({loggedIn: false, isLecturer: false, isExpert: false, newNotificationsCount: 0, authReady: true});
         this.props.navigate("/login");
     }
 
@@ -120,7 +117,6 @@ class App extends Component<{ navigate: any }, AppState> {
                         onLogout={this.logout}
                         contextAction={this.state.appBarContextAction}/>
                 <TrackPageChanges/>
-
                 <Routes>
                     <Route element={<AuthLayout/>}>
                         <Route path="user/edit" element={<EditProfile isExpert={this.state.isExpert}/>}/>

hwproj.front/src/api/ApiSingleton.ts

@@ -69,10 +69,15 @@ function getApiBase(): string {
     return `${protocol}//${hostname}${effectivePort ? `:${effectivePort}` : ""}`
 }
 
-let unauthorizedHandler: (() => void) | null = null
+let skipRedirect = false;
 
-export const setUnauthorizedHandler = (handler: (() => void) | null) => {
-    unauthorizedHandler = handler;
+export async function runWithoutAuthRedirect(functionToRun: () => Promise<any>) {
+    skipRedirect = true;
+    try {
+        return await functionToRun();
+    } finally {
+        skipRedirect = false;
+    }
 }
 
 const cookieFetch = async (url: string, init: any) => {
@@ -85,10 +90,9 @@ const cookieFetch = async (url: string, init: any) => {
 
     if (response.status === 401 &&
         !path.includes("login") &&
-        !path.includes("register")){
-        if (unauthorizedHandler) {
-            unauthorizedHandler()
-        }
+        !path.includes("register") &&
+        !skipRedirect){
+        window.location.href = `/login?returnUrl=${window.location.pathname}`;
     }
 
     return response;

hwproj.front/src/services/AuthService.ts

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