From 2ec1d621dab96fb4d8d53e67a0a13245d812b18a Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 12 Aug 2024 11:30:06 +0800 Subject: [PATCH 1/2] Trim the changed value when users change their first or last name. Resolve #20460 --- .../Volo/Abp/Account/ProfileAppService.cs | 4 ++-- .../Volo/Abp/Identity/IdentityUserAppService.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/ProfileAppService.cs b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/ProfileAppService.cs index 9749a607d5..20ce663f02 100644 --- a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/ProfileAppService.cs +++ b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/ProfileAppService.cs @@ -68,8 +68,8 @@ public class ProfileAppService : IdentityAppServiceBase, IProfileAppService (await UserManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors(); } - user.Name = input.Name; - user.Surname = input.Surname; + user.Name = input.Name.Trim(); + user.Surname = input.Surname.Trim(); input.MapExtraPropertiesTo(user); diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs index 6b55815732..7eb557c74e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs @@ -184,8 +184,8 @@ public class IdentityUserAppService : IdentityAppServiceBase, IIdentityUserAppSe user.SetIsActive(input.IsActive); } - user.Name = input.Name; - user.Surname = input.Surname; + user.Name = input.Name.Trim(); + user.Surname = input.Surname.Trim(); (await UserManager.UpdateAsync(user)).CheckErrors(); if (input.RoleNames != null && await PermissionChecker.IsGrantedAsync(IdentityPermissions.Users.ManageRoles)) { From c6aa291cb654bfdecc23e7e627acd7be43c80e53 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 12 Aug 2024 13:22:11 +0800 Subject: [PATCH 2/2] Prevent name is null. --- .../Volo/Abp/Account/ProfileAppService.cs | 4 ++-- .../Volo/Abp/Identity/IdentityUserAppService.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/ProfileAppService.cs b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/ProfileAppService.cs index 20ce663f02..d2baae8393 100644 --- a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/ProfileAppService.cs +++ b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/ProfileAppService.cs @@ -68,8 +68,8 @@ public class ProfileAppService : IdentityAppServiceBase, IProfileAppService (await UserManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors(); } - user.Name = input.Name.Trim(); - user.Surname = input.Surname.Trim(); + user.Name = input.Name?.Trim(); + user.Surname = input.Surname?.Trim(); input.MapExtraPropertiesTo(user); diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs index 7eb557c74e..a56935424e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs @@ -184,8 +184,8 @@ public class IdentityUserAppService : IdentityAppServiceBase, IIdentityUserAppSe user.SetIsActive(input.IsActive); } - user.Name = input.Name.Trim(); - user.Surname = input.Surname.Trim(); + user.Name = input.Name?.Trim(); + user.Surname = input.Surname?.Trim(); (await UserManager.UpdateAsync(user)).CheckErrors(); if (input.RoleNames != null && await PermissionChecker.IsGrantedAsync(IdentityPermissions.Users.ManageRoles)) {