Merge branch 'dev' of https://github.com/abpframework/abp into dev

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

@@ -82,6 +82,7 @@
     "DisplayName:Abp.Identity.Lockout.LockoutDuration": "Lockout duration(seconds)",
     "DisplayName:Abp.Identity.Lockout.MaxFailedAccessAttempts": "Max failed access attempts",
     "DisplayName:Abp.Identity.SignIn.RequireConfirmedEmail": "Require confirmed email",
+    "DisplayName:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "Enable phone number confirmation",
     "DisplayName:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "Require confirmed phoneNumber",
     "DisplayName:Abp.Identity.User.IsUserNameUpdateEnabled": "Is username update enabled",
     "DisplayName:Abp.Identity.User.IsEmailUpdateEnabled": "Is email update enabled",
@@ -95,6 +96,7 @@
     "Description:Abp.Identity.Lockout.LockoutDuration": "The duration a user is locked out for when a lockout occurs.",
     "Description:Abp.Identity.Lockout.MaxFailedAccessAttempts": "The number of failed access attempts allowed before a user is locked out, assuming lock out is enabled.",
     "Description:Abp.Identity.SignIn.RequireConfirmedEmail": "Whether a confirmed email address is required to sign in.",
+    "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."

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

@@ -30,6 +30,7 @@
             private const string SignInPrefix = Prefix + ".SignIn";
 
             public const string RequireConfirmedEmail = SignInPrefix + ".RequireConfirmedEmail";
+            public const string EnablePhoneNumberConfirmation = SignInPrefix + ".EnablePhoneNumberConfirmation";
             public const string RequireConfirmedPhoneNumber = SignInPrefix + ".RequireConfirmedPhoneNumber";
         }
 

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

@@ -72,6 +72,11 @@ namespace Volo.Abp.Identity
                     false.ToString(), L("DisplayName:Abp.Identity.SignIn.RequireConfirmedEmail"), 
                     L("Description:Abp.Identity.SignIn.RequireConfirmedEmail"), 
                     true),
+                new SettingDefinition(
+                    IdentitySettingNames.SignIn.EnablePhoneNumberConfirmation, 
+                    true.ToString(), L("DisplayName:Abp.Identity.SignIn.EnablePhoneNumberConfirmation"), 
+                    L("Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation"), 
+                    true),
                 new SettingDefinition(
                     IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, 
                     false.ToString(), L("DisplayName:Abp.Identity.SignIn.RequireConfirmedPhoneNumber"),