");
@@ -86,7 +86,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
output.PostContent.AppendHtml($"
");
output.PostContent.AppendHtml("
");
- output.PostContent.AppendHtml("");
+ output.PostContent.AppendHtml("");
output.PostContent.Append(content.GetContent());
output.PostContent.AppendHtml("");
output.PostContent.AppendHtml("");
diff --git a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobNamingNormalizer.cs
index b456d7abb6..cf8ff42973 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobNamingNormalizer.cs
@@ -1,46 +1,51 @@
-using System.Text.RegularExpressions;
+using System.Globalization;
+using System.Text.RegularExpressions;
using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
namespace Volo.Abp.BlobStoring.Aliyun
{
public class AliyunBlobNamingNormalizer : IBlobNamingNormalizer, ITransientDependency
{
///
- /// Container names can contain only letters, numbers, and the dash (-) character
- /// they can't start or end with the dash (-) character
+ /// Container names can contain only letters, numbers, and the dash (-) character
+ /// they can't start or end with the dash (-) character
/// Container names must be from 3 through 63 characters long
///
public virtual string NormalizeContainerName(string containerName)
{
- // All letters in a container name must be lowercase.
- containerName = containerName.ToLower();
+ using (CultureHelper.Use(CultureInfo.InvariantCulture))
+ {
+ // All letters in a container name must be lowercase.
+ containerName = containerName.ToLower();
- // Container names can contain only letters, numbers, and the dash (-) character.
- containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
+ // Container names can contain only letters, numbers, and the dash (-) character.
+ containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
- // Every dash (-) character must be immediately preceded and followed by a letter or number;
- // consecutive dashes are not permitted in container names.
- // Container names must start or end with a letter or number
- containerName = Regex.Replace(containerName, "-{2,}", "-");
- containerName = Regex.Replace(containerName, "^-", string.Empty);
- containerName = Regex.Replace(containerName, "-$", string.Empty);
+ // Every dash (-) character must be immediately preceded and followed by a letter or number;
+ // consecutive dashes are not permitted in container names.
+ // Container names must start or end with a letter or number
+ containerName = Regex.Replace(containerName, "-{2,}", "-");
+ containerName = Regex.Replace(containerName, "^-", string.Empty);
+ containerName = Regex.Replace(containerName, "-$", string.Empty);
- // Container names must be from 3 through 63 characters long.
- if (containerName.Length < 3)
- {
- var length = containerName.Length;
- for (var i = 0; i < 3 - length; i++)
+ // Container names must be from 3 through 63 characters long.
+ if (containerName.Length < 3)
{
- containerName += "0";
+ var length = containerName.Length;
+ for (var i = 0; i < 3 - length; i++)
+ {
+ containerName += "0";
+ }
}
- }
- if (containerName.Length > 63)
- {
- containerName = containerName.Substring(0, 63);
- }
+ if (containerName.Length > 63)
+ {
+ containerName = containerName.Substring(0, 63);
+ }
- return containerName;
+ return containerName;
+ }
}
public virtual string NormalizeBlobName(string blobName)
diff --git a/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobNamingNormalizer.cs
index cd8eca021e..3779f9ff70 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobNamingNormalizer.cs
@@ -1,5 +1,7 @@
-using System.Text.RegularExpressions;
+using System.Globalization;
+using System.Text.RegularExpressions;
using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
namespace Volo.Abp.BlobStoring.Aws
{
@@ -10,35 +12,38 @@ namespace Volo.Abp.BlobStoring.Aws
///
public virtual string NormalizeContainerName(string containerName)
{
- // All letters in a container name must be lowercase.
- containerName = containerName.ToLower();
+ using (CultureHelper.Use(CultureInfo.InvariantCulture))
+ {
+ // All letters in a container name must be lowercase.
+ containerName = containerName.ToLower();
- // Container names can contain only letters, numbers, and the dash (-) character.
- containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
+ // Container names can contain only letters, numbers, and the dash (-) character.
+ containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
- // Every dash (-) character must be immediately preceded and followed by a letter or number;
- // consecutive dashes are not permitted in container names.
- // Container names must start or end with a letter or number
- containerName = Regex.Replace(containerName, "-{2,}", "-");
- containerName = Regex.Replace(containerName, "^-", string.Empty);
- containerName = Regex.Replace(containerName, "-$", string.Empty);
+ // Every dash (-) character must be immediately preceded and followed by a letter or number;
+ // consecutive dashes are not permitted in container names.
+ // Container names must start or end with a letter or number
+ containerName = Regex.Replace(containerName, "-{2,}", "-");
+ containerName = Regex.Replace(containerName, "^-", string.Empty);
+ containerName = Regex.Replace(containerName, "-$", string.Empty);
- // Container names must be from 3 through 63 characters long.
- if (containerName.Length < 3)
- {
- var length = containerName.Length;
- for (var i = 0; i < 3 - length; i++)
+ // Container names must be from 3 through 63 characters long.
+ if (containerName.Length < 3)
{
- containerName += "0";
+ var length = containerName.Length;
+ for (var i = 0; i < 3 - length; i++)
+ {
+ containerName += "0";
+ }
}
- }
- if (containerName.Length > 63)
- {
- containerName = containerName.Substring(0, 63);
- }
+ if (containerName.Length > 63)
+ {
+ containerName = containerName.Substring(0, 63);
+ }
- return containerName;
+ return containerName;
+ }
}
///
diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs
index 43b479e08e..767a7b6fea 100644
--- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs
@@ -1,5 +1,7 @@
-using System.Text.RegularExpressions;
+using System.Globalization;
+using System.Text.RegularExpressions;
using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
namespace Volo.Abp.BlobStoring.Azure
{
@@ -10,35 +12,38 @@ namespace Volo.Abp.BlobStoring.Azure
///
public virtual string NormalizeContainerName(string containerName)
{
- // All letters in a container name must be lowercase.
- containerName = containerName.ToLower();
+ using (CultureHelper.Use(CultureInfo.InvariantCulture))
+ {
+ // All letters in a container name must be lowercase.
+ containerName = containerName.ToLower();
- // Container names can contain only letters, numbers, and the dash (-) character.
- containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
+ // Container names can contain only letters, numbers, and the dash (-) character.
+ containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
- // Every dash (-) character must be immediately preceded and followed by a letter or number;
- // consecutive dashes are not permitted in container names.
- // Container names must start or end with a letter or number
- containerName = Regex.Replace(containerName, "-{2,}", "-");
- containerName = Regex.Replace(containerName, "^-", string.Empty);
- containerName = Regex.Replace(containerName, "-$", string.Empty);
+ // Every dash (-) character must be immediately preceded and followed by a letter or number;
+ // consecutive dashes are not permitted in container names.
+ // Container names must start or end with a letter or number
+ containerName = Regex.Replace(containerName, "-{2,}", "-");
+ containerName = Regex.Replace(containerName, "^-", string.Empty);
+ containerName = Regex.Replace(containerName, "-$", string.Empty);
- // Container names must be from 3 through 63 characters long.
- if (containerName.Length < 3)
- {
- var length = containerName.Length;
- for (var i = 0; i < 3 - length; i++)
+ // Container names must be from 3 through 63 characters long.
+ if (containerName.Length < 3)
{
- containerName += "0";
+ var length = containerName.Length;
+ for (var i = 0; i < 3 - length; i++)
+ {
+ containerName += "0";
+ }
}
- }
- if (containerName.Length > 63)
- {
- containerName = containerName.Substring(0, 63);
- }
+ if (containerName.Length > 63)
+ {
+ containerName = containerName.Substring(0, 63);
+ }
- return containerName;
+ return containerName;
+ }
}
///
diff --git a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs
index f7d273dca7..94c19b07f8 100644
--- a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs
@@ -1,8 +1,10 @@
using System;
+using System.Globalization;
using System.Runtime;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
namespace Volo.Abp.BlobStoring.FileSystem
{
@@ -27,15 +29,18 @@ namespace Volo.Abp.BlobStoring.FileSystem
protected virtual string Normalize(string fileName)
{
- var os = _iosPlatformProvider.GetCurrentOSPlatform();
- if (os == OSPlatform.Windows)
+ using (CultureHelper.Use(CultureInfo.InvariantCulture))
{
- // A filename cannot contain any of the following characters: \ / : * ? " < > |
- // In order to support the directory included in the blob name, remove / and \
- fileName = Regex.Replace(fileName, "[:\\*\\?\"<>\\|]", string.Empty);
- }
+ var os = _iosPlatformProvider.GetCurrentOSPlatform();
+ if (os == OSPlatform.Windows)
+ {
+ // A filename cannot contain any of the following characters: \ / : * ? " < > |
+ // In order to support the directory included in the blob name, remove / and \
+ fileName = Regex.Replace(fileName, "[:\\*\\?\"<>\\|]", string.Empty);
+ }
- return fileName;
+ return fileName;
+ }
}
}
}
diff --git a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobNamingNormalizer.cs b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobNamingNormalizer.cs
index d350910105..c4df24f91a 100644
--- a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobNamingNormalizer.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobNamingNormalizer.cs
@@ -1,5 +1,7 @@
-using System.Text.RegularExpressions;
+using System.Globalization;
+using System.Text.RegularExpressions;
using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
namespace Volo.Abp.BlobStoring.Minio
{
@@ -10,35 +12,38 @@ namespace Volo.Abp.BlobStoring.Minio
///
public virtual string NormalizeContainerName(string containerName)
{
- // All letters in a container name must be lowercase.
- containerName = containerName.ToLower();
+ using (CultureHelper.Use(CultureInfo.InvariantCulture))
+ {
+ // All letters in a container name must be lowercase.
+ containerName = containerName.ToLower();
- // Container names can contain only letters, numbers, and the dash (-) character.
- containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
+ // Container names can contain only letters, numbers, and the dash (-) character.
+ containerName = Regex.Replace(containerName, "[^a-z0-9-]", string.Empty);
- // Every dash (-) character must be immediately preceded and followed by a letter or number;
- // consecutive dashes are not permitted in container names.
- // Container names must start or end with a letter or number
- containerName = Regex.Replace(containerName, "-{2,}", "-");
- containerName = Regex.Replace(containerName, "^-", string.Empty);
- containerName = Regex.Replace(containerName, "-$", string.Empty);
+ // Every dash (-) character must be immediately preceded and followed by a letter or number;
+ // consecutive dashes are not permitted in container names.
+ // Container names must start or end with a letter or number
+ containerName = Regex.Replace(containerName, "-{2,}", "-");
+ containerName = Regex.Replace(containerName, "^-", string.Empty);
+ containerName = Regex.Replace(containerName, "-$", string.Empty);
- // Container names must be from 3 through 63 characters long.
- if (containerName.Length < 3)
- {
- var length = containerName.Length;
- for (var i = 0; i < 3 - length; i++)
+ // Container names must be from 3 through 63 characters long.
+ if (containerName.Length < 3)
{
- containerName += "0";
+ var length = containerName.Length;
+ for (var i = 0; i < 3 - length; i++)
+ {
+ containerName += "0";
+ }
}
- }
- if (containerName.Length > 63)
- {
- containerName = containerName.Substring(0, 63);
- }
+ if (containerName.Length > 63)
+ {
+ containerName = containerName.Substring(0, 63);
+ }
- return containerName;
+ return containerName;
+ }
}
///
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityFeatureCheckerExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityTwoFactorBehaviourFeatureHelper.cs
similarity index 83%
rename from modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityFeatureCheckerExtensions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityTwoFactorBehaviourFeatureHelper.cs
index 988b381643..6d8d9f33a7 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityFeatureCheckerExtensions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/IdentityTwoFactorBehaviourFeatureHelper.cs
@@ -5,9 +5,9 @@ using Volo.Abp.Features;
namespace Volo.Abp.Identity.Features
{
- public static class IdentityFeatureCheckerExtensions
+ public static class IdentityTwoFactorBehaviourFeatureHelper
{
- public static async Task GetIdentityTwoFactorBehaviour([NotNull] this IFeatureChecker featureChecker)
+ public static async Task Get([NotNull] IFeatureChecker featureChecker)
{
Check.NotNull(featureChecker, nameof(featureChecker));
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
index 97dc56b417..9bdecca7b2 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
@@ -81,7 +81,7 @@
"Feature:TwoFactorDescription": "İki faktörlü kimlik doğrulama",
"Feature:TwoFactor.Optional": "İsteğe bağlı",
"Feature:TwoFactor.Disabled": "Devre dışı",
- "Feature:TwoFactor.Forced": "Zorla etkinleştirildi",
+ "Feature:TwoFactor.Forced": "Zorunlu",
"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",
@@ -112,7 +112,7 @@
"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 faktör kimlik doğrulamasını değiştirmesine izin verin.",
- "Description:Abp.Identity.UsersCanChange": "Kullanıcıların faktör kimlik doğrulamasını değiştirmesine izin verin."
+ "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"
}
}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentitySettingProviderExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentityTwoFactorBehaviourSettingHelper.cs
similarity index 78%
rename from modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentitySettingProviderExtensions.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentityTwoFactorBehaviourSettingHelper.cs
index 6ffe035c80..46d7d414a6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentitySettingProviderExtensions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentityTwoFactorBehaviourSettingHelper.cs
@@ -2,14 +2,13 @@
using System.Threading.Tasks;
using JetBrains.Annotations;
using Volo.Abp.Identity.Features;
-using Volo.Abp.Identity.Settings;
using Volo.Abp.Settings;
-namespace Volo.Abp.Identity
+namespace Volo.Abp.Identity.Settings
{
- public static class IdentitySettingProviderExtensions
+ public static class IdentityTwoFactorBehaviourSettingHelper
{
- public static async Task GetIdentityTwoFactorBehaviour([NotNull] this ISettingProvider settingProvider)
+ public static async Task Get([NotNull] ISettingProvider settingProvider)
{
Check.NotNull(settingProvider, nameof(settingProvider));
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTwoFactorManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTwoFactorManager.cs
index 5838ee20b8..75e74afa3c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTwoFactorManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTwoFactorManager.cs
@@ -2,6 +2,7 @@ using System.Threading.Tasks;
using Volo.Abp.Domain.Services;
using Volo.Abp.Features;
using Volo.Abp.Identity.Features;
+using Volo.Abp.Identity.Settings;
using Volo.Abp.Settings;
namespace Volo.Abp.Identity
@@ -20,10 +21,10 @@ namespace Volo.Abp.Identity
public virtual async Task IsOptionalAsync()
{
- var feature = await FeatureChecker.GetIdentityTwoFactorBehaviour();
+ var feature = await IdentityTwoFactorBehaviourFeatureHelper.Get(FeatureChecker);
if (feature == IdentityTwoFactorBehaviour.Optional)
{
- var setting = await SettingProvider.GetIdentityTwoFactorBehaviour();
+ var setting = await IdentityTwoFactorBehaviourSettingHelper.Get(SettingProvider);
if (setting == IdentityTwoFactorBehaviour.Optional)
{
return true;
@@ -35,13 +36,13 @@ namespace Volo.Abp.Identity
public virtual async Task IsForcedEnableAsync()
{
- var feature = await FeatureChecker.GetIdentityTwoFactorBehaviour();
+ var feature = await IdentityTwoFactorBehaviourFeatureHelper.Get(FeatureChecker);
if (feature == IdentityTwoFactorBehaviour.Forced)
{
return true;
}
- var setting = await SettingProvider.GetIdentityTwoFactorBehaviour();
+ var setting = await IdentityTwoFactorBehaviourSettingHelper.Get(SettingProvider);
if (setting == IdentityTwoFactorBehaviour.Forced)
{
return true;
@@ -52,13 +53,13 @@ namespace Volo.Abp.Identity
public virtual async Task IsForcedDisableAsync()
{
- var feature = await FeatureChecker.GetIdentityTwoFactorBehaviour();
+ var feature = await IdentityTwoFactorBehaviourFeatureHelper.Get(FeatureChecker);
if (feature == IdentityTwoFactorBehaviour.Disabled)
{
return true;
}
- var setting = await SettingProvider.GetIdentityTwoFactorBehaviour();
+ var setting = await IdentityTwoFactorBehaviourSettingHelper.Get(SettingProvider);
if (setting == IdentityTwoFactorBehaviour.Disabled)
{
return true;
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
index 2712e41607..ccc3e055f5 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
@@ -14,6 +14,7 @@ using Volo.Abp.Domain.Repositories;
using Volo.Abp.Features;
using Volo.Abp.Guids;
using Volo.Abp.Identity.Features;
+using Volo.Abp.Identity.Settings;
using Volo.Abp.Settings;
namespace Volo.Abp.Identity
@@ -947,7 +948,7 @@ namespace Volo.Abp.Identity
Check.NotNull(user, nameof(user));
- var feature = await FeatureChecker.GetIdentityTwoFactorBehaviour();
+ var feature = await IdentityTwoFactorBehaviourFeatureHelper.Get(FeatureChecker);
if (feature == IdentityTwoFactorBehaviour.Disabled)
{
return false;
@@ -957,7 +958,7 @@ namespace Volo.Abp.Identity
return true;
}
- var setting = await SettingProvider.GetIdentityTwoFactorBehaviour();
+ var setting = await IdentityTwoFactorBehaviourSettingHelper.Get(SettingProvider);
if (setting == IdentityTwoFactorBehaviour.Disabled)
{
return false;
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html
index 42bdd7376a..4e6395da05 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html
@@ -60,7 +60,7 @@