Merge pull request #2203 from abpframework/maliming/identity-patch1

Handling cases where Email and PhoneNumber have not changed.
abpframework · Nov 19, 2019 · d0f6963 · d0f6963
2 parents e782dfa + f09a93c
commit d0f6963
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...es/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs b/...es/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs
@@ -127,8 +127,16 @@ await _userManager.FindByEmailAsync(email)
 
         private async Task UpdateUserByInput(IdentityUser user, IdentityUserCreateOrUpdateDtoBase input)
         {
-            (await _userManager.SetEmailAsync(user, input.Email)).CheckErrors();
-            (await _userManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
+            if (!string.Equals(user.Email, input.Email, StringComparison.InvariantCultureIgnoreCase))
+            {
+                (await _userManager.SetEmailAsync(user, input.Email)).CheckErrors();
+            }
+
+            if (!string.Equals(user.PhoneNumber, input.PhoneNumber, StringComparison.InvariantCultureIgnoreCase))
+            {
+                (await _userManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
+            }
+
             (await _userManager.SetTwoFactorEnabledAsync(user, input.TwoFactorEnabled)).CheckErrors();
             (await _userManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();