Updated to .net 6.0 and now performance is more good

evgomes · Nov 7, 2022 · efb1676 · efb1676
1 parent b6400f3
commit efb1676
Show file tree

Hide file tree

Showing 40 changed files with 732 additions and 846 deletions.
diff --git a/src/JWTAPI/JWTAPI/Controllers/LoginController.cs b/src/JWTAPI/JWTAPI/Controllers/LoginController.cs
@@ -31,31 +31,25 @@ public async Task<IActionResult> LoginAsync(
     }
 
     [HttpPost("token/refresh")]
-    public async Task<IActionResult> RefreshTokenAsync([FromBody] RefreshTokenResource refreshTokenResource)
+    public async Task<IActionResult> RefreshTokenAsync(
+        [FromBody] RefreshTokenResource refreshTokenResource)
     {
-        if (!ModelState.IsValid)
-        {
-            return BadRequest(ModelState);
-        }
-
-        var response = await _authenticationService.RefreshTokenAsync(refreshTokenResource.Token, refreshTokenResource.UserEmail);
+        var response = await _authenticationService
+            .RefreshTokenAsync(refreshTokenResource.Token, refreshTokenResource.UserEmail);
+
         if (!response.Success)
         {
             return BadRequest(response.Message);
         }
 
         var tokenResource = _mapper.Map<AccessToken, AccessTokenResource>(response.Token);
+
         return Ok(tokenResource);
     }
 
     [HttpPost("token/revoke")]
     public IActionResult RevokeToken([FromBody] RevokeTokenResource resource)
     {
-        if (!ModelState.IsValid)
-        {
-            return BadRequest(ModelState);
-        }
-
         _authenticationService.RevokeRefreshToken(resource.Token, resource.Email);
         return NoContent();
     }

diff --git a/src/JWTAPI/JWTAPI/Controllers/ProtectedController.cs b/src/JWTAPI/JWTAPI/Controllers/ProtectedController.cs
@@ -1,25 +1,22 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
+namespace JWTAPI.Controllers;
 
-namespace JWTAPI.Controllers
+[ApiController]
+[Route("api/protected")]
+public class ProtectedController : ControllerBase
 {
-    [ApiController]
-    public class ProtectedController : Controller
+    [HttpGet]
+    [Authorize]
+    [Route("for-commonusers")]
+    public IActionResult GetProtectedData()
     {
-        [HttpGet]
-        [Authorize]
-        [Route("/api/protectedforcommonusers")]
-        public IActionResult GetProtectedData()
-        {
-            return Ok("Hello world from protected controller.");
-        }
+        return Ok("Hello world from protected controller.");
+    }
 
-        [HttpGet]
-        [Authorize(Roles = "Administrator")]
-        [Route("/api/protectedforadministrators")]
-        public IActionResult GetProtectedDataForAdmin()
-        {
-            return Ok("Hello admin!");
-        }
+    [HttpGet]
+    [Authorize(Roles = "Administrator")]
+    [Route("for-administrators")]
+    public IActionResult GetProtectedDataForAdmin()
+    {
+        return Ok("Hello admin!");
     }
 }
diff --git a/src/JWTAPI/JWTAPI/Controllers/Resources/RefreshTokenResource.cs b/src/JWTAPI/JWTAPI/Controllers/Resources/RefreshTokenResource.cs
@@ -1,15 +1,11 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace JWTAPI.Controllers.Resources
+namespace JWTAPI.Controllers.Resources;
+public class RefreshTokenResource
 {
-    public class RefreshTokenResource
-    {
-        [Required]
-        public string Token { get; set; }
+    [Required]
+    public string Token { get; set; }
 
-        [Required]
-        [DataType(DataType.EmailAddress)]
-        [StringLength(255)]
-        public string UserEmail { get; set; }
-    }
+    [Required]
+    [EmailAddress]
+    [StringLength(255)]
+    public string UserEmail { get; set; }
 }
diff --git a/src/JWTAPI/JWTAPI/Controllers/Resources/RevokeTokenResource.cs b/src/JWTAPI/JWTAPI/Controllers/Resources/RevokeTokenResource.cs
@@ -1,13 +1,9 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace JWTAPI.Controllers.Resources
+namespace JWTAPI.Controllers.Resources;
+public class RevokeTokenResource
 {
-    public class RevokeTokenResource
-    {
-        [Required]
-        public string Token { get; set; }
+    [Required]
+    public string Token { get; set; }
 
-		[Required]
-		public string Email { get; set; }
-	}
+    [Required]
+    public string Email { get; set; }
 }
diff --git a/src/JWTAPI/JWTAPI/Controllers/Resources/TokenResource.cs b/src/JWTAPI/JWTAPI/Controllers/Resources/TokenResource.cs
@@ -1,9 +1,7 @@
-namespace JWTAPI.Controllers.Resources
+namespace JWTAPI.Controllers.Resources;
+public class AccessTokenResource
 {
-    public class AccessTokenResource
-    {
-        public string AccessToken { get; set; }
-        public string RefreshToken { get; set; }
-        public long Expiration { get; set; }
-    }
+    public string AccessToken { get; set; }
+    public string RefreshToken { get; set; }
+    public long Expiration { get; set; }
 }
diff --git a/src/JWTAPI/JWTAPI/Controllers/Resources/UserCredentialsResource.cs b/src/JWTAPI/JWTAPI/Controllers/Resources/UserCredentialsResource.cs
@@ -1,5 +1,4 @@
 namespace JWTAPI.Controllers.Resources;
-
 public class UserCredentialsResource
 {
     [Required]

diff --git a/src/JWTAPI/JWTAPI/Controllers/Resources/UserResource.cs b/src/JWTAPI/JWTAPI/Controllers/Resources/UserResource.cs
@@ -1,11 +1,7 @@
-using System.Collections.Generic;
-
-namespace JWTAPI.Controllers.Resources
+namespace JWTAPI.Controllers.Resources;
+public class UserResource
 {
-    public class UserResource
-    {
-        public int Id { get; set; }
-        public string Email { get; set; }
-        public IEnumerable<string> Roles { get; set; }
-    }
+    public int Id { get; set; }
+    public string Email { get; set; }
+    public IEnumerable<string> Roles { get; set; }
 }
diff --git a/src/JWTAPI/JWTAPI/Controllers/UsersController.cs b/src/JWTAPI/JWTAPI/Controllers/UsersController.cs
@@ -1,42 +1,33 @@
-using AutoMapper;
-using JWTAPI.Controllers.Resources;
-using JWTAPI.Core.Models;
-using JWTAPI.Core.Services;
-using Microsoft.AspNetCore.Mvc;
+namespace JWTAPI.Controllers;
 
-namespace JWTAPI.Controllers
+[ApiController]
+[Route("/api/users")]
+public class UsersController : ControllerBase
 {
-    [ApiController]
-    [Route("/api/[controller]")]
-    public class UsersController : Controller
+    private readonly IMapper _mapper;
+    private readonly IUserService _userService;
+
+    public UsersController(IUserService userService, IMapper mapper)
     {
-        private readonly IMapper _mapper;
-        private readonly IUserService _userService;
+        _userService = userService;
+        _mapper = mapper;
+    }
 
-        public UsersController(IUserService userService, IMapper mapper)
-        {
-            _userService = userService;
-            _mapper = mapper;
-        }
+    [HttpPost]
+    public async Task<IActionResult> CreateUserAsync(
+        [FromBody] UserCredentialsResource userCredentials)
+    {
+        var user = _mapper.Map<UserCredentialsResource, User>(userCredentials);
+
+        var response = await _userService.CreateUserAsync(user, ApplicationRole.Common);
 
-        [HttpPost]
-        public async Task<IActionResult> CreateUserAsync([FromBody] UserCredentialsResource userCredentials)
+        if (!response.Success)
         {
-            if (!ModelState.IsValid)
-            {
-                return BadRequest(ModelState);
-            }
+            return BadRequest(response.Message);
+        }
 
-            var user = _mapper.Map<UserCredentialsResource, User>(userCredentials);
-
-            var response = await _userService.CreateUserAsync(user, ApplicationRole.Common);
-            if(!response.Success)
-            {
-                return BadRequest(response.Message);
-            }
+        var userResource = _mapper.Map<User, UserResource>(response.User);
 
-            var userResource = _mapper.Map<User, UserResource>(response.User);
-            return Ok(userResource);
-        }
+        return Ok(userResource);
     }
 }
diff --git a/src/JWTAPI/JWTAPI/Core/Models/ApplicationRole.cs b/src/JWTAPI/JWTAPI/Core/Models/ApplicationRole.cs
@@ -1,8 +1,6 @@
-namespace JWTAPI.Core.Models
+namespace JWTAPI.Core.Models;
+public enum ApplicationRole
 {
-    public enum ApplicationRole
-    {
-        Common = 1,
-        Administrator = 2
-    }
+    Common = 1,
+    Administrator = 2
 }
diff --git a/src/JWTAPI/JWTAPI/Core/Models/Role.cs b/src/JWTAPI/JWTAPI/Core/Models/Role.cs
@@ -1,16 +1,11 @@
-using System.Collections.ObjectModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace JWTAPI.Core.Models
+namespace JWTAPI.Core.Models;
+public class Role
 {
-    public class Role
-    {
-        public int Id { get; set; }
+    public int Id { get; set; }
 
-        [Required]
-        [StringLength(50)]
-        public string Name { get; set; }
+    [Required]
+    [StringLength(50)]
+    public string Name { get; set; }
 
-        public ICollection<UserRole> UsersRole { get; set; } = new Collection<UserRole>();
-    }
+    public virtual ICollection<UserRole> UsersRole { get; set; } = new Collection<UserRole>();
 }
diff --git a/src/JWTAPI/JWTAPI/Core/Models/User.cs b/src/JWTAPI/JWTAPI/Core/Models/User.cs
@@ -1,20 +1,15 @@
-using System.Collections.ObjectModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace JWTAPI.Core.Models
+namespace JWTAPI.Core.Models;
+public class User
 {
-    public class User
-    {
-        public int Id { get; set; }
+    public int Id { get; set; }
 
-        [Required]
-        [DataType(DataType.EmailAddress)]
-        [StringLength(255)]
-        public string Email { get; set; }
+    [Required]
+    [EmailAddress]
+    [StringLength(255)]
+    public string Email { get; set; }
 
-        [Required]
-        public string Password { get; set; }
+    [Required]
+    public string Password { get; set; }
 
-        public ICollection<UserRole> UserRoles { get; set; } = new Collection<UserRole>();
-    }
+    public ICollection<UserRole> UserRoles { get; set; } = new Collection<UserRole>();
 }
diff --git a/src/JWTAPI/JWTAPI/Core/Models/UserRole.cs b/src/JWTAPI/JWTAPI/Core/Models/UserRole.cs
@@ -1,14 +1,11 @@
-using System.ComponentModel.DataAnnotations.Schema;
+namespace JWTAPI.Core.Models;
 
-namespace JWTAPI.Core.Models
+[Table("UserRoles")]
+public class UserRole
 {
-    [Table("UserRoles")]
-    public class UserRole
-    {
-        public int UserId { get; set; }
-        public User User { get; set; }
+    public int UserId { get; set; }
+    public User User { get; set; }
 
-        public int RoleId { get; set; }
-        public Role Role { get; set; }
-    }
+    public int RoleId { get; set; }
+    public Role Role { get; set; }
 }
diff --git a/src/JWTAPI/JWTAPI/Core/Repositories/IUnitOfWork.cs b/src/JWTAPI/JWTAPI/Core/Repositories/IUnitOfWork.cs
@@ -1,7 +1,5 @@
-namespace JWTAPI.Core.Repositories
+namespace JWTAPI.Core.Repositories;
+public interface IUnitOfWork
 {
-    public interface IUnitOfWork
-    {
-         Task CompleteAsync();
-    }
+     Task CompleteAsync();
 }
diff --git a/src/JWTAPI/JWTAPI/Core/Repositories/IUserRepository.cs b/src/JWTAPI/JWTAPI/Core/Repositories/IUserRepository.cs
@@ -1,10 +1,6 @@
-using JWTAPI.Core.Models;
-
-namespace JWTAPI.Core.Repositories
+namespace JWTAPI.Core.Repositories;
+public interface IUserRepository
 {
-    public interface IUserRepository
-    {
-        Task AddAsync(User user, ApplicationRole[] userRoles);
-        Task<User> FindByEmailAsync(string email);
-    }
+    Task AddAsync(User user, ApplicationRole[] userRoles);
+    Task<User> FindByEmailAsync(string email);
 }
diff --git a/src/JWTAPI/JWTAPI/Core/Security/Hashing/IPasswordHasher.cs b/src/JWTAPI/JWTAPI/Core/Security/Hashing/IPasswordHasher.cs
@@ -1,8 +1,6 @@
-namespace JWTAPI.Core.Security.Hashing
+namespace JWTAPI.Core.Security.Hashing;
+public interface IPasswordHasher
 {
-    public interface IPasswordHasher
-    {
-        string HashPassword(string password);
-        bool PasswordMatches(string providedPassword, string passwordHash);
-    }
+    string HashPassword(string password);
+    bool PasswordMatches(string providedPassword, string passwordHash);
 }
diff --git a/src/JWTAPI/JWTAPI/Core/Security/Tokens/AccessToken.cs b/src/JWTAPI/JWTAPI/Core/Security/Tokens/AccessToken.cs
@@ -1,15 +1,11 @@
-namespace JWTAPI.Core.Security.Tokens
+namespace JWTAPI.Core.Security.Tokens;
+public class AccessToken : JsonWebToken
 {
-    public class AccessToken : JsonWebToken
-    {
-        public RefreshToken RefreshToken { get; private set; }
+    public RefreshToken RefreshToken { get; private set; }
 
-        public AccessToken(string token, long expiration, RefreshToken refreshToken) : base(token, expiration)
-        {
-            if(refreshToken == null)
-                throw new ArgumentException("Specify a valid refresh token.");
-
-            RefreshToken = refreshToken;
-        }
+    public AccessToken(string token, long expiration, RefreshToken refreshToken) : base(token, expiration)
+    {
+        RefreshToken = refreshToken 
+            ?? throw new ArgumentException("Specify a valid refresh token.");
     }
 }