Add helpful SiteService extension

src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailBackgroundTask.cs

@@ -23,7 +23,7 @@ public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToke
         {
             var siteService = serviceProvider.GetRequiredService<ISiteService>();
 
-            var settings = (await siteService.GetSiteSettingsAsync()).As<AuditTrailTrimmingSettings>();
+            var settings = await siteService.GetSettingsAsync<AuditTrailTrimmingSettings>();
             if (settings.Disabled)
             {
                 return;

src/OrchardCore.Modules/OrchardCore.ContentLocalization/ContentRequestCultureProvider.cs

@@ -24,7 +24,7 @@ public override async Task<ProviderCultureResult> DetermineProviderCultureResult
 
             if (localization != null)
             {
-                var settings = (await siteService.GetSiteSettingsAsync()).As<ContentRequestCultureProviderSettings>();
+                var settings = await siteService.GetSettingsAsync<ContentRequestCultureProviderSettings>();
                 if (settings.SetCookie)
                 {
                     culturePickerService.SetContentCulturePickerCookie(localization.Culture);

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/ContentCulturePickerController.cs

@@ -47,7 +47,7 @@ public async Task<IActionResult> RedirectToLocalizedContent(string targetCulture
 
             if (supportedCultures.Any(t => t == targetCulture))
             {
-                var settings = (await _siteService.GetSiteSettingsAsync()).As<ContentCulturePickerSettings>();
+                var settings = await _siteService.GetSettingsAsync<ContentCulturePickerSettings>();
                 if (settings.SetCookie)
                 {
                     _culturePickerService.SetContentCulturePickerCookie(targetCulture);

src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs

@@ -83,7 +83,7 @@ await content.AddAsync(S["Content Items"], S["Content Items"].PrefixPosition(),
                 });
             });
 
-            var adminSettings = (await _siteService.GetSiteSettingsAsync()).As<AdminSettings>();
+            var adminSettings = await _siteService.GetSettingsAsync<AdminSettings>();
 
             if (adminSettings.DisplayNewMenu && contentTypes.Any())
             {

src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Handlers/AuditTrailContentHandler.cs

@@ -72,9 +72,8 @@ private async Task RecordAuditTrailEventAsync(string name, ContentItem content)
                 return;
             }
 
-            var siteSettings = await _siteService.GetSiteSettingsAsync();
+            var settings = await _siteService.GetSettingsAsync<ContentAuditTrailSettings>();
 
-            var settings = siteSettings.As<ContentAuditTrailSettings>();
             if (!settings.AllowedContentTypes.Contains(content.ContentItem.ContentType))
             {
                 return;

src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentDriver.cs

@@ -29,8 +29,8 @@ public override IDisplayResult Display(ContentItem model)
                     {
                         if (await _deploymentPlanService.DoesUserHaveExportPermissionAsync())
                         {
-                            var siteSettings = await _siteService.GetSiteSettingsAsync();
-                            var exportContentToDeploymentTargetSettings = siteSettings.As<ExportContentToDeploymentTargetSettings>();
+                            var exportContentToDeploymentTargetSettings = await _siteService.GetSettingsAsync<ExportContentToDeploymentTargetSettings>();
+
                             if (exportContentToDeploymentTargetSettings.ExportContentToDeploymentTargetPlanId != 0)
                             {
                                 return true;
@@ -45,8 +45,8 @@ public override IDisplayResult Display(ContentItem model)
                     {
                         if (await _deploymentPlanService.DoesUserHaveExportPermissionAsync())
                         {
-                            var siteSettings = await _siteService.GetSiteSettingsAsync();
-                            var exportContentToDeploymentTargetSettings = siteSettings.As<ExportContentToDeploymentTargetSettings>();
+                            var exportContentToDeploymentTargetSettings = await _siteService.GetSettingsAsync<ExportContentToDeploymentTargetSettings>();
+
                             if (exportContentToDeploymentTargetSettings.ExportContentToDeploymentTargetPlanId != 0)
                             {
                                 return true;

src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentsAdminListDisplayDriver.cs

@@ -24,8 +24,8 @@ public override async Task<IDisplayResult> DisplayAsync(ContentOptionsViewModel
         {
             if (await _deploymentPlanService.DoesUserHaveExportPermissionAsync())
             {
-                var siteSettings = await _siteService.GetSiteSettingsAsync();
-                var exportContentToDeploymentTargetSettings = siteSettings.As<ExportContentToDeploymentTargetSettings>();
+                var exportContentToDeploymentTargetSettings = await _siteService.GetSettingsAsync<ExportContentToDeploymentTargetSettings>();
+
                 if (exportContentToDeploymentTargetSettings.ExportContentToDeploymentTargetPlanId != 0)
                 {
                     return Combine(

src/OrchardCore.Modules/OrchardCore.Cors/Services/CorsService.cs

@@ -16,8 +16,7 @@ public CorsService(ISiteService siteService)
 
         public async Task<CorsSettings> GetSettingsAsync()
         {
-            var siteSettings = await _siteService.GetSiteSettingsAsync();
-            return siteSettings.As<CorsSettings>();
+            return await _siteService.GetSettingsAsync<CorsSettings>();
         }
 
         internal async Task UpdateSettingsAsync(CorsSettings corsSettings)

src/OrchardCore.Modules/OrchardCore.Email.Azure/Services/AzureEmailOptionsConfiguration.cs

@@ -23,10 +23,9 @@ public AzureEmailOptionsConfiguration(
 
     public void Configure(AzureEmailOptions options)
     {
-        var settings = _siteService.GetSiteSettingsAsync()
+        var settings = _siteService.GetSettingsAsync<AzureEmailSettings>()
             .GetAwaiter()
-            .GetResult()
-            .As<AzureEmailSettings>();
+            .GetResult();
 
         options.IsEnabled = settings.IsEnabled;
         options.DefaultSender = settings.DefaultSender;

src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpOptionsConfiguration.cs

@@ -25,9 +25,9 @@ public SmtpOptionsConfiguration(
 
     public void Configure(SmtpOptions options)
     {
-        var settings = _siteService.GetSiteSettingsAsync()
-            .GetAwaiter().GetResult()
-            .As<SmtpSettings>();
+        var settings = _siteService.GetSettingsAsync<SmtpSettings>()
+            .GetAwaiter()
+            .GetResult();
 
         options.DefaultSender = settings.DefaultSender;
         options.DeliveryMethod = settings.DeliveryMethod;

src/OrchardCore.Modules/OrchardCore.Email/Migrations/EmailMigrations.cs

@@ -32,9 +32,7 @@ public int Create()
                 return;
             }
 
-            var site = await siteService.GetSiteSettingsAsync();
-
-            var smtpSettings = site.As<SmtpSettings>();
+            var smtpSettings = await siteService.GetSettingsAsync<SmtpSettings>();
 
             if (!string.IsNullOrEmpty(smtpSettings.DefaultSender)
                 || scope.ServiceProvider.GetService<IOptions<SmtpOptions>>()?.Value.ConfigurationExists() == true)

src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FacebookPixelFilter.cs

@@ -34,7 +34,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
 
             if (_scriptsCache == null && canTrack)
             {
-                var settings = (await _siteService.GetSiteSettingsAsync()).As<FacebookPixelSettings>();
+                var settings = await _siteService.GetSettingsAsync<FacebookPixelSettings>();
 
                 if (!string.IsNullOrWhiteSpace(settings?.PixelId))
                 {

src/OrchardCore.Modules/OrchardCore.Facebook/Login/Services/FacebookLoginService.cs

@@ -19,10 +19,9 @@ public FacebookLoginService(ISiteService siteService)
             _siteService = siteService;
         }
 
-        public async Task<FacebookLoginSettings> GetSettingsAsync()
+        public Task<FacebookLoginSettings> GetSettingsAsync()
         {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return container.As<FacebookLoginSettings>();
+            return _siteService.GetSettingsAsync<FacebookLoginSettings>();
         }
 
         public async Task<FacebookLoginSettings> LoadSettingsAsync()

src/OrchardCore.Modules/OrchardCore.Facebook/ScriptsMiddleware.cs

@@ -26,8 +26,8 @@ public async Task Invoke(HttpContext httpContext)
             if (httpContext.Request.Path.StartsWithSegments("/OrchardCore.Facebook/sdk", StringComparison.OrdinalIgnoreCase))
             {
                 var script = default(string);
-                var site = (await _siteService.GetSiteSettingsAsync());
-                var settings = site.As<FacebookSettings>();
+                var settings = await _siteService.GetSettingsAsync<FacebookSettings>();
+
                 if (Path.GetFileName(httpContext.Request.Path.Value) == "fbsdk.js")
                 {
                     var locale = CultureInfo.CurrentUICulture.Name.Replace('-', '_');

src/OrchardCore.Modules/OrchardCore.Facebook/Services/FacebookService.cs

@@ -23,10 +23,9 @@ public FacebookService(
             S = stringLocalizer;
         }
 
-        public async Task<FacebookSettings> GetSettingsAsync()
+        public Task<FacebookSettings> GetSettingsAsync()
         {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return container.As<FacebookSettings>();
+            return _siteService.GetSettingsAsync<FacebookSettings>();
         }
 
         public async Task UpdateSettingsAsync(FacebookSettings settings)

src/OrchardCore.Modules/OrchardCore.Facebook/Views/FacebookPluginPart.Summary.cshtml

@@ -2,9 +2,9 @@
 @using OrchardCore.Settings
 @using OrchardCore.Facebook.Settings
 @model OrchardCore.Facebook.Widgets.ViewModels.FacebookPluginPartViewModel
-@inject ISiteService _site
+@inject ISiteService SiteService
 @{
-    var fbInit = (await _site.GetSiteSettingsAsync()).As<FacebookSettings>().FBInit;
+    var fbInit = (await SiteService.GetSettingsAsync<FacebookSettings>()).FBInit;
 }
 
 @Html.Raw(Model.Html)

src/OrchardCore.Modules/OrchardCore.Facebook/Views/FacebookPluginPart.cshtml

@@ -2,9 +2,9 @@
 @using OrchardCore.Settings
 @using OrchardCore.Facebook.Settings
 @model OrchardCore.Facebook.Widgets.ViewModels.FacebookPluginPartViewModel
-@inject ISiteService _site
+@inject ISiteService SiteService
 @{
-    var fbInit = (await _site.GetSiteSettingsAsync()).As<FacebookSettings>().FBInit;
+    var fbInit = (await SiteService.GetSettingsAsync<FacebookSettings>()).FBInit;
 }
 
 @Html.Raw(Model.Html)

src/OrchardCore.Modules/OrchardCore.GitHub/Services/GithubAuthenticationService.cs

@@ -22,10 +22,9 @@ public GitHubAuthenticationService(
             S = stringLocalizer;
         }
 
-        public async Task<GitHubAuthenticationSettings> GetSettingsAsync()
+        public Task<GitHubAuthenticationSettings> GetSettingsAsync()
         {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return container.As<GitHubAuthenticationSettings>();
+            return _siteService.GetSettingsAsync<GitHubAuthenticationSettings>();
         }
 
         public async Task<GitHubAuthenticationSettings> LoadSettingsAsync()

src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs

@@ -33,7 +33,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
 
                 if (_scriptsCache == null && canTrack)
                 {
-                    var settings = (await _siteService.GetSiteSettingsAsync()).As<GoogleAnalyticsSettings>();
+                    var settings = await _siteService.GetSettingsAsync<GoogleAnalyticsSettings>();
 
                     if (!string.IsNullOrWhiteSpace(settings?.TrackingID))
                     {

src/OrchardCore.Modules/OrchardCore.Google/Analytics/Services/GoogleAnalyticsService.cs

@@ -14,10 +14,9 @@ public GoogleAnalyticsService(
             _siteService = siteService;
         }
 
-        public async Task<GoogleAnalyticsSettings> GetSettingsAsync()
+        public Task<GoogleAnalyticsSettings> GetSettingsAsync()
         {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return container.As<GoogleAnalyticsSettings>();
+            return _siteService.GetSettingsAsync<GoogleAnalyticsSettings>();
         }
     }
 }

src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs

@@ -33,7 +33,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
 
                 if (_scriptsCache == null && canTrack)
                 {
-                    var settings = (await _siteService.GetSiteSettingsAsync()).As<GoogleTagManagerSettings>();
+                    var settings = await _siteService.GetSettingsAsync<GoogleTagManagerSettings>();
 
                     if (!string.IsNullOrWhiteSpace(settings?.ContainerID))
                     {

src/OrchardCore.Modules/OrchardCore.Google/TagManager/Services/GoogleTagManagerService.cs

@@ -13,10 +13,9 @@ public GoogleTagManagerService(ISiteService siteService)
             _siteService = siteService;
         }
 
-        public async Task<GoogleTagManagerSettings> GetSettingsAsync()
+        public Task<GoogleTagManagerSettings> GetSettingsAsync()
         {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return container.As<GoogleTagManagerSettings>();
+            return _siteService.GetSettingsAsync<GoogleTagManagerSettings>();
         }
     }
 }

src/OrchardCore.Modules/OrchardCore.Https/Services/HttpsService.cs

@@ -13,10 +13,9 @@ public HttpsService(ISiteService siteService)
             _siteService = siteService;
         }
 
-        public async Task<HttpsSettings> GetSettingsAsync()
+        public Task<HttpsSettings> GetSettingsAsync()
         {
-            var siteSettings = await _siteService.GetSiteSettingsAsync();
-            return siteSettings.As<HttpsSettings>();
+            return _siteService.GetSettingsAsync<HttpsSettings>();
         }
     }
 }

src/OrchardCore.Modules/OrchardCore.Layers/Controllers/AdminController.cs

@@ -99,10 +99,9 @@ public async Task<IActionResult> Index()
 
             var model = new LayersIndexViewModel { Layers = layers.Layers.ToList() };
 
-            var siteSettings = await _siteService.GetSiteSettingsAsync();
             var contentDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
 
-            model.Zones = siteSettings.As<LayerSettings>().Zones ?? [];
+            model.Zones = (await _siteService.GetSettingsAsync<LayerSettings>()).Zones ?? [];
             model.Widgets = [];
 
             foreach (var widget in widgets.OrderBy(x => x.Position))

src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentSource.cs

@@ -41,13 +41,13 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
                 ["Layers"] = JArray.FromObject(layers.Layers, _jsonSerializerOptions),
             });
 
-            var siteSettings = await _siteService.GetSiteSettingsAsync();
+            var layerSettings = await _siteService.GetSettingsAsync<LayerSettings>();
 
             // Adding Layer settings
             result.Steps.Add(new JsonObject
             {
                 ["name"] = "Settings",
-                ["LayerSettings"] = JObject.FromObject(siteSettings.As<LayerSettings>()),
+                ["LayerSettings"] = JObject.FromObject(layerSettings),
             });
         }
     }

src/OrchardCore.Modules/OrchardCore.Localization/Services/LocalizationService.cs

@@ -47,11 +47,7 @@ public async Task<string[]> GetSupportedCulturesAsync()
 
         private async Task InitializeLocalizationSettingsAsync()
         {
-            if (_localizationSettings == null)
-            {
-                var siteSettings = await _siteService.GetSiteSettingsAsync();
-                _localizationSettings = siteSettings.As<LocalizationSettings>();
-            }
+            _localizationSettings ??= await _siteService.GetSettingsAsync<LocalizationSettings>();
         }
     }
 }

src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenOptionsConfiguration.cs

@@ -14,9 +14,9 @@ public MediaTokenOptionsConfiguration(ISiteService siteService)
 
         public void Configure(MediaTokenOptions options)
         {
-            options.HashKey = _siteService.GetSiteSettingsAsync()
-                .GetAwaiter().GetResult()
-                .As<MediaTokenSettings>()
+            options.HashKey = _siteService.GetSettingsAsync<MediaTokenSettings>()
+                .GetAwaiter()
+                .GetResult()
                 .HashKey;
         }
     }

src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenSettingsUpdater.cs

@@ -34,7 +34,7 @@ public async Task ActivatedAsync()
                 return;
             }
 
-            var mediaTokenSettings = (await _siteService.GetSiteSettingsAsync()).As<MediaTokenSettings>();
+            var mediaTokenSettings = await _siteService.GetSettingsAsync<MediaTokenSettings>();
 
             if (mediaTokenSettings.HashKey == null)
             {

src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/AzureADService.cs

@@ -22,10 +22,9 @@ public AzureADService(
             S = stringLocalizer;
         }
 
-        public async Task<AzureADSettings> GetSettingsAsync()
+        public Task<AzureADSettings> GetSettingsAsync()
         {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return container.As<AzureADSettings>();
+            return _siteService.GetSettingsAsync<AzureADSettings>();
         }
 
         public async Task<AzureADSettings> LoadSettingsAsync()

src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/MicrosoftAccountService.cs

@@ -22,10 +22,9 @@ public MicrosoftAccountService(
             S = stringLocalizer;
         }
 
-        public async Task<MicrosoftAccountSettings> GetSettingsAsync()
+        public Task<MicrosoftAccountSettings> GetSettingsAsync()
         {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return container.As<MicrosoftAccountSettings>();
+            return _siteService.GetSettingsAsync<MicrosoftAccountSettings>();
         }
 
         public async Task<MicrosoftAccountSettings> LoadSettingsAsync()

src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdClientService.cs

@@ -24,10 +24,9 @@ public OpenIdClientService(
             S = stringLocalizer;
         }
 
-        public async Task<OpenIdClientSettings> GetSettingsAsync()
+        public Task<OpenIdClientSettings> GetSettingsAsync()
         {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return container.As<OpenIdClientSettings>();
+            return _siteService.GetSettingsAsync<OpenIdClientSettings>();
         }
 
         public async Task<OpenIdClientSettings> LoadSettingsAsync()

src/OrchardCore.Modules/OrchardCore.ReCaptcha/Drivers/ReCaptchaForgotPasswordFormDisplayDriver.cs

@@ -18,7 +18,7 @@ public ReCaptchaForgotPasswordFormDisplayDriver(ISiteService siteService)
 
     public override async Task<IDisplayResult> EditAsync(ForgotPasswordForm model, BuildEditorContext context)
     {
-        var _reCaptchaSettings = (await _siteService.GetSiteSettingsAsync()).As<ReCaptchaSettings>();
+        var _reCaptchaSettings = await _siteService.GetSettingsAsync<ReCaptchaSettings>();
 
         if (!_reCaptchaSettings.IsValid())
         {

src/OrchardCore.Modules/OrchardCore.ReCaptcha/Drivers/ReCaptchaLoginFormDisplayDriver.cs

@@ -23,7 +23,7 @@ public ReCaptchaLoginFormDisplayDriver(
 
     public override async Task<IDisplayResult> EditAsync(LoginForm model, BuildEditorContext context)
     {
-        var _reCaptchaSettings = (await _siteService.GetSiteSettingsAsync()).As<ReCaptchaSettings>();
+        var _reCaptchaSettings = await _siteService.GetSettingsAsync<ReCaptchaSettings>();
 
         if (!_reCaptchaSettings.IsValid() || !_reCaptchaService.IsThisARobot())
         {

src/OrchardCore.Modules/OrchardCore.ReCaptcha/Drivers/ReCaptchaResetPasswordFormDisplayDriver.cs

@@ -18,7 +18,7 @@ public ReCaptchaResetPasswordFormDisplayDriver(ISiteService siteService)
 
     public override async Task<IDisplayResult> EditAsync(ResetPasswordForm model, BuildEditorContext context)
     {
-        var _reCaptchaSettings = (await _siteService.GetSiteSettingsAsync()).As<ReCaptchaSettings>();
+        var _reCaptchaSettings = await _siteService.GetSettingsAsync<ReCaptchaSettings>();
 
         if (!_reCaptchaSettings.IsValid())
         {