Skip to content

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.

Minor improvements - move UrlRewrite settings to the new class (changes in App_Settings)

supportd4e717d731a0
diff --git a/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs b/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
index f41159bf4..d84a61bd4 100644
--- a/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
+++ b/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
@@ -172,14 +172,7 @@ namespace Grand.Infrastructure.Configuration
public bool UseHtmlMinification { get; set; }
public bool HtmlMinificationErrors { get; set; }
public bool UseSessionStateTempDataProvider { get; set; }
- /// <summary>
- /// Gets or sets a value indicating whether we use url rewrite
- /// </summary>
- public bool UseUrlRewrite { get; set; }
- public bool UrlRewriteHttpsOptions { get; set; }
- public int UrlRewriteHttpsOptionsStatusCode { get; set; }
- public int UrlRewriteHttpsOptionsPort { get; set; }
- public bool UrlRedirectToHttpsPermanent { get; set; }
+
/// <summary>
/// HTTP Strict Transport Security Protocol
diff --git a/src/Core/Grand.Infrastructure/Configuration/UrlRewriteConfig.cs b/src/Core/Grand.Infrastructure/Configuration/UrlRewriteConfig.cs
new file mode 100644
index 000000000..f7a080fde
--- /dev/null
+++ b/src/Core/Grand.Infrastructure/Configuration/UrlRewriteConfig.cs
@@ -0,0 +1,15 @@
+namespace Grand.Infrastructure.Configuration
+{
+ public partial class UrlRewriteConfig
+ {
+ /// <summary>
+ /// Gets or sets a value indicating whether we use url rewrite
+ /// </summary>
+ public bool UseUrlRewrite { get; set; }
+ public bool UrlRewriteHttpsOptions { get; set; }
+ public int UrlRewriteHttpsOptionsStatusCode { get; set; }
+ public int UrlRewriteHttpsOptionsPort { get; set; }
+ public bool UrlRedirectToHttpsPermanent { get; set; }
+
+ }
+}
diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.cs
index 861f1a356..19da37e09 100644
--- a/src/Core/Grand.Infrastructure/StartupBase.cs
+++ b/src/Core/Grand.Infrastructure/StartupBase.cs
@@ -192,6 +192,7 @@ namespace Grand.Infrastructure
//add AppConfig configuration parameters
var config = services.StartupConfig<AppConfig>(configuration.GetSection("Application"));
services.StartupConfig<HostingConfig>(configuration.GetSection("Hosting"));
+ services.StartupConfig<UrlRewriteConfig>(configuration.GetSection("UrlRewrite"));
services.StartupConfig<RedisConfig>(configuration.GetSection("Redis"));
services.StartupConfig<RabbitConfig>(configuration.GetSection("Rabbit"));
services.StartupConfig<ApiConfig>(configuration.GetSection("Api"));
diff --git a/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs b/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs
index 901449bc5..74c69a11b 100644
--- a/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs
+++ b/src/Web/Grand.Web.Common/Startup/UrlRewriteStartup.cs
@@ -30,10 +30,10 @@ namespace Grand.Web.Common.Startup
public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
{
var serviceProvider = application.ApplicationServices;
- var appConfig = serviceProvider.GetRequiredService<AppConfig>();
+ var urlConfig = serviceProvider.GetRequiredService<UrlRewriteConfig>();
var urlRewriteOptions = new RewriteOptions();
var rewriteOptions = false;
- if (appConfig.UseUrlRewrite)
+ if (urlConfig.UseUrlRewrite)
{
if (File.Exists("App_Data/UrlRewrite.xml"))
{
@@ -44,12 +44,12 @@ namespace Grand.Web.Common.Startup
}
}
}
- if (appConfig.UrlRewriteHttpsOptions)
+ if (urlConfig.UrlRewriteHttpsOptions)
{
rewriteOptions = true;
- urlRewriteOptions.AddRedirectToHttps(appConfig.UrlRewriteHttpsOptionsStatusCode, appConfig.UrlRewriteHttpsOptionsPort);
+ urlRewriteOptions.AddRedirectToHttps(urlConfig.UrlRewriteHttpsOptionsStatusCode, urlConfig.UrlRewriteHttpsOptionsPort);
}
- if (appConfig.UrlRedirectToHttpsPermanent)
+ if (urlConfig.UrlRedirectToHttpsPermanent)
{
rewriteOptions = true;
urlRewriteOptions.AddRedirectToHttpsPermanent();
diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.json
index ec16491a0..a9cda6ac3 100644
--- a/src/Web/Grand.Web/App_Data/appsettings.json
+++ b/src/Web/Grand.Web/App_Data/appsettings.json
@@ -43,13 +43,6 @@
//Ignore the migration process
"SkipMigrationProcess": false,
- //Load url rewrite rules from external file AppData/UrlRewrite.xml
- "UseUrlRewrite": false,
- "UrlRewriteHttpsOptions": false,
- "UrlRewriteHttpsOptionsStatusCode": 303,
- "UrlRewriteHttpsOptionsPort": 443,
- "UrlRedirectToHttpsPermanent": false,
-
//HTTP Strict Transport Security Protocol
"UseHsts": false,
@@ -157,7 +150,14 @@
//must be unique for each instance
"RabbitCacheReceiveEndpoint": "grandnode"
},
-
+ "UrlRewrite": {
+ //Load url rewrite rules from external file AppData/UrlRewrite.xml
+ "UseUrlRewrite": false,
+ "UrlRewriteHttpsOptions": false,
+ "UrlRewriteHttpsOptionsStatusCode": 303,
+ "UrlRewriteHttpsOptionsPort": 443,
+ "UrlRedirectToHttpsPermanent": false
+ },
"FacebookSettings": {
//Facebook-assigned App ID
"AppId": "",