authenticate changes

Controllers/UsersController.cs

@@ -31,7 +31,8 @@ public IActionResult Authenticate(AuthenticateRequest model)
     [HttpGet]
     public IActionResult GetAll()
     {
-        var users = _userService.GetAll();
-        return Ok(users);
+        //var users = _userService.GetAll();
+        var v = HttpContext.Items["Token"];
+        return Ok(v);
     }
 }

Helpers/JwtMiddleware.cs

@@ -45,9 +45,16 @@ private void attachUserToContext(HttpContext context, IUserService userService,
 
             var jwtToken = (JwtSecurityToken)validatedToken;
             var userId = int.Parse(jwtToken.Claims.First(x => x.Type == "id").Value);
-
+            var userName = jwtToken.Claims.First(x => x.Type == "username").Value;
+            var tokenExpireat=jwtToken.ValidTo;
+              System.Collections.Hashtable ht=new System.Collections.Hashtable();
+            ht.Add("userId", userId);
+            ht.Add("userName", userName);
+            ht.Add("tokenExpireat", tokenExpireat);
+            context.Items["Token"] = ht;
             // attach user to context on successful jwt validation
             context.Items["User"] = userService.GetById(userId);
+
         }
         catch
         {

Models/AuthenticateResponse.cs

@@ -4,19 +4,19 @@ namespace WebApi.Models;
 
 public class AuthenticateResponse
 {
-    public int Id { get; set; }
-    public string FirstName { get; set; }
-    public string LastName { get; set; }
-    public string Username { get; set; }
+    //public int Id { get; set; }
+    //public string FirstName { get; set; }
+    //public string LastName { get; set; }
+    //public string Username { get; set; }
     public string Token { get; set; }
 
 
-    public AuthenticateResponse(User user, string token)
+    public AuthenticateResponse(/*User user,*/ string token)
     {
-        Id = user.Id;
-        FirstName = user.FirstName;
-        LastName = user.LastName;
-        Username = user.Username;
+        //Id = user.Id;
+        //FirstName = user.FirstName;
+        //LastName = user.LastName;
+        //Username = user.Username;
         Token = token;
     }
 }

Program.cs

@@ -14,13 +14,15 @@
 
     // configure DI for application services
     services.AddScoped<IUserService, UserService>();
+
 }
 
 var app = builder.Build();
 
 // configure HTTP request pipeline
 {
     // global cors policy
+
     app.UseCors(x => x
         .AllowAnyOrigin()
         .AllowAnyMethod()

Services/UserService.cs

@@ -41,7 +41,7 @@ public AuthenticateResponse Authenticate(AuthenticateRequest model)
         // authentication successful so generate jwt token
         var token = generateJwtToken(user);
 
-        return new AuthenticateResponse(user, token);
+        return new AuthenticateResponse(token);
     }
 
     public IEnumerable<User> GetAll()
@@ -63,8 +63,8 @@ private string generateJwtToken(User user)
         var key = Encoding.ASCII.GetBytes(_appSettings.Secret);
         var tokenDescriptor = new SecurityTokenDescriptor
         {
-            Subject = new ClaimsIdentity(new[] { new Claim("id", user.Id.ToString()) }),
-            Expires = DateTime.UtcNow.AddDays(7),
+            Subject = new ClaimsIdentity(new[] { new Claim("id", user.Id.ToString()), new Claim("username", user.Username.ToString()) }),
+            Expires = DateTime.UtcNow.AddHours(1),
             SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
         };
         var token = tokenHandler.CreateToken(tokenDescriptor);