Merge branch 'small_fixes' into dev_auth

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

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

hwproj.front/src/api/ApiSingleton.ts

@@ -75,6 +75,23 @@ const cookieFetch = async (url: string, init: any) => {
         credentials: "include"
     });
 
+    const path = window.location.pathname;
+
+    if (response.status === 401 &&
+        !path.includes("login") &&
+        !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;
 }
 
@@ -84,6 +101,8 @@ 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, AccountApi, RegisterViewModel} from '../api';
-import ApiSingleton from "../api/ApiSingleton";
+import {LoginViewModel, RegisterViewModel} from '../api';
+import ApiSingleton, {accountApiWithoutRedirect} from "../api/ApiSingleton";
 import decode from "jwt-decode";
 
 
@@ -29,7 +29,7 @@ export default class AuthService {
 
     public async getUser() {
         try {
-            const accountData = await ApiSingleton.accountApi.accountGetUserSummary();
+            const accountData = await accountApiWithoutRedirect.accountGetUserSummary();
             if (accountData) {
                 this._user = {
                     id: accountData.userId!,