From f84222477fddcf687487cdc89f5baa53e1aa3932 Mon Sep 17 00:00:00 2001 From: Mahdi Jafari <126339078+mahdijafariii@users.noreply.github.com> Date: Sun, 8 Sep 2024 22:18:42 +0330 Subject: [PATCH] fix (User) : remove jwt update after update user information (#106) * fix (User) : remove jwt update after update user information * fix (Test) : fix tets --- .../Services/UserService/AdminService/AdminService.cs | 11 +++++------ .../UserService/AdminService/AdminServiceTests.cs | 5 +---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/AnalysisData/AnalysisData/Services/UserService/AdminService/AdminService.cs b/AnalysisData/AnalysisData/Services/UserService/AdminService/AdminService.cs index 5405376..905f850 100644 --- a/AnalysisData/AnalysisData/Services/UserService/AdminService/AdminService.cs +++ b/AnalysisData/AnalysisData/Services/UserService/AdminService/AdminService.cs @@ -33,14 +33,15 @@ public async Task UpdateUserInformationByAdminAsync(Guid id, UpdateAdminDto upda { throw new AdminProtectedException(); } + await ValidateUserInformation(user, updateAdminDto); _validationService.EmailCheck(updateAdminDto.Email); _validationService.PhoneNumberCheck(updateAdminDto.PhoneNumber); - await CheckExistenceOfRole(user,updateAdminDto); + await CheckExistenceOfRole(user, updateAdminDto); await SetUpdatedInformation(user, updateAdminDto); } - private async Task ValidateUserInformation(User user,UpdateAdminDto updateAdminDto) + private async Task ValidateUserInformation(User user, UpdateAdminDto updateAdminDto) { var checkUsername = await _userRepository.GetUserByUsernameAsync(updateAdminDto.UserName); var checkEmail = await _userRepository.GetUserByEmailAsync(updateAdminDto.Email); @@ -49,16 +50,14 @@ private async Task ValidateUserInformation(User user,UpdateAdminDto updateAdminD throw new DuplicateUserException(); } - private async Task CheckExistenceOfRole(User user,UpdateAdminDto updateAdminDto) + private async Task CheckExistenceOfRole(User user, UpdateAdminDto updateAdminDto) { var role = await _roleRepository.GetRoleByNameAsync(updateAdminDto.RoleName); if (role == null) { throw new RoleNotFoundException(); } - await SetUpdatedInformation(user, updateAdminDto); - await _jwtService.UpdateUserCookie(user.Username, false); } private async Task SetUpdatedInformation(User user, UpdateAdminDto updateAdminDto) @@ -76,7 +75,7 @@ private async Task SetUpdatedInformation(User user, UpdateAdminDto updateAdminDt user.RoleId = role.Id; await _userRepository.UpdateUserAsync(user.Id, user); } - + public async Task DeleteUserAsync(Guid id) { diff --git a/AnalysisData/TestProject/Services/UserService/AdminService/AdminServiceTests.cs b/AnalysisData/TestProject/Services/UserService/AdminService/AdminServiceTests.cs index 1999fbf..5e555ef 100644 --- a/AnalysisData/TestProject/Services/UserService/AdminService/AdminServiceTests.cs +++ b/AnalysisData/TestProject/Services/UserService/AdminService/AdminServiceTests.cs @@ -79,10 +79,7 @@ await _userRepository u.PhoneNumber == updateAdminDto.PhoneNumber && u.Role.RoleName == updateAdminDto.RoleName )); - - await _jwtService - .Received() - .UpdateUserCookie(updateAdminDto.UserName, false); + } [Fact]