From f7c1e7b706a93f1e10c0a74fe6ead02a0523e9e4 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Thu, 6 Jan 2022 13:37:29 -0500
Subject: [PATCH] alias management improvements

---
 Oqtane.Client/Modules/Admin/Site/Index.razor  | 33 ++++++++++---------
 .../Resources/Modules/Admin/Site/Index.resx   |  2 +-
 ...irect.cs => 03000201_AddAliasIsDefault.cs} |  6 ++--
 Oqtane.Server/Pages/_Host.cshtml.cs           | 26 +++++++++------
 4 files changed, 37 insertions(+), 30 deletions(-)
 rename Oqtane.Server/Migrations/Master/{03000201_AddAliasRedirect.cs => 03000201_AddAliasIsDefault.cs} (82%)

diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 930191cb..24ca93e7 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -158,7 +158,7 @@
                 </div>
             </div>
         </Section>
-        @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        @if (_aliases != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
 			<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
                 <div class="container">
@@ -172,7 +172,7 @@
 						<Label Class="col-sm-3" For="defaultalias" HelpText="The default alias for the site. Requests for non-default aliases will be redirected to the default alias." ResourceKey="DefaultAlias">Default Alias: </Label>
 						<div class="col-sm-9">
                             <select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
-								@foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+								@foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
 								{
 									<option value="@name">@name</option>
 								}
@@ -395,18 +395,20 @@
 			{
 				if (_name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-")
 				{
-					_urls = Regex.Replace(_urls, @"\r\n?|\n", ","); // convert line breaks to commas
 					var unique = true;
 					if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 					{
+						_urls = Regex.Replace(_urls, @"\r\n?|\n", ","); // convert line breaks to commas
+						var aliases = await AliasService.GetAliasesAsync();
 						foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
 						{
-							var alias = _aliases.Where(item => item.Name == name).FirstOrDefault();
+							var alias = aliases.Where(item => item.Name == name).FirstOrDefault();
 							if (alias != null && unique)
 							{
 								unique = (alias.TenantId == PageState.Site.TenantId && alias.SiteId == PageState.Site.SiteId);
 							}
 						}
+						if (unique && string.IsNullOrEmpty(_defaultalias)) unique = false;
 					}
 
 					if (unique)
@@ -489,18 +491,17 @@
 							{
 								var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
 									.Select(sValue => sValue.Trim()).ToArray();
-								foreach (Alias alias in _aliases.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+								foreach (Alias alias in _aliases)
 								{
-									if (!names.Contains(alias.Name))
+									if (!names.Contains(alias.Name.Trim()))
 									{
 										await AliasService.DeleteAliasAsync(alias.AliasId);
 									}
 								}
-								if (!names.Contains(_defaultalias)) { _defaultalias = names[0]; }
 
 								foreach (string name in names)
 								{
-									var alias = _aliases.Find(item => item.Name == name);
+									var alias = _aliases.Find(item => item.Name.Trim() == name);
 									if (alias == null)
 									{
 										alias = new Alias();
@@ -512,8 +513,9 @@
 									}
 									else
 									{
-										if (alias.IsDefault != (alias.Name == _defaultalias))
+										if (alias.Name != name || alias.IsDefault != (alias.Name.Trim() == _defaultalias))
 										{
+											alias.Name = name;
 											alias.IsDefault = (name == _defaultalias);
 											await AliasService.UpdateAliasAsync(alias);
 										}
@@ -534,7 +536,7 @@
 							}
 						}
 					}
-					else
+					else // deuplicate alias or default alias not specified
 					{
 						AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
 					}
@@ -622,13 +624,12 @@
 		_urls = string.Empty;
 		_defaultalias = string.Empty;
 		_aliases = await AliasService.GetAliasesAsync();
-		foreach (Alias alias in _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).ToList())
+		_aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
+		foreach (Alias alias in _aliases)
 		{
-			_urls += (_urls == string.Empty) ? alias.Name : ", " + alias.Name;
-			if (alias.IsDefault && string.IsNullOrEmpty(_defaultalias))
-			{
-				_defaultalias = alias.Name;
-			}
+			_urls += (_urls == string.Empty) ? alias.Name.Trim() : ", " + alias.Name.Trim();
+			if (alias.IsDefault) _defaultalias = alias.Name.Trim();
 		}
+		if (string.IsNullOrEmpty(_defaultalias)) _defaultalias = _aliases.First().Name.Trim();
 	}
 }
diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
index f757d453..49c4d0e7 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -142,7 +142,7 @@
     <value>Site Settings Saved</value>
   </data>
   <data name="Message.Aliases.Taken" xml:space="preserve">
-    <value>An Alias Specified Has Already Been Used For Another Site</value>
+    <value>The Default Alias Has Not Been Specified Or An Alias Was Specified That Has Already Been Used For Another Site</value>
   </data>
   <data name="Message.Required.SiteName" xml:space="preserve">
     <value>You Must Provide A Site Name, Alias, And Default Theme/Container</value>
diff --git a/Oqtane.Server/Migrations/Master/03000201_AddAliasRedirect.cs b/Oqtane.Server/Migrations/Master/03000201_AddAliasIsDefault.cs
similarity index 82%
rename from Oqtane.Server/Migrations/Master/03000201_AddAliasRedirect.cs
rename to Oqtane.Server/Migrations/Master/03000201_AddAliasIsDefault.cs
index bc5372b0..ae24722f 100644
--- a/Oqtane.Server/Migrations/Master/03000201_AddAliasRedirect.cs
+++ b/Oqtane.Server/Migrations/Master/03000201_AddAliasIsDefault.cs
@@ -8,9 +8,9 @@ namespace Oqtane.Migrations.Master
 {
     [DbContext(typeof(MasterDBContext))]
     [Migration("Master.03.00.02.01")]
-    public class AddAliasRedirect : MultiDatabaseMigration
+    public class AddAliasIsDefault : MultiDatabaseMigration
     {
-        public AddAliasRedirect(IDatabase database) : base(database)
+        public AddAliasIsDefault(IDatabase database) : base(database)
         {
         }
 
@@ -19,7 +19,7 @@ namespace Oqtane.Migrations.Master
             //Add Column to Alias table
             var aliasEntityBuilder = new AliasEntityBuilder(migrationBuilder, ActiveDatabase);
             aliasEntityBuilder.AddBooleanColumn("IsDefault", true);
-            aliasEntityBuilder.UpdateColumn("IsDefault", "1", "bool", "");
+            aliasEntityBuilder.UpdateColumn("IsDefault", "0", "bool", "");
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index ef0992ed..3bb360a2 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -86,12 +86,17 @@ namespace Oqtane.Pages
                     // redirect non-default alias
                     if (!alias.IsDefault)
                     {
-                        var redirect = _aliases.GetAliases()
-                            .Where(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId && item.IsDefault)
-                            .FirstOrDefault();
-                        if (redirect != null)
+                        var aliases = _aliases.GetAliases().Where(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId);
+                        if (aliases.Where(item => item.IsDefault).FirstOrDefault() != null)
                         {
-                            return RedirectPermanent(url.Replace(alias.Name, redirect.Name));
+                            return RedirectPermanent(url.Replace(alias.Name, aliases.Where(item => item.IsDefault).FirstOrDefault().Name));
+                        }
+                        else // no default specified - use first alias
+                        {
+                            if (alias.Name.Trim() != aliases.First().Name.Trim())
+                            {
+                                return RedirectPermanent(url.Replace(alias.Name, aliases.First().Name));
+                            }
                         }
                     }
 
@@ -303,7 +308,7 @@ namespace Oqtane.Pages
                 var obj = Activator.CreateInstance(type) as IHostResources;
                 foreach (var resource in obj.Resources)
                 {
-                    ProcessResource(resource);
+                    ProcessResource(resource, 0);
                 }
             }
         }
@@ -323,7 +328,7 @@ namespace Oqtane.Pages
                     {
                         if (resource.Declaration == ResourceDeclaration.Global)
                         {
-                            ProcessResource(resource);
+                            ProcessResource(resource, 0);
                         }
                     }
                 }
@@ -341,24 +346,25 @@ namespace Oqtane.Pages
                 var obj = Activator.CreateInstance(type) as IThemeControl;
                 if (obj.Resources != null)
                 {
+                    int count = 0; // required for local stylesheets for current theme
                     foreach (var resource in obj.Resources)
                     {
                         if (resource.Declaration == ResourceDeclaration.Global || (Utilities.GetFullTypeName(type.AssemblyQualifiedName) == ThemeType && resource.ResourceType == ResourceType.Stylesheet))
                         {
-                            ProcessResource(resource);
+                            ProcessResource(resource, count++);
                         }
                     }
                 }
             }
         }
-        private void ProcessResource(Resource resource)
+        private void ProcessResource(Resource resource, int count)
         {
             switch (resource.ResourceType)
             {
                 case ResourceType.Stylesheet:
                     if (!HeadResources.Contains(resource.Url, StringComparison.OrdinalIgnoreCase))
                     {
-                        var id = (resource.Declaration == ResourceDeclaration.Global) ? "" : "id=\"app-stylesheet-" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + "-00\" ";
+                        var id = (resource.Declaration == ResourceDeclaration.Global) ? "" : "id=\"app-stylesheet-" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + "-" + count.ToString("00") + "\" ";
                         HeadResources += "<link " + id + "rel=\"stylesheet\" href=\"" + resource.Url + "\"" + CrossOrigin(resource.CrossOrigin) + Integrity(resource.Integrity) + " />" + Environment.NewLine;
                     }
                     break;