[User profile][Duy] Return user's roles when getting profile

SWD392-Domus · Mar 20, 2024 · 68cd404 · 68cd404
1 parent 5f0d952
commit 68cd404
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Domus.Service/Implementations/UserService.cs b/Domus.Service/Implementations/UserService.cs
@@ -85,11 +85,12 @@ public async Task<ServiceActionResult> GetSelfProfile(string token)
 		    throw new InvalidTokenException();
 
 	    var userId = _jwtService.GetTokenClaim(token, TokenClaimConstants.SUBJECT)?.ToString() ?? throw new UserNotFoundException();
-	    var user = await _userManager.Users.Where(u => u.Id == userId)
-		    .ProjectTo<DtoDomusUser>(_mapper.ConfigurationProvider)
-		    .FirstOrDefaultAsync() ?? throw new UserNotFoundException();
+		var user = await _userRepository.GetAsync(u => u.Id == userId && !u.IsDeleted) ?? throw new UserNotFoundException();
+		var userRoles = await _userManager.GetRolesAsync(user);
+		var userDto = _mapper.Map<DtoDomusUserWithRole>(user);
+		userDto.Role = userRoles;
 
-	    return new ServiceActionResult(true) { Data = user };
+	    return new ServiceActionResult(true) { Data = userDto };
     }
 
     public async Task<ServiceActionResult> GetAllUsers()