Taking AllowContentDashboardAccessToAllUsers prop from GlobalSettings to ContentDashboardSettings and saving AccessRulesFromConfig into a backing field

Author: elit0451

src/Umbraco.Core/ConfigsExtensions.cs

@@ -8,7 +8,6 @@
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
-using Umbraco.Core.Services;
 
 namespace Umbraco.Core
 {
@@ -50,9 +49,7 @@ public static void AddCoreConfigs(this Configs configs)
                 factory.GetInstance<ManifestParser>(),
                 factory.GetInstance<IRuntimeState>().Debug));
 
-            configs.Add<IContentDashboardSettings>(factory =>
-                new ContentDashboardSettings(factory.GetInstance<IGlobalSettings>(),
-                    factory.GetInstance<IUserService>()));
+            configs.Add<IContentDashboardSettings>(() => new ContentDashboardSettings());
         }
     }
 }

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -395,23 +395,6 @@ public bool UseHttps
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether the content dashboard should be available to all users.
-        /// </summary>
-        /// <value>
-        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
-        ///     and the default access rules for that dashboard will be in use.
-        /// </value>
-        public bool AllowContentDashboardAccessToAllUsers
-        {
-            get
-            {
-                bool.TryParse(ConfigurationManager.AppSettings[Constants.AppSettings.AllowContentDashboardAccessToAllUsers], out var value);
-                return value;
-            }
-        }
-
-
         /// <summary>
         /// An int value representing the time in milliseconds to lock the database for a write operation
         /// </summary>

src/Umbraco.Core/Configuration/IGlobalSettings.cs

@@ -57,15 +57,6 @@ public interface IGlobalSettings
         /// </summary>
         bool UseHttps { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether the content dashboard should be available to all users.
-        /// </summary>
-        /// <value>
-        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
-        ///     and the default access rules for that dashboard will be in use.
-        /// </value>
-        bool AllowContentDashboardAccessToAllUsers { get; }
-
         /// <summary>
         /// Returns a string value to determine if umbraco should skip version-checking.
         /// </summary>

src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs

@@ -1,43 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Services;
+using System.Configuration;
 
 namespace Umbraco.Core.Dashboards
 {
     public class ContentDashboardSettings: IContentDashboardSettings
     {
-        private readonly IGlobalSettings _globalSettings;
-        private readonly IUserService _userService;
 
-        public ContentDashboardSettings(IGlobalSettings globalSettings, IUserService userService)
+        /// <summary>
+        /// Gets a value indicating whether the content dashboard should be available to all users.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
+        ///     and the default access rules for that dashboard will be in use.
+        /// </value>
+        public bool AllowContentDashboardAccessToAllUsers
         {
-            _globalSettings = globalSettings;
-            _userService = userService;
-        }
-
-        public IAccessRule[] GetAccessRulesFromConfig()
-        {
-            var rules = new List<IAccessRule>();
-
-            if (_globalSettings.AllowContentDashboardAccessToAllUsers)
+            get
             {
-                var allUserGroups = _userService.GetAllUserGroups();
-
-                foreach (var userGroup in allUserGroups)
-                {
-                    rules.Add(new AccessRule
-                    {
-                        Type = AccessRuleType.Grant,
-                        Value = userGroup.Alias
-                    });
-                }
+                bool.TryParse(ConfigurationManager.AppSettings[Constants.AppSettings.AllowContentDashboardAccessToAllUsers], out var value);
+                return value;
             }
-
-            return rules.ToArray();
         }
     }
 }

src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs

@@ -1,13 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core.Dashboards
+namespace Umbraco.Core.Dashboards
 {
     public interface IContentDashboardSettings
     {
-        IAccessRule[] GetAccessRulesFromConfig();
+        /// <summary>
+        /// Gets a value indicating whether the content dashboard should be available to all users.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
+        ///     and the default access rules for that dashboard will be in use.
+        /// </value>
+        bool AllowContentDashboardAccessToAllUsers { get; }
     }
 }

src/Umbraco.Web/Dashboards/ContentDashboard.cs

@@ -1,16 +1,18 @@
-using System.IO;
-using Newtonsoft.Json;
+using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
-using Umbraco.Core.IO;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
     public class ContentDashboard : IDashboard
     {
         private readonly IContentDashboardSettings _dashboardSettings;
+        private readonly IUserService _userService;
+        private IAccessRule[] _accessRulesFromConfig;
+
         public string Alias => "contentIntro";
 
         public string[] Sections => new[] { "content" };
@@ -21,7 +23,7 @@ public IAccessRule[] AccessRules
         {
             get
             {
-                var rules = _dashboardSettings.GetAccessRulesFromConfig();
+                var rules = AccessRulesFromConfig;
 
                 if (rules.Length == 0)
                 {
@@ -36,9 +38,39 @@ public IAccessRule[] AccessRules
             }
         }
 
-        public ContentDashboard(IContentDashboardSettings dashboardSettings)
+        private IAccessRule[] AccessRulesFromConfig
+        {
+            get
+            {
+                if (_accessRulesFromConfig is null)
+                {
+                    var rules = new List<IAccessRule>();
+
+                    if (_dashboardSettings.AllowContentDashboardAccessToAllUsers)
+                    {
+                        var allUserGroups = _userService.GetAllUserGroups();
+
+                        foreach (var userGroup in allUserGroups)
+                        {
+                            rules.Add(new AccessRule
+                            {
+                                Type = AccessRuleType.Grant,
+                                Value = userGroup.Alias
+                            });
+                        }
+                    }
+
+                    _accessRulesFromConfig = rules.ToArray();
+                }
+
+                return _accessRulesFromConfig;
+            }
+        }
+
+        public ContentDashboard(IContentDashboardSettings dashboardSettings, IUserService userService)
         {
             _dashboardSettings = dashboardSettings;
+            _userService = userService;
         }
     }
 }