(B) Modify JWT provider and login response

Clinics.Backend/Application/Abstractions/JWT/IJWTProvider.cs

 using Domain.Entities.Identity.Users;
+using Domain.Entities.People.Shared;
 
 namespace Application.Abstractions.JWT;
 
 public interface IJWTProvider
 {
-    string Generate(User user);
+    string Generate(User user, PersonalInfo? personalInfo = null);
 }

Clinics.Backend/Application/Users/Commands/Login/LoginCommandHandler.cs

@@ -33,37 +33,38 @@ public class LoginCommandHandler : CommandHandlerBase<LoginCommand, LoginRespons
             return Result.Failure<LoginResponse>(IdentityErrors.PasswordMismatch);
         #endregion
 
-        #region 2. Generate JWT
         User user = loginResult.Value!;
-        string token = _jwtProvider.Generate(user);
-        #endregion
 
-        #region 3. Generate Response
+        #region 2. Generate Response
 
-        #region 3.1. Admin
+        #region 2.1. Admin
         if (user.Role == Roles.Admin)
         {
-            return LoginResponse.GetResponse(user, token);
+            var token = _jwtProvider.Generate(user);
+            return LoginResponse.GetResponse(token);
         }
         #endregion
 
-        #region 3.2. Doctor
+        #region 2.2. Doctor
         if (user.Role == Roles.Doctor)
         {
             var doctorUserResult = await _userRepository.GetDoctorUserByUserNameFullAsync(user.UserName);
             if (doctorUserResult.IsFailure)
                 return Result.Failure<LoginResponse>(doctorUserResult.Error);
-            return LoginResponse.GetResponse(doctorUserResult.Value.User, token, doctorUserResult.Value.Doctor.PersonalInfo);
+
+            var token = _jwtProvider.Generate(user, doctorUserResult.Value.Doctor.PersonalInfo);
+            return LoginResponse.GetResponse(token);
         }
         #endregion
 
-        #region 3.3. Receptionist user
+        #region 2.3. Receptionist user
         if (user.Role == Roles.Receptionist)
         {
             var receptionistUser = await _userRepository.GetReceptionistUserByUserNameFullAsync(user.UserName);
             if (receptionistUser.IsFailure)
                 return Result.Failure<LoginResponse>(receptionistUser.Error);
-            return LoginResponse.GetResponse(receptionistUser.Value.User, token, receptionistUser.Value.PersonalInfo);
+            var token = _jwtProvider.Generate(user, receptionistUser.Value.PersonalInfo);
+            return LoginResponse.GetResponse(token);
         }
 
         #endregion

Clinics.Backend/Application/Users/Commands/Login/LoginResponse.cs

@@ -8,27 +8,16 @@ namespace Application.Users.Commands.Login;
 
 public class LoginResponse
 {
-    public int Id { get; set; }
-    public string UserName { get; set; } = null!;
     public string JWT { get; set; } = null!;
-    public string FullName { get; set; } = null!;
 
-    public static Result<LoginResponse> GetResponse(User user, string jwt, PersonalInfo? personalInfo = null)
+    public static Result<LoginResponse> GetResponse(string jwt)
     {
+        if (jwt is null)
+            return Result.Failure< LoginResponse>(IdentityErrors.NotFound);
         var response = new LoginResponse
         {
-            Id = user.Id,
-            UserName = user.UserName,
             JWT = jwt
         };
-        if (personalInfo is null)
-        {
-            if (user.Role != Roles.Admin)
-                return Result.Failure<LoginResponse>(IdentityErrors.NotFound);
-            response.FullName = Roles.AdminName;
-            return response;
-        }
-        response.FullName = personalInfo.FullName;
         return response;
     }
 }

Clinics.Backend/Persistence/Identity/Authentication/JWT/JWTProvider.cs

 using Application.Abstractions.JWT;
 using Domain.Entities.Identity.Users;
+using Domain.Entities.People.Shared;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using System.IdentityModel.Tokens.Jwt;
@@ -17,15 +18,20 @@ public sealed class JWTProvider : IJWTProvider
         _options = options.Value;
     }
 
-    public string Generate(User user)
+    public string Generate(User user, PersonalInfo? personalInfo = null)
     {
-        var claims = new Claim[]
+        var claims = new List<Claim>
         {
+            new("Id", user.Id.ToString()),
             new(ClaimTypes.Name, user.UserName),
             new(ClaimTypes.Role, user.Role.Name)
-
         };
 
+        if (personalInfo is not null)
+        {
+            claims.Add(new Claim("FullName", personalInfo.FullName));
+        }
+
         var signingCredentials = new SigningCredentials(
             new SymmetricSecurityKey(
             Encoding.UTF8.GetBytes(_options.SecretKey)),
@@ -34,7 +40,7 @@ public sealed class JWTProvider : IJWTProvider
         var token = new JwtSecurityToken(
             _options.Issuer,
             _options.Audience,
-            claims,
+            claims.ToArray(),
             null,
             DateTime.UtcNow.AddDays(30),
             signingCredentials);