Merge pull request #7719 from abpframework/maliming/identity-pro-feat…

…ures-settings

Remove TwoFactor's settings and feature.

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json

@@ -78,12 +78,6 @@
     "Permission:ChangePermissions": "Change permissions",
     "Permission:UserManagement": "User management",
     "Permission:UserLookup": "User lookup",
-    "Feature:IdentityGroup": "Identity",
-    "Feature:TwoFactor": "Two factor behaviour",
-    "Feature:TwoFactorDescription": "Set two factor behaviour. Optional values: Optional,Disabled,Forced",
-    "Feature:TwoFactor.Optional": "Optional",
-    "Feature:TwoFactor.Disabled": "Disabled",
-    "Feature:TwoFactor.Forced": "Forced",
     "DisplayName:Abp.Identity.Password.RequiredLength": "Required length",
     "DisplayName:Abp.Identity.Password.RequiredUniqueChars": "Required unique characters number",
     "DisplayName:Abp.Identity.Password.RequireNonAlphanumeric": "Required non-alphanumeric character",
@@ -111,10 +105,6 @@
     "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "Whether the phoneNumber can be confirmed by the user.",
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "Whether a confirmed telephone number is required to sign in.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "Whether the username can be updated by the user.",
-    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "Whether the email can be updated by the user.",
-    "DisplayName:Abp.Identity.TwoFactorBehaviour": "Two Factor behaviour",
-    "Description:Abp.Identity.TwoFactorBehaviour": "Two Factor behaviour",
-    "DisplayName:Abp.Identity.UsersCanChange": "Allow users to change their Two Factor.",
-    "Description:Abp.Identity.UsersCanChange": "Allow users to change their Two Factor."
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "Whether the email can be updated by the user."
   }
 }

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json

@@ -76,12 +76,6 @@
     "Permission:ChangePermissions": "İzinleri değiştirme",
     "Permission:UserManagement": "Kullanıcı yönetimi",
     "Permission:UserLookup": "Kullanıcı sorgulama",
-    "Feature:IdentityGroup": "Kimlik",
-    "Feature:TwoFactor": "İki faktörlü kimlik doğrulama",
-    "Feature:TwoFactorDescription": "İki faktörlü kimlik doğrulamanın talep edileceği durumu seçin",
-    "Feature:TwoFactor.Optional": "İsteğe bağlı",
-    "Feature:TwoFactor.Disabled": "Asla",
-    "Feature:TwoFactor.Forced": "Her zaman",
     "DisplayName:Abp.Identity.Password.RequiredLength": "Uzunluk gerekli",
     "DisplayName:Abp.Identity.Password.RequiredUniqueChars": "Tekil karakter gerekli",
     "DisplayName:Abp.Identity.Password.RequireNonAlphanumeric": "Alfasayısal olmayan karakter gerekli",
@@ -109,10 +103,6 @@
     "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "Oturum açmak için telefon numarası gerekli",
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "Oturum açmak için onaylanmış bir telefon numarasının gerekli olup olmadığı.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "Kullanıcı adının, kullanıcının kendisi tarafından güncellenebilirliği.",
-    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "E-posta alanının, kullanıcının kendisi tarafından güncellenebilirliği",
-    "DisplayName:Abp.Identity.TwoFactorBehaviour": "İki faktörlü kimlik doğrulama davranışı",
-    "Description:Abp.Identity.TwoFactorBehaviour": "İki faktörlü kimlik doğrulama davranışı",
-    "DisplayName:Abp.Identity.UsersCanChange": "Kullanıcıların iki faktörlü kimlik doğrulama davranışını değiştirmelerine izin verin.",
-    "Description:Abp.Identity.UsersCanChange": "Kullanıcıların iki faktörlü kimlik doğrulama davranışını değiştirmelerine izin verin"
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "E-posta alanının, kullanıcının kendisi tarafından güncellenebilirliği"
   }
 }

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json

@@ -78,12 +78,6 @@
     "Permission:ChangePermissions": "更改权限",
     "Permission:UserManagement": "用户管理",
     "Permission:UserLookup": "用户查询",
-    "Feature:IdentityGroup": "身份标识",
-    "Feature:TwoFactor": "双因素身份验证行为",
-    "Feature:TwoFactorDescription": "设置双因素身份验证行为. 可选值:可选,禁用,强制启用",
-    "Feature:TwoFactor.Optional": "可选",
-    "Feature:TwoFactor.Disabled": "禁用",
-    "Feature:TwoFactor.Forced": "强制启用",
     "DisplayName:Abp.Identity.Password.RequiredLength": "要求长度",
     "DisplayName:Abp.Identity.Password.RequiredUniqueChars": "要求唯一字符数量",
     "DisplayName:Abp.Identity.Password.RequireNonAlphanumeric": "要求非字母数字",
@@ -111,10 +105,6 @@
     "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "用户是否可以确认电话号码",
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "登录时是否需要验证的手机号码.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "是否允许用户更新用户名.",
-    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "是否允许用户更新电子邮箱.",
-    "DisplayName:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为",
-    "Description:Abp.Identity.TwoFactorBehaviour": "双因素身份验证行为",
-    "DisplayName:Abp.Identity.UsersCanChange": "允许用户更改其因素身份验证.",
-    "Description:Abp.Identity.UsersCanChange": "允许用户更改其因素身份验证."
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "是否允许用户更新电子邮箱."
   }
-}
+}

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json

@@ -78,12 +78,6 @@
     "Permission:ChangePermissions": "更改權限",
     "Permission:UserManagement": "使用者管理",
     "Permission:UserLookup": "使用者查詢",
-    "Feature:IdentityGroup": "身份識別",
-    "Feature:TwoFactor": "雙因素身份驗證行為",
-    "Feature:TwoFactorDescription": "設置雙因素身份驗證行為. 可選值:可選,禁用,強制啟用",
-    "Feature:TwoFactor.Optional": "選用",
-    "Feature:TwoFactor.Disabled": "關閉",
-    "Feature:TwoFactor.Forced": "強制啟用",
     "DisplayName:Abp.Identity.Password.RequiredLength": "長度需符合",
     "DisplayName:Abp.Identity.Password.RequiredUniqueChars": "需最小特殊字元數",
     "DisplayName:Abp.Identity.Password.RequireNonAlphanumeric": "需包含非數字字母",
@@ -111,10 +105,6 @@
     "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "是否啟用電話認證.",
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "決定使用者是否需電話認證後才能登入.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "決定使用者是否能更新帳號.",
-    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "決定使用者是否能更新信箱.",
-    "DisplayName:Abp.Identity.TwoFactorBehaviour": "雙因素認證行為",
-    "Description:Abp.Identity.TwoFactorBehaviour": "雙因素認證行為",
-    "DisplayName:Abp.Identity.UsersCanChange": "允許使用者變更雙因素認證.",
-    "Description:Abp.Identity.UsersCanChange": "允許使用者變更雙因素認證."
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "決定使用者是否能更新信箱."
   }
 }

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentitySettingNames.cs

@@ -48,14 +48,5 @@ public static class OrganizationUnit
 
             public const string MaxUserMembershipCount = OrganizationUnitPrefix + ".MaxUserMembershipCount";
         }
-
-        public static class TwoFactor
-        {
-            private const string TwoFactorPrefix = Prefix + ".TwoFactor";
-
-            public const string Behaviour = TwoFactorPrefix + ".Behaviour";
-
-            public const string UsersCanChange = TwoFactorPrefix + ".UsersCanChange";
-        }
     }
 }

modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj

@@ -22,9 +22,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Identity.Domain.Shared\Volo.Abp.Identity.Domain.Shared.csproj" />
-
     <ProjectReference Include="..\..\..\users\src\Volo.Abp.Users.Domain\Volo.Abp.Users.Domain.csproj" />
-
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
   </ItemGroup>

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

@@ -1,5 +1,4 @@
-using Volo.Abp.Identity.Features;
-using Volo.Abp.Identity.Localization;
+using Volo.Abp.Identity.Localization;
 using Volo.Abp.Identity.Settings;
 using Volo.Abp.Localization;
 using Volo.Abp.Settings;
@@ -112,19 +111,7 @@ public override void Define(ISettingDefinitionContext context)
                     int.MaxValue.ToString(),
                     L("Identity.OrganizationUnit.MaxUserMembershipCount"),
                     L("Identity.OrganizationUnit.MaxUserMembershipCount"),
-                    true),
-
-                new SettingDefinition(IdentitySettingNames.TwoFactor.Behaviour,
-                    IdentityTwoFactorBehaviour.Optional.ToString(),
-                    L("DisplayName:Abp.Identity.TwoFactorBehaviour"),
-                    L("Description:Abp.Identity.TwoFactorBehaviour"),
-                    isVisibleToClients: true),
-
-                new SettingDefinition(IdentitySettingNames.TwoFactor.UsersCanChange,
-                    true.ToString(),
-                    L("DisplayName:Abp.Identity.UsersCanChange"),
-                    L("Description:Abp.Identity.UsersCanChange"),
-                    isVisibleToClients: true)
+                    true)
             );
         }