Personal settings #309

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json

@@ -34,6 +34,7 @@
     "PagerPrevious": "Previous",
     "PagerInfo": "Showing {0} to {1} of {2} entries.",
     "DatatableActionDropdownDefaultText": "Actions",
-    "ChangePassword": "Change password"
+    "ChangePassword": "Change password",
+    "PersonalInfo": "Personal info"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json

@@ -34,6 +34,7 @@
     "PagerPrevious": "Önceki",
     "PagerInfo": "{2} kayıttan {0} ile {1} arası gösteriliyor.",
     "DatatableActionDropdownDefaultText": "İşlemler",
-    "ChangePassword": "Şifre değiştir"
+    "ChangePassword": "Şifre değiştir",
+    "PersonalInfo": "Kişisel Bilgiler"
   }
 }

modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs

@@ -24,6 +24,8 @@ namespace Volo.Abp.Account.Web
 
             context.Menu.AddItem(new ApplicationMenuItem("Account.ChangePassword", l["ChangePassword"], icon: "fa fa-key", url: "#", elementId: "abp-account-change-password"));
 
+            context.Menu.AddItem(new ApplicationMenuItem("Account.PersonalSettings", l["PersonalInfo"], icon: "fa fa-info", url: "#", elementId: "abp-account-personal-settings"));
+
             context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));
 
             return Task.CompletedTask;

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

@@ -16,6 +16,8 @@ namespace Volo.Abp.Identity
 
         Task UpdatePermissionsAsync(Guid id, UpdatePermissionsDto input);
 
+        Task<IdentityUserDto> UpdatePersonalSettingsAsync(UpdatePersonalSettingsDto input);
+
         Task<IdentityUserDto> FindByUsernameAsync(string username);
 
         Task<IdentityUserDto> FindByEmailAsync(string email);

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

@@ -9,6 +9,12 @@ namespace Volo.Abp.Identity
         [StringLength(IdentityUserConsts.MaxUserNameLength)]
         public string UserName { get; set; }
 
+        [StringLength(IdentityUserConsts.MaxNameLength)]
+        public string Name { get; set; }
+
+        [StringLength(IdentityUserConsts.MaxSurnameLength)]
+        public string Surname { get; set; }
+
         [Required]
         [EmailAddress]
         [StringLength(IdentityUserConsts.MaxEmailLength)]

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

@@ -4,12 +4,16 @@ using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.Identity
 {
-    public class IdentityUserDto : EntityDto<Guid>, IMultiTenant
+    public class IdentityUserDto : FullAuditedEntityDto<Guid>, IMultiTenant
     {
         public Guid? TenantId { get; set; }
 
         public string UserName { get; set; }
 
+        public string Name { get; set; }
+
+        public string Surname { get; set; }
+
         public string Email { get; set; }
 
         public bool EmailConfirmed { get; set; }

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

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Volo.Abp.Identity
+{
+    public class UpdatePersonalSettingsDto
+    {
+        [StringLength(IdentityUserConsts.MaxNameLength)]
+        public string Name { get; set; }
+
+        [StringLength(IdentityUserConsts.MaxSurnameLength)]
+        public string Surname { get; set; }
+
+        [StringLength(IdentityUserConsts.MaxPhoneNumberLength)]
+        public string PhoneNumber { get; set; }
+    }
+}

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Security.Authentication;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
@@ -115,6 +116,23 @@ namespace Volo.Abp.Identity
             await _permissionAppServiceHelper.UpdateAsync(UserPermissionValueProvider.ProviderName, id.ToString(), input);
         }
 
+        public async Task<IdentityUserDto> UpdatePersonalSettingsAsync(UpdatePersonalSettingsDto input)
+        {
+            if (!CurrentUser.Id.HasValue)
+            {
+                throw new AuthenticationException();
+            }
+
+            var user = await _userManager.GetByIdAsync(CurrentUser.Id.Value);
+
+            await _userManager.SetPersonalSettingsAsync(user, input.Name, input.Surname, input.PhoneNumber);
+
+            (await _userManager.UpdateAsync(user)).CheckErrors();
+            await CurrentUnitOfWork.SaveChangesAsync();
+
+            return ObjectMapper.Map<IdentityUser, IdentityUserDto>(user);
+        }
+
         [Authorize(IdentityPermissions.Users.Default)]
         public async Task<IdentityUserDto> FindByUsernameAsync(string username)
         {
@@ -145,7 +163,7 @@ namespace Volo.Abp.Identity
         private async Task UpdateUserByInput(IdentityUser user, IdentityUserCreateOrUpdateDtoBase input)
         {
             (await _userManager.SetEmailAsync(user, input.Email)).CheckErrors();
-            (await _userManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
+            (await _userManager.SetPersonalSettingsAsync(user,input.Name,input.Surname, input.PhoneNumber)).CheckErrors();
             (await _userManager.SetTwoFactorEnabledAsync(user, input.TwoFactorEnabled)).CheckErrors();
             (await _userManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();
 

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserConsts.cs

@@ -6,6 +6,10 @@ namespace Volo.Abp.Identity
     {
         public const int MaxUserNameLength = AbpUserConsts.MaxUserNameLength;
 
+        public const int MaxNameLength = AbpUserConsts.MaxNameLength;
+
+        public const int MaxSurnameLength = AbpUserConsts.MaxSurnameLength;
+
         public const int MaxNormalizedUserNameLength = MaxUserNameLength;
 
         public const int MaxEmailLength = AbpUserConsts.MaxEmailLength;

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs

@@ -8,12 +8,13 @@ using Microsoft.AspNetCore.Identity;
 using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.Guids;
 using Volo.Abp.Users;
 
 namespace Volo.Abp.Identity
 {
-    public class IdentityUser : AggregateRoot<Guid>, IHasConcurrencyStamp, IUser, IHasExtraProperties
+    public class IdentityUser : FullAuditedAggregateRoot<Guid>, IHasConcurrencyStamp, IUser, IHasExtraProperties
     {
         public virtual Guid? TenantId { get; protected set; }
 
@@ -28,6 +29,16 @@ namespace Volo.Abp.Identity
         [DisableAuditing]
         public virtual string NormalizedUserName { get; protected internal set; }
 
+        /// <summary>
+        /// Gets or sets the Name for the user.
+        /// </summary>
+        public virtual string Name { get; protected internal set; }
+
+        /// <summary>
+        /// Gets or sets the Surame for the user.
+        /// </summary>
+        public virtual string Surname { get; protected internal set; }
+
         /// <summary>
         /// Gets or sets the email address for this user.
         /// </summary>

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs

@@ -75,5 +75,17 @@ namespace Volo.Abp.Identity
 
             return IdentityResult.Success;
         }
+
+        public async Task<IdentityResult> SetPersonalSettingsAsync([NotNull] IdentityUser user, [CanBeNull]  string name, [CanBeNull] string surname, [CanBeNull] string phoneNumber)
+        {
+            Check.NotNull(user, nameof(user));
+
+            user.Name = name;
+            user.Surname = surname;
+
+            (await SetPhoneNumberAsync(user, phoneNumber)).CheckErrors();
+
+            return IdentityResult.Success;
+        }
     }
 }

modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/IdentityUserExtensions.cs

@@ -10,6 +10,8 @@ namespace Volo.Abp.Identity
                 user.Id,
                 user.UserName,
                 user.Email,
+                user.Name,
+                user.Surname,
                 user.EmailConfirmed,
                 user.PhoneNumber,
                 user.PhoneNumberConfirmed,

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserController.cs

@@ -64,6 +64,11 @@ namespace Volo.Abp.Identity
             return _userAppService.UpdatePermissionsAsync(id, input);
         }
 
+        public virtual Task<IdentityUserDto> UpdatePersonalSettingsAsync(UpdatePersonalSettingsDto input)
+        {
+            return _userAppService.UpdatePersonalSettingsAsync(input);
+        }
+
         [HttpGet]
         public virtual Task<IdentityUserDto> FindByUsernameAsync(string username)
         {

modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebAutoMapperProfile.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using Volo.Abp.Identity.Web.Pages.Identity.Roles;
+using Volo.Abp.Identity.Web.Pages.Identity.Shared;
 using CreateUserModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.CreateModalModel;
 using EditUserModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.EditModalModel;
 
@@ -31,6 +32,10 @@ namespace Volo.Abp.Identity.Web
 
             CreateMap<IdentityRoleDto, EditUserModalModel.AssignedRoleViewModel>()
                 .ForMember(dest => dest.IsAssigned, opt => opt.Ignore());
+
+            CreateMap<IdentityUserDto, PersonalSettingsInfoModel>();
+
+            CreateMap<PersonalSettingsInfoModel, UpdatePersonalSettingsDto>();
         }
 
         private void CreateRoleMappings()

modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs

@@ -75,7 +75,8 @@ namespace Volo.Abp.Identity.Web
                 options
                     .ScriptBundles
                     .Get(StandardBundles.Scripts.Global)
-                    .AddFiles("/Pages/Identity/Shared/change-password-modal.js");
+                    .AddFiles("/Pages/Identity/Shared/change-password-modal.js")
+                    .AddFiles("/Pages/Identity/Shared/personal-settings-modal.js");
             });
         }
     }

modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json

@@ -10,10 +10,14 @@
     "UserInformations": "User informations",
     "Roles": "Roles",
     "Password": "Password",
+    "PersonalInfo": "Personal Info",
+    "PersonalSettings": "Personal settings",
     "UserDeletionConfirmationMessage": "User '{0}' will be deleted. Do you confirm that?",
     "RoleDeletionConfirmationMessage": "Role '{0}' will be deleted. Do you confirm that?",
     "DisplayName:RoleName": "Role name",
     "DisplayName:UserName": "User name",
+    "DisplayName:Name": "Name",
+    "DisplayName:Surname": "Surname",
     "DisplayName:Password": "Password",
     "DisplayName:EmailAddress": "Email address",
     "DisplayName:PhoneNumber": "Phone number",
@@ -26,6 +30,7 @@
     "DisplayName:CurrentPassword": "Current password",
     "DisplayName:NewPassword": "New password",
     "DisplayName:NewPasswordConfirm": "Confirm new password",
-    "PasswordChangedMessage": "Your password has been changed successfully."
+    "PasswordChangedMessage": "Your password has been changed successfully.",
+    "PersonalSettingsSavedMessage": "Your personal settings has been saved successfully."
   }
 }

modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/tr.json

@@ -10,10 +10,14 @@
     "UserInformations": "Kullanıcı bilgileri",
     "Roles": "Roller",
     "Password": "Şifre",
+    "PersonalInfo": "Kişisel bilgi",
+    "PersonalSettings": "Kişisel Ayarlar",
     "UserDeletionConfirmationMessage": "{0} kullanıcısı silinecektir. Onaylıyor musunuz?",
     "RoleDeletionConfirmationMessage": "'{0}' rolü silinecektir. Onaylıyor musunuz?",
     "DisplayName:RoleName": "Rol adı",
     "DisplayName:UserName": "Kullanıcı adı",
+    "DisplayName:Name": "Adı",
+    "DisplayName:Surname": "Soyadı",
     "DisplayName:Password": "Şifre",
     "DisplayName:EmailAddress": "E-posta adresi",
     "DisplayName:PhoneNumber": "Telefon numarası",
@@ -26,6 +30,7 @@
     "DisplayName:CurrentPassword": "Mevcut şifre",
     "DisplayName:NewPassword": "Yeni şifre",
     "DisplayName:NewPasswordConfirm": "Yeni şifre (tekrar)",
-    "PasswordChangedMessage": "Şifreniz başarıyla değiştirildi."
+    "PasswordChangedMessage": "Şifreniz başarıyla değiştirildi.",
+    "PersonalSettingsSavedMessage": "Kişisel bilgileriniz başarıyla kaydedildi."
   }
 }

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Shared/PersonalSettingsModal.cshtml

@@ -0,0 +1,20 @@
+@page
+@using Microsoft.AspNetCore.Mvc.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@using Volo.Abp.Identity.Localization
+@using Volo.Abp.Identity.Web.Pages.Identity.Shared
+@model PersonalSettingsModal
+@inject IHtmlLocalizer<IdentityResource> L
+@{
+    Layout = null;
+}
+
+<abp-dynamic-form abp-model="@Model.PersonalSettingsInfoModel" asp-page="/Identity/Shared/PersonalSettingsModal">
+    <abp-modal>
+        <abp-modal-header title="@L["PersonalSettings"].Value"></abp-modal-header>
+        <abp-modal-body>
+            <abp-form-content />
+        </abp-modal-body>
+        <abp-modal-footer buttons="@(AbpModalButtons.Cancel|AbpModalButtons.Save)"></abp-modal-footer>
+    </abp-modal>
+</abp-dynamic-form>

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Shared/PersonalSettingsModal.cshtml.cs

@@ -0,0 +1,64 @@
+using System.ComponentModel.DataAnnotations;
+using System.Security.Authentication;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Localization;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+using Volo.Abp.Identity.Localization;
+
+namespace Volo.Abp.Identity.Web.Pages.Identity.Shared
+{
+    public class PersonalSettingsModal : AbpPageModel
+    {
+        [BindProperty]
+        public PersonalSettingsInfoModel PersonalSettingsInfoModel { get; set; }
+
+        private readonly IIdentityUserAppService _userAppService;
+
+        public PersonalSettingsModal(IIdentityUserAppService userAppService)
+        {
+            _userAppService = userAppService;
+        }
+
+        public async Task OnGetAsync()
+        {
+            if (!CurrentUser.Id.HasValue)
+            {
+                throw new AuthenticationException();
+            }
+
+            var user = await _userAppService.GetAsync(CurrentUser.Id.Value);
+
+            PersonalSettingsInfoModel = ObjectMapper.Map<IdentityUserDto, PersonalSettingsInfoModel>(user);
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            ValidateModel();
+
+            var updateDto = ObjectMapper.Map<PersonalSettingsInfoModel, UpdatePersonalSettingsDto>(PersonalSettingsInfoModel);
+
+            await _userAppService.UpdatePersonalSettingsAsync(updateDto);
+
+            return NoContent();
+        }
+    }
+
+    public class PersonalSettingsInfoModel
+    {
+        [Required]
+        [StringLength(IdentityUserConsts.MaxNameLength)]
+        [Display(Name = "DisplayName:Name")]
+        public string Name { get; set; }
+
+        [Required]
+        [StringLength(IdentityUserConsts.MaxSurnameLength)]
+        [Display(Name = "DisplayName:Surname")]
+        public string Surname { get; set; }
+
+        [Required]
+        [StringLength(IdentityUserConsts.MaxPhoneNumberLength)]
+        [Display(Name = "DisplayName:PhoneNumber")]
+        public string PhoneNumber { get; set; }
+    }
+}

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Shared/personal-settings-modal.js

@@ -0,0 +1,18 @@
+(function ($) {
+
+    var l = abp.localization.getResource('AbpIdentity');
+    var _personalSettingsModal = new abp.ModalManager(abp.appPath + 'Identity/Shared/PersonalSettingsModal');
+  
+    $(function () {
+
+        $("#abp-account-personal-settings").click(function (e) {
+            e.preventDefault();
+            _personalSettingsModal.open();
+        });
+
+        _personalSettingsModal.onResult(function () {
+            //abp.message.success(l("PersonalSettingsSavedMessage"));
+        });
+    });
+
+})(jQuery);

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml

@@ -15,6 +15,8 @@
                 <abp-tab title="@L["UserInformations"].Value">
                     @* TODO: Can we use dynamic form? *@
                     <abp-input asp-for="UserInfo.UserName" />
+                    <abp-input asp-for="UserInfo.Name" />
+                    <abp-input asp-for="UserInfo.Surname" />
                     <abp-input asp-for="UserInfo.Password" />
                     <abp-input asp-for="UserInfo.Email" />
                     <abp-input asp-for="UserInfo.PhoneNumber" />

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs

@@ -51,6 +51,12 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             [StringLength(IdentityUserConsts.MaxUserNameLength)]
             public string UserName { get; set; }
 
+            [StringLength(IdentityUserConsts.MaxNameLength)]
+            public string Name { get; set; }
+
+            [StringLength(IdentityUserConsts.MaxSurnameLength)]
+            public string Surname { get; set; }
+
             [Required]
             [StringLength(IdentityUserConsts.MaxPasswordLength)]
             [DataType(DataType.Password)]

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml

@@ -14,12 +14,14 @@
             <abp-tabs name="create-user-modal-tabs">
                 <abp-tab title="@L["UserInformations"].Value">
                     @* TODO: Can we use dynamic form? *@
-                    <input asp-for="UserInfo.Id"/>
+                    <input asp-for="UserInfo.Id" />
-                    <abp-input asp-for="UserInfo.UserName"/>
+                    <abp-input asp-for="UserInfo.UserName" />
-                    <abp-input asp-for="UserInfo.Email"/>
+                    <abp-input asp-for="UserInfo.Name" />
-                    <abp-input asp-for="UserInfo.PhoneNumber"/>
+                    <abp-input asp-for="UserInfo.Surname" />
-                    <abp-input asp-for="UserInfo.LockoutEnabled"/>
+                    <abp-input asp-for="UserInfo.Email" />
-                    <abp-input asp-for="UserInfo.TwoFactorEnabled"/>
+                    <abp-input asp-for="UserInfo.PhoneNumber" />
+                    <abp-input asp-for="UserInfo.LockoutEnabled" />
+                    <abp-input asp-for="UserInfo.TwoFactorEnabled" />
                 </abp-tab>
                 <abp-tab title="@L["Roles"].Value">
                     @for (var i = 0; i < Model.Roles.Length; i++)

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs

@@ -63,6 +63,12 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             [StringLength(IdentityUserConsts.MaxUserNameLength)]
             public string UserName { get; set; }
 
+            [StringLength(IdentityUserConsts.MaxNameLength)]
+            public string Name { get; set; }
+
+            [StringLength(IdentityUserConsts.MaxSurnameLength)]
+            public string Surname { get; set; }
+
             [Required]
             [EmailAddress]
             [StringLength(IdentityUserConsts.MaxEmailLength)]

modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/IUserData.cs

@@ -11,6 +11,10 @@ namespace Volo.Abp.Users
 
         string UserName { get; }
 
+        string Name { get; }
+
+        string Surname { get; }
+
         [CanBeNull]
         string Email { get; }
 

modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserData.cs

@@ -9,6 +9,10 @@ namespace Volo.Abp.Users
 
         public string UserName { get; set; }
 
+        public string Name { get; set; }
+
+        public string Surname { get; set; }
+
         public string Email { get; set; }
 
         public bool EmailConfirmed { get; set; }
@@ -28,6 +32,8 @@ namespace Volo.Abp.Users
             Guid id,
             [NotNull] string userName,
             [CanBeNull] string email = null,
+            [CanBeNull] string name = null,
+            [CanBeNull] string surname = null,
             bool emailConfirmed = false,
             [CanBeNull] string phoneNumber = null,
             bool phoneNumberConfirmed = false,
@@ -36,6 +42,8 @@ namespace Volo.Abp.Users
             Id = id;
             UserName = userName;
             Email = email;
+            Name = name;
+            Surname = surname;
             EmailConfirmed = emailConfirmed;
             PhoneNumber = phoneNumber;
             PhoneNumberConfirmed = phoneNumberConfirmed;

modules/users/src/Volo.Abp.Users.Domain.Shared/Volo/Abp/Users/AbpUserConsts.cs

@@ -3,6 +3,10 @@ namespace Volo.Abp.Users
     public class AbpUserConsts
     {
         public const int MaxUserNameLength = 256;
+        
+        public const int MaxNameLength = 64;
+        
+        public const int MaxSurnameLength = 64;
 
         public const int MaxEmailLength = 256;
 

modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUserExtensions.cs

@@ -7,6 +7,8 @@ namespace Volo.Abp.Users
             return new UserData(
                 user.Id,
                 user.UserName,
+                user.Name,
+                user.Surname,
                 user.Email,
                 user.EmailConfirmed,
                 user.PhoneNumber,

modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/IUser.cs

@@ -12,6 +12,12 @@ namespace Volo.Abp.Users
         [CanBeNull]
         string Email { get; }
 
+        [CanBeNull]
+        string Name  { get; }
+
+        [CanBeNull]
+        string Surname { get; }
+
         bool EmailConfirmed { get; }
 
         [CanBeNull]

modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/AbpUsersDbContextModelCreatingExtensions.cs

@@ -12,6 +12,8 @@ namespace Volo.Abp.Users.EntityFrameworkCore
             b.Property(u => u.TenantId).HasColumnName(nameof(IUser.TenantId));
             b.Property(u => u.UserName).IsRequired().HasMaxLength(AbpUserConsts.MaxUserNameLength).HasColumnName(nameof(IUser.UserName));
             b.Property(u => u.Email).HasMaxLength(AbpUserConsts.MaxEmailLength).HasColumnName(nameof(IUser.Email));
+            b.Property(u => u.Name).HasMaxLength(AbpUserConsts.MaxNameLength).HasColumnName(nameof(IUser.Name));
+            b.Property(u => u.Surname).HasMaxLength(AbpUserConsts.MaxSurnameLength).HasColumnName(nameof(IUser.Surname));
             b.Property(u => u.EmailConfirmed).HasDefaultValue(false).HasColumnName(nameof(IUser.EmailConfirmed));
             b.Property(u => u.PhoneNumber).HasMaxLength(AbpUserConsts.MaxPhoneNumberLength).HasColumnName(nameof(IUser.PhoneNumber));
             b.Property(u => u.PhoneNumberConfirmed).HasDefaultValue(false).HasColumnName(nameof(IUser.PhoneNumberConfirmed));