diff options
Diffstat (limited to 'API')
| -rw-r--r-- | API/Controllers/UserController.cs | 5 | ||||
| -rw-r--r-- | API/Migrations/DevHiveContextModelSnapshot.cs | 6 | ||||
| -rw-r--r-- | API/Service/UserService.cs | 11 |
3 files changed, 13 insertions, 9 deletions
diff --git a/API/Controllers/UserController.cs b/API/Controllers/UserController.cs index 8c7a3c3..5b47f1c 100644 --- a/API/Controllers/UserController.cs +++ b/API/Controllers/UserController.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Authorization; namespace API.Controllers { + [Authorize] [ApiController] [Route("/api/[controller]")] public class UserController: ControllerBase @@ -20,6 +21,7 @@ namespace API.Controllers this._service = new UserService(context, mapper); } + [AllowAnonymous] [HttpPost] [Route("login")] public async Task<IActionResult> Login([FromBody] UserDTO userDTO) @@ -29,6 +31,7 @@ namespace API.Controllers //Create + [AllowAnonymous] [HttpPost] public async Task<IActionResult> Create([FromBody] UserDTO userDTO) { @@ -36,8 +39,8 @@ namespace API.Controllers } //Read - [Authorize] [HttpGet] + [Authorize(Roles = "Admin")] public async Task<IActionResult> GetById(int id) { return await this._service.GetUserById(id); diff --git a/API/Migrations/DevHiveContextModelSnapshot.cs b/API/Migrations/DevHiveContextModelSnapshot.cs index eb9d6a4..56b50d9 100644 --- a/API/Migrations/DevHiveContextModelSnapshot.cs +++ b/API/Migrations/DevHiveContextModelSnapshot.cs @@ -126,6 +126,9 @@ namespace API.Migrations b.Property<string>("ProfilePicture") .HasColumnType("text"); + b.Property<string>("Role") + .HasColumnType("text"); + b.Property<string>("SecurityStamp") .HasColumnType("text"); @@ -146,6 +149,9 @@ namespace API.Migrations .IsUnique() .HasDatabaseName("UserNameIndex"); + b.HasIndex("UserName") + .IsUnique(); + b.ToTable("AspNetUsers"); }); diff --git a/API/Service/UserService.cs b/API/Service/UserService.cs index 5d59f61..48f6c6e 100644 --- a/API/Service/UserService.cs +++ b/API/Service/UserService.cs @@ -18,8 +18,6 @@ namespace API.Service private readonly UserDbRepository _userDbRepository; private readonly IMapper _userMapper; - private static Random rnd = new Random(); // FOR TESTING PURPOSES ONLY - public UserService(DevHiveContext context, IMapper mapper) { this._userDbRepository = new UserDbRepository(context); @@ -33,18 +31,15 @@ namespace API.Service User user = this._userMapper.Map<User>(userDTO); - - - - // Key generation - var key = Encoding.ASCII.GetBytes(")H@McQfTB?E(H+Mb8x/A?D(Gr4u7x!A%WnZr4t7weThWmZq4KbPeShVm*G-KaPdSz%C*F-Ja6w9z$C&F"); //Startup.Configuration.GetSection("AppSettings").GetValue("Secret", "bruh")); + // Temporary, TODO: get key from appsettings + var key = Encoding.ASCII.GetBytes(")H@McQfTB?E(H+Mb8x/A?D(Gr4u7x!A%WnZr4t7weThWmZq4KbPeShVm*G-KaPdSz%C*F-Ja6w9z$C&F"); var tokenHandler = new JwtSecurityTokenHandler(); var tokenDescriptor = new SecurityTokenDescriptor { Subject = new ClaimsIdentity(new Claim[] { - new Claim(ClaimTypes.Name, user.Id.ToString()) + new Claim(ClaimTypes.Role, user.Role) }), Expires = DateTime.UtcNow.AddDays(7), SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature) |