Updated access token payloads

- Removed user details in login response

Author: jioo

src/Api/Features/Auth/GenerateAccessToken.cs

@@ -18,16 +18,16 @@ public class Command : IRequest<LoginResponse>
             public Command(
                 ClaimsIdentity claimsIdentity,
                 EmployeeViewModel employee,
-                string uername)
+                string userName)
             {
                 ClaimsIdentity = claimsIdentity;
                 Employee = employee;
-                Uername = uername;
+                UserName = userName;
             }
 
             public ClaimsIdentity ClaimsIdentity { get; }
             public EmployeeViewModel Employee { get; }
-            public string Uername { get; }
+            public string UserName { get; }
         }
 
         public class CommandHandler : IRequestHandler<Command, LoginResponse>
@@ -46,16 +46,7 @@ public async Task<LoginResponse> Handle(Command request, CancellationToken cance
                 {
                     return new LoginResponse
                     {
-                        User = new UserDetails
-                        {
-                            EmployeeId = (request.Employee.Id != Guid.Empty) ? request.Employee.Id: Guid.Empty,
-                            FullName = request.Employee.FullName,
-                            UserName = request.Uername,
-                            Roles = request.ClaimsIdentity.Claims.Where(c => c.Type == ClaimTypes.Role)
-                                .Select(c => c.Value)
-                                .ToList()
-                        },
-                        AccessToken = await GenerateEncodedToken(request.Uername, request.ClaimsIdentity),
+                        AccessToken = await GenerateEncodedToken(request, request.ClaimsIdentity),
                         ExpiresIn = (int) _jwtOptions.ValidFor.TotalSeconds
                     };
                 }
@@ -66,11 +57,13 @@ public async Task<LoginResponse> Handle(Command request, CancellationToken cance
                 }
             }
 
-            public async Task<string> GenerateEncodedToken(string userName, ClaimsIdentity identity)
+            public async Task<string> GenerateEncodedToken(Command request, ClaimsIdentity identity)
             {
                 var claims = new[]
                 {
-                    new Claim(JwtRegisteredClaimNames.Sub, userName),
+                    new Claim(JwtRegisteredClaimNames.Sub, request.UserName),
+                    new Claim("full_name", request.Employee.FullName),
+                    new Claim("employee_id", request.Employee.Id.ToString()),
                     new Claim(JwtRegisteredClaimNames.Jti, await _jwtOptions.JtiGenerator()),
                     new Claim(JwtRegisteredClaimNames.Iat, Extensions.ToUnixEpochDate(_jwtOptions.IssuedAt).ToString(), ClaimValueTypes.Integer64),
                     identity.FindFirst(ClaimTypes.Role)
@@ -83,7 +76,8 @@ public async Task<string> GenerateEncodedToken(string userName, ClaimsIdentity i
                     claims: claims,
                     notBefore: _jwtOptions.NotBefore,
                     expires: _jwtOptions.Expiration,
-                    signingCredentials: _jwtOptions.SigningCredentials);
+                    signingCredentials: _jwtOptions.SigningCredentials
+                );
 
                 var encodedJwt = new JwtSecurityTokenHandler().WriteToken(jwt);
 

src/Api/Features/Auth/LoginResponse.cs

@@ -6,25 +6,10 @@ namespace WebApi.Features.Auth
 {
     public class LoginResponse
     {
-        [JsonProperty("user")]
-        public UserDetails User { get; set; }
-
         [JsonProperty("access_token")]
         public string AccessToken { get; set; }
 
         [JsonProperty("expires_in")]
         public int ExpiresIn { get; set; }
     }
-
-    public class UserDetails
-    {
-        [JsonProperty("empId")]
-        public Guid EmployeeId { get; set; }
-        [JsonProperty("fullName")]
-        public string FullName { get; set; }
-        [JsonProperty("username")]
-        public string UserName { get; set; }
-        [JsonProperty("roles")]
-        public List<string> Roles { get; set; }
-    }
 }