feat: User roles

0xCator · May 8, 2024 · c9b1af7 · c9b1af7
1 parent 7350a29
commit c9b1af7
Show file tree

Hide file tree

Showing 8 changed files with 373 additions and 20 deletions.
diff --git a/Controllers/ProjectController.cs b/Controllers/ProjectController.cs
@@ -10,7 +10,6 @@
 
 namespace ia_back.Controllers
 {
-    [Authorize]
     [Route("api/[controller]")]
     [ApiController]
     public class ProjectController : Controller
@@ -28,6 +27,7 @@ public ProjectController(IMapper mapper, IDataRepository<Project> projectReposit
         }
 
 
+        [Authorize]
         [HttpGet]
         public async Task<IActionResult> GetAllProjects()
         {
@@ -43,6 +43,7 @@ public async Task<IActionResult> GetAllProjects()
         }
 
 
+        [Authorize]
         [HttpGet("user/{id}")]
         public async Task<IActionResult> GetProjectsByUser(int id)
         {
@@ -61,6 +62,7 @@ public async Task<IActionResult> GetProjectsByUser(int id)
         }
 
 
+        [Authorize(Roles = "TeamLeader")]
         [HttpPost]
         public async Task<IActionResult> CreateProject(ProjectEntryDTO projectInfo)
         {
@@ -103,6 +105,7 @@ public async Task<IActionResult> CreateProject(ProjectEntryDTO projectInfo)
         }
 
 
+        [Authorize(Roles = "TeamLeader")]
         [HttpDelete("id")]
         public async Task<IActionResult> DeleteProject(int id)
         {
@@ -119,6 +122,7 @@ public async Task<IActionResult> DeleteProject(int id)
         }
 
 
+        [Authorize(Roles = "TeamLeader")]
         [HttpPatch("{id}/{newName}")]
         public async Task<IActionResult> UpdateProjectName(int id, string newName)
         {
@@ -136,6 +140,7 @@ public async Task<IActionResult> UpdateProjectName(int id, string newName)
         }
 
 
+        [Authorize]
         [HttpGet("{id}")]
         public async Task<IActionResult> GetProject(int id)
         {
@@ -156,6 +161,7 @@ public async Task<IActionResult> GetProject(int id)
         }
 
 
+        [Authorize(Roles = "TeamLeader")]
         [HttpPost("{id}/developer/{developerUserName}")]
         public async Task<IActionResult> AssignDeveloperToProject(int id, string developerUserName)
         {
@@ -173,6 +179,10 @@ public async Task<IActionResult> AssignDeveloperToProject(int id, string develop
             {
                 return NotFound("Developer doesn't exist");
             }
+            if (developer.Role != Role.Developer)
+            {
+                return BadRequest("Developer is not a developer");
+            }
             if (project.RequestedDevelopers.Contains(developer) || project.AssignedDevelopers.Contains(developer))
             {
                 return BadRequest("Developer is already in the project");
@@ -192,6 +202,7 @@ public async Task<IActionResult> AssignDeveloperToProject(int id, string develop
         }
 
 
+        [Authorize(Roles = "TeamLeader")]
         [HttpDelete("{id}/developer/{developerUserName}")]
         public async Task<IActionResult> RemoveDeveloperFromProject(int id, string developerUserName)
         {

diff --git a/Controllers/ProjectTaskController.cs b/Controllers/ProjectTaskController.cs
@@ -11,7 +11,6 @@
 
 namespace ia_back.Controllers
 {
-    [Authorize]
     [Route("api/[controller]")]
     [ApiController]
     public class ProjectTaskController : Controller
@@ -32,6 +31,7 @@ public ProjectTaskController(IMapper mapper,
         }
 
 
+        [Authorize]
         [HttpGet("project/{id}")]
         public async Task<IActionResult> GetProjectTasksByProject(int id)
         {
@@ -50,6 +50,7 @@ public async Task<IActionResult> GetProjectTasksByProject(int id)
         }
 
 
+        [Authorize(Roles = "TeamLeader")]
         [HttpPost]
         public async Task<IActionResult> CreateProjectTask(TaskEntryDTO projectTaskInfo)
         {
@@ -92,6 +93,7 @@ public async Task<IActionResult> CreateProjectTask(TaskEntryDTO projectTaskInfo)
         }
 
 
+        [Authorize]
         [HttpGet("{id}")]
         public async Task<IActionResult> GetProjectTask(int id)
         {
@@ -107,6 +109,7 @@ public async Task<IActionResult> GetProjectTask(int id)
         }
 
 
+        [Authorize(Roles = "Developer")]
         [HttpPatch("{id}/status")]
         public async Task<IActionResult> UpdateTaskStatus(int id, ProjectStatus newStatus)
         {
@@ -132,6 +135,8 @@ public async Task<IActionResult> UpdateTaskStatus(int id, ProjectStatus newStatu
             return Ok();
         }
 
+
+        [Authorize(Roles = "TeamLeader")]
         [HttpPatch("{id}")]
         public async Task<IActionResult> UpdateTask(int id, TaskEntryDTO projectTaskInfo)
         {
@@ -177,6 +182,24 @@ public async Task<IActionResult> UpdateTask(int id, TaskEntryDTO projectTaskInfo
         }
 
 
+        [Authorize(Roles = "TeamLeader")]
+        [HttpDelete("{id}")]
+        public async Task<IActionResult> DeleteProjectTask(int id)
+        {
+            var projectTask = await _projectTaskRepository.GetByIdAsync(id);
+            if (projectTask == null)
+            {
+                return NotFound();
+            }
+
+            await _projectTaskRepository.DeleteAsync(projectTask);
+            await _projectTaskRepository.Save();
+
+            return Ok("Task deleted successfully");
+        }
+
+
+        [Authorize(Roles = "Developer")]
         [HttpPost("{id}/UploadAttachment")]
         public async Task<IActionResult> UploadAttachment(int id, [FromForm] IFormFile file)
         {
@@ -210,22 +233,8 @@ public async Task<IActionResult> UploadAttachment(int id, [FromForm] IFormFile f
 
         }
 
-        [HttpDelete("{id}")]
-        public async Task<IActionResult> DeleteProjectTask(int id)
-        {
-            var projectTask = await _projectTaskRepository.GetByIdAsync(id);
-            if (projectTask == null)
-            {
-                return NotFound();
-            }
-
-            await _projectTaskRepository.DeleteAsync(projectTask);
-            await _projectTaskRepository.Save();
-
-            return Ok("Task deleted successfully");
-        }
-
 
+        [Authorize]
         [HttpGet("{id}/AttachmentFile")]
         public async Task<IActionResult> GetAttachmentFile(int id){
             var projectTask = await _projectTaskRepository.GetByIdAsync(id);
@@ -257,6 +266,7 @@ public async Task<IActionResult> GetAttachmentFile(int id){
         }
 
 
+        [Authorize]
         [HttpGet("{id}/AttachmentName")]
         public async Task<IActionResult> GetAttachmentName(int id){
             var projectTask = await _projectTaskRepository.GetByIdAsync(id);

diff --git a/Controllers/UserController.cs b/Controllers/UserController.cs
@@ -70,6 +70,7 @@ private string CreateToken(User user){
             {
                 new Claim(ClaimTypes.Name, user.Username),
                 new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()),
+                new Claim(ClaimTypes.Role, user.Role.ToString()),
                 new Claim(JwtRegisteredClaimNames.Aud, _configuration["Jwt:Audience"]),
                 new Claim(JwtRegisteredClaimNames.Iss, _configuration["Jwt:Issuer"])
             };
@@ -114,7 +115,8 @@ public async Task<IActionResult> Register(RegisterDTO register)
                 Email = register.Email,
                 Username = register.Username,
                 PasswordHash = passwordHash,
-                PasswordSalt = passwordSalt
+                PasswordSalt = passwordSalt,
+                Role = register.Role
             };
 
             await _userRepository.AddAsync(registeringUser);
@@ -133,7 +135,7 @@ private void CreatePasswordHash(string password, out byte[] passwordHash, out by
         }
 
 
-        [Authorize]
+        [Authorize(Roles = "Developer")]
         [HttpPost("acceptRequest")]
         public async Task<IActionResult> AcceptRequest(RequestDTO request)
         {
@@ -158,7 +160,7 @@ public async Task<IActionResult> AcceptRequest(RequestDTO request)
         }
 
 
-        [Authorize]
+        [Authorize(Roles = "Developer")]
         [HttpPost("rejectRequest")]
         public async Task<IActionResult> RejectRequest(RequestDTO request)
         {

diff --git a/DTOs/Login/RegisterDTO.cs b/DTOs/Login/RegisterDTO.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using ia_back.Models;
 
 namespace ia_back.DTOs.Login
 {
@@ -13,5 +14,7 @@ public class RegisterDTO
         public string Username { get; set; }
         [Required]
         public string Password { get; set; }
+        [Required]
+        public Role Role { get; set; }
     }
 }