#7403 Removed the problematic pathBase code until we find a solution …

…with local links
nopSolutions · Nov 11, 2024 · 8adea3b · 8adea3b
1 parent b320af0
commit 8adea3b
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 69 deletions.
diff --git a/src/Libraries/Nop.Core/Configuration/HostingConfig.cs b/src/Libraries/Nop.Core/Configuration/HostingConfig.cs
@@ -28,10 +28,5 @@ public partial class HostingConfig : IConfig
     /// <summary>
     /// Gets or sets addresses of known networks to accept forwarded headers from
     /// </summary>
-    public string KnownNetworks { get; protected set; } = string.Empty;   
-
-    /// <summary>
-    /// Ability to set a custom path base, for example domain.com/path/
-    /// </summary>
-    public string PathBase { get; protected set; } = "/";
+    public string KnownNetworks { get; protected set; } = string.Empty;
 }
diff --git a/src/Presentation/Nop.Web.Framework/Infrastructure/NopRoutingStartup.cs b/src/Presentation/Nop.Web.Framework/Infrastructure/NopRoutingStartup.cs
@@ -26,12 +26,6 @@ public void ConfigureServices(IServiceCollection services, IConfiguration config
     /// <param name="application">Builder for configuring an application's request pipeline</param>
     public void Configure(IApplicationBuilder application)
     {
-        var hostingConfig = Singleton<AppSettings>.Instance.Get<HostingConfig>();
-
-        //use path base
-        if (!string.IsNullOrEmpty(hostingConfig.PathBase))
-            application.UsePathBase(hostingConfig.PathBase);
-
         //add the RoutingMiddleware
         application.UseRouting();
 

diff --git a/src/Presentation/Nop.Web.Framework/Migrations/UpgradeTo480/LocalizationMigration.cs b/src/Presentation/Nop.Web.Framework/Migrations/UpgradeTo480/LocalizationMigration.cs
@@ -274,9 +274,6 @@ public override void Up()
             //#7299
             ["Admin.Catalog.Products.Multimedia.Videos.Description"] = "How to embed a video: Find your video in your library (on any video hosting) and select it to open the video settings page. Select the privacy icon from your \"Share\" button. Click on \"Embed\" from the window that opens up. You can copy the <strong>src</strong> from the embed option and use it.",
 
-            //path base
-            ["Admin.Configuration.AppSettings.Hosting.PathBase"] = "Path base",
-            ["Admin.Configuration.AppSettings.Hosting.PathBase.Hint"] = "Ability to set a custom path base, for example domain.com/path/",
             //4306
             ["Admin.Configuration.Settings.Catalog.ShowSearchBoxCategories"] = "Show product categories for the search box",
             ["Admin.Configuration.Settings.Catalog.ShowSearchBoxCategories.Hint"] = "Check to display the drop-down list with product categories next to the search box.",

diff --git a/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml b/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml
@@ -4667,13 +4667,7 @@
   </LocaleResource>
   <LocaleResource Name="Admin.Configuration.AppSettings.Hosting.KnownNetworks.Hint">
     <Value>Specify a list of IP CIDR notations (comma separated) to accept forwarded headers. e.g. 172.64.0.0/13,162.158.0.0/15</Value>
-  </LocaleResource>
-  <LocaleResource Name="Admin.Configuration.AppSettings.Hosting.PathBase">
-    <Value>Path base</Value>
-  </LocaleResource>
-  <LocaleResource Name="Admin.Configuration.AppSettings.Hosting.PathBase.Hint">
-    <Value>Ability to set a custom path base, for example domain.com/path/</Value>
-  </LocaleResource>    
+  </LocaleResource>   
   <LocaleResource Name="Admin.Configuration.AppSettings.Hosting.UseProxy">
     <Value>Use proxy servers</Value>
   </LocaleResource>

diff --git a/src/Presentation/Nop.Web/Areas/Admin/Models/Settings/HostingConfigModel.cs b/src/Presentation/Nop.Web/Areas/Admin/Models/Settings/HostingConfigModel.cs
@@ -25,8 +25,5 @@ public partial record HostingConfigModel : BaseNopModel, IConfigModel
     [NopResourceDisplayName("Admin.Configuration.AppSettings.Hosting.KnownNetworks")]
     public string KnownNetworks { get; set; }
 
-    [NopResourceDisplayName("Admin.Configuration.AppSettings.Hosting.PathBase")]
-    public string PathBase { get; set; } = "/";
-
     #endregion
 }
diff --git a/src/Presentation/Nop.Web/Areas/Admin/Views/Setting/_AppSettings.Hosting.cshtml b/src/Presentation/Nop.Web/Areas/Admin/Views/Setting/_AppSettings.Hosting.cshtml
@@ -48,13 +48,4 @@
             </div>
         </div>
     </nop-nested-setting>
-    <div class="form-group row">
-        <div class="col-md-3">
-            <nop-label asp-for="HostingConfigModel.PathBase" />
-        </div>
-        <div class="col-md-9">
-            <nop-editor asp-for="HostingConfigModel.PathBase" />
-            <span asp-validation-for="HostingConfigModel.PathBase"></span>
-        </div>
-    </div>
 </div>
diff --git a/src/Presentation/Nop.Web/Areas/Admin/Views/Shared/_AdminLayout.cshtml b/src/Presentation/Nop.Web/Areas/Admin/Views/Shared/_AdminLayout.cshtml
@@ -6,11 +6,9 @@
 @inject LocalizationSettings localizationSettings
 @inject StoreInformationSettings storeInformationSettings
 @inject Nop.Services.Localization.ILanguageService languageService
-@inject AppSettings appSettings
 
 @using Nop.Core.Domain
 @using Nop.Core.Domain.Localization
-@using Nop.Core.Configuration
 @using Nop.Services.Customers
 @using Nop.Services.Helpers
 @using Nop.Services.Security
@@ -28,10 +26,7 @@
 
     //avatar
     var currentCustomer = await workContext.GetCurrentCustomerAsync();
-
-    // Custom path base
-    var usePathBase = appSettings.Get<HostingConfig>().PathBase;
-
+
     //event
     await eventPublisher.PublishAsync(new PageRenderingEvent(NopHtml));
 
@@ -43,8 +38,6 @@
     <title>@adminPageTitle</title>
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-
-    <base href="@usePathBase" />
 
     @NopHtml.GenerateHeadCustom()
 

diff --git a/src/Presentation/Nop.Web/Areas/Admin/Views/Shared/_AdminPopupLayout.cshtml b/src/Presentation/Nop.Web/Areas/Admin/Views/Shared/_AdminPopupLayout.cshtml
@@ -1,16 +1,13 @@
 @inject IEventPublisher eventPublisher
 @inject LocalizationSettings localizationSettings
-@inject AppSettings appSettings
 
 @using Nop.Core.Domain.Localization
-@using Nop.Core.Configuration
+
 @{
     //page title
     string adminPageTitle = !string.IsNullOrWhiteSpace(ViewBag.PageTitle) ? ViewBag.PageTitle + " / " : "";
     adminPageTitle += T("Admin.PageTitle").Text;
 
-    var usePathBase = appSettings.Get<HostingConfig>().PathBase;
-
     //event
     await eventPublisher.PublishAsync(new PageRenderingEvent(NopHtml));
 }
@@ -21,8 +18,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
 
-    <base href="@usePathBase" />
-
     @NopHtml.GenerateHeadCustom()
 
     @* CSS & Script resources *@

diff --git a/src/Presentation/Nop.Web/Views/Install/Index.cshtml b/src/Presentation/Nop.Web/Views/Install/Index.cshtml
@@ -1,20 +1,14 @@
 @model InstallModel
 
-@inject AppSettings appSettings
-
-@using Nop.Core.Configuration
 @{
     Layout = null;
-    var usePathBase = appSettings.Get<HostingConfig>().PathBase;
 }
 
 <!DOCTYPE html>
 <html>
 <head>
     <title>@ILS.GetResource("Title")</title>
-
-    <base href="@usePathBase" />
-
+
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic" />
     <link rel="shortcut icon" href="/icons/icons_0/favicon.ico" />

diff --git a/src/Presentation/Nop.Web/Views/Shared/_Print.cshtml b/src/Presentation/Nop.Web/Views/Shared/_Print.cshtml
@@ -1,22 +1,16 @@
 @inject Nop.Core.Domain.Common.CommonSettings commonSettings
 @inject IThemeContext themeContext
-@inject AppSettings appSettings
-
-@using Nop.Core.Configuration
 
 @{
     var themeName = await themeContext.GetWorkingThemeNameAsync();
     var title = await NopHtml.GenerateTitleAsync();
-    var usePathBase = appSettings.Get<HostingConfig>().PathBase;
 }
 <!DOCTYPE html>
 <html lang="@CultureInfo.CurrentUICulture.TwoLetterISOLanguageName" dir="@Html.GetUIDirection(!await Html.ShouldUseRtlThemeAsync())" class="@NopHtml.GeneratePageCssClasses()">
 <head>
     <title>@title</title>
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
 
-    <base href="@usePathBase" />
-
     <link href="~/Themes/@themeName/Content/css/print.css" rel="stylesheet" type="text/css" />
 
     @NopHtml.GenerateCssFiles()    

diff --git a/src/Presentation/Nop.Web/Views/Shared/_Root.Head.cshtml b/src/Presentation/Nop.Web/Views/Shared/_Root.Head.cshtml
@@ -1,5 +1,4 @@
-@using Nop.Core.Configuration
-@using Nop.Core.Domain.Catalog
+@using Nop.Core.Domain.Catalog
 @using Nop.Core.Domain.Common
 @using Nop.Core.Domain.Seo
 @using Nop.Services.Security
@@ -10,7 +9,6 @@
 @inject IEventPublisher eventPublisher
 @inject IPermissionService permissionService
 @inject SeoSettings seoSettings
-@inject AppSettings appSettings
 
 @{
     if (catalogSettings.DisplayAllPicturesOnCatalogPages)
@@ -39,9 +37,7 @@
     {
         NopHtml.AppendHeadCustomParts(seoSettings.CustomHeadTags);
     }
-
-    var usePathBase = appSettings.Get<HostingConfig>().PathBase;
-
+
     //event
     await eventPublisher.PublishAsync(new PageRenderingEvent(NopHtml));
 
@@ -54,8 +50,6 @@
 <head>
     <title>@title</title>
 
-    <base href="@usePathBase" />
-
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
     <meta name="description" content="@description" />
     <meta name="keywords" content="@keywords" />