feat: general improvements and minor bugs

Author: ReneSchwarzer

src/WebExpress.WebCore/WebMessage/ResponseSender.cs

@@ -1,5 +1,10 @@
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.Extensions.Primitives;
 using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
 using WebExpress.WebCore.WebHtml;
 
@@ -59,7 +64,20 @@ public async Task SendAsync(IHttpContext context, IResponse response, bool keepA
 
                 if (response.Header.Cookies.Count != 0)
                 {
-                    responseFeature.Headers.SetCookie = string.Join(" ", response.Header.Cookies);
+                    // Cookie.ToString() only emits "name=value" and discards
+                    // Path / Expires / Domain / SameSite - which makes the
+                    // browser default-path the cookie to the request URI's
+                    // directory. Build a proper Set-Cookie header per cookie
+                    // so attributes survive the round trip.
+                    var headerValues = response.Header.Cookies
+                        .Cast<Cookie>()
+                        .Select(SerializeSetCookie)
+                        .Where(s => !string.IsNullOrEmpty(s))
+                        .ToArray();
+                    if (headerValues.Length > 0)
+                    {
+                        responseFeature.Headers.SetCookie = new StringValues(headerValues);
+                    }
                 }
 
                 if (!string.IsNullOrWhiteSpace(response.Header.Upgrade))
@@ -112,5 +130,54 @@ public async Task SendAsync(IHttpContext context, IResponse response, bool keepA
                 log.Error(context.RemoteEndPoint + ": " + ex.Message);
             }
         }
+
+        /// <summary>
+        /// Serialises a <see cref="Cookie"/> as a single Set-Cookie header
+        /// value preserving Path, Domain, Expires and the HttpOnly / Secure
+        /// flags. SameSite defaults to <c>Lax</c> because System.Net.Cookie
+        /// does not model the attribute directly.
+        /// </summary>
+        /// <param name="cookie">The cookie to serialise.</param>
+        /// <returns>A Set-Cookie header value, or null when the cookie is empty.</returns>
+        private static string SerializeSetCookie(Cookie cookie)
+        {
+            if (cookie is null || string.IsNullOrEmpty(cookie.Name))
+            {
+                return null;
+            }
+
+            var parts = new List<string>
+            {
+                $"{cookie.Name}={cookie.Value ?? string.Empty}"
+            };
+
+            if (!string.IsNullOrEmpty(cookie.Path))
+            {
+                parts.Add($"Path={cookie.Path}");
+            }
+            if (!string.IsNullOrEmpty(cookie.Domain))
+            {
+                parts.Add($"Domain={cookie.Domain}");
+            }
+            if (cookie.Expires != DateTime.MinValue)
+            {
+                // RFC 7231 IMF-fixdate: "Wed, 21 Oct 2015 07:28:00 GMT".
+                parts.Add($"Expires={cookie.Expires.ToUniversalTime().ToString("r", CultureInfo.InvariantCulture)}");
+            }
+            if (cookie.HttpOnly)
+            {
+                parts.Add("HttpOnly");
+            }
+            if (cookie.Secure)
+            {
+                parts.Add("Secure");
+            }
+
+            // System.Net.Cookie has no SameSite property; default to Lax for
+            // first-party fit-for-purpose behaviour without cross-site leaks.
+            parts.Add("SameSite=Lax");
+
+            return string.Join("; ", parts);
+        }
     }
 }

src/WebExpress.WebCore/WebTheme/RenderContextThemeExtensions.cs

@@ -9,18 +9,31 @@ namespace WebExpress.WebCore.WebTheme
     /// application carried in the render context.
     /// </summary>
     /// <remarks>
-    /// Themes were moved out of <c>IApplicationContext</c> with the icon-theme
-    /// migration: the active theme is now the first theme registered for an
-    /// application via the <c>ThemeManager</c>. These helpers keep call sites
-    /// short for code that has a render context but no access to the visual
-    /// tree (e.g. <c>Icon</c> Funcs on form buttons).
+    /// The resolution order mirrors <c>VisualTreeControl</c> so server-side
+    /// icon factories and the visual tree end up with the same theme:
+    /// <list type="number">
+    ///   <item><description>
+    ///     The application's declared default theme (<c>[Theme&lt;T&gt;]</c> →
+    ///     <c>IApplicationContext.DefaultTheme</c>).
+    ///   </description></item>
+    ///   <item><description>
+    ///     The first theme registered for the application (legacy fallback).
+    ///   </description></item>
+    ///   <item><description>
+    ///     <see langword="null"/>; downstream <see cref="TypeIconTheme"/>
+    ///     callers fall back to <see cref="TypeIconTheme.Default"/>.
+    ///   </description></item>
+    /// </list>
+    /// Per-user overrides are wired by application code: the page's
+    /// <c>Process</c> hook calls <c>visualTree.UseTheme&lt;TTheme&gt;()</c>
+    /// based on whatever store the application keeps; the framework itself
+    /// does not consult cookies, sessions, or identities.
     /// </remarks>
     public static class RenderContextThemeExtensions
     {
         /// <summary>
-        /// Returns the first theme registered for the render context's
-        /// application, or <see langword="null"/> when no theme has been
-        /// registered.
+        /// Returns the active theme for the render context using the
+        /// resolution order documented on the class.
         /// </summary>
         /// <param name="renderContext">The current render context.</param>
         /// <returns>The active theme context or <see langword="null"/>.</returns>
@@ -32,6 +45,13 @@ public static IThemeContext GetActiveTheme(this IRenderContext renderContext)
                 return null;
             }
 
+            // 1. application's declared default
+            if (applicationContext.DefaultTheme is { } declared)
+            {
+                return declared;
+            }
+
+            // 2. first registered theme for the application
             return WebEx.ComponentHub?.ThemeManager?.Themes
                 ?.FirstOrDefault(t => t.ApplicationContext == applicationContext);
         }
@@ -47,5 +67,61 @@ public static TypeIconTheme GetIconTheme(this IRenderContext renderContext)
         {
             return renderContext.GetActiveTheme()?.IconTheme ?? TypeIconTheme.Default;
         }
+
+        /// <summary>
+        /// Re-themes an existing <see cref="WebIcon.IIcon"/> for the active
+        /// icon theme of <paramref name="renderContext"/>. Convenience over
+        /// <see cref="ApplyIconTheme(WebIcon.IIcon, TypeIconTheme)"/> for
+        /// callers that only have a render context in hand.
+        /// </summary>
+        /// <param name="icon">The icon to re-theme; may be <see langword="null"/>.</param>
+        /// <param name="renderContext">The current render context.</param>
+        /// <returns>The re-themed icon or the original instance.</returns>
+        public static WebIcon.IIcon ApplyIconTheme(this WebIcon.IIcon icon, IRenderContext renderContext)
+        {
+            return icon.ApplyIconTheme(renderContext.GetIconTheme());
+        }
+
+        /// <summary>
+        /// Re-themes an existing <see cref="WebIcon.IIcon"/> for the given
+        /// <paramref name="theme"/>. Icons created at registration time
+        /// (e.g. <c>PageContext.PageIcon</c>) carry the theme that was
+        /// active when the page was discovered; this helper rebuilds them
+        /// so the breadcrumb, sidebars, etc. swap glyphs at runtime when
+        /// the application code activates a different theme via
+        /// <c>visualTree.UseTheme&lt;TTheme&gt;()</c>. Controls that have
+        /// a visual tree in hand should pass
+        /// <c>visualTree.IconTheme</c> here.
+        /// <para>
+        /// Falls back to <paramref name="icon"/> when its concrete type does
+        /// not expose a <c>(TypeIconTheme)</c> constructor.
+        /// </para>
+        /// </summary>
+        /// <param name="icon">The icon to re-theme; may be <see langword="null"/>.</param>
+        /// <param name="theme">The icon theme to apply.</param>
+        /// <returns>The re-themed icon or the original instance.</returns>
+        public static WebIcon.IIcon ApplyIconTheme(this WebIcon.IIcon icon, TypeIconTheme theme)
+        {
+            if (icon is null)
+            {
+                return null;
+            }
+
+            var iconType = icon.GetType();
+            var ctor = iconType.GetConstructor(new[] { typeof(TypeIconTheme) });
+            if (ctor is null)
+            {
+                return icon;
+            }
+
+            try
+            {
+                return ctor.Invoke(new object[] { theme }) as WebIcon.IIcon ?? icon;
+            }
+            catch
+            {
+                return icon;
+            }
+        }
     }
 }