From 806e4ae60f0cacb5f170a4a6b5827c212f2bf0c9 Mon Sep 17 00:00:00 2001
From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com>
Date: Fri, 20 Jan 2023 12:09:49 +0300
Subject: [PATCH] Update DefaultHomePageMiddleware.cs

---
 .../DefaultHomePageMiddleware.cs                    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 297f765bbc..b5ad981cc0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/DefaultHomePageMiddleware.cs
@@ -12,11 +12,16 @@ public class DefaultHomePageMiddleware : IMiddleware, ITransientDependency
 {
     public async Task InvokeAsync(HttpContext context, RequestDelegate next)
     {
-        var _pagePublicAppService = context.RequestServices.GetRequiredService<IPagePublicAppService>();
-        var page = await _pagePublicAppService.FindDefaultHomePageAsync();
-        if (page is not null && context.Request.Path.Value == "/")
+        if (context.Request.Path.Value == "/")
         {
-            context.Request.Path = $"{PageConsts.UrlPrefix}{page.Slug}";
+            var pagePublicAppService = context.RequestServices.GetRequiredService<IPagePublicAppService>();
+            
+            var page = await pagePublicAppService.FindDefaultHomePageAsync();
+            if (page != null)
+            {
+                context.Request.Path = $"{PageConsts.UrlPrefix}{page.Slug}";
+            }
+            
         }
         
         await next(context);