From 5a34f8194bca69ccf3d1a69619f88c892c3632ab Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Sat, 5 Aug 2023 01:09:00 +0300 Subject: [PATCH 1/2] Add feature check for CmsKit Page Middleware --- .../Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs index b5ad981cc0..5763f26053 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs @@ -3,6 +3,8 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.DependencyInjection; +using Volo.Abp.Features; +using Volo.CmsKit.Features; using Volo.CmsKit.Pages; using Volo.CmsKit.Public.Pages; @@ -12,6 +14,13 @@ public class DefaultHomePageMiddleware : IMiddleware, ITransientDependency { public async Task InvokeAsync(HttpContext context, RequestDelegate next) { + var featureChecker = context.RequestServices.GetRequiredService(); + + if (!await featureChecker.IsEnabledAsync(CmsKitFeatures.PageEnable)) + { + return; + } + if (context.Request.Path.Value == "/") { var pagePublicAppService = context.RequestServices.GetRequiredService(); From d7d9158ddd5ba9354e2c5c6b86f19d093b1b74b3 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Sat, 5 Aug 2023 01:35:33 +0300 Subject: [PATCH 2/2] Update DefaultHomePageMiddleware.cs --- .../DefaultHomePageMiddleware.cs | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs index 5763f26053..f80cba3970 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs @@ -16,23 +16,20 @@ public class DefaultHomePageMiddleware : IMiddleware, ITransientDependency { var featureChecker = context.RequestServices.GetRequiredService(); - if (!await featureChecker.IsEnabledAsync(CmsKitFeatures.PageEnable)) + if (await featureChecker.IsEnabledAsync(CmsKitFeatures.PageEnable)) { - return; - } - - if (context.Request.Path.Value == "/") - { - var pagePublicAppService = context.RequestServices.GetRequiredService(); - - var page = await pagePublicAppService.FindDefaultHomePageAsync(); - if (page != null) + if (context.Request.Path.Value == "/") { - context.Request.Path = $"{PageConsts.UrlPrefix}{page.Slug}"; + var pagePublicAppService = context.RequestServices.GetRequiredService(); + + var page = await pagePublicAppService.FindDefaultHomePageAsync(); + if (page != null) + { + context.Request.Path = $"{PageConsts.UrlPrefix}{page.Slug}"; + } } - } - + await next(context); } } \ No newline at end of file