Handling cases where Email and PhoneNumber have not changed.

Resolve #2140
abpframework · Nov 18, 2019 · 74c034e · gdlcf88 · Nov 19, 2019 · hikalkan
1 parent c09aecc
commit 74c034e
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 (!input.Email.IsNullOrWhiteSpace() && !string.Equals(user.Email, input.Email, StringComparison.InvariantCultureIgnoreCase))
+            {
+                (await _userManager.SetEmailAsync(user, input.Email)).CheckErrors();
+            }
+
+            if (!input.PhoneNumber.IsNullOrWhiteSpace() && !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();