Merge pull request #6964 from donker/cdf-fix-x

Fix to resolution of ClientResourceController in ServicesFramework

Author: valadas

DNN Platform/DotNetNuke.Web.Client.ResourceManager/ClientResourceController.cs

@@ -11,12 +11,16 @@ namespace DotNetNuke.Web.Client.ResourceManager
 
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Abstractions.ClientResources;
+    using DotNetNuke.Instrumentation;
 
     /// <inheritdoc />
     public class ClientResourceController : IClientResourceController
     {
+        private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(ClientResourceController));
         private readonly IHostSettings hostSettings;
         private readonly IApplicationStatusInfo appStatus;
+        private readonly Guid controllerId;
+        private bool hasBegunRendering;
 
         /// <summary>Initializes a new instance of the <see cref="ClientResourceController"/> class.</summary>
         /// <param name="hostSettings">The host settings.</param>
@@ -34,6 +38,8 @@ public ClientResourceController(IHostSettings hostSettings, IApplicationStatusIn
             this.hostSettings = hostSettings;
             this.appStatus = appStatus;
             this.RegisterPathNameAlias("SharedScripts", "~/Resources/Shared/Scripts/");
+            this.controllerId = Guid.NewGuid();
+            Logger.Debug($"ClientResourceController initialized with ID {this.controllerId}");
         }
 
         private List<IFontResource> Fonts { get; set; } = [];
@@ -198,6 +204,8 @@ public void RemoveStylesheetByPath(string stylesheetPath, string pathNameAlias)
         /// <inheritdoc />
         public string RenderDependencies(ResourceType resourceType, string provider, string applicationPath)
         {
+            this.hasBegunRendering = true;
+            Logger.Debug($"Rendering dependencies for CRC id {this.controllerId} with ResourceType={resourceType}, Provider={provider}, ApplicationPath={applicationPath}. We have {this.Scripts.Count} scripts, {this.Stylesheets.Count} stylesheets and {this.Fonts.Count} fonts.");
             var sortedList = new List<IResource>();
             if (resourceType is ResourceType.Font or ResourceType.All)
             {
@@ -264,6 +272,15 @@ private List<T> AddResource<T>(List<T> resources, T resource)
             where T : IResource
         {
             resource.ResolvedPath = this.ResolvePath(resource.FilePath, resource.PathNameAlias);
+            Logger.Debug($"Adding resource {resource.ResolvedPath} to CRC id {this.controllerId} which currently has {resources.Count} resources");
+
+            if (this.hasBegunRendering)
+            {
+                Logger.Error($"Cannot add resource {resource.ResolvedPath} to CRC id {this.controllerId} because rendering has already begun");
+
+                ////throw new InvalidOperationException("Cannot add resources after rendering has begun.");
+            }
+
             resources.RemoveAll(l => string.Equals(l.ResolvedPath, resource.ResolvedPath, StringComparison.OrdinalIgnoreCase)); // remove any existing link with the same key (i.e. exactly the same resolved path)
             if (!string.IsNullOrEmpty(resource.Name))
             {

DNN Platform/Library/Framework/ServicesFrameworkImpl.cs

@@ -27,7 +27,6 @@ internal class ServicesFrameworkImpl : IServicesFramework, IServiceFrameworkInte
     {
         private const string AntiForgeryKey = "dnnAntiForgeryRequested";
         private const string ScriptKey = "dnnSFAjaxScriptRequested";
-        private readonly IClientResourceController clientResourceController;
         private readonly IApplicationStatusInfo appStatus;
         private readonly IEventLogger eventLogger;
 
@@ -44,9 +43,9 @@ public ServicesFrameworkImpl()
         /// <param name="eventLogger">The event logger.</param>
         public ServicesFrameworkImpl(IClientResourceController clientResourceController, IApplicationStatusInfo appStatus, IEventLogger eventLogger)
         {
-            this.clientResourceController = clientResourceController ?? Globals.GetCurrentServiceProvider().GetRequiredService<IClientResourceController>();
-            this.appStatus = appStatus ?? Globals.GetCurrentServiceProvider().GetRequiredService<IApplicationStatusInfo>();
-            this.eventLogger = eventLogger ?? Globals.GetCurrentServiceProvider().GetRequiredService<IEventLogger>();
+            var servicesProvider = Globals.GetCurrentServiceProvider();
+            this.appStatus = appStatus ?? servicesProvider.GetRequiredService<IApplicationStatusInfo>();
+            this.eventLogger = eventLogger ?? servicesProvider.GetRequiredService<IEventLogger>();
         }
 
         /// <inheritdoc />
@@ -105,7 +104,7 @@ public void RegisterAjaxScript(Page page)
                 scriptPath = "~/js/dnn.servicesframework.js";
             }
 
-            this.clientResourceController.RegisterScript(scriptPath);
+            GetClientResourcesController().RegisterScript(scriptPath);
         }
 
         private static void SetKey(string key)
@@ -117,5 +116,11 @@ private static bool CheckKey(string antiForgeryKey)
         {
             return HttpContextSource.Current.Items.Contains(antiForgeryKey);
         }
+
+        private static IClientResourceController GetClientResourcesController()
+        {
+            var serviceProvider = Globals.GetCurrentServiceProvider();
+            return serviceProvider.GetRequiredService<IClientResourceController>();
+        }
     }
 }