From daeee64c2d7045d70d33da98eeed4e02f97cecf6 Mon Sep 17 00:00:00 2001 From: maliming <6908465+maliming@users.noreply.github.com> Date: Wed, 16 Sep 2020 09:51:22 +0800 Subject: [PATCH] Use static helper instead extension method. --- ...s => IdentityTwoFactorBehaviourFeatureHelper.cs} | 4 ++-- .../Volo/Abp/Identity/Localization/tr.json | 6 +++--- .../IdentityTwoFactorBehaviourSettingHelper.cs} | 7 +++---- .../Volo/Abp/Identity/IdentityTwoFactorManager.cs | 13 +++++++------ .../Volo/Abp/Identity/IdentityUserStore.cs | 5 +++-- 5 files changed, 18 insertions(+), 17 deletions(-) rename modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Features/{IdentityFeatureCheckerExtensions.cs => IdentityTwoFactorBehaviourFeatureHelper.cs} (83%) rename modules/identity/src/{Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentitySettingProviderExtensions.cs => Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Settings/IdentityTwoFactorBehaviourSettingHelper.cs} (78%) 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;