Merge pull request #363 from GeekInTheNorth/feature/multi-site-support

Add multi-site support to the CMS 13 solution

Author: GeekInTheNorth

.gitignore

@@ -362,4 +362,7 @@ MigrationBackup/
 .vscode/
 
 # AI
-.claude/
+.claude/
+
+# Settings
+appsettings.Development.json

Sample/OptimizelyTwelveTest/Features/Configuration/SetupMigrationStep.cs

@@ -22,46 +22,50 @@ public override void AddChanges()
         {
             try
             {
-                SetUpSystem();
+                var appRepository = ServiceLocator.Current.GetInstance<IApplicationRepository>();
+                if (!ConfigurationExists(appRepository))
+                {
+                    var contentRepository = ServiceLocator.Current.GetInstance<IContentRepository>();
+                    SetUpSystem(appRepository, contentRepository, 1, 5000, 5001);
+                    SetUpSystem(appRepository, contentRepository, 2, 5002, 5003);
+                }
             }
             catch(Exception ex)
             {
                 Console.WriteLine($"Error encountered during initial configuration: {ex.Message}");
             }
         }
 
-        private void SetUpSystem()
+        private static bool ConfigurationExists(IApplicationRepository appRepository)
         {
-            var appRepository = ServiceLocator.Current.GetInstance<IApplicationRepository>();
             var sites = appRepository.List();
-            if (sites.Any())
-            {
-                return;
-            }
+            return sites.Any();
+        }
 
-            var contentRepository = ServiceLocator.Current.GetInstance<IContentRepository>();
+        private static void SetUpSystem(IApplicationRepository appRepository, IContentRepository contentRepository, int siteNumber, int portOne, int portTwo)
+        {
             var culture = new CultureInfo("en");
 
             // Create HomePage
             var newHomePage = contentRepository.GetDefault<HomePage>(ContentReference.RootPage, culture);
-            newHomePage.Name = "Home";
-            newHomePage.Heading = "Home";
-            newHomePage.MetaTitle = "Home";
+            newHomePage.Name = $"Home {siteNumber}";
+            newHomePage.Heading = $"Home {siteNumber}";
+            newHomePage.MetaTitle = $"Home {siteNumber}";
 
             var homePageReference = contentRepository.Save(newHomePage, SaveAction.Publish, AccessLevel.NoAccess);
 
             // Create Not Found Page
-            var newNotFoundPage = contentRepository.GetDefault<NotFoundPage>(ContentReference.RootPage, culture);
-            newNotFoundPage.Name = "Not Found";
-            newNotFoundPage.MetaTitle = "Home";
+            var newNotFoundPage = contentRepository.GetDefault<NotFoundPage>(homePageReference, culture);
+            newNotFoundPage.Name = $"Not Found {siteNumber}";
+            newNotFoundPage.MetaTitle = $"Not Found {siteNumber}";
 
             var notFoundReference = contentRepository.Save(newNotFoundPage, SaveAction.Publish, AccessLevel.NoAccess);
 
             // Create SiteSettings
             var newSiteSettings = contentRepository.GetDefault<SiteSettingsPage>(homePageReference, culture);
-            newSiteSettings.Name = "[Site Settings]";
+            newSiteSettings.Name = $"[Site Settings {siteNumber}]";
             newSiteSettings.NotFoundPage = notFoundReference.ToReferenceWithoutVersion();
-            newSiteSettings.SiteName = "Stott Security Dev Site";
+            newSiteSettings.SiteName = $"Site {siteNumber}";
 
             var siteSettingsReference = contentRepository.Save(newSiteSettings, SaveAction.Publish, AccessLevel.NoAccess);
 
@@ -73,17 +77,23 @@ private void SetUpSystem()
             homePageReference = contentRepository.Save(editableHomePage, SaveAction.Publish, AccessLevel.NoAccess);
 
             // Create Site
-            var newSite = new Website("TestWebsite", homePageReference.ToReferenceWithoutVersion())
+            var newSite = new Website($"TestWebsite{siteNumber}", homePageReference.ToReferenceWithoutVersion())
             {
-                DisplayName = "Test Website"
+                DisplayName = $"Test Website {siteNumber}"
             };
 
-            newSite.Hosts.Add(new ApplicationHost("localhost:44344")
+            newSite.Hosts.Add(new ApplicationHost($"localhost:{portOne}")
             {
                 UseSecureConnection = true,
                 Type = ApplicationHostType.Primary
             });
-            
+
+            newSite.Hosts.Add(new ApplicationHost($"localhost:{portTwo}")
+            {
+                UseSecureConnection = true,
+                Type = ApplicationHostType.Edit
+            });
+
             appRepository.SaveAsync(newSite).GetAwaiter().GetResult();
         }
     }

Sample/OptimizelyTwelveTest/Features/Home/HomePageController.cs

@@ -9,14 +9,9 @@
 
     using Stott.Security.Optimizely.Features.Csp.Settings.Service;
 
-    public class HomePageController : PageControllerBase<HomePage>
+    public class HomePageController(ICspSettingsService cspSettingsService) : PageControllerBase<HomePage>
     {
-        private readonly ICspSettingsService _cspSettingsService;
-
-        public HomePageController(ICspSettingsService cspSettingsService)
-        {
-            _cspSettingsService = cspSettingsService;
-        }
+        private readonly ICspSettingsService _cspSettingsService = cspSettingsService;
 
         [SecurityHeaderAction]
         public async Task<IActionResult> Index(HomePage currentPage, bool resetReportMode)
@@ -25,9 +20,9 @@ public async Task<IActionResult> Index(HomePage currentPage, bool resetReportMod
 
             if (resetReportMode)
             {
-                var currentSettings = await _cspSettingsService.GetAsync();
+                var currentSettings = await _cspSettingsService.GetAsync(null, null);
                 currentSettings.IsReportOnly = true;
-                await _cspSettingsService.SaveAsync(currentSettings, "Mark Stott");
+                await _cspSettingsService.SaveAsync(currentSettings, "Mark Stott", null, null);
             }
 
             return View(model);

Sample/OptimizelyTwelveTest/Program.cs

@@ -1,45 +1,45 @@
 namespace OptimizelyTwelveTest;
 
+using System;
+
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-using System;
-
 public class Program
 {
-    public static void Main(string[] args)
+    public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
+
+    public static IHostBuilder CreateHostBuilder(string[] args)
     {
         var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
-        var isDevelopment = environment == Environments.Development;
-
-        if (isDevelopment)
-        {
-            //Development configuration
-        }
-
-        CreateHostBuilder(args, isDevelopment).Build().Run();
-    }
 
-    public static IHostBuilder CreateHostBuilder(string[] args, bool isDevelopment)
-    {
-        if (isDevelopment)
+        if (environment == Environments.Development)
         {
-            //Development configuration can be addded here, like local logging.
             return Host.CreateDefaultBuilder(args)
-                .ConfigureCmsDefaults()
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
+                       .ConfigureCmsDefaults()
+                       .ConfigureWebHostDefaults(webBuilder => webBuilder.ConfigureKestrel((context, options) =>
+                       {
+                           // Add valid HTTPS ports for development that are compatible with Opti Id
+                           options.ListenLocalhost(5000, options => { options.UseHttps(); });
+                           options.ListenLocalhost(5001, options => { options.UseHttps(); });
+                           options.ListenLocalhost(5002, options => { options.UseHttps(); });
+                           options.ListenLocalhost(5003, options => { options.UseHttps(); });
+
+                           options.Limits.MaxRequestBodySize = 2147483648;
+                           options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(60);
+                       })
+                       .UseStartup<Startup>());
         }
         else
         {
             return Host.CreateDefaultBuilder(args)
-                .ConfigureCmsDefaults()
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
+                       .ConfigureCmsDefaults()
+                       .ConfigureWebHostDefaults(webBuilder => webBuilder.ConfigureKestrel((context, options) =>
+                       {
+                           options.Limits.MaxRequestBodySize = 2147483648;
+                           options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(60);
+                       })
+                       .UseStartup<Startup>());
         }
     }
-}
+}

Sample/OptimizelyTwelveTest/Properties/launchSettings.json

@@ -1,27 +1,12 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:60396/",
-      "sslPort": 44344
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "OptimizelyTwelveTest": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+      "applicationUrl": "https://localhost:5000"
     }
   }
 }

Sample/OptimizelyTwelveTest/appsettings.Development.json

@@ -7,7 +7,6 @@
       "Microsoft.Hosting.Lifetime": "Warning"
     }
   },
-  "urls": "http://*:8000/;https://*:8001/;",
   "AllowedHosts": "*",
   "ConnectionStrings": {
     "EPiServerDB": "Server=(localdb)\\mssqllocaldb;Database=StottSecurityCms13Db;Trusted_Connection=true;MultipleActiveResultSets=true"