Merge pull request #6538 from bdukes/host-settings

Introduce IHostSettings to replace Host class

Author: david-poindexter

DNN Platform/Admin Modules/Dnn.Modules.Console/ViewConsole.ascx.cs

@@ -33,15 +33,26 @@ public partial class ViewConsole : PortalModuleBase
     {
         private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(ViewConsole));
         private readonly INavigationManager navigationManager;
+        private readonly IJavaScriptLibraryHelper javaScript;
+
         private string defaultSize = string.Empty;
         private string defaultView = string.Empty;
-        private int groupTabID = -1;
+        private int groupTabId = -1;
         private IList<TabInfo> tabs;
 
         /// <summary>Initializes a new instance of the <see cref="ViewConsole"/> class.</summary>
         public ViewConsole()
+            : this(null, null)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="ViewConsole"/> class.</summary>
+        /// <param name="navigationManager">The navigation manager.</param>
+        /// <param name="javaScript">The JavaScript library helper.</param>
+        public ViewConsole(INavigationManager navigationManager, IJavaScriptLibraryHelper javaScript)
         {
-            this.navigationManager = this.DependencyProvider.GetRequiredService<INavigationManager>();
+            this.navigationManager = navigationManager ?? this.DependencyProvider.GetRequiredService<INavigationManager>();
+            this.javaScript = javaScript ?? this.DependencyProvider.GetRequiredService<IJavaScriptLibraryHelper>();
         }
 
         /// <summary>Gets a value indicating whether the module settings allow size change.</summary>
@@ -200,7 +211,7 @@ protected override void OnInit(EventArgs e)
 
             try
             {
-                JavaScript.RequestRegistration(CommonJs.jQuery);
+                this.javaScript.RequestRegistration(CommonJs.jQuery);
 
                 ClientResourceManager.RegisterScript(this.Page, "~/desktopmodules/admin/console/scripts/jquery.console.js");
 
@@ -313,9 +324,9 @@ protected override void OnLoad(EventArgs e)
         protected string GetHtml(TabInfo tab)
         {
             string returnValue = string.Empty;
-            if (this.groupTabID > -1 && this.groupTabID != tab.ParentId)
+            if (this.groupTabId > -1 && this.groupTabId != tab.ParentId)
             {
-                this.groupTabID = -1;
+                this.groupTabId = -1;
                 if (!tab.DisableLink)
                 {
                     returnValue = "<br style=\"clear:both;\" /><br />";
@@ -326,7 +337,7 @@ protected string GetHtml(TabInfo tab)
             {
                 const string headerHtml = "<br style=\"clear:both;\" /><br /><h1><span class=\"TitleHead\">{0}</span></h1><br style=\"clear:both\" />";
                 returnValue += string.Format(headerHtml, tab.TabName);
-                this.groupTabID = tab.TabID;
+                this.groupTabId = tab.TabID;
             }
             else
             {
@@ -535,7 +546,7 @@ private void SaveUserSetting(string key, object val)
 
         private void RepeaterItemDataBound(object sender, RepeaterItemEventArgs e)
         {
-            var tab = e.Item.DataItem as TabInfo;
+            var tab = (TabInfo)e.Item.DataItem;
             e.Item.Controls.Add(new Literal() { Text = this.GetHtml(tab) });
             if (this.tabs.Any(t => t.ParentId == tab.TabID))
             {

DNN Platform/Dnn.AuthServices.Jwt/Auth/JwtAuthMessageHandler.cs

@@ -26,7 +26,7 @@ public class JwtAuthMessageHandler : AuthMessageHandlerBase
         private readonly IJwtController jwtController = JwtController.Instance;
 
         /// <summary>Initializes a new instance of the <see cref="JwtAuthMessageHandler"/> class.</summary>
-        /// <param name="includeByDefault">A value indicating whether this handler should be inlcuded by default on all API endpoints.</param>
+        /// <param name="includeByDefault">A value indicating whether this handler should be included by default on all API endpoints.</param>
         /// <param name="forceSsl">A value indicating whether this handler should enforce SSL usage.</param>
         public JwtAuthMessageHandler(bool includeByDefault, bool forceSsl)
             : base(includeByDefault, forceSsl)

DNN Platform/Dnn.AuthServices.Jwt/Data/DataService.cs

@@ -9,21 +9,44 @@ namespace Dnn.AuthServices.Jwt.Data
     using System.Web.Caching;
 
     using Dnn.AuthServices.Jwt.Components.Entity;
+
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Extensions;
     using DotNetNuke.Common.Utilities;
     using DotNetNuke.ComponentModel;
     using DotNetNuke.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Host;
+
+    using Microsoft.Extensions.DependencyInjection;
 
     /// <summary>This class provides the Data Access Layer for the JWT Authentication library.</summary>
     public class DataService : ComponentBase<IDataService, DataService>, IDataService
     {
         private readonly DataProvider dataProvider = DataProvider.Instance();
+        private readonly IHostSettings hostSettings;
+
+        /// <summary>Initializes a new instance of the <see cref="DataService"/> class.</summary>
+        public DataService()
+            : this(null)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="DataService"/> class.</summary>
+        /// <param name="hostSettings">The host settings.</param>
+        public DataService(IHostSettings hostSettings)
+        {
+            this.hostSettings = hostSettings ?? HttpContextSource.Current?.GetScope().ServiceProvider.GetRequiredService<IHostSettings>() ?? new HostSettings(new HostController());
+        }
 
         /// <inheritdoc/>
         public virtual PersistedToken GetTokenById(string tokenId)
         {
             try
             {
                 return CBO.GetCachedObject<PersistedToken>(
+                    this.hostSettings,
                     new CacheItemArgs(GetCacheKey(tokenId), 60, CacheItemPriority.Default),
                     _ => CBO.FillObject<PersistedToken>(this.dataProvider.ExecuteReader("JsonWebTokens_GetById", tokenId)));
             }

DNN Platform/DotNetNuke.Abstractions/Application/CacheControlHeader.cs

@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Abstractions.Application;
+
+/// <summary>Provides enumerated values that are used to set the <c>Cache-Control</c> HTTP header.</summary>
+/// <remarks>This is a copy of <c>System.Web.HttpCacheability</c>, which is defined in System.Web (and therefore not available in .NET Standard 2.0).</remarks>
+/// <seealso href="https://learn.microsoft.com/en-us/dotnet/api/system.web.httpcacheability"/>
+public enum CacheControlHeader
+{
+    /// <summary>A header value that is unknown.</summary>
+    Unknown = 0,
+
+    /// <summary>Sets the <c>Cache-Control: no-cache</c> header. Without a field name, the directive applies to the entire request and a shared (proxy server) cache must force a successful revalidation with the origin Web server before satisfying the request. With a field name, the directive applies only to the named field; the rest of the response may be supplied from a shared cache.</summary>
+    NoCache = 1,
+
+    /// <summary>Default value. Sets <c>Cache-Control: private</c> to specify that the response is cacheable only on the client and not by shared (proxy server) caches.</summary>
+    Private = 2,
+
+    /// <summary>Specifies that the response is cached only at the origin server. Similar to the <see cref="NoCache" /> option. Clients receive a <c>Cache-Control: no-cache</c> directive but the document is cached on the origin server. Equivalent to <see cref="ServerAndNoCache" />.</summary>
+    Server = 3,
+
+    /// <summary>Applies the settings of both <see cref="Server" /> and <see cref="NoCache" /> to indicate that the content is cached at the server but all others are explicitly denied the ability to cache the response.</summary>
+    ServerAndNoCache = 3,
+
+    /// <summary>Sets <c>Cache-Control: public</c> to specify that the response is cacheable by clients and shared (proxy) caches.</summary>
+    Public = 4,
+
+    /// <summary>Indicates that the response is cached at the server and at the client but nowhere else. Proxy servers are not allowed to cache the response.</summary>
+    ServerAndPrivate = 5,
+}

DNN Platform/DotNetNuke.Abstractions/Application/IApplicationInfo.cs

@@ -16,7 +16,7 @@ public interface IApplicationInfo
         /// Gets the version of the currently installed DotNetNuke framework/application
         /// Can be prior to Version, if the application is pending to be upgraded.
         /// </summary>
-        /// <value>The version as retreieved from the database version table.</value>
+        /// <value>The version as retrieved from the database version table.</value>
         Version CurrentVersion { get; }
 
         /// <summary>Gets the description of the application.</summary>
@@ -69,7 +69,7 @@ public interface IApplicationInfo
         string Url { get; }
 
         /// <summary>Gets the version of the DotNetNuke framework/application.</summary>
-        /// <value>The version as retreieved from the Executing assembly.</value>
+        /// <value>The version as retrieved from the Executing assembly.</value>
         Version Version { get; }
 
         /// <summary>  Determine whether a product specific change is to be applied.</summary>