Setting tanımlama

api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/Settings/SettingsSettingDefinitionProvider.cs

@@ -28,22 +28,38 @@ public class SettingsDefinitionProvider : SettingDefinitionProvider
         foreach (var item in settingDefinitions.OrderBy(a => a.Order))
         {
             var iDescription = item.DescriptionKey.IsNullOrEmpty() ? null : L(item.DescriptionKey);
+            var providers = item.Providers.IsNullOrEmpty()
+                ? []
+                : item.Providers.Split(MultiValueDelimiter, StringSplitOptions.RemoveEmptyEntries);
 
-            var def = new Volo.Abp.Settings.SettingDefinition(
+            var def = context.GetOrNull(item.Code);
+
+            if (def == null)
+            {
+                def = new Volo.Abp.Settings.SettingDefinition(
                     item.Code, item.DefaultValue, L(item.NameKey), iDescription,
-                item.IsVisibleToClients, item.IsInherited, item.IsEncrypted)
+                    item.IsVisibleToClients, item.IsInherited, item.IsEncrypted);
-                .WithProperty(SettingsConsts.MainGroup, item.MainGroupKey)
+
+                context.Add(def);
+            }
+            else
+            {
+                def.DefaultValue = item.DefaultValue;
+                def.DisplayName = L(item.NameKey);
+                def.Description = iDescription;
+                def.IsVisibleToClients = item.IsVisibleToClients;
+                def.IsInherited = item.IsInherited;
+                def.IsEncrypted = item.IsEncrypted;
+                def.Properties.Clear();
+                def.Providers.Clear();
+            }
+
+            def.Providers.AddRange(providers);
+            def.WithProperty(SettingsConsts.MainGroup, item.MainGroupKey)
                 .WithProperty(SettingsConsts.SubGroup, item.SubGroupKey)
                 .WithProperty(SettingsConsts.DataType, item.DataType)
                 .WithProperty(SettingsConsts.RequiredPermission, item.RequiredPermissionName)
                 .WithProperty(SettingsConsts.SelectOptions, item.SelectOptions?.ToDictionary(x => x.Key, x => L(x.Value)));
-
-            if (!item.Providers.IsNullOrEmpty())
-            {
-                def.Providers.AddRange(item.Providers.Split(MultiValueDelimiter));
-            }
-
-            context.Add(def);
         }
     }
 

api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingsDomainModule.cs

@@ -1,5 +1,6 @@
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 using Volo.Abp.SettingManagement;
+using Volo.Abp.Settings;
 
 namespace Sozsoft.Settings;
 
@@ -11,7 +12,10 @@ public class SettingsDomainModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-
+        Configure<AbpSettingOptions>(options =>
+        {
+            options.DefinitionProviders.Remove<SettingsDefinitionProvider>();
+            options.DefinitionProviders.Add<SettingsDefinitionProvider>();
+        });
     }
 }
-

api/src/Sozsoft.Platform.Application/ListForms/ListFormDynamicApiAppService.cs

@@ -9,9 +9,7 @@ using Volo.Abp;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Identity;
 using Volo.Abp.TenantManagement;
-using Volo.Abp.Data;
 using IdentityUser = Volo.Abp.Identity.IdentityUser;
-using Sozsoft.Platform.Data.Seeds;
 
 namespace Sozsoft.Platform.ListForms.DynamicApi;
 
@@ -41,6 +39,11 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic
         this.identityOptions = identityOptions;
     }
 
+    private static Guid ParseGuid(string value)
+    {
+        return Guid.TryParse(value, out var id) ? id : Guid.Empty;
+    }
+
     [Authorize(IdentityPermissions.Users.Create)]
     public async Task PostUserInsertAsync(DynamicApiBaseInput<CreateUpdateUserInput> input)
     {
@@ -49,9 +52,6 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic
         var verifySetting = await SettingProvider.GetOrNullAsync(PlatformConsts.AbpIdentity.Profile.General.RequireVerifiedAccount);
         var verify = !string.Equals(verifySetting, "true", StringComparison.OrdinalIgnoreCase);
 
-        var phoneSetting = await SettingProvider.GetOrNullAsync(PlatformConsts.AbpIdentity.SignIn.RequireConfirmedPhoneNumber);
-        var phoneVerified = !string.Equals(phoneSetting, "true", StringComparison.OrdinalIgnoreCase);
-
         var user = new IdentityUser(
             GuidGenerator.Create(),
             input.Data.Email,
@@ -63,7 +63,7 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic
         };
 
         user.SetIsActive(input.Data.IsActive ?? true);
-        user.SetPhoneNumber(input.Data.PhoneNumber, phoneVerified);
+        user.SetPhoneNumber(input.Data.PhoneNumber, user.PhoneNumberConfirmed);
         user.SetWorkHour(input.Data.WorkHour);
         user.SetDepartmentId(ParseGuid(input.Data.DepartmentId));
         user.SetJobPositionId(ParseGuid(input.Data.JobPositionId));
@@ -73,11 +73,6 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic
         await userManager.SetLockoutEnabledAsync(user, true);
     }
 
-    private static Guid ParseGuid(string value)
-    {
-        return Guid.TryParse(value, out var id) ? id : Guid.Empty;
-    }
-
     [Authorize(IdentityPermissions.Users.Update)]
     public async Task PostUserUpdateAsync(DynamicApiBaseInput<CreateUpdateUserInput> input)
     {
@@ -250,6 +245,5 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic
         var id = Guid.Parse(input.Keys[0]!.ToString()!);
         await tenantRepository.DeleteAsync(id);
     }
-
 }
 

api/src/Sozsoft.Platform.DbMigrator/Seeds/HostData.json

@@ -8,6 +8,94 @@
         }
     ],
     "Settings": [
+        {
+            "code": "App.SiteManagement.General.NewMemberNotificationEmails",
+            "nameKey": "App.SiteManagement.General.NewMemberNotificationEmails",
+            "descriptionKey": "App.SiteManagement.General.NewMemberNotificationEmails.Description",
+            "defaultValue": "system@sozsoft.com",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "App.SiteManagement",
+            "subGroupKey": "App.SiteManagement.General",
+            "requiredPermissionName": "App.SiteManagement.General",
+            "dataType": "Text",
+            "selectOptions": {},
+            "order": 1
+        },
+        {
+            "code": "App.SiteManagement.General.TimedLoginEmails",
+            "nameKey": "App.SiteManagement.General.TimedLoginEmails",
+            "descriptionKey": "App.SiteManagement.General.TimedLoginEmails.Description",
+            "defaultValue": "system@sozsoft.com",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "App.SiteManagement",
+            "subGroupKey": "App.SiteManagement.General",
+            "requiredPermissionName": "App.SiteManagement.General",
+            "dataType": "Text",
+            "selectOptions": {},
+            "order": 2
+        },
+        {
+            "code": "App.SiteManagement.Theme.Style",
+            "nameKey": "App.SiteManagement.Theme.Style",
+            "descriptionKey": "App.SiteManagement.Theme.Style.Description",
+            "defaultValue": "dx.material.blue.light.compact",
+            "isVisibleToClients": true,
+            "providers": "U|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "App.SiteManagement",
+            "subGroupKey": "App.SiteManagement.Theme",
+            "requiredPermissionName": "App.SiteManagement.Theme",
+            "dataType": "List",
+            "selectOptions": {
+                "dx.light": "App.Setting.light",
+                "dx.light.compact": "App.Setting.light.compact",
+                "dx.dark": "App.Setting.dark",
+                "dx.dark.compact": "App.Setting.dark.compact",
+                "dx.contrast": "App.Setting.contrast",
+                "dx.contrast.compact": "App.Setting.contrast.compact",
+                "dx.carmine": "App.Setting.carmine",
+                "dx.darkmoon": "App.Setting.darkmoon",
+                "dx.softblue": "App.Setting.softblue",
+                "dx.darkviolet": "App.Setting.darkviolet",
+                "dx.greenmist": "App.Setting.greenmist",
+                "dx.material.blue.light": "App.Setting.material.blue.light",
+                "dx.material.blue.dark": "App.Setting.material.blue.dark",
+                "dx.material.lime.light": "App.Setting.material.lime.light",
+                "dx.material.lime.dark": "App.Setting.material.lime.dark",
+                "dx.material.orange.light": "App.Setting.material.orange.light",
+                "dx.material.orange.dark": "App.Setting.material.orange.dark",
+                "dx.material.purple.light": "App.Setting.material.purple.light",
+                "dx.material.purple.dark": "App.Setting.material.purple.dark",
+                "dx.material.teal.light": "App.Setting.material.teal.light",
+                "dx.material.teal.dark": "App.Setting.material.teal.dark",
+                "dx.material.blue.light.compact": "App.Setting.material.blue.light.compact",
+                "dx.material.blue.dark.compact": "App.Setting.material.blue.dark.compact",
+                "dx.material.lime.light.compact": "App.Setting.material.lime.light.compact",
+                "dx.material.lime.dark.compact": "App.Setting.material.lime.dark.compact",
+                "dx.material.orange.light.compact": "App.Setting.material.orange.light.compact",
+                "dx.material.orange.dark.compact": "App.Setting.material.orange.dark.compact",
+                "dx.material.purple.light.compact": "App.Setting.material.purple.light.compact",
+                "dx.material.purple.dark.compact": "App.Setting.material.purple.dark.compact",
+                "dx.material.teal.light.compact": "App.Setting.material.teal.light.compact",
+                "dx.material.teal.dark.compact": "App.Setting.material.teal.dark.compact",
+                "dx.fluent.blue.dark.compact": "App.Setting.fluent.blue.dark.compact",
+                "dx.fluent.blue.dark": "App.Setting.fluent.blue.dark",
+                "dx.fluent.blue.light.compact": "App.Setting.fluent.blue.light.compact",
+                "dx.fluent.blue.light": "App.Setting.fluent.blue.light",
+                "dx.fluent.saas.dark.compact": "App.Setting.fluent.saas.dark.compact",
+                "dx.fluent.saas.dark": "App.Setting.fluent.saas.dark",
+                "dx.fluent.saas.light.compact": "App.Setting.fluent.saas.light.compact",
+                "dx.fluent.saas.light": "App.Setting.fluent.saas.light"
+            },
+            "order": 3
+        },
         {
             "code": "Abp.Localization.DefaultLanguage",
             "nameKey": "Abp.Localization.DefaultLanguage",
@@ -40,7 +128,7 @@
                 "tr": "Türkçe",
                 "zh-Hans": "繁體中文"
             },
-            "order": 1
+            "order": 4
         },
         {
             "code": "Abp.Timing.TimeZone",
@@ -196,94 +284,6 @@
                 "Yakutsk Standard Time": "Yakutsk Standard Time (+09:00)",
                 "Yukon Standard Time": "Yukon Standard Time (-07:00)"
             },
-            "order": 2
-        },
-        {
-            "code": "App.SiteManagement.Theme.Style",
-            "nameKey": "App.SiteManagement.Theme.Style",
-            "descriptionKey": "App.SiteManagement.Theme.Style.Description",
-            "defaultValue": "dx.material.blue.light.compact",
-            "isVisibleToClients": true,
-            "providers": "U|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "App.SiteManagement",
-            "subGroupKey": "App.SiteManagement.Theme",
-            "requiredPermissionName": "App.SiteManagement.Theme",
-            "dataType": "List",
-            "selectOptions": {
-                "dx.light": "App.Setting.light",
-                "dx.light.compact": "App.Setting.light.compact",
-                "dx.dark": "App.Setting.dark",
-                "dx.dark.compact": "App.Setting.dark.compact",
-                "dx.contrast": "App.Setting.contrast",
-                "dx.contrast.compact": "App.Setting.contrast.compact",
-                "dx.carmine": "App.Setting.carmine",
-                "dx.darkmoon": "App.Setting.darkmoon",
-                "dx.softblue": "App.Setting.softblue",
-                "dx.darkviolet": "App.Setting.darkviolet",
-                "dx.greenmist": "App.Setting.greenmist",
-                "dx.material.blue.light": "App.Setting.material.blue.light",
-                "dx.material.blue.dark": "App.Setting.material.blue.dark",
-                "dx.material.lime.light": "App.Setting.material.lime.light",
-                "dx.material.lime.dark": "App.Setting.material.lime.dark",
-                "dx.material.orange.light": "App.Setting.material.orange.light",
-                "dx.material.orange.dark": "App.Setting.material.orange.dark",
-                "dx.material.purple.light": "App.Setting.material.purple.light",
-                "dx.material.purple.dark": "App.Setting.material.purple.dark",
-                "dx.material.teal.light": "App.Setting.material.teal.light",
-                "dx.material.teal.dark": "App.Setting.material.teal.dark",
-                "dx.material.blue.light.compact": "App.Setting.material.blue.light.compact",
-                "dx.material.blue.dark.compact": "App.Setting.material.blue.dark.compact",
-                "dx.material.lime.light.compact": "App.Setting.material.lime.light.compact",
-                "dx.material.lime.dark.compact": "App.Setting.material.lime.dark.compact",
-                "dx.material.orange.light.compact": "App.Setting.material.orange.light.compact",
-                "dx.material.orange.dark.compact": "App.Setting.material.orange.dark.compact",
-                "dx.material.purple.light.compact": "App.Setting.material.purple.light.compact",
-                "dx.material.purple.dark.compact": "App.Setting.material.purple.dark.compact",
-                "dx.material.teal.light.compact": "App.Setting.material.teal.light.compact",
-                "dx.material.teal.dark.compact": "App.Setting.material.teal.dark.compact",
-                "dx.fluent.blue.dark.compact": "App.Setting.fluent.blue.dark.compact",
-                "dx.fluent.blue.dark": "App.Setting.fluent.blue.dark",
-                "dx.fluent.blue.light.compact": "App.Setting.fluent.blue.light.compact",
-                "dx.fluent.blue.light": "App.Setting.fluent.blue.light",
-                "dx.fluent.saas.dark.compact": "App.Setting.fluent.saas.dark.compact",
-                "dx.fluent.saas.dark": "App.Setting.fluent.saas.dark",
-                "dx.fluent.saas.light.compact": "App.Setting.fluent.saas.light.compact",
-                "dx.fluent.saas.light": "App.Setting.fluent.saas.light"
-            },
-            "order": 3
-        },
-        {
-            "code": "App.SiteManagement.General.NewMemberNotificationEmails",
-            "nameKey": "App.SiteManagement.General.NewMemberNotificationEmails",
-            "descriptionKey": "App.SiteManagement.General.NewMemberNotificationEmails.Description",
-            "defaultValue": "system@sozsoft.com",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "App.SiteManagement",
-            "subGroupKey": "App.SiteManagement.General",
-            "requiredPermissionName": "App.SiteManagement.General",
-            "dataType": "Text",
-            "selectOptions": {},
-            "order": 4
-        },
-        {
-            "code": "App.SiteManagement.General.TimedLoginEmails",
-            "nameKey": "App.SiteManagement.General.TimedLoginEmails",
-            "descriptionKey": "App.SiteManagement.General.TimedLoginEmails.Description",
-            "defaultValue": "system@sozsoft.com",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "App.SiteManagement",
-            "subGroupKey": "App.SiteManagement.General",
-            "requiredPermissionName": "App.SiteManagement.General",
-            "dataType": "Text",
-            "selectOptions": {},
             "order": 5
         },
         {
@@ -674,7 +674,7 @@
             "code": "Abp.Account.EnableLocalLogin",
             "nameKey": "Abp.Account.EnableLocalLogin",
             "descriptionKey": "Abp.Account.EnableLocalLogin.Description",
-            "defaultValue": "True",
+            "defaultValue": "False",
             "isVisibleToClients": false,
             "providers": "G|D",
             "isInherited": false,
@@ -766,22 +766,6 @@
             "selectOptions": {},
             "order": 46
         },
-        {
-            "code": "Abp.Identity.OrganizationUnit.MaxUserMembershipCount",
-            "nameKey": "Abp.Identity.OrganizationUnit.MaxUserMembershipCount",
-            "descriptionKey": "Abp.Identity.OrganizationUnit.MaxUserMembershipCount.Description",
-            "defaultValue": "2147483647",
-            "isVisibleToClients": true,
-            "providers": "T|G|D",
-            "isInherited": true,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.OrganizationUnit",
-            "requiredPermissionName": "Abp.Identity.OrganizationUnits",
-            "dataType": "Number",
-            "selectOptions": {},
-            "order": 49
-        },
         {
             "code": "Abp.Identity.Profile.General.RequireVerifiedAccount",
             "nameKey": "Abp.Identity.Profile.General.RequireVerifiedAccount",
@@ -814,182 +798,6 @@
             "selectOptions": {},
             "order": 51
         },
-        {
-            "code": "Abp.Identity.Password.ForceUsersToPeriodicallyChangePassword",
-            "nameKey": "Abp.Identity.Password.ForceUsersToPeriodicallyChangePassword",
-            "descriptionKey": "Abp.Identity.Password.ForceUsersToPeriodicallyChangePassword.Description",
-            "defaultValue": "True",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Password",
-            "requiredPermissionName": "Abp.Identity.Password",
-            "dataType": "Bool",
-            "selectOptions": {},
-            "order": 52
-        },
-        {
-            "code": "Abp.Identity.Password.PasswordChangePeriodDays",
-            "nameKey": "Abp.Identity.Password.PasswordChangePeriodDays",
-            "descriptionKey": "Abp.Identity.Password.PasswordChangePeriodDays.Description",
-            "defaultValue": "0",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Password",
-            "requiredPermissionName": "Abp.Identity.Password",
-            "dataType": "Number",
-            "selectOptions": {},
-            "order": 53
-        },
-        {
-            "code": "Abp.Identity.Password.RequiredLength",
-            "nameKey": "Abp.Identity.Password.RequiredLength",
-            "descriptionKey": "Abp.Identity.Password.RequiredLength.Description",
-            "defaultValue": "6",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Password",
-            "requiredPermissionName": "Abp.Identity.Password",
-            "dataType": "Number",
-            "selectOptions": {},
-            "order": 54
-        },
-        {
-            "code": "Abp.Identity.Password.RequiredUniqueChars",
-            "nameKey": "Abp.Identity.Password.RequiredUniqueChars",
-            "descriptionKey": "Abp.Identity.Password.RequiredUniqueChars.Description",
-            "defaultValue": "1",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Password",
-            "requiredPermissionName": "Abp.Identity.Password",
-            "dataType": "Number",
-            "selectOptions": {},
-            "order": 55
-        },
-        {
-            "code": "Abp.Identity.Password.RequireNonAlphanumeric",
-            "nameKey": "Abp.Identity.Password.RequireNonAlphanumeric",
-            "descriptionKey": "Abp.Identity.Password.RequireNonAlphanumeric.Description",
-            "defaultValue": "True",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Password",
-            "requiredPermissionName": "Abp.Identity.Password",
-            "dataType": "Bool",
-            "selectOptions": {},
-            "order": 56
-        },
-        {
-            "code": "Abp.Identity.Password.RequireLowercase",
-            "nameKey": "Abp.Identity.Password.RequireLowercase",
-            "descriptionKey": "Abp.Identity.Password.RequireLowercase.Description",
-            "defaultValue": "True",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Password",
-            "requiredPermissionName": "Abp.Identity.Password",
-            "dataType": "Bool",
-            "selectOptions": {},
-            "order": 57
-        },
-        {
-            "code": "Abp.Identity.Password.RequireUppercase",
-            "nameKey": "Abp.Identity.Password.RequireUppercase",
-            "descriptionKey": "Abp.Identity.Password.RequireUppercase.Description",
-            "defaultValue": "True",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Password",
-            "requiredPermissionName": "Abp.Identity.Password",
-            "dataType": "Bool",
-            "selectOptions": {},
-            "order": 58
-        },
-        {
-            "code": "Abp.Identity.Password.RequireDigit",
-            "nameKey": "Abp.Identity.Password.RequireDigit",
-            "descriptionKey": "Abp.Identity.Password.RequireDigit.Description",
-            "defaultValue": "True",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Password",
-            "requiredPermissionName": "Abp.Identity.Password",
-            "dataType": "Bool",
-            "selectOptions": {},
-            "order": 59
-        },
-        {
-            "code": "Abp.Identity.Lockout.AllowedForNewUsers",
-            "nameKey": "Abp.Identity.Lockout.AllowedForNewUsers",
-            "descriptionKey": "Abp.Identity.Lockout.AllowedForNewUsers.Description",
-            "defaultValue": "True",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Lockout",
-            "requiredPermissionName": "Abp.Identity.Lockout",
-            "dataType": "Bool",
-            "selectOptions": {},
-            "order": 60
-        },
-        {
-            "code": "Abp.Identity.Lockout.LockoutDuration",
-            "nameKey": "Abp.Identity.Lockout.LockoutDuration",
-            "descriptionKey": "Abp.Identity.Lockout.LockoutDuration.Description",
-            "defaultValue": "300",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Lockout",
-            "requiredPermissionName": "Abp.Identity.Lockout",
-            "dataType": "Number",
-            "selectOptions": {},
-            "order": 61
-        },
-        {
-            "code": "Abp.Identity.Lockout.MaxFailedAccessAttempts",
-            "nameKey": "Abp.Identity.Lockout.MaxFailedAccessAttempts",
-            "descriptionKey": "Abp.Identity.Lockout.MaxFailedAccessAttempts.Description",
-            "defaultValue": "5",
-            "isVisibleToClients": false,
-            "providers": "T|G|D",
-            "isInherited": false,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.Lockout",
-            "requiredPermissionName": "Abp.Identity.Lockout",
-            "dataType": "Number",
-            "selectOptions": {},
-            "order": 62
-        },
         {
             "code": "Abp.Identity.SignIn.RequireConfirmedEmail",
             "nameKey": "Abp.Identity.SignIn.RequireConfirmedEmail",
@@ -1004,7 +812,23 @@
             "requiredPermissionName": "Abp.Identity.SignIn",
             "dataType": "Bool",
             "selectOptions": {},
-            "order": 63
+            "order": 60
+        },
+        {
+            "code": "Abp.Identity.SignIn.RequireEmailVerificationToRegister",
+            "nameKey": "Abp.Identity.SignIn.RequireEmailVerificationToRegister",
+            "descriptionKey": "Abp.Identity.SignIn.RequireEmailVerificationToRegister.Description",
+            "defaultValue": "False",
+            "isVisibleToClients": true,
+            "providers": "G|D",
+            "isInherited": true,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.SignIn",
+            "requiredPermissionName": "Abp.Identity.SignIn",
+            "dataType": "Bool",
+            "selectOptions": {},
+            "order": 61
         },
         {
             "code": "Abp.Identity.SignIn.RequireConfirmedPhoneNumber",
@@ -1020,13 +844,13 @@
             "requiredPermissionName": "Abp.Identity.SignIn",
             "dataType": "Bool",
             "selectOptions": {},
-            "order": 64
+            "order": 62
         },
         {
             "code": "Abp.Identity.SignIn.EnablePhoneNumberConfirmation",
             "nameKey": "Abp.Identity.SignIn.EnablePhoneNumberConfirmation",
             "descriptionKey": "Abp.Identity.SignIn.EnablePhoneNumberConfirmation.Description",
-            "defaultValue": "True",
+            "defaultValue": "False",
             "isVisibleToClients": true,
             "providers": "G|D",
             "isInherited": true,
@@ -1036,23 +860,7 @@
             "requiredPermissionName": "Abp.Identity.SignIn",
             "dataType": "Bool",
             "selectOptions": {},
-            "order": 65
+            "order": 63
-        },
-        {
-            "code": "Abp.Identity.SignIn.RequireEmailVerificationToRegister",
-            "nameKey": "Abp.Identity.SignIn.RequireEmailVerificationToRegister",
-            "descriptionKey": "Abp.Identity.SignIn.RequireEmailVerificationToRegister.Description",
-            "defaultValue": "True",
-            "isVisibleToClients": true,
-            "providers": "G|D",
-            "isInherited": true,
-            "isEncrypted": false,
-            "mainGroupKey": "Abp.Identity",
-            "subGroupKey": "Abp.Identity.SignIn",
-            "requiredPermissionName": "Abp.Identity.SignIn",
-            "dataType": "Bool",
-            "selectOptions": {},
-            "order": 66
         },
         {
             "code": "Abp.Identity.User.IsUserNameUpdateEnabled",
@@ -1068,7 +876,7 @@
             "requiredPermissionName": "Abp.Identity.User",
             "dataType": "Bool",
             "selectOptions": {},
-            "order": 67
+            "order": 64
         },
         {
             "code": "Abp.Identity.User.IsEmailUpdateEnabled",
@@ -1084,7 +892,185 @@
             "requiredPermissionName": "Abp.Identity.User",
             "dataType": "Bool",
             "selectOptions": {},
-            "order": 68
+            "order": 65
+        },
+
+
+        {
+            "code": "Abp.Identity.Password.ForceUsersToPeriodicallyChangePassword",
+            "nameKey": "Abp.Identity.Password.ForceUsersToPeriodicallyChangePassword",
+            "descriptionKey": "Abp.Identity.Password.ForceUsersToPeriodicallyChangePassword.Description",
+            "defaultValue": "True",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Password",
+            "requiredPermissionName": "Abp.Identity.Password",
+            "dataType": "Bool",
+            "selectOptions": {},
+            "order": 70
+        },
+        {
+            "code": "Abp.Identity.Password.PasswordChangePeriodDays",
+            "nameKey": "Abp.Identity.Password.PasswordChangePeriodDays",
+            "descriptionKey": "Abp.Identity.Password.PasswordChangePeriodDays.Description",
+            "defaultValue": "180",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Password",
+            "requiredPermissionName": "Abp.Identity.Password",
+            "dataType": "Number",
+            "selectOptions": {},
+            "order": 71
+        },
+        {
+            "code": "Abp.Identity.Password.RequiredLength",
+            "nameKey": "Abp.Identity.Password.RequiredLength",
+            "descriptionKey": "Abp.Identity.Password.RequiredLength.Description",
+            "defaultValue": "6",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Password",
+            "requiredPermissionName": "Abp.Identity.Password",
+            "dataType": "Number",
+            "selectOptions": {},
+            "order": 72
+        },
+        {
+            "code": "Abp.Identity.Password.RequiredUniqueChars",
+            "nameKey": "Abp.Identity.Password.RequiredUniqueChars",
+            "descriptionKey": "Abp.Identity.Password.RequiredUniqueChars.Description",
+            "defaultValue": "1",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Password",
+            "requiredPermissionName": "Abp.Identity.Password",
+            "dataType": "Number",
+            "selectOptions": {},
+            "order": 73
+        },
+        {
+            "code": "Abp.Identity.Password.RequireNonAlphanumeric",
+            "nameKey": "Abp.Identity.Password.RequireNonAlphanumeric",
+            "descriptionKey": "Abp.Identity.Password.RequireNonAlphanumeric.Description",
+            "defaultValue": "True",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Password",
+            "requiredPermissionName": "Abp.Identity.Password",
+            "dataType": "Bool",
+            "selectOptions": {},
+            "order": 74
+        },
+        {
+            "code": "Abp.Identity.Password.RequireLowercase",
+            "nameKey": "Abp.Identity.Password.RequireLowercase",
+            "descriptionKey": "Abp.Identity.Password.RequireLowercase.Description",
+            "defaultValue": "True",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Password",
+            "requiredPermissionName": "Abp.Identity.Password",
+            "dataType": "Bool",
+            "selectOptions": {},
+            "order": 75
+        },
+        {
+            "code": "Abp.Identity.Password.RequireUppercase",
+            "nameKey": "Abp.Identity.Password.RequireUppercase",
+            "descriptionKey": "Abp.Identity.Password.RequireUppercase.Description",
+            "defaultValue": "True",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Password",
+            "requiredPermissionName": "Abp.Identity.Password",
+            "dataType": "Bool",
+            "selectOptions": {},
+            "order": 76
+        },
+        {
+            "code": "Abp.Identity.Password.RequireDigit",
+            "nameKey": "Abp.Identity.Password.RequireDigit",
+            "descriptionKey": "Abp.Identity.Password.RequireDigit.Description",
+            "defaultValue": "True",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Password",
+            "requiredPermissionName": "Abp.Identity.Password",
+            "dataType": "Bool",
+            "selectOptions": {},
+            "order": 77
+        },
+        {
+            "code": "Abp.Identity.Lockout.AllowedForNewUsers",
+            "nameKey": "Abp.Identity.Lockout.AllowedForNewUsers",
+            "descriptionKey": "Abp.Identity.Lockout.AllowedForNewUsers.Description",
+            "defaultValue": "True",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Lockout",
+            "requiredPermissionName": "Abp.Identity.Lockout",
+            "dataType": "Bool",
+            "selectOptions": {},
+            "order": 78
+        },
+        {
+            "code": "Abp.Identity.Lockout.LockoutDuration",
+            "nameKey": "Abp.Identity.Lockout.LockoutDuration",
+            "descriptionKey": "Abp.Identity.Lockout.LockoutDuration.Description",
+            "defaultValue": "300",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Lockout",
+            "requiredPermissionName": "Abp.Identity.Lockout",
+            "dataType": "Number",
+            "selectOptions": {},
+            "order": 79
+        },
+        {
+            "code": "Abp.Identity.Lockout.MaxFailedAccessAttempts",
+            "nameKey": "Abp.Identity.Lockout.MaxFailedAccessAttempts",
+            "descriptionKey": "Abp.Identity.Lockout.MaxFailedAccessAttempts.Description",
+            "defaultValue": "5",
+            "isVisibleToClients": false,
+            "providers": "T|G|D",
+            "isInherited": false,
+            "isEncrypted": false,
+            "mainGroupKey": "Abp.Identity",
+            "subGroupKey": "Abp.Identity.Lockout",
+            "requiredPermissionName": "Abp.Identity.Lockout",
+            "dataType": "Number",
+            "selectOptions": {},
+            "order": 80
         }
     ],
     "NotificationTypes": [],

api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json

@@ -2157,8 +2157,8 @@
         {
             "resourceName": "Platform",
             "key": "Abp.Mailing.Smtp.UseDefaultCredentials.Description",
-            "en": "Use Default Credentials Description",
+            "en": "Whether to use default credentials for the SMTP server.",
-            "tr": "Varsayılan Kimlik Bilgilerini Kullan Açıklaması"
+            "tr": "SMTP sunucusu için varsayılan kimlik bilgilerini kullanıp kullanmayacağını belirtir."
         },
         {
             "resourceName": "Platform",
@@ -2457,8 +2457,8 @@
         {
             "resourceName": "Platform",
             "key": "Abp.Account.TwoFactor.Enabled.Description",
-            "en": "Two Factor Enabled Description",
+            "en": "When enabled, users will be required to enter a two-factor authentication code sent to their email address during login.",
-            "tr": "İki Faktör Ektinleştirme Açıklaması"
+            "tr": "Etkinleştirildiğinde, kullanıcıların giriş sırasında e-posta adreslerine gönderilen iki faktörlü kimlik doğrulama kodunu girmeleri gerekecektir."
         },
         {
             "resourceName": "Platform",

api/src/Sozsoft.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs

@@ -135,10 +135,10 @@ public class PlatformIdentityDataSeeder : IdentityDataSeeder
                     Surname = PlatformConsts.AbpIdentity.User.AdminSurNameDefaultValue,
                 };
 
-                adminUser.SetEmailConfirmed(true);
                 adminUser.SetIsVerified(true);
+                adminUser.SetEmailConfirmed(true);
                 adminUser.SetRocketUsername(PlatformConsts.AbpIdentity.User.AdminRocketUsernameDefaultValue);
-                adminUser.SetPhoneNumber(PlatformConsts.AbpIdentity.User.AdminPhoneNumberDefaultValue, true);
+                adminUser.SetPhoneNumber(PlatformConsts.AbpIdentity.User.AdminPhoneNumberDefaultValue, adminUser.PhoneNumberConfirmed);
                 adminUser.SetWorkHour(PlatformConsts.AbpIdentity.User.AdminWorkHourDefaultValue);
                 adminUser.SetNationality(PlatformConsts.AbpIdentity.User.AdminNationalityDefaultValue);
                 adminUser.SetBloodType(PlatformConsts.AbpIdentity.User.AdminBloodTypeDefaultValue);

api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantIdentityDataSeeder.cs

@@ -133,10 +133,10 @@ public class TenantIdentityDataSeeder : IdentityDataSeeder
                     Surname = PlatformConsts.AbpIdentity.User.AdminSurNameDefaultValue,
                 };
 
-                adminUser.SetEmailConfirmed(true);
                 adminUser.SetIsVerified(true);
+                adminUser.SetEmailConfirmed(true);
                 adminUser.SetRocketUsername(PlatformConsts.AbpIdentity.User.AdminRocketUsernameDefaultValue);
-                adminUser.SetPhoneNumber(PlatformConsts.AbpIdentity.User.AdminPhoneNumberDefaultValue, true);
+                adminUser.SetPhoneNumber(PlatformConsts.AbpIdentity.User.AdminPhoneNumberDefaultValue, adminUser.PhoneNumberConfirmed);
                 adminUser.SetWorkHour(PlatformConsts.AbpIdentity.User.AdminWorkHourDefaultValue);
                 adminUser.SetNationality(PlatformConsts.AbpIdentity.User.AdminNationalityDefaultValue);
                 adminUser.SetBloodType(PlatformConsts.AbpIdentity.User.AdminBloodTypeDefaultValue);

ui/src/views/admin/user-management/Details.tsx

@@ -1274,7 +1274,6 @@ function UserDetails() {
                               />
                             </FormItem>
 
-                            {isRequireVerifiedAccount?.toLowerCase() === 'true' && (
                             <FormItem
                               layout="horizontal"
                               labelClass="!justify-start"
@@ -1285,14 +1284,12 @@ function UserDetails() {
                             >
                               <Field
                                 name="isVerified"
-                                  disabled={isRequireVerifiedAccount?.toLowerCase() !== 'true'}
                                 placeholder={translate(
                                   '::Abp.Identity.User.LockoutManagement.AdminVerification',
                                 )}
                                 component={Checkbox}
                               />
                             </FormItem>
-                            )}
 
                             {isRequireConfirmedEmail?.toLowerCase() === 'true' && (
                               <FormItem