Added code for storing hostname with Integrated Middleware. See #986

PiranhaCMS · Jan 16, 2020 · 341a749 · 341a749
1 parent ed28e8b
commit 341a749
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core/Piranha.AspNetCore/IntegratedMiddleware.cs b/core/Piranha.AspNetCore/IntegratedMiddleware.cs
@@ -61,17 +61,21 @@ public override async Task Invoke(HttpContext context, IApi api, IApplicationSer
                 //
                 Site site = null;
 
+                var hostname = context.Request.Host.Host;
+
                 if (_config.UseSiteRouting)
                 {
                     // Try to get the requested site by hostname & prefix
                     if (segments.Length > 0)
                     {
-                        site = await api.Sites.GetByHostnameAsync($"{context.Request.Host.Host}/{segments[0]}")
+                        var prefixedHostname = $"{hostname}/{segments[0]}";
+                        site = await api.Sites.GetByHostnameAsync(prefixedHostname)
                             .ConfigureAwait(false);
 
                         if (site != null)
                         {
                             context.Request.Path = "/" + string.Join("/", segments.Skip(1));
+                            hostname = prefixedHostname;
                             pos = 1;
                         }
                     }
@@ -106,6 +110,9 @@ public override async Task Invoke(HttpContext context, IApi api, IApplicationSer
                     }
                 }
 
+                // Store hostname
+                service.Hostname = hostname;
+
                 //
                 // Check if we shouldn't handle empty requests for start page
                 //