From 1f8d51c5393ea2f413de4f3e05f77d360d096ff3 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Sat, 23 Jan 2021 16:01:05 +0200
Subject: The beginning of role based authorization

---
 src/DevHive.Services/Configurations/Mapping/RoleMapings.cs          | 1 +
 src/DevHive.Services/Interfaces/IRoleService.cs                     | 2 +-
 src/DevHive.Services/Models/Identity/Role/CreateRoleServiceModel.cs | 4 ----
 src/DevHive.Services/Services/RoleService.cs                        | 3 +--
 src/DevHive.Services/Services/UserService.cs                        | 2 ++
 5 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/DevHive.Services')

diff --git a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
index d6c8511..5f9452f 100644
--- a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
@@ -8,6 +8,7 @@ namespace DevHive.Services.Configurations.Mapping
 	{
 		public RoleMappings()
 		{
+			CreateMap<CreateRoleServiceModel, Role>();
 			CreateMap<RoleServiceModel, Role>();
 			CreateMap<UpdateRoleServiceModel, Role>();
 
diff --git a/src/DevHive.Services/Interfaces/IRoleService.cs b/src/DevHive.Services/Interfaces/IRoleService.cs
index fd661be..3a498d2 100644
--- a/src/DevHive.Services/Interfaces/IRoleService.cs
+++ b/src/DevHive.Services/Interfaces/IRoleService.cs
@@ -6,7 +6,7 @@ namespace DevHive.Services.Interfaces
 {
     public interface IRoleService
 	{
-		Task<Guid> CreateRole(RoleServiceModel roleServiceModel);
+		Task<Guid> CreateRole(CreateRoleServiceModel roleServiceModel);
 
 		Task<RoleServiceModel> GetRoleById(Guid id);
 
diff --git a/src/DevHive.Services/Models/Identity/Role/CreateRoleServiceModel.cs b/src/DevHive.Services/Models/Identity/Role/CreateRoleServiceModel.cs
index 53bea9e..3bed3fd 100644
--- a/src/DevHive.Services/Models/Identity/Role/CreateRoleServiceModel.cs
+++ b/src/DevHive.Services/Models/Identity/Role/CreateRoleServiceModel.cs
@@ -5,10 +5,6 @@ namespace DevHive.Services.Models.Identity.Role
 {
 	public class CreateRoleServiceModel
 	{
-		[NotNull]
-		[Required]
-		[MinLength(3)]
-		[MaxLength(50)]
 		public string Name { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Services/RoleService.cs b/src/DevHive.Services/Services/RoleService.cs
index 896946d..91a8c73 100644
--- a/src/DevHive.Services/Services/RoleService.cs
+++ b/src/DevHive.Services/Services/RoleService.cs
@@ -20,12 +20,11 @@ namespace DevHive.Services.Services
 			this._roleMapper = mapper;
 		}
 
-		public async Task<Guid> CreateRole(RoleServiceModel roleServiceModel)
+		public async Task<Guid> CreateRole(CreateRoleServiceModel roleServiceModel)
 		{
 			if (await this._roleRepository.DoesNameExist(roleServiceModel.Name))
 				throw new ArgumentException("Role already exists!");
 
-
 			Role role = this._roleMapper.Map<Role>(roleServiceModel);
 			bool success = await this._roleRepository.AddAsync(role);
 
diff --git a/src/DevHive.Services/Services/UserService.cs b/src/DevHive.Services/Services/UserService.cs
index 533f422..cf33644 100644
--- a/src/DevHive.Services/Services/UserService.cs
+++ b/src/DevHive.Services/Services/UserService.cs
@@ -194,6 +194,8 @@ namespace DevHive.Services.Services
 					return false;
 
 			/* Check roles */
+			if(jwtRoleNames.Contains(Role.AdminRole))
+				return true;
 
 			// Check if jwt contains all user roles (if it doesn't, jwt is either old or tampered with)
 			foreach (var role in user.Roles)
-- 
cgit v1.2.3