From ab65edd7f20c2a98cb5b42f168fa1bcf07102317 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 23 Jun 2023 09:34:41 +0800
Subject: [PATCH] Remove
 `AllowChangingTimeZoneSettingsFeatureSimpleStateChecker`.

---
 ...meZoneSettingsFeatureSimpleStateChecker.cs | 24 -------------------
 ...gManagementPermissionDefinitionProvider.cs |  4 ++--
 .../TimeZoneSettingsAppService.cs             |  4 +---
 3 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowChangingTimeZoneSettingsFeatureSimpleStateChecker.cs

diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowChangingTimeZoneSettingsFeatureSimpleStateChecker.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowChangingTimeZoneSettingsFeatureSimpleStateChecker.cs
deleted file mode 100644
index b6d50f2046..0000000000
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/AllowChangingTimeZoneSettingsFeatureSimpleStateChecker.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Features;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.SimpleStateChecking;
-
-namespace Volo.Abp.SettingManagement;
-
-public class AllowChangingTimeZoneSettingsFeatureSimpleStateChecker : ISimpleStateChecker<PermissionDefinition>
-{
-    public async Task<bool> IsEnabledAsync(SimpleStateCheckerContext<PermissionDefinition> context)
-    {
-        var currentTenant = context.ServiceProvider.GetRequiredService<ICurrentTenant>();
-
-        if (!currentTenant.IsAvailable)
-        {
-            return true;
-        }
-
-        var featureChecker = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
-        return await featureChecker.IsEnabledAsync(SettingManagementFeatures.EnableTimeZone);
-    }
-}
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs
index 6270460623..bac701a653 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs
@@ -1,4 +1,5 @@
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Features;
 using Volo.Abp.Localization;
 using Volo.Abp.SettingManagement.Localization;
 
@@ -16,8 +17,7 @@ public class SettingManagementPermissionDefinitionProvider : PermissionDefinitio
 
         emailPermission.AddChild(SettingManagementPermissions.EmailingTest, L("Permission:EmailingTest"));
 
-        moduleGroup.AddPermission(SettingManagementPermissions.TimeZone, L("Permission:TimeZone"));
-        emailPermission.StateCheckers.Add(new AllowChangingTimeZoneSettingsFeatureSimpleStateChecker());
+        moduleGroup.AddPermission(SettingManagementPermissions.TimeZone, L("Permission:TimeZone")).RequireFeatures(SettingManagementFeatures.EnableTimeZone);
     }
 
     private static LocalizableString L(string name)
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/TimeZoneSettingsAppService.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/TimeZoneSettingsAppService.cs
index 423840284e..ea8035cf76 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/TimeZoneSettingsAppService.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/TimeZoneSettingsAppService.cs
@@ -16,13 +16,11 @@ namespace Volo.Abp.SettingManagement;
 public class TimeZoneSettingsAppService : SettingManagementAppServiceBase, ITimeZoneSettingsAppService
 {
     protected ISettingManager SettingManager { get; }
-    protected ISettingProvider SettingProvider { get; }
     protected ITimezoneProvider TimezoneProvider { get; }
 
-    public TimeZoneSettingsAppService(ISettingManager settingManager, ISettingProvider settingProvider, ITimezoneProvider timezoneProvider)
+    public TimeZoneSettingsAppService(ISettingManager settingManager, ITimezoneProvider timezoneProvider)
     {
         SettingManager = settingManager;
-        SettingProvider = settingProvider;
         TimezoneProvider = timezoneProvider;
     }