From 72502154725594cf31878aa944f4bc9d9f3521a3 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Tue, 16 Feb 2021 18:07:51 +0200
Subject: UserManager&RoleManager logic moved to Repo; Password hashing and
 validation moved to Repo and using ASPNET Core hashing methods; Added
 Migrations; Fixed Roles not added to user

---
 .../DevHive.Services/Configurations/Mapping/UserMappings.cs      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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

diff --git a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs
index 043fcb7..99b41a8 100644
--- a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs
+++ b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs
@@ -1,8 +1,6 @@
 using DevHive.Data.Models;
 using AutoMapper;
 using DevHive.Services.Models.User;
-using DevHive.Common.Models.Misc;
-using DevHive.Data.Models.Relational;
 
 namespace DevHive.Services.Configurations.Mapping
 {
@@ -11,19 +9,18 @@ namespace DevHive.Services.Configurations.Mapping
 		public UserMappings()
 		{
 			CreateMap<UserServiceModel, User>();
-			CreateMap<RegisterServiceModel, User>();
+			CreateMap<RegisterServiceModel, User>()
+				.ForMember(dest => dest.PasswordHash, src => src.MapFrom(p => p.Password));
 			CreateMap<FriendServiceModel, User>()
 				.ForMember(dest => dest.Friends, src => src.Ignore());
 			CreateMap<UpdateUserServiceModel, User>()
-				.ForMember(dest => dest.Friends, src => src.Ignore())
-				.AfterMap((src, dest) => dest.PasswordHash = PasswordModifications.GeneratePasswordHash(src.Password));
+				.ForMember(dest => dest.Friends, src => src.Ignore());
 			CreateMap<UpdateFriendServiceModel, User>();
 
 			CreateMap<User, UserServiceModel>()
 				.ForMember(dest => dest.ProfilePictureURL, src => src.MapFrom(p => p.ProfilePicture.PictureURL))
 				.ForMember(dest => dest.Friends, src => src.MapFrom(p => p.Friends));
 			CreateMap<User, UpdateUserServiceModel>()
-				.ForMember(x => x.Password, opt => opt.Ignore())
 				.ForMember(dest => dest.ProfilePictureURL, src => src.MapFrom(p => p.ProfilePicture.PictureURL));
 			CreateMap<User, FriendServiceModel>();
 		}
-- 
cgit v1.2.3