added AuthenticateResponse model and removed Token prop from User entity

Author: cornflourblue

Controllers/UsersController.cs

@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Authorization;
 using WebApi.Services;
 using WebApi.Models;
-using System.Linq;
 
 namespace WebApi.Controllers
 {
@@ -20,14 +19,14 @@ public UsersController(IUserService userService)
 
         [AllowAnonymous]
         [HttpPost("authenticate")]
-        public IActionResult Authenticate([FromBody]AuthenticateModel model)
+        public IActionResult Authenticate([FromBody]AuthenticateRequest model)
         {
-            var user = _userService.Authenticate(model.Username, model.Password);
+            var response = _userService.Authenticate(model);
 
-            if (user == null)
+            if (response == null)
                 return BadRequest(new { message = "Username or password is incorrect" });
 
-            return Ok(user);
+            return Ok(response);
         }
 
         [HttpGet]

Entities/User.cs

@@ -11,7 +11,5 @@ public class User
 
         [JsonIgnore]
         public string Password { get; set; }
-
-        public string Token { get; set; }
     }
 }

Models/AuthenticateModel.cs renamed to Models/AuthenticateRequest.cs

@@ -2,7 +2,7 @@
 
 namespace WebApi.Models
 {
-    public class AuthenticateModel
+    public class AuthenticateRequest
     {
         [Required]
         public string Username { get; set; }

Models/AuthenticateResponse.cs

@@ -0,0 +1,23 @@
+using WebApi.Entities;
+
+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 string Token { get; set; }
+
+
+        public AuthenticateResponse(User user, string token)
+        {
+            Id = user.Id;
+            FirstName = user.FirstName;
+            LastName = user.LastName;
+            Username = user.Username;
+            Token = token;
+        }
+    }
+}

Services/UserService.cs

@@ -8,12 +8,13 @@
 using Microsoft.IdentityModel.Tokens;
 using WebApi.Entities;
 using WebApi.Helpers;
+using WebApi.Models;
 
 namespace WebApi.Services
 {
     public interface IUserService
     {
-        User Authenticate(string username, string password);
+        AuthenticateResponse Authenticate(AuthenticateRequest model);
         IEnumerable<User> GetAll();
     }
 
@@ -32,15 +33,29 @@ public UserService(IOptions<AppSettings> appSettings)
             _appSettings = appSettings.Value;
         }
 
-        public User Authenticate(string username, string password)
+        public AuthenticateResponse Authenticate(AuthenticateRequest model)
         {
-            var user = _users.SingleOrDefault(x => x.Username == username && x.Password == password);
+            var user = _users.SingleOrDefault(x => x.Username == model.Username && x.Password == model.Password);
 
             // return null if user not found
-            if (user == null)
-                return null;
+            if (user == null) return null;
 
             // authentication successful so generate jwt token
+            var token = generateJwtToken(user);
+
+            return new AuthenticateResponse(user, token);
+        }
+
+        public IEnumerable<User> GetAll()
+        {
+            return _users;
+        }
+
+        // helper methods
+
+        private string generateJwtToken(User user)
+        {
+            // generate token that is valid for 7 days
             var tokenHandler = new JwtSecurityTokenHandler();
             var key = Encoding.ASCII.GetBytes(_appSettings.Secret);
             var tokenDescriptor = new SecurityTokenDescriptor
@@ -53,14 +68,7 @@ public User Authenticate(string username, string password)
                 SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
             };
             var token = tokenHandler.CreateToken(tokenDescriptor);
-            user.Token = tokenHandler.WriteToken(token);
-
-            return user;
-        }
-
-        public IEnumerable<User> GetAll()
-        {
-            return _users;
+            return tokenHandler.WriteToken(token);
         }
     }
 }