fix: fix cors and add Unauthorized error handler

Author: alexmagikov

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/AccountController.cs

@@ -155,6 +155,7 @@ public async Task<IActionResult> RefreshToken()
         }
 
         [HttpPost("logout")]
+        [ProducesResponseType((int)HttpStatusCode.OK)]
         public IActionResult Logout()
         {
             ClearTokenCookie();

HwProj.APIGateway/HwProj.APIGateway.API/Startup.cs

@@ -126,7 +126,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env)
 
         app.UseRouting();
         app.UseCors(x => x
-            .AllowAnyMethod()
+            .WithMethods("GET")
             .AllowAnyHeader()
             .SetIsOriginAllowed(_ => true)
             .AllowCredentials());

hwproj.front/src/App.tsx

@@ -16,7 +16,7 @@ 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 from "./api/ApiSingleton";
+import ApiSingleton, {setAunauthorizedHandler} from "./api/ApiSingleton";
 import SystemInfoComponent from "./components/System/SystemInfoComponent";
 import WrongPath from "./components/WrongPath";
 import ResetPassword from "components/Auth/ResetPassword";
@@ -34,6 +34,7 @@ interface AppState {
     newNotificationsCount: number;
     appBarContextAction: AppBarContextAction;
     authReady: boolean;
+    needAuth: boolean;
 }
 
 const withRouter = (Component: any) => {
@@ -58,12 +59,15 @@ class App extends Component<{ navigate: any }, AppState> {
             isExpert: ApiSingleton.authService.isExpert(),
             newNotificationsCount: 0,
             appBarContextAction: "Default",
-            authReady: false
+            authReady: false,
+            needAuth: false,
         };
         appBarStateManager.setOnContextActionChange(appBarState => this.setState({appBarContextAction: appBarState}))
     }
 
     componentDidMount = async () => {
+        setUnauthorizedHandler(() => this.setState({needAuth: true}));
+
         const user = await ApiSingleton.authService.getProfile();
         this.setState(
             {
@@ -90,7 +94,8 @@ class App extends Component<{ navigate: any }, AppState> {
         this.setState({
             loggedIn: true,
             isLecturer: isLecturer,
-            isExpert: isExpert
+            isExpert: isExpert,
+            needAuth: false,
         })
         if (!isExpert) {
             await this.updatedNewNotificationsCount()
@@ -100,7 +105,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});
+        this.setState({loggedIn: false, isLecturer: false, isExpert: false, newNotificationsCount: 0, authReady: true, needAuth: false});
         this.props.navigate("/login");
     }
 
@@ -115,6 +120,7 @@ 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,12 +69,28 @@ function getApiBase(): string {
     return `${protocol}//${hostname}${effectivePort ? `:${effectivePort}` : ""}`
 }
 
+let unauthorizedHandler: (() => void) | null = null
+
+export const setUnauthorizedHandler = (handler: (() => void) | null) => {
+    unauthorizedHandler = handler;
+}
+
 const cookieFetch = async (url: string, init: any) => {
     const response = await fetch(url, {
         ...init,
         credentials: "include"
     });
 
+    const path = window.location.pathname;
+
+    if (response.status === 401 &&
+        !path.includes("login") &&
+        !path.includes("register")){
+        if (unauthorizedHandler) {
+            unauthorizedHandler()
+        }
+    }
+
     return response;
 }
 

hwproj.front/src/services/AuthService.ts

@@ -1,4 +1,4 @@
-import {LoginViewModel, AccountApi, RegisterViewModel} from '../api';
+import {LoginViewModel, RegisterViewModel} from '../api';
 import ApiSingleton from "../api/ApiSingleton";
 import decode from "jwt-decode";