Prevent confusing usage of IRunningShellTable.Match(HttpContext) (Lom…

…biq Technologies: OCORE-69) (OrchardCMS#10779) * Formatting * Fix that IRunningShellTable.Match(HttpContext) didn't match tenants with URL prefixes * Revert "Fix that IRunningShellTable.Match(HttpContext) didn't match tenants with URL prefixes" This reverts commit baf4240. * Making IRunningShellTable.Match(HttpContext) internal to avoid confusion by consumers
vmyspace · Nov 29, 2021 · 72fab98 · 72fab98
1 parent e0e4dd7
commit 72fab98
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/OrchardCore.Cms.Web/Program.cs b/src/OrchardCore.Cms.Web/Program.cs
@@ -15,10 +15,10 @@ public static void Main(string[] args)
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureLogging(logging => logging.ClearProviders())
-                 .ConfigureWebHostDefaults(webBuilder =>
-                 {
-                     webBuilder.UseNLogWeb();
-                     webBuilder.UseStartup<Startup>();
-                 });
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseNLogWeb();
+                    webBuilder.UseStartup<Startup>();
+                });
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Extensions/RunningShellTableExtensions.cs b/src/OrchardCore/OrchardCore/Modules/Extensions/RunningShellTableExtensions.cs
@@ -4,7 +4,10 @@
 
 namespace OrchardCore.Modules
 {
-    public static class RunningShellTableExtensions
+    // Not public because it wouldn't match tenants with an URL prefix later in the request pipeline. Mostly to be used
+    // from ModularTenantContainerMiddleware.
+    // For details see: https://github.com/OrchardCMS/OrchardCore/pull/10779#discussion_r758741155.
+    internal static class RunningShellTableExtensions
     {
         public static ShellSettings Match(this IRunningShellTable table, HttpContext httpContext)
         {