The beginning of role based authorization

2 files changed, 3 insertions, 2 deletions

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)