From 1080d3b4ad9005d291bbbbfff71ded065f22a7c1 Mon Sep 17 00:00:00 2001 From: Egamorf Date: Mon, 21 Apr 2025 00:35:36 +0200 Subject: [PATCH] Enable authentication --- .../Pages/User/Component.razor | 0 .../Pages/User/Components/Login.razor.cs | 22 ++++++++-- .../Pages/User/Gateways/AuthGateway.cs | 7 ++-- .../Pages/User/UserMenu.razor | 42 +++++++++++++++---- .../Pages/User/UserMenu.razor.cs | 10 ++++- .../Client/GameIdeas.BlazorApp/Program.cs | 3 +- .../CreateStaticResourceKey.cs | 2 + .../Controllers/UserController.cs | 4 +- .../GameIdeas.WebAPI/Files/GameIdeas.fr.json | 1 + .../Server/GameIdeas.WebAPI/Program.cs | 2 + 10 files changed, 75 insertions(+), 18 deletions(-) create mode 100644 src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Component.razor diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Component.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Component.razor new file mode 100644 index 0000000..e69de29 diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor.cs index 6d73a76..6d8a405 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Components/Login.razor.cs @@ -1,10 +1,14 @@ +using GameIdeas.BlazorApp.Pages.User.Gateways; using GameIdeas.Shared.Dto; +using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Forms; namespace GameIdeas.BlazorApp.Pages.User.Components; public partial class Login { + [Parameter] public IAuthGateway AuthGateway { get; set; } = default!; + private EditContext? EditContext; private UserDto UserDto = new(); private bool IsLoading = false; @@ -21,9 +25,19 @@ public partial class Login return; } - IsLoading = true; - await Task.Delay(TimeSpan.FromSeconds(5)); - IsLoading = false; + try + { + IsLoading = true; + await AuthGateway.Login(UserDto); + } + catch (Exception) + { + throw; + } + finally + { + IsLoading = false; + StateHasChanged(); + } } - } \ No newline at end of file diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/AuthGateway.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/AuthGateway.cs index f19366e..ea2de5c 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/AuthGateway.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/Gateways/AuthGateway.cs @@ -3,18 +3,19 @@ using GameIdeas.BlazorApp.Shared.Constants; using GameIdeas.BlazorApp.Shared.Exceptions; using GameIdeas.Resources; using GameIdeas.Shared.Dto; +using Microsoft.AspNetCore.Components.Authorization; namespace GameIdeas.BlazorApp.Pages.User.Gateways; public class AuthGateway(IHttpClientService httpClient, - JwtAuthenticationStateProvider stateProvider) : IAuthGateway + AuthenticationStateProvider stateProvider) : IAuthGateway { public async Task Login(UserDto userDto) { try { var token = await httpClient.PostAsync(Endpoints.Auth.Login, userDto); - await stateProvider.NotifyUserAuthenticationAsync(token!.Token!); + await ((JwtAuthenticationStateProvider)stateProvider).NotifyUserAuthenticationAsync(token!.Token!); return true; } catch (Exception) @@ -27,7 +28,7 @@ public class AuthGateway(IHttpClientService httpClient, { try { - await stateProvider.NotifyUserLogoutAsync(); + await ((JwtAuthenticationStateProvider)stateProvider).NotifyUserLogoutAsync(); } catch (Exception) { diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor index cd46546..b069564 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor @@ -1,5 +1,8 @@ -@using GameIdeas.BlazorApp.Shared.Components.BackdropFilter +@using GameIdeas.BlazorApp.Pages.User.Components +@using GameIdeas.BlazorApp.Shared.Components.BackdropFilter @using GameIdeas.BlazorApp.Shared.Constants +@using GameIdeas.Shared.Constants +@using Microsoft.AspNetCore.Components.Authorization
@@ -9,13 +12,36 @@ @if (ContentVisile) {
-
- @ResourcesKey.UserManager -
- -
- @ResourcesKey.Logout -
+ + + +
+ @ResourcesKey.CategoriesManager +
+ + + + + + +
+ @ResourcesKey.UserManager +
+ + + + + + +
+ @ResourcesKey.Logout +
+ + + + + +
}
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor.cs index fca4032..33e6c07 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/User/UserMenu.razor.cs @@ -1,11 +1,19 @@ +using GameIdeas.BlazorApp.Pages.User.Gateways; +using GameIdeas.BlazorApp.Services; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Authorization; + namespace GameIdeas.BlazorApp.Pages.User; public partial class UserMenu { + [Inject] private IAuthGateway AuthGateway { get; set; } = default!; + private bool ContentVisile = false; - private void HandleLogoutClicked() + private async Task HandleLogoutClicked() { + await AuthGateway.Logout(); ContentVisile = false; } diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs index 60ff0f6..647dc15 100644 --- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs +++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Program.cs @@ -5,6 +5,7 @@ using GameIdeas.BlazorApp.Pages.Games.Gateways; using GameIdeas.BlazorApp.Pages.User.Gateways; using GameIdeas.BlazorApp.Services; using GameIdeas.Resources; +using Microsoft.AspNetCore.Components.Authorization; using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; @@ -30,7 +31,7 @@ services.AddHttpClient( services.AddBlazoredLocalStorage(); services.AddAuthorizationCore(); -services.AddScoped(); +services.AddScoped(); services.AddScoped(); diff --git a/src/GameIdeas/GameIdeas.Resources/CreateStaticResourceKey.cs b/src/GameIdeas/GameIdeas.Resources/CreateStaticResourceKey.cs index f6deabc..d2494b2 100644 --- a/src/GameIdeas/GameIdeas.Resources/CreateStaticResourceKey.cs +++ b/src/GameIdeas/GameIdeas.Resources/CreateStaticResourceKey.cs @@ -11,6 +11,7 @@ public class Translations (TranslationService translationService) public string EnterUsername => translationService.Translate(nameof(EnterUsername)); public string EnterPassword => translationService.Translate(nameof(EnterPassword)); public string UserManager => translationService.Translate(nameof(UserManager)); + public string CategoriesManager => translationService.Translate(nameof(CategoriesManager)); public string Filters => translationService.Translate(nameof(Filters)); public string LastAdd => translationService.Translate(nameof(LastAdd)); public string Research => translationService.Translate(nameof(Research)); @@ -72,6 +73,7 @@ public static class ResourcesKey public static string EnterUsername => _instance?.EnterUsername ?? throw new InvalidOperationException("ResourcesKey.EnterUsername is not initialized."); public static string EnterPassword => _instance?.EnterPassword ?? throw new InvalidOperationException("ResourcesKey.EnterPassword is not initialized."); public static string UserManager => _instance?.UserManager ?? throw new InvalidOperationException("ResourcesKey.UserManager is not initialized."); + public static string CategoriesManager => _instance?.CategoriesManager ?? throw new InvalidOperationException("ResourcesKey.CategoriesManager is not initialized."); public static string Filters => _instance?.Filters ?? throw new InvalidOperationException("ResourcesKey.Filters is not initialized."); public static string LastAdd => _instance?.LastAdd ?? throw new InvalidOperationException("ResourcesKey.LastAdd is not initialized."); public static string Research => _instance?.Research ?? throw new InvalidOperationException("ResourcesKey.Research is not initialized."); diff --git a/src/GameIdeas/Server/GameIdeas.WebAPI/Controllers/UserController.cs b/src/GameIdeas/Server/GameIdeas.WebAPI/Controllers/UserController.cs index ca35ecc..8fa1de7 100644 --- a/src/GameIdeas/Server/GameIdeas.WebAPI/Controllers/UserController.cs +++ b/src/GameIdeas/Server/GameIdeas.WebAPI/Controllers/UserController.cs @@ -5,13 +5,15 @@ using Microsoft.AspNetCore.Mvc; namespace GameIdeas.WebAPI.Controllers; +[ApiController] +[Route("api/[controller]")] public class UserController( IUserService userService, ILoggerFactory loggerFactory) : Controller { private readonly ILogger logger = loggerFactory.CreateLogger(); - [HttpPost("login")] + [HttpPost("Login")] public async Task> Login([FromBody] UserDto model) { try diff --git a/src/GameIdeas/Server/GameIdeas.WebAPI/Files/GameIdeas.fr.json b/src/GameIdeas/Server/GameIdeas.WebAPI/Files/GameIdeas.fr.json index 4eaf51b..7296e28 100644 --- a/src/GameIdeas/Server/GameIdeas.WebAPI/Files/GameIdeas.fr.json +++ b/src/GameIdeas/Server/GameIdeas.WebAPI/Files/GameIdeas.fr.json @@ -7,6 +7,7 @@ "EnterUsername": "Nom d'utilisateur", "EnterPassword": "Mot de passe", "UserManager": "Gestion des utilisateurs", + "CategoriesManager": "Gestion des catégories", "Filters": "Les filtres", "LastAdd": "Les ajouts récents", "Research": "Rechercher", diff --git a/src/GameIdeas/Server/GameIdeas.WebAPI/Program.cs b/src/GameIdeas/Server/GameIdeas.WebAPI/Program.cs index 54d780e..a110899 100644 --- a/src/GameIdeas/Server/GameIdeas.WebAPI/Program.cs +++ b/src/GameIdeas/Server/GameIdeas.WebAPI/Program.cs @@ -3,6 +3,7 @@ using GameIdeas.Shared.Model; using GameIdeas.WebAPI.Context; using GameIdeas.WebAPI.Services.Categories; using GameIdeas.WebAPI.Services.Games; +using GameIdeas.WebAPI.Services.Users; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; @@ -63,6 +64,7 @@ services.AddAuthorization(); services.AddSingleton(); services.AddSingleton(); +services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped();