Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Prevent exception when Themes directory not exists
supportbbde23d27a77
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.csindex 47d1d944d..44be79d9b 100644--- a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs+++ b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs@@ -121,9 +121,9 @@ namespace Grand.Web.Common.Infrastructurevar logger = context.HttpContext.RequestServices.GetRequiredService<ILogger>();//get current customervar workContext = context.HttpContext.RequestServices.GetRequiredService<IWorkContext>();- _ = logger.InsertLog(Domain.Logging.LogLevel.Error,+ _ = logger.InsertLog(Domain.Logging.LogLevel.Error,$"Error 404. The requested page ({context.HttpContext.Request?.GetDisplayUrl()}) was not found",- customer: workContext.CurrentCustomer,+ customer: workContext.CurrentCustomer,ipAddress: context.HttpContext?.Connection?.RemoteIpAddress?.ToString(),pageurl: context.HttpContext?.Request?.GetDisplayUrl(),referrerUrl: context.HttpContext?.Request?.GetTypedHeaders().Referer?.ToString());@@ -211,32 +211,35 @@ namespace Grand.Web.Common.InfrastructureOnPrepareResponse = ctx =>{- if (!String.IsNullOrEmpty(appConfig.StaticFilesCacheControl))+ if (!string.IsNullOrEmpty(appConfig.StaticFilesCacheControl))ctx.Context.Response.Headers.Append(HeaderNames.CacheControl, appConfig.StaticFilesCacheControl);}});//themes- application.UseStaticFiles(new StaticFileOptions {- FileProvider = new PhysicalFileProvider(CommonPath.ThemePath),- RequestPath = new PathString("/Themes"),- OnPrepareResponse = ctx =>- {- if (!String.IsNullOrEmpty(appConfig.StaticFilesCacheControl))- ctx.Context.Response.Headers.Append(HeaderNames.CacheControl, appConfig.StaticFilesCacheControl);- }- });+ if (Directory.Exists(CommonPath.ThemePath))+ application.UseStaticFiles(new StaticFileOptions {+ FileProvider = new PhysicalFileProvider(CommonPath.ThemePath),+ RequestPath = new PathString("/Themes"),+ OnPrepareResponse = ctx =>+ {+ if (!string.IsNullOrEmpty(appConfig.StaticFilesCacheControl))+ ctx.Context.Response.Headers.Append(HeaderNames.CacheControl, appConfig.StaticFilesCacheControl);+ }+ });+//plugins- application.UseStaticFiles(new StaticFileOptions {- FileProvider = new PhysicalFileProvider(CommonPath.PluginsPath),- RequestPath = new PathString("/Plugins"),- OnPrepareResponse = ctx =>- {- if (!string.IsNullOrEmpty(appConfig.StaticFilesCacheControl))- ctx.Context.Response.Headers.Append(HeaderNames.CacheControl, appConfig.StaticFilesCacheControl);- }- });+ if (Directory.Exists(CommonPath.PluginsPath))+ application.UseStaticFiles(new StaticFileOptions {+ FileProvider = new PhysicalFileProvider(CommonPath.PluginsPath),+ RequestPath = new PathString("/Plugins"),+ OnPrepareResponse = ctx =>+ {+ if (!string.IsNullOrEmpty(appConfig.StaticFilesCacheControl))+ ctx.Context.Response.Headers.Append(HeaderNames.CacheControl, appConfig.StaticFilesCacheControl);+ }+ });}@@ -320,7 +323,7 @@ namespace Grand.Web.Common.Infrastructurebuilder.AddStyleSrc().From("*").UnsafeEval().UnsafeInline();}).AddPermissionsPolicy(builder =>- {+ {builder.AddAutoplay().Self();builder.AddCamera().Self();builder.AddEncryptedMedia().Self();diff --git a/src/Web/Grand.Web.Common/Themes/ThemeList.cs b/src/Web/Grand.Web.Common/Themes/ThemeList.csindex 25996b6d5..799f9d0c3 100644--- a/src/Web/Grand.Web.Common/Themes/ThemeList.cs+++ b/src/Web/Grand.Web.Common/Themes/ThemeList.cs@@ -8,14 +8,15 @@ namespace Grand.Web.Common.Themespublic ThemeList(){ThemeConfigurations = new List<ThemeConfiguration>();- foreach (var themeName in Directory.GetDirectories(CommonPath.ThemePath))- {- var configuration = CreateThemeConfiguration(themeName);- if (configuration != null)+ if (Directory.Exists(CommonPath.ThemePath))+ foreach (var themeName in Directory.GetDirectories(CommonPath.ThemePath)){- ThemeConfigurations.Add(configuration);+ var configuration = CreateThemeConfiguration(themeName);+ if (configuration != null)+ {+ ThemeConfigurations.Add(configuration);+ }}- }}public IList<ThemeConfiguration> ThemeConfigurations { get; }