From 55a17e797a4a84dedd763732d5a1657abd999800 Mon Sep 17 00:00:00 2001 From: Amelia <77553571+Fesaa@users.noreply.github.com> Date: Thu, 11 Sep 2025 00:17:14 +0200 Subject: [PATCH] Redirect to login when trying to logout without a cookie --- API/Controllers/AuthController.cs | 6 +++--- UI/Web/src/app/nav-bar/nav-bar.component.ts | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/API/Controllers/AuthController.cs b/API/Controllers/AuthController.cs index 1cdb4a8..39a3955 100644 --- a/API/Controllers/AuthController.cs +++ b/API/Controllers/AuthController.cs @@ -8,7 +8,7 @@ namespace API.Controllers; [Route("[controller]")] -public class AuthController: ControllerBase +public class AuthController(ILogger logger): ControllerBase { /// /// Trigger OIDC login flow @@ -33,14 +33,14 @@ public async Task Logout() { if (!Request.Cookies.ContainsKey(OidcService.CookieName)) { - return Redirect("/"); + return Redirect("/Auth/login"); } var res = await HttpContext.AuthenticateAsync(CookieAuthenticationDefaults.AuthenticationScheme); if (!res.Succeeded || res.Properties == null || string.IsNullOrEmpty(res.Properties.GetString(OidcService.IdToken))) { HttpContext.Response.Cookies.Delete(OidcService.CookieName); - return Redirect("/"); + return Redirect("/Auth/login"); } return SignOut( diff --git a/UI/Web/src/app/nav-bar/nav-bar.component.ts b/UI/Web/src/app/nav-bar/nav-bar.component.ts index 6adb9bc..38f5cca 100644 --- a/UI/Web/src/app/nav-bar/nav-bar.component.ts +++ b/UI/Web/src/app/nav-bar/nav-bar.component.ts @@ -65,10 +65,6 @@ export class NavBarComponent implements OnInit { ngOnInit(): void { } - logout() { - this.authService.logout(); - } - toggleMobileMenu() { this.navService.isMobileMenuOpen.update(v => !v); } @@ -88,6 +84,4 @@ export class NavBarComponent implements OnInit { this.navService.isAccountDropdownOpen.set(false); } } - - protected readonly main = main; }