Fix settings Dictionary

Raise event for remote servers to update its dictionary.

Fixes: 895

Author: Mark Hall

src/Foundation/Infrastructure/Cms/Initialize.cs

@@ -1,4 +1,5 @@
-using EPiServer.Framework;
+using EPiServer.Events.Clients;
+using EPiServer.Framework;
 using EPiServer.Framework.Initialization;
 using Foundation.Infrastructure.Cms.ModelBinders;
 using Foundation.Infrastructure.Cms.Settings;
@@ -8,9 +9,12 @@
 
 namespace Foundation.Infrastructure.Cms
 {
-    [ModuleDependency(typeof(InitializationModule))]//, typeof(SetupBootstrapRenderer))]
+    [ModuleDependency(typeof(InitializationModule))]
     public class Initialize : IConfigurableModule
     {
+        public static readonly Guid SettingsRaiserId = Guid.NewGuid();
+        public static readonly Guid SettingsEventId = new Guid("c3b20325-5aa8-4430-b33f-2a74c3e5b807");
+
         void IConfigurableModule.ConfigureContainer(ServiceConfigurationContext context)
         {
             context.Services.AddTransient<IsInEditModeAccessor>(locator => () => locator.GetInstance<IContextModeResolver>().CurrentMode.EditOrPreview());
@@ -23,10 +27,14 @@ void IConfigurableModule.ConfigureContainer(ServiceConfigurationContext context)
 
         void IInitializableModule.Initialize(InitializationEngine context)
         {
+            context.Locate.Advanced.GetInstance<IEventRegistry>().Get(SettingsEventId).Raised += context.Locate.Advanced.GetInstance<ISettingsService>().SettingsEvent_Raised;
+            context.Locate.Advanced.GetInstance<ISettingsService>().InitializeSettings();
         }
 
         void IInitializableModule.Uninitialize(InitializationEngine context)
         {
+            context.Locate.Advanced.GetInstance<IEventRegistry>().Get(SettingsEventId).Raised -= context.Locate.Advanced.GetInstance<ISettingsService>().SettingsEvent_Raised;
+            context.Locate.Advanced.GetInstance<ISettingsService>().UnintializeSettings();
         }
     }
 }

src/Foundation/Infrastructure/Cms/Settings/SettingsEvent.cs

@@ -0,0 +1,22 @@
+using EPiServer.Events;
+using System.Runtime.Serialization;
+
+namespace Foundation.Infrastructure.Cms.Settings
+{
+    [DataContract]
+    [EventsServiceKnownType]
+    public class SettingsEvent
+    {
+        [DataMember]
+        public Guid SiteId { get; set; }
+
+        [DataMember]
+        public string ContentReference { get; set; }
+
+        [DataMember]
+        public bool IsPublished { get; set; }
+
+        [DataMember]
+        public bool IsDelete { get; set; }
+    }
+}

src/Foundation/Infrastructure/Cms/Settings/SettingsService.cs

@@ -1,9 +1,12 @@
 using EPiServer.DataAccess;
+using EPiServer.Events;
+using EPiServer.Events.Clients;
 using EPiServer.Framework.TypeScanner;
 using EPiServer.Globalization;
 using EPiServer.Logging;
 using EPiServer.Security;
 using System.Collections.Concurrent;
+using System.Security.Policy;
 
 namespace Foundation.Infrastructure.Cms.Settings
 {
@@ -16,6 +19,7 @@ public interface ISettingsService
         void UnintializeSettings();
         void UpdateSettings(Guid siteId, IContent content, bool isContentNotPublished);
         void UpdateSettings();
+        void SettingsEvent_Raised(object sender, EventNotificationEventArgs e);
     }
 
     public static class ISettingsServiceExtensions
@@ -55,6 +59,7 @@ public class SettingsService : ISettingsService
         private readonly ISiteDefinitionResolver _siteDefinitionResolver;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IContextModeResolver _contextModeResolver;
+        private readonly IEventRegistry _eventRegistry;
 
         public SettingsService(
             IContentRepository contentRepository,
@@ -67,7 +72,8 @@ public SettingsService(
             ISiteDefinitionRepository siteDefinitionRepository,
             ISiteDefinitionResolver siteDefinitionResolver,
             IHttpContextAccessor httpContextAccessor,
-            IContextModeResolver contextModeResolver)
+            IContextModeResolver contextModeResolver,
+            IEventRegistry eventRegistry)
         {
             _contentRepository = contentRepository;
             _contentVersionRepository = contentVersionRepository;
@@ -80,6 +86,7 @@ public SettingsService(
             _siteDefinitionResolver = siteDefinitionResolver;
             _httpContextAccessor = httpContextAccessor;
             _contextModeResolver = contextModeResolver;
+            _eventRegistry = eventRegistry;
         }
 
         public ConcurrentDictionary<string, Dictionary<Type, object>> SiteSettings { get; } = new ConcurrentDictionary<string, Dictionary<Type, object>>();
@@ -140,6 +147,45 @@ public T GetSiteSettings<T>(Guid? siteId = null)
             return default;
         }
 
+        public void SettingsEvent_Raised(object sender, EventNotificationEventArgs e)
+        {
+            if (e.RaiserId == Initialize.SettingsRaiserId)
+            {
+                return;
+            }
+
+            var eventParameter = e.Param as SettingsEvent;
+            if (eventParameter == null)
+            {
+                return;
+            }
+
+            if (eventParameter.IsDelete)
+            {
+                if (eventParameter.SiteId == Guid.Empty)
+                {
+                    return;
+                }
+
+                foreach(var key in SiteSettings.Keys.Where(x => x.Contains(eventParameter.SiteId.ToString(), StringComparison.OrdinalIgnoreCase)))
+                {
+                    SiteSettings.TryRemove(key, out var value);
+                }
+            }
+            
+            if (!ContentReference.TryParse(eventParameter.ContentReference, out var reference))
+            {
+                return;
+            }
+
+            if (!_contentRepository.TryGet<IContent>(reference, out var content))
+            {
+                return;
+            }
+
+            UpdateSettings(eventParameter.SiteId, content, !eventParameter.IsPublished);
+        }
+
         public void UpdateSettings(Guid siteId, IContent content, bool isContentNotPublished)
         {
             var contentType = content.GetOriginalType();
@@ -192,6 +238,12 @@ public void UpdateSettings(Guid siteId, IContent content, bool isContentNotPubli
                     SiteSettings[siteId.ToString() + $"-{contentLanguage}"][contentType] = content;
                     SiteSettings[$"{siteId}-common-draft-{contentLanguage}"][contentType] = content;
                 }
+                _eventRegistry.Get(Initialize.SettingsEventId).Raise(Initialize.SettingsRaiserId, new SettingsEvent
+                {
+                    ContentReference = content.ContentLink.ToString(),
+                    SiteId = siteId,
+                    IsPublished = !isContentNotPublished
+                });
             }
             catch (KeyNotFoundException keyNotFoundException)
             {
@@ -241,6 +293,7 @@ public void UpdateSettings()
                 return;
             }
 
+            SiteSettings.Clear();
             GlobalSettingsRoot = root.ContentLink;
             var children = _contentRepository.GetChildren<SettingsFolder>(GlobalSettingsRoot).ToList();
             foreach (var site in _siteDefinitionRepository.List())
@@ -326,6 +379,17 @@ private void SiteDeleted(object sender, SiteDefinitionEventArgs e)
             }
 
             _contentRepository.Delete(folder.ContentLink, true, AccessLevel.NoAccess);
+            foreach (var key in SiteSettings.Keys.Where(x => x.Contains(e.Site.Id.ToString(), StringComparison.OrdinalIgnoreCase)))
+            {
+                SiteSettings.TryRemove(key, out var value);
+            }
+            _eventRegistry.Get(Initialize.SettingsEventId).Raise(Initialize.SettingsRaiserId, new SettingsEvent
+            {
+                ContentReference = null,
+                SiteId = e.Site.Id,
+                IsPublished = false,
+                IsDelete = true
+            });
         }
 
         private void SiteUpdated(object sender, SiteDefinitionEventArgs e)

src/Foundation/Infrastructure/ContentInstaller.cs

@@ -17,16 +17,12 @@ namespace Foundation.Infrastructure
 {
     public class ContentInstaller : IBlockingFirstRequestInitializer
     {
-        private readonly UIUserProvider _uIUserProvider;
-        private readonly UIRoleProvider _uIRoleProvider;
-        private readonly UISignInManager _uISignInManager;
         private readonly ISiteDefinitionRepository _siteDefinitionRepository;
         private readonly ContentRootService _contentRootService;
         private readonly IContentRepository _contentRepository;
         private readonly IDataImporter _dataImporter;
         private readonly IScheduledJobExecutor _scheduledJobExecutor;
         private readonly IScheduledJobRepository _scheduledJobRepository;
-        private readonly ISettingsService _settingsService;
         private readonly ILanguageBranchRepository _languageBranchRepository;
         private readonly IWebHostEnvironment _webHostEnvironment;
         private readonly EventedIndexingSettings _eventedIndexingSettings;
@@ -35,16 +31,12 @@ public class ContentInstaller : IBlockingFirstRequestInitializer
         private readonly IndexBuilder _indexBuilder;
         private readonly IPrincipalAccessor _principalAccessor;
 
-        public ContentInstaller(UIUserProvider uIUserProvider,
-            UISignInManager uISignInManager,
-            UIRoleProvider uIRoleProvider,
-            ISiteDefinitionRepository siteDefinitionRepository,
+        public ContentInstaller(ISiteDefinitionRepository siteDefinitionRepository,
             ContentRootService contentRootService,
             IContentRepository contentRepository,
             IDataImporter dataImporter,
             IScheduledJobExecutor scheduledJobExecutor,
             IScheduledJobRepository scheduledJobRepository,
-            ISettingsService settingsService,
             ILanguageBranchRepository languageBranchRepository,
             IWebHostEnvironment webHostEnvironment,
             EventedIndexingSettings eventedIndexingSettings,
@@ -53,16 +45,12 @@ public ContentInstaller(UIUserProvider uIUserProvider,
             IndexBuilder indexBuilder,
             IPrincipalAccessor principalAccessor)
         {
-            _uIUserProvider = uIUserProvider;
-            _uISignInManager = uISignInManager;
-            _uIRoleProvider = uIRoleProvider;
             _siteDefinitionRepository = siteDefinitionRepository;
             _contentRootService = contentRootService;
             _contentRepository = contentRepository;
             _dataImporter = dataImporter;
             _scheduledJobExecutor = scheduledJobExecutor;
             _scheduledJobRepository = scheduledJobRepository;
-            _settingsService = settingsService;
             _languageBranchRepository = languageBranchRepository;
             _webHostEnvironment = webHostEnvironment;
             _eventedIndexingSettings = eventedIndexingSettings;
@@ -77,7 +65,6 @@ public ContentInstaller(UIUserProvider uIUserProvider,
         public async Task InitializeAsync(HttpContext httpContext)
         {
             InstallDefaultContent(httpContext);
-            _settingsService.InitializeSettings();
             await Task.CompletedTask;
         }