V17/dev

uTPro/Common/uTPro.Common/Constants/PathFolder.cs

@@ -17,6 +17,10 @@ public struct PathFolder
         /// </summary>
         public static string? ContentRootPathOverride { get; set; }
 
+        /// <summary>
+        /// Gets the wwwroot directory path. Returns <see cref="WebRootPathOverride"/> if set,
+        /// otherwise returns a default path of 'wwwroot' under <see cref="DirectoryRootServer"/>.
+        /// </summary>
         public static string DirectoryWWWRoot
         {
             get
@@ -27,6 +31,10 @@ public static string DirectoryWWWRoot
             }
         }
 
+        /// <summary>
+        /// Gets the content root directory path. Returns <see cref="ContentRootPathOverride"/> if set,
+        /// otherwise returns the process's current working directory.
+        /// </summary>
         public static string DirectoryRootServer
         {
             get

uTPro/Extension/uTPro.Extension/ContentExtensions.cs

@@ -11,12 +11,28 @@ public static class ContentExtensions
         // bottomComponent, site-level toggles) so the repeated walks add up.
         private static readonly object _cacheKey = new();
 
+        /// <summary>
+        /// Retrieves a strongly-typed value for the specified property alias by walking up the content
+        /// tree (self and ancestors) until a node with that property is found, then returns the value
+        /// cast to type <typeparamref name="T"/>.
+        /// </summary>
+        /// <typeparam name="T">The expected type of the property value.</typeparam>
+        /// <param name="content">The content node to start searching from.</param>
+        /// <param name="alias">The property alias to search for.</param>
+        /// <returns>The inherited property value, or the default value of <typeparamref name="T"/> if not found.</returns>
         public static T? ValueInherited<T>(this IPublishedContent content, string alias)
         {
             var node = content.Inherited(alias);
             return node == null ? default : node.Value<T>(alias);
         }
 
+        /// <summary>
+        /// Finds the nearest ancestor (or self) that has a value for the specified property alias.
+        /// Results are cached per-request to avoid repeated tree traversals for the same content and alias.
+        /// </summary>
+        /// <param name="content">The content node to start searching from.</param>
+        /// <param name="alias">The property alias to search for.</param>
+        /// <returns>The nearest <see cref="IPublishedContent"/> node that has the property, or null if not found.</returns>
         public static IPublishedContent? Inherited(this IPublishedContent content, string alias)
         {
             var cache = TryGetCache();
@@ -36,6 +52,16 @@ public static class ContentExtensions
             return ResolveInherited(content, alias);
         }
 
+        /// <summary>
+        /// Searches the content tree (self and ancestors) for the first node that has a value for any
+        /// of the specified property aliases, returning both the matched alias and the node containing it.
+        /// </summary>
+        /// <param name="content">The content node to start searching from.</param>
+        /// <param name="alias">One or more property aliases to search for, checked in order.</param>
+        /// <returns>
+        /// A tuple containing the matched alias and the <see cref="IPublishedContent"/> node that has it,
+        /// or (null, null) if none of the aliases are found.
+        /// </returns>
         public static (string? alias, IPublishedContent? value) Inherited(this IPublishedContent content, params string[] alias)
         {
             foreach (var node in content.AncestorsOrSelf())

uTPro/Extension/uTPro.Extension/HttpContextStaticComposer.cs

@@ -13,6 +13,11 @@ namespace uTPro.Extension
     /// </summary>
     public class HttpContextStaticComposer : IComposer
     {
+        /// <summary>
+        /// Composes the Umbraco application by registering <see cref="IHttpContextAccessor"/>
+        /// and wiring it into the application startup pipeline via <see cref="HttpContextStaticStartupFilter"/>.
+        /// </summary>
+        /// <param name="builder">The Umbraco builder used to register services.</param>
         public void Compose(IUmbracoBuilder builder)
         {
             builder.Services.AddHttpContextAccessor();

uTPro/Extension/uTPro.Extension/HttpContextStaticStartupFilter.cs

@@ -8,12 +8,24 @@ internal sealed class HttpContextStaticStartupFilter : IStartupFilter
     {
         private readonly IHttpContextAccessor _accessor;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpContextStaticStartupFilter"/> class
+        /// and assigns the provided <paramref name="accessor"/> to <see cref="HttpContextStatic.Accessor"/>.
+        /// </summary>
+        /// <param name="accessor">The HTTP context accessor to be stored and used throughout the application.</param>
         public HttpContextStaticStartupFilter(IHttpContextAccessor accessor)
         {
             _accessor = accessor;
             HttpContextStatic.Accessor = accessor;
         }
 
+        /// <summary>
+        /// Configures the application builder pipeline, ensuring the HTTP context accessor
+        /// is assigned to <see cref="HttpContextStatic.Accessor"/> before proceeding with
+        /// the next configuration action.
+        /// </summary>
+        /// <param name="next">The next configuration action in the pipeline.</param>
+        /// <returns>The configuration action to be executed.</returns>
         public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
         {
             // Re-assign defensively in case something reset it. Cheap no-op otherwise.

uTPro/Feature/uTPro.Feature/uTPro.Feature.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
@@ -15,13 +15,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="uTPro.Feature.AuditLog" Version="5.0.0" />
-    <PackageReference Include="uTPro.Feature.FileManager" Version="6.0.1" />
-    <PackageReference Include="uTPro.Feature.JobMonitor" Version="2.0.0" />
-    <PackageReference Include="uTPro.Feature.SimpleFormBuilder" Version="5.0.1" />
-    <PackageReference Include="uTPro.Feature.UrlViewer" Version="3.1.0" />
-    <PackageReference Include="uTPro.Feature.SEOAudit" Version="2.0.5" />
-    <PackageReference Include="uTPro.Feature.SearchPlus" Version="1.0.0" />
+    <PackageReference Include="uTPro.Feature.AuditLog" Version="5.0.1" />
+    <PackageReference Include="uTPro.Feature.FileManager" Version="6.0.2" />
+    <PackageReference Include="uTPro.Feature.JobMonitor" Version="2.0.1" />
+    <PackageReference Include="uTPro.Feature.SimpleFormBuilder" Version="5.0.2" />
+    <PackageReference Include="uTPro.Feature.UrlViewer" Version="3.1.1" />
+    <PackageReference Include="uTPro.Feature.SEOAudit" Version="2.0.6" />
+    <PackageReference Include="uTPro.Feature.SearchPlus" Version="1.0.2" />
+    <PackageReference Include="uTPro.Feature.GeoLocation" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

uTPro/Foundation/uTPro.Foundation.Middleware/RequestLocalizationOptionMiddleware.cs

@@ -305,8 +305,22 @@ private static (string culture, string prefixUrl, bool isRedirect) GetUrlCulture
             }
             else
             {
-                // Root URL — try cookie
+                // Root URL — try cookie first, then GeoLocation detection, then site default.
                 culture = context.Request.Cookies[CookieCulture]?.ToString() ?? string.Empty;
+
+                if (!string.IsNullOrWhiteSpace(culture) && !HasDomainForCulture(domains, culture))
+                    culture = string.Empty;
+
+                if (string.IsNullOrWhiteSpace(culture))
+                {
+                    // Only use GeoLocation culture if the site actually serves that language
+                    // (i.e. a matching Umbraco domain exists). Otherwise fall through to default.
+                    var geoCulture = GetGeoLocationCulture(context);
+                    if (!string.IsNullOrEmpty(geoCulture) && HasDomainForCulture(domains, geoCulture))
+                    {
+                        culture = geoCulture;
+                    }
+                }
             }
 
             if (cul == null)
@@ -320,6 +334,48 @@ private static (string culture, string prefixUrl, bool isRedirect) GetUrlCulture
             return (cul?.Culture ?? string.Empty, cul?.Name ?? string.Empty, isRedirect);
         }
 
+        /// <summary>
+        /// Reads the culture name resolved by the uTPro.Feature.GeoLocation middleware
+        /// (if installed and detected). The GeoLocation middleware stores its result in
+        /// <c>HttpContext.Items["uTPro.GeoLocation.Result"]</c> before this middleware runs.
+        /// Loose-coupled: Foundation does not reference the Feature package — reads via reflection-free
+        /// duck-typing on the Items dictionary.
+        /// </summary>
+        private static string? GetGeoLocationCulture(HttpContext context)
+        {
+            const string GeoLocationItemKey = "uTPro.GeoLocation.Result";
+
+            if (!context.Items.TryGetValue(GeoLocationItemKey, out var resultObj) || resultObj is null)
+                return null;
+
+            // The result object has a public CultureInfo? Culture property and a bool IsDetected property.
+            // We access it via dynamic to avoid a hard reference to the Feature assembly.
+            try
+            {
+                dynamic geoResult = resultObj;
+                if (!(bool)geoResult.IsDetected)
+                    return null;
+
+                var culture = geoResult.Culture as CultureInfo;
+                return culture?.Name;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns <c>true</c> if the site has at least one Umbraco domain configured for the given culture.
+        /// Prevents GeoLocation from redirecting to a language the site does not serve.
+        /// </summary>
+        private static bool HasDomainForCulture(IReadOnlyList<Umbraco.Cms.Core.Routing.Domain> domains, string culture)
+        {
+            return domains.Any(d =>
+                !string.IsNullOrEmpty(d.Culture) &&
+                d.Culture.Equals(culture, StringComparison.OrdinalIgnoreCase));
+        }
+
         private static Umbraco.Cms.Core.Routing.Domain? SelectDomainForCulture(
             IReadOnlyList<Umbraco.Cms.Core.Routing.Domain> domains, string culture)
         {

uTPro/Project/uTPro.Project.Web/Startup/PipelineSetup.cs

@@ -1,3 +1,4 @@
+using uTPro.Feature.GeoLocation.Extensions;
 using uTPro.Foundation.Middleware;
 using WebMarkupMin.AspNetCoreLatest;
 
@@ -26,6 +27,7 @@ public static WebApplication ConfigurePipeline(this WebApplication app)
         app.UseWebMarkupMin();
         app.UseOutputCache();
         app.UseCookiePolicy();
+        app.UseGeoLocationDetection();
         app.UseInitMiddleware();
         app.ConfigureUmbracoPipeline();
         app.MapControllers();
@@ -44,16 +46,23 @@ private static void UseFrontendCaching(this WebApplication app)
                 && !path.StartsWith("/umbraco", StringComparison.OrdinalIgnoreCase)
                 && !path.StartsWith("/app_plugins", StringComparison.OrdinalIgnoreCase)
                 && !path.Contains('.');
+            var isRootPage = string.IsNullOrEmpty(path) || path == "/";
 
             if (isWebsitePage)
             {
                 context.Response.OnStarting(() =>
                 {
-                    if (context.Response.StatusCode == 200
-                        && !context.Response.Headers.ContainsKey("Cache-Control"))
+                    if (context.Response.StatusCode == 200)
                     {
-                        context.Response.Headers.CacheControl =
-                            "public, max-age=120, stale-while-revalidate=60";
+                        if (isRootPage)
+                        {
+                            context.Response.Headers.CacheControl = "private, no-store";
+                        }
+                        else if (!context.Response.Headers.ContainsKey("Cache-Control"))
+                        {
+                            context.Response.Headers.CacheControl =
+                                "public, max-age=120, stale-while-revalidate=60";
+                        }
                     }
                     return Task.CompletedTask;
                 });

uTPro/Project/uTPro.Project.Web/uTPro.Project.Web.csproj

@@ -6,7 +6,7 @@
     <!-- SDK build/publish-time Brotli+GZip pre-compression of static web assets (.NET 9+). -->
     <CompressionEnabled>true</CompressionEnabled>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
-    <Version>17.11.4</Version>
+    <Version>17.12.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Controllers\Api\**" />