Merge pull request #266 from sbwalker/master

infrastructure for dealing with client cache invalidation in a multi-user environment

Oqtane.Server/Controllers/AliasController.cs

@@ -8,6 +8,7 @@ using Oqtane.Infrastructure;
 using System.Linq;
 using System;
 using System.Net;
+using System.Globalization;
 
 namespace Oqtane.Controllers
 {
@@ -15,11 +16,13 @@ namespace Oqtane.Controllers
     public class AliasController : Controller
     {
         private readonly IAliasRepository _aliases;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public AliasController(IAliasRepository aliases, ILogManager logger)
+        public AliasController(IAliasRepository aliases, ISyncManager syncManager, ILogManager logger)
         {
             _aliases = aliases;
+            _syncManager = syncManager;
             _logger = logger;
         }
 
@@ -39,9 +42,9 @@ namespace Oqtane.Controllers
             return _aliases.GetAlias(id);
         }
 
-        // GET api/<controller>/name/localhost:12345
+        // GET api/<controller>/name/localhost:12345?lastsyncdate=yyyyMMddHHmmssfff
         [HttpGet("name/{name}")]
-        public Alias Get(string name)
+        public Alias Get(string name, string lastsyncdate)
         {
             name = WebUtility.UrlDecode(name);
             List<Alias> aliases = _aliases.GetAliases().ToList();
@@ -57,6 +60,11 @@ namespace Oqtane.Controllers
                 // use first alias if name does not exist
                 alias = aliases.FirstOrDefault();
             }
+
+            // get sync events
+            alias.SyncDate = DateTime.Now;
+            alias.SyncEvents = _syncManager.GetSyncEvents(DateTime.ParseExact(lastsyncdate, "yyyyMMddHHmmssfff", CultureInfo.InvariantCulture));
+
             return alias; 
         }
         

Oqtane.Server/Controllers/PageController.cs

@@ -17,14 +17,16 @@ namespace Oqtane.Controllers
         private readonly IModuleRepository _modules;
         private readonly IPageModuleRepository _pageModules;
         private readonly IUserPermissions _userPermissions;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, ILogManager logger)
+        public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger)
         {
             _pages = pages;
             _modules = modules;
             _pageModules = pageModules;
             _userPermissions = userPermissions;
+            _syncManager = syncManager;
             _logger = logger;
         }
 
@@ -88,6 +90,7 @@ namespace Oqtane.Controllers
                 if (_userPermissions.IsAuthorized(User, "Edit", permissions))
                 {
                     Page = _pages.AddPage(Page);
+                    _syncManager.AddSyncEvent("Site", Page.SiteId);
                     _logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Added {Page}", Page);
                 }
                 else

Oqtane.Server/Infrastructure/Interfaces/ISyncManager.cs

@@ -0,0 +1,13 @@
+using Oqtane.Models;
+using Oqtane.Shared;
+using System;
+using System.Collections.Generic;
+
+namespace Oqtane.Infrastructure
+{
+    public interface ISyncManager
+    {
+        List<SyncEvent> GetSyncEvents(DateTime LastSyncDate);
+        void AddSyncEvent(string EntityName, int EntityId);
+    }
+}

Oqtane.Server/Infrastructure/SyncManager.cs

@@ -0,0 +1,44 @@
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Models;
+using Oqtane.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Oqtane.Infrastructure
+{
+    public class SyncManager : ISyncManager
+    {
+        private readonly IServiceScopeFactory ServiceScopeFactory;
+        private List<SyncEvent> SyncEvents { get; set; }
+
+        public SyncManager(IServiceScopeFactory ServiceScopeFactory)
+        {
+            this.ServiceScopeFactory = ServiceScopeFactory;
+            SyncEvents = new List<SyncEvent>();
+        }
+
+        private int TenantId
+        {
+            get 
+            {
+                using (var scope = ServiceScopeFactory.CreateScope())
+                {
+                    return scope.ServiceProvider.GetRequiredService<ITenantResolver>().GetTenant().TenantId;
+                }
+            }
+        }
+
+        public List<SyncEvent> GetSyncEvents(DateTime LastSyncDate)
+        {
+            return SyncEvents.Where(item => item.TenantId == TenantId && item.ModifiedOn >= LastSyncDate).ToList();
+        }
+
+        public void AddSyncEvent(string EntityName, int EntityId)
+        {
+            SyncEvents.Add(new SyncEvent { TenantId = TenantId, EntityName = EntityName, EntityId = EntityId, ModifiedOn = DateTime.Now });
+            // trim sync events 
+            SyncEvents.RemoveAll(item => item.ModifiedOn < DateTime.Now.AddHours(-1));
+        }
+    }
+}

Oqtane.Server/Startup.cs

@@ -162,6 +162,7 @@ namespace Oqtane.Server
             // register singleton scoped core services
             services.AddSingleton<IConfigurationRoot>(Configuration);
             services.AddSingleton<IInstallationManager, InstallationManager>();
+            services.AddSingleton<ISyncManager, SyncManager>();
 
             // register transient scoped core services
             services.AddTransient<IModuleDefinitionRepository, ModuleDefinitionRepository>();