✨ refactoring login function

Loginfunction

Author: neozhu

src/Application/Common/Interfaces/Identity/IIdentityService.cs

@@ -11,7 +11,7 @@ namespace CleanArchitecture.Blazor.Application.Common.Interfaces.Identity;
 public interface IIdentityService : IService
 {
     Task<Result<TokenResponse>> LoginAsync(TokenRequest request, CancellationToken cancellation = default);
-    Task<string> GenerateJwtAsync(ApplicationUser user);
+    Task<TokenResponse> GenerateJwtAsync(ApplicationUser user);
     Task<Result<TokenResponse>> RefreshTokenAsync(RefreshTokenRequest request, CancellationToken cancellation = default);
     Task<ClaimsPrincipal> GetClaimsPrincipal(string token);
     Task<string?> GetUserNameAsync(string userId, CancellationToken cancellation = default);

src/Blazor.Server.UI/Pages/Authentication/Login.razor

@@ -2,6 +2,8 @@
 @inject AccessTokenProvider TokenProvider
 @inject IJSRuntime JS
 @inherits OwningComponentBase
+@using CleanArchitecture.Blazor.Application.Common.Interfaces.Identity;
+@using CleanArchitecture.Blazor.Application.Common.Interfaces.Identity.DTOs;
 @using CleanArchitecture.Blazor.Infrastructure.Services.JWT
 @using Microsoft.AspNetCore.DataProtection
 @using CleanArchitecture.Blazor.Application.Common.Security
@@ -93,6 +95,8 @@
 
     [Inject]
     protected NavigationManager NavigationManager { get; set; } = null!;
+    [Inject]
+    protected IIdentityService _identityService { get; set; } = null!;
 
     private LoginFormModel _model = new()
     {
@@ -147,9 +151,18 @@
                         }
                         else
                         {
-                            await TokenProvider.GenerateJwt(user);
-                            NavigationManager.NavigateTo(NavigationManager.Uri, true);
-                            Logger.LogInformation("{@UserName:l} has successfully logged in", user.UserName);
+                            var tokenresponse = await _identityService.LoginAsync(new TokenRequest() { UserName=_model.UserName,Password=_model.Password, RememberMe = _model.RememberMe });
+                            if (tokenresponse.Succeeded && tokenresponse.Data is not null)
+                            {
+                                await TokenProvider.SaveToken(tokenresponse.Data);
+                                NavigationManager.NavigateTo(NavigationManager.Uri, true);
+                                Logger.LogInformation("{@UserName:l} has successfully logged in", user.UserName);
+                            }
+                            else
+                            {
+                                Snackbar.Add(tokenresponse.ErrorMessage, Severity.Error);
+                            }
+                            
                         }
                     }
                 }

src/Infrastructure/Services/Identity/IdentityService.cs

@@ -173,7 +173,7 @@ private string GenerateRefreshToken()
         rng.GetBytes(randomNumber);
         return Convert.ToBase64String(randomNumber);
     }
-    public async Task<string> GenerateJwtAsync(ApplicationUser user)
+    public async Task<TokenResponse> GenerateJwtAsync(ApplicationUser user)
     {
         var principal = await _userClaimsPrincipalFactory.CreateAsync(user);
         var token = GenerateEncryptedToken(GetSigningCredentials(), principal.Claims);

src/Infrastructure/Services/JWT/AccessTokenProvider.cs

@@ -1,4 +1,5 @@
 using System.Security.Cryptography;
+using CleanArchitecture.Blazor.Application.Common.Interfaces.Identity.DTOs;
 using CleanArchitecture.Blazor.Application.Common.Interfaces.MultiTenant;
 using CleanArchitecture.Blazor.Infrastructure.Extensions;
 using Microsoft.AspNetCore.Components;
@@ -8,12 +9,14 @@ namespace CleanArchitecture.Blazor.Infrastructure.Services.JWT;
 public class AccessTokenProvider
 {
     private readonly string _tokenKey = nameof(_tokenKey);
+    private readonly string _refreshTokenKey = nameof(_refreshTokenKey);
     private readonly ProtectedLocalStorage _localStorage;
     private readonly NavigationManager _navigation;
     private readonly IIdentityService _identityService;
     private readonly ITenantProvider _tenantProvider;
     private readonly ICurrentUserService _currentUser;
     public string? AccessToken { get; private set; }
+    public string? RefreshToken { get; private set; }
 
     public AccessTokenProvider(ProtectedLocalStorage localStorage, NavigationManager navigation, IIdentityService identityService,
         ITenantProvider tenantProvider,
@@ -27,15 +30,34 @@ public AccessTokenProvider(ProtectedLocalStorage localStorage, NavigationManager
     }
     public async Task GenerateJwt(ApplicationUser applicationUser)
     {
-        AccessToken = await _identityService.GenerateJwtAsync(applicationUser);
-        await _localStorage.SetAsync(_tokenKey, AccessToken);
+        var token = await _identityService.GenerateJwtAsync(applicationUser,true);
+        await _localStorage.SetAsync(_tokenKey, token.Token);
+        await _localStorage.SetAsync(_refreshTokenKey, token.RefreshToken);
         _tenantProvider.TenantId = applicationUser.TenantId;
         _tenantProvider.TenantName = applicationUser.TenantName;
         _currentUser.UserId = applicationUser.Id;
         _currentUser.UserName = applicationUser.UserName;
         _currentUser.TenantId = applicationUser.TenantId;
         _currentUser.TenantName = applicationUser.TenantName;
 
+    }
+    public async Task SaveToken(TokenResponse token)
+    {
+        AccessToken = token.Token;
+        RefreshToken = token.RefreshToken;
+        await _localStorage.SetAsync(_tokenKey, AccessToken);
+        await _localStorage.SetAsync(_refreshTokenKey, RefreshToken);
+        var principal = await _identityService.GetClaimsPrincipal(token.Token);
+        if (principal?.Identity?.IsAuthenticated ?? false)
+        {
+            _tenantProvider.TenantId = principal?.GetTenantId();
+            _tenantProvider.TenantName = principal?.GetTenantName();
+            _currentUser.UserId = principal?.GetUserId();
+            _currentUser.UserName = principal?.GetUserName();
+            _currentUser.TenantId = principal?.GetTenantId();
+            _currentUser.TenantName = principal?.GetTenantId();
+        }
+
     }
     public async Task<ClaimsPrincipal> GetClaimsPrincipal()
     {
@@ -45,6 +67,8 @@ public async Task<ClaimsPrincipal> GetClaimsPrincipal()
             if (token.Success && !string.IsNullOrEmpty(token.Value))
             {
                 AccessToken = token.Value;
+                var refreshToken = await _localStorage.GetAsync<string>(_refreshTokenKey);
+                RefreshToken = refreshToken.Value;
                 var principal = await _identityService.GetClaimsPrincipal(token.Value);
                 if (principal?.Identity?.IsAuthenticated ?? false)
                 {