From e6cb176c837a1e6a1a849376bfa968b12928fb2e Mon Sep 17 00:00:00 2001 From: Syndamia Date: Fri, 5 Feb 2021 19:24:37 +0200 Subject: Fixed user updating --- src/DevHive.Services/Services/UserService.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/DevHive.Services/Services/UserService.cs') diff --git a/src/DevHive.Services/Services/UserService.cs b/src/DevHive.Services/Services/UserService.cs index cd004ee..99ac050 100644 --- a/src/DevHive.Services/Services/UserService.cs +++ b/src/DevHive.Services/Services/UserService.cs @@ -83,8 +83,7 @@ namespace DevHive.Services.Services User user = this._userMapper.Map(registerModel); user.PasswordHash = PasswordModifications.GeneratePasswordHash(registerModel.Password); - user.ProfilePicture = new ProfilePicture() { PictureURL = "/assets/images/feed/profile-pic.png":w - }; + user.ProfilePicture = new ProfilePicture() { PictureURL = "/assets/images/feed/profile-pic.png" }; // Make sure the default role exists //TODO: Move when project starts @@ -266,7 +265,7 @@ namespace DevHive.Services.Services HashSet claims = new() { new Claim("ID", $"{userId}"), - new Claim("Username", username), + new Claim("Username", username) }; foreach (var role in roles) @@ -318,6 +317,11 @@ namespace DevHive.Services.Services private async Task PopulateUserModel(User user, UpdateUserServiceModel updateUserServiceModel) { + user.UserName = updateUserServiceModel.UserName; + user.FirstName = updateUserServiceModel.FirstName; + user.LastName = updateUserServiceModel.LastName; + user.Email = updateUserServiceModel.Email; + //Do NOT allow a user to change his roles, unless he is an Admin bool isAdmin = await this._userManager.IsInRoleAsync(user, Role.AdminRole); -- cgit v1.2.3