Refactor pull/4975

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs

@@ -29,7 +29,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             PersonalSettingsInfoModel = ObjectMapper.Map<ProfileDto, PersonalSettingsInfoModel>(user);
 
-            DisablePasswordChange = user.IsExternalLoggedIn;
+            DisablePasswordChange = user.IsExternal;
             HideOldPasswordInput = !user.HasPassword;
 
             return Page();

modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs

@@ -14,7 +14,7 @@ namespace Volo.Abp.Identity
 
         public string PhoneNumber { get; set; }
 
-        public bool IsExternalLoggedIn { get; set; }
+        public bool IsExternal { get; set; }
 
         public bool HasPassword { get; set; }
     }

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs

@@ -14,8 +14,8 @@ namespace Volo.Abp.Identity
                 .MapExtraProperties();
 
             CreateMap<IdentityUser, ProfileDto>()
-                .Ignore(x=>x.IsExternalLoggedIn)
+                .ForMember(dest => dest.HasPassword,
-                .Ignore(x=>x.HasPassword)
+                    op => op.MapFrom(src => src.PasswordHash != null))
                 .MapExtraProperties();
         }
     }

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs

@@ -23,11 +23,7 @@ namespace Volo.Abp.Identity
         {
             var currentUser = await UserManager.GetByIdAsync(CurrentUser.GetId());
 
-            var profile = ObjectMapper.Map<IdentityUser, ProfileDto>(currentUser);
+            return ObjectMapper.Map<IdentityUser, ProfileDto>(currentUser);
-            profile.IsExternalLoggedIn = currentUser.IsExternal;
-            profile.HasPassword = currentUser.PasswordHash != null;
-
-            return profile;
         }
 
         public virtual async Task<ProfileDto> UpdateAsync(UpdateProfileDto input)
@@ -69,7 +65,6 @@ namespace Volo.Abp.Identity
 
             if (currentUser.PasswordHash == null)
             {
-                (await UserManager.RemovePasswordAsync(currentUser)).CheckErrors();
                 (await UserManager.AddPasswordAsync(currentUser, input.NewPassword)).CheckErrors();
 
                 return;