Let UmbracoMediaUrl fallback to UmbracoMediaPath when empty

Author: ronaldbarendse

src/Umbraco.Core/Configuration/Models/GlobalSettings.cs

@@ -24,29 +24,26 @@ public class GlobalSettings
         internal const string StaticUmbracoCssPath = "~/css";
         internal const string StaticUmbracoScriptsPath = "~/scripts";
         internal const string StaticUmbracoMediaPath = "~/media";
-        internal const string StaticUmbracoMediaUrl = "~/media";
         internal const bool StaticInstallMissingDatabase = false;
         internal const bool StaticDisableElectionForSingleServer = false;
         internal const string StaticNoNodesViewPath = "~/umbraco/UmbracoWebsite/NoNodes.cshtml";
         internal const string StaticSqlWriteLockTimeOut = "00:00:05";
         internal const bool StaticSanitizeTinyMce = false;
 
         /// <summary>
-        /// Gets or sets a value for the reserved URLs.
-        /// It must end with a comma
+        /// Gets or sets a value for the reserved URLs (must end with a comma).
         /// </summary>
         [DefaultValue(StaticReservedUrls)]
         public string ReservedUrls { get; set; } = StaticReservedUrls;
 
         /// <summary>
-        /// Gets or sets a value for the reserved paths.
-        /// It must end with a comma
+        /// Gets or sets a value for the reserved paths (must end with a comma).
         /// </summary>
         [DefaultValue(StaticReservedPaths)]
         public string ReservedPaths { get; set; } = StaticReservedPaths;
 
         /// <summary>
-        /// Gets or sets a value for the timeout
+        /// Gets or sets a value for the back-office login timeout.
         /// </summary>
         [DefaultValue(StaticTimeOut)]
         public TimeSpan TimeOut { get; set; } = TimeSpan.Parse(StaticTimeOut);
@@ -110,12 +107,10 @@ public class GlobalSettings
         [DefaultValue(StaticUmbracoMediaPath)]
         public string UmbracoMediaPath { get; set; } = StaticUmbracoMediaPath;
 
-
         /// <summary>
-        /// Gets or sets a value for the Umbraco media url. Starts with "~/".
+        /// Gets or sets a value for the Umbraco media URL (falls back to <see cref="UmbracoMediaPath" /> when empty).
         /// </summary>
-        [DefaultValue(StaticUmbracoMediaUrl)]
-        public string UmbracoMediaUrl { get; set; } = StaticUmbracoMediaUrl;
+        public string UmbracoMediaUrl { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to install the database when it is missing.
@@ -139,6 +134,9 @@ public class GlobalSettings
         /// </summary>
         public string MainDomLock { get; set; } = string.Empty;
 
+        /// <summary>
+        /// Gets or sets the telemetry ID.
+        /// </summary>
         public string Id { get; set; } = string.Empty;
 
         /// <summary>
@@ -172,18 +170,18 @@ public class GlobalSettings
         /// </summary>
         public bool IsPickupDirectoryLocationConfigured => !string.IsNullOrWhiteSpace(Smtp?.PickupDirectoryLocation);
 
-        /// Gets a value indicating whether TinyMCE scripting sanitization should be applied
+        /// <summary>
+        /// Gets a value indicating whether TinyMCE scripting sanitization should be applied.
         /// </summary>
         [DefaultValue(StaticSanitizeTinyMce)]
         public bool SanitizeTinyMce => StaticSanitizeTinyMce;
 
         /// <summary>
-        /// An int value representing the time in milliseconds to lock the database for a write operation
+        /// Gets a value representing the time in milliseconds to lock the database for a write operation.
         /// </summary>
         /// <remarks>
-        /// The default value is 5000 milliseconds
+        /// The default value is 5000 milliseconds.
         /// </remarks>
-        /// <value>The timeout in milliseconds.</value>
         [DefaultValue(StaticSqlWriteLockTimeOut)]
         public TimeSpan SqlWriteLockTimeOut { get; } = TimeSpan.Parse(StaticSqlWriteLockTimeOut);
     }

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs

@@ -13,23 +13,25 @@ namespace Umbraco.Cms.Core.DependencyInjection
     public static partial class UmbracoBuilderExtensions
     {
 
-        private static IUmbracoBuilder AddUmbracoOptions<TOptions>(this IUmbracoBuilder builder)
+        private static IUmbracoBuilder AddUmbracoOptions<TOptions>(this IUmbracoBuilder builder, Action<OptionsBuilder<TOptions>> configure = null)
             where TOptions : class
         {
             var umbracoOptionsAttribute = typeof(TOptions).GetCustomAttribute<UmbracoOptionsAttribute>();
-
             if (umbracoOptionsAttribute is null)
             {
-                throw new ArgumentException("typeof(TOptions) do not have the UmbracoOptionsAttribute");
+                throw new ArgumentException($"{typeof(TOptions)} do not have the UmbracoOptionsAttribute.");
             }
 
-
-            builder.Services.AddOptions<TOptions>()
-                .Bind(builder.Config.GetSection(umbracoOptionsAttribute.ConfigurationKey),
-                    o => o.BindNonPublicProperties = umbracoOptionsAttribute.BindNonPublicProperties)
+            var optionsBuilder = builder.Services.AddOptions<TOptions>()
+                .Bind(
+                    builder.Config.GetSection(umbracoOptionsAttribute.ConfigurationKey),
+                    o => o.BindNonPublicProperties = umbracoOptionsAttribute.BindNonPublicProperties
+                )
                 .ValidateDataAnnotations();
 
-             return builder;
+            configure?.Invoke(optionsBuilder);
+
+            return builder;
         }
 
         /// <summary>
@@ -52,7 +54,13 @@ public static IUmbracoBuilder AddConfiguration(this IUmbracoBuilder builder)
                 .AddUmbracoOptions<ContentSettings>()
                 .AddUmbracoOptions<CoreDebugSettings>()
                 .AddUmbracoOptions<ExceptionFilterSettings>()
-                .AddUmbracoOptions<GlobalSettings>()
+                .AddUmbracoOptions<GlobalSettings>(optionsBuilder => optionsBuilder.PostConfigure(options =>
+                {
+                    if (string.IsNullOrEmpty(options.UmbracoMediaUrl))
+                    {
+                        options.UmbracoMediaUrl = options.UmbracoMediaPath;
+                    }
+                }))
                 .AddUmbracoOptions<HealthChecksSettings>()
                 .AddUmbracoOptions<HostingSettings>()
                 .AddUmbracoOptions<ImagingSettings>()