From df52b1068e16adc50ffd365e2e8b8ea19b59fac3 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Tue, 26 Jan 2021 11:44:41 +0200
Subject: UserUpdate does not allow updating roles if not admin; HTTP Put now
 works properly; UserUpdate validates properly

---
 src/DevHive.Services/Configurations/Mapping/RoleMapings.cs  | 4 ++--
 src/DevHive.Services/Configurations/Mapping/UserMappings.cs | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/DevHive.Services/Configurations/Mapping')

diff --git a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
index 23bd46f..e61a107 100644
--- a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
@@ -9,10 +9,10 @@ namespace DevHive.Services.Configurations.Mapping
 		public RoleMappings()
 		{
 			CreateMap<CreateRoleServiceModel, Role>();
-			CreateMap<ReadRoleServiceModel, Role>();
+			CreateMap<RoleServiceModel, Role>();
 			CreateMap<UpdateRoleServiceModel, Role>();
 
-			CreateMap<Role, ReadRoleServiceModel>();
+			CreateMap<Role, RoleServiceModel>();
 			CreateMap<Role, UpdateRoleServiceModel>();
 		}
 	}
diff --git a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
index 6797ce1..096af38 100644
--- a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
@@ -11,11 +11,10 @@ namespace DevHive.Services.Configurations.Mapping
 		{
 			CreateMap<UserServiceModel, User>();
 			CreateMap<RegisterServiceModel, User>();
+			CreateMap<FriendServiceModel, User>();
 			CreateMap<UpdateUserServiceModel, User>()
 				.AfterMap((src, dest) => dest.PasswordHash = PasswordModifications.GeneratePasswordHash(src.Password));
-			CreateMap<FriendServiceModel, User>();
-			CreateMap<UpdateFriendServiceModel, User>()
-				.ForMember(dest => dest.UserName, src => src.MapFrom(p => p.Name));
+			CreateMap<UpdateFriendServiceModel, User>();
 
 			CreateMap<User, UserServiceModel>();
 			CreateMap<User, UpdateUserServiceModel>()
-- 
cgit v1.2.3