Merge pull request #2784 from oqtane/master

Merge pull request #2783 from oqtane/dev

Oqtane.Client/Installer/Installer.razor

@@ -55,7 +55,7 @@
 				else
 				{
 					<div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">String:</Label>
+						<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">Settings:</Label>
 						<div class="col-sm-9">
 							<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
 						</div>
@@ -77,7 +77,7 @@
                     <div class="col-sm-9">
 						<div class="input-group">
 							<input id="password" type="@_passwordType" class="form-control" @bind="@_hostPassword" autocomplete="new-password" />
-							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglePassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglePassword</button>
 						</div>
                     </div>
                 </div>
@@ -86,7 +86,7 @@
                     <div class="col-sm-9">
 						<div class="input-group">
 							<input id="confirm" type="@_confirmPasswordType" class="form-control" @bind="@_confirmPassword" autocomplete="new-password" />
-							<button type="button" class="btn btn-secondary" @onclick="@ToggleConfirmPassword">@_toggleConfirmPassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@ToggleConfirmPassword" tabindex="-1">@_toggleConfirmPassword</button>
 						</div>
                     </div>
                 </div>

Oqtane.Client/Modules/Admin/Dashboard/Index.razor

@@ -4,32 +4,35 @@
 @inject IUserService UserService
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<div class="row">
-    @foreach (var p in _pages)
-    {
-        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+@if (_pages != null)
+{
+    <div class="row">
+        @foreach (var p in _pages)
         {
-            string url = NavigateUrl(p.Path);
-            <div class="col-md-2 mx-auto text-center mb-3">
-                <NavLink class="nav-link text-primary" href="@url" Match="NavLinkMatch.All">
-                    <h2><span class="@p.Icon" aria-hidden="true"></span></h2>@SharedLocalizer[p.Name]
-                </NavLink>
-            </div>
+            if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
+            {
+                string url = NavigateUrl(p.Path);
+                <div class="col-md-2 mx-auto text-center mb-3">
+                    <NavLink class="nav-link text-primary" href="@url" Match="NavLinkMatch.All">
+                        <h2><span class="@p.Icon" aria-hidden="true"></span></h2>@SharedLocalizer[p.Name]
+                    </NavLink>
+                </div>
+            }
         }
-    }
-</div>
+    </div>
+}
 
 @code {
 	private List<Page> _pages;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
 	protected override void OnInitialized()
 	{
 		var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
 		if (admin != null)
 		{
-			_pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList();
+			_pages = PageState.Pages.Where(item => item.ParentId == admin.PageId).ToList();
 		}
     }
 }

Oqtane.Client/Modules/Admin/Files/Edit.razor

@@ -62,8 +62,7 @@
             <div class="row mb-1 align-items-center">
                 <div class="col-sm-12">
                     <Label Class="col-sm-3" For="permissions" HelpText="Select the permissions you want for the folder" ResourceKey="Permissions">Permissions: </Label>
-                    <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="@(PermissionNames.Browse + "," + PermissionNames.View + "," + PermissionNames.Edit)" Permissions="@_permissions" @ref="_permissionGrid" />
-
+                    <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="@(PermissionNames.Browse + "," + PermissionNames.View + "," + PermissionNames.Edit)" PermissionList="@_permissions" @ref="_permissionGrid" />
                 </div>
             </div>
         </div>
@@ -99,7 +98,7 @@
     private string _imagesizes = string.Empty;
     private string _capacity = "0";
     private bool _isSystem;
-    private string _permissions = string.Empty;
+    private List<Permission> _permissions = null;
     private string _createdBy;
     private DateTime _createdOn;
     private string _modifiedBy;
@@ -131,7 +130,7 @@
                     _imagesizes = folder.ImageSizes;
                     _capacity = folder.Capacity.ToString();
                     _isSystem = folder.IsSystem;
-                    _permissions = folder.Permissions;
+                    _permissions = folder.PermissionList;
                     _createdBy = folder.CreatedBy;
                     _createdOn = folder.CreatedOn;
                     _modifiedBy = folder.ModifiedBy;
@@ -196,7 +195,7 @@
                 folder.ImageSizes = _imagesizes;
                 folder.Capacity = int.Parse(_capacity);
                 folder.IsSystem = _isSystem;
-                folder.Permissions = _permissionGrid.GetPermissions();
+                folder.PermissionList = _permissionGrid.GetPermissionList();
 
                 if (_folderId != -1)
                 {

Oqtane.Client/Modules/Admin/Languages/Add.razor

@@ -20,15 +20,6 @@ else
             <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
                 <div class="container">
 					<div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="translated" HelpText="Specify If You Wish To Select Languages That Have Translations Installed" ResourceKey="Translated">Translated?</Label>
-						<div class="col-sm-9">
-							<select id="translated" class="form-select" value="@_translated" @onchange="(e => TranslatedChanged(e))" required>
-								<option value="True">@SharedLocalizer["Yes"]</option>
-								<option value="False">@SharedLocalizer["No"]</option>
-							</select>
-						</div>
-					</div>
-					<div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="name" HelpText="Name Of The Language" ResourceKey="Name">Name:</Label>
                         <div class="col-sm-9">
                             <select id="_code" class="form-select" @bind="@_code" required>
@@ -57,13 +48,12 @@ else
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="LanguageUpload">Translation: </Label>
+                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install." ResourceKey="LanguageUpload">Translation: </Label>
                     <div class="col-sm-9">
-                        <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
+                        <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
                     </div>
                 </div>
             </div>
-            <button type="button" class="btn btn-success" @onclick="InstallTranslations">@SharedLocalizer["Install"]</button>
             <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
         </TabPanel>
     </TabStrip>
@@ -73,7 +63,6 @@ else
 	private ElementReference form;
 	private bool validated = false;
 
-	private string _translated = "True";
 	private string _code = "-";
 	private string _default = "False";
 	private List<string> _languages;
@@ -91,18 +80,11 @@ else
 
 	private async Task LoadCultures()
 	{
-		_cultures = await LocalizationService.GetCulturesAsync(bool.Parse(_translated));
+		_cultures = await LocalizationService.GetCulturesAsync(false);
 		_cultures = _cultures.Where(c => !c.Name.Equals(Constants.DefaultCulture) && !_languages.Contains(c.Name));
 		_code = "-";
 	}
 
-	private async void TranslatedChanged(ChangeEventArgs e)
-	{
-		_translated = (string)e.Value;
-		await LoadCultures();
-		StateHasChanged();
-	}
-
 	private async Task SaveLanguage()
 	{
 		validated = true;
@@ -136,24 +118,11 @@ else
 				AddModuleMessage(Localizer["Error.Language.Add"], MessageType.Error);
 			}
 		}
-        else
-        {
-            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
-        }
-    }
-
-	private async Task InstallTranslations()
-    {
-        try
-        {
-            await PackageService.InstallPackagesAsync();
-            AddModuleMessage(string.Format(Localizer["Success.Language.Install"], NavigateUrl("admin/system")), MessageType.Success);
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Installing Translations");
-        }
-    }
+		else
+		{
+			AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+		}
+	}
 
     private async Task SetCultureAsync(string culture)
     {
@@ -166,4 +135,9 @@ else
             NavigationManager.NavigateTo(NavigationManager.Uri, true);
         }
     }
+
+    private void OnUpload()
+    {
+        AddModuleMessage(string.Format(Localizer["Success.Language.Download"], NavigateUrl("admin/system")), MessageType.Success);
+    }
 }

Oqtane.Client/Modules/Admin/Languages/Index.razor

@@ -35,23 +35,27 @@ else
 			{
 				<td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
 				<td>
-					@switch (TranslationAvailable(context.Code, context.Version))
+					@{
+						var translation = TranslationAvailable(context.Code, context.Version);
+					}
+					@if (translation != null)
 					{
-						case "install":
-							<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code))>@SharedLocalizer["Download"]</button>
-							break;
-						case "upgrade":
-							<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code))>@SharedLocalizer["Upgrade"]</button>
-							break;
+						if (string.IsNullOrEmpty(context.Version))
+						{
+							<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code, translation.Version))>@SharedLocalizer["Download"]</button>
+						}
+						else
+						{
+							if (Version.Parse(translation.Version).CompareTo(Version.Parse(context.Version)) > 0)
+							{
+								<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code, translation.Version))>@SharedLocalizer["Upgrade"]</button>
+							}
+						}
 					}
 				</td>
 			}
         </Row>
     </Pager>
-	@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _install)
-	{
-		<button type="button" class="btn btn-success" @onclick="InstallTranslations">@SharedLocalizer["Install"]</button>
-	}
 }
 
 @if (_package != null)
@@ -98,7 +102,6 @@ else
 	private List<Language> _languages;
 	private List<Package> _packages;
 	private Package _package;
-	private bool _install = false;
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -134,38 +137,16 @@ else
 		}
 	}
 
-	private string TranslationAvailable(string code, string version)
+	private Package TranslationAvailable(string code, string version)
 	{
-		if (_packages != null)
-		{
-			var package = _packages.Where(item => item.PackageId == (Constants.PackageId + "." + code)).FirstOrDefault();
-			if (package != null)
-			{
-				// package version needs to match current framework version
-				if (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0)
-				{
-					if (string.IsNullOrEmpty(version))
-					{
-						return "install";
-					}
-					else
-					{
-						if (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
-						{
-							return "upgrade";
-						}
-					}
-				}					
-			}
-		}
-		return "";
+		return _packages?.FirstOrDefault(item => item.PackageId == (Constants.PackageId + "." + code));
 	}
 
-	private async Task GetPackage(string code)
+	private async Task GetPackage(string code, string version)
 	{
 		try
 		{
-			_package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, Constants.Version);
+			_package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, version);
 			StateHasChanged();
 		}
 		catch (Exception ex)
@@ -181,9 +162,8 @@ else
 		{
 			await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version, Constants.PackagesFolder);
 			await logger.LogInformation("Language Package {Name} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
-			AddModuleMessage(Localizer["Success.Language.Download"], MessageType.Success);
+			AddModuleMessage(string.Format(Localizer["Success.Language.Download"], NavigateUrl("admin/system")), MessageType.Success);
 			_package = null;
-			_install = true;
 			StateHasChanged();
 		}
 		catch (Exception ex)
@@ -198,19 +178,4 @@ else
 		_package = null;
 		StateHasChanged();
 	}
-
-	private async Task InstallTranslations()
-	{
-		try
-		{
-			await PackageService.InstallPackagesAsync();
-			AddModuleMessage(string.Format(Localizer["Success.Translation.Install"], NavigateUrl("admin/system")), MessageType.Success);
-			_install = false;
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Installing Translations");
-		}
-	}
 }

Oqtane.Client/Modules/Admin/Login/Index.razor

@@ -1,3 +1,4 @@
+@using System.Net
 @namespace Oqtane.Modules.Admin.Login
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
@@ -33,7 +34,7 @@
 						<Label Class="control-label" For="password" HelpText="Please enter your Password" ResourceKey="Password">Password:</Label>
 						<div class="input-group">
 							<input id="password" type="@_passwordtype" name="Password" class="form-control" placeholder="@Localizer["Password.Placeholder"]" @bind="@_password" required />
-							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 						</div>
 					</div>
 					<div class="form-group mt-2">
@@ -205,7 +206,7 @@
 						var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider
 							.GetService(typeof(IdentityAuthenticationStateProvider));
 						authstateprovider.NotifyAuthenticationChanged();
-						NavigationManager.NavigateTo(NavigateUrl(_returnUrl, true));
+						NavigationManager.NavigateTo(NavigateUrl(WebUtility.UrlDecode(_returnUrl), true));
 					}
 					else
 					{

Oqtane.Client/Modules/Admin/Logs/Index.razor

@@ -106,12 +106,6 @@ else
 	{
 		try
 		{
-			// external link to log item will display Details component
-			if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id))
-			{
-				NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"/{id}"));
-			}
-
 			if (UrlParameters.ContainsKey("level"))
 			{
 				_level = UrlParameters["level"];
@@ -241,4 +235,15 @@ else
 		_page = page;	
 	}
 
+	protected override void OnAfterRender(bool firstRender)
+	{
+		if (firstRender)
+		{
+			// external link to log item will display Details component
+			if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id))
+			{
+				NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"/{id}"));
+			}
+		}
+	}
 }

Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor

@@ -174,7 +174,7 @@ else
     private bool IsValid(string name)
     {
         // must contain letters, underscores and digits and first character must be letter or underscore
-        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+		return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)

Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor

@@ -65,13 +65,15 @@
                 </div>
             }
         }
+        <br />
+        <ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
     </TabPanel>
     <TabPanel Name="Upload" ResourceKey="Upload">
         <div class="container">
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
                 <div class="col-sm-9">
-                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
                 </div>
             </div>
         </div>
@@ -111,153 +113,140 @@
     </div>
 }
 
-<button type="button" class="btn btn-success" @onclick="InstallModules">@SharedLocalizer["Install"]</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
-<br />
-<br />
-<ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
-
 @code {
-	private List<Package> _packages;
-	private string _price = "free";
-	private string _search = "";
-	private string _productname = "";
-	private string _packageid = "";
-	private string _packagelicense = "";
-	private string _packageversion = "";
+    private List<Package> _packages;
+    private string _price = "free";
+    private string _search = "";
+    private string _productname = "";
+    private string _packageid = "";
+    private string _packagelicense = "";
+    private string _packageversion = "";
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-	protected override async Task OnInitializedAsync()
-	{
-		try
-		{
-			await LoadModuleDefinitions();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
-			AddModuleMessage(Localizer["Error.Package.Load"], MessageType.Error);
-		}
-	}
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            await LoadModuleDefinitions();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Package.Load"], MessageType.Error);
+        }
+    }
 
-	private async Task LoadModuleDefinitions()
-	{
-		var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-		_packages = await PackageService.GetPackagesAsync("module", _search, _price, "");
+    private async Task LoadModuleDefinitions()
+    {
+        var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+        _packages = await PackageService.GetPackagesAsync("module", _search, _price, "");
 
-		if (_packages != null)
-		{
-			foreach (Package package in _packages.ToArray())
-			{
-				if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
-				{
-					_packages.Remove(package);
-				}
-			}
-		}
-	}
+        if (_packages != null)
+        {
+            foreach (Package package in _packages.ToArray())
+            {
+                if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
+                {
+                    _packages.Remove(package);
+                }
+            }
+        }
+    }
 
-	private async void PriceChanged(ChangeEventArgs e)
-	{
-		try
-		{
-			_price = (string)e.Value;
-			_search = "";
-			await LoadModuleDefinitions();
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error On PriceChanged");
-		}
-	}
+    private async void PriceChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _price = (string)e.Value;
+            _search = "";
+            await LoadModuleDefinitions();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On PriceChanged");
+        }
+    }
 
-	private async Task Search()
-	{
-		try
-		{
-			await LoadModuleDefinitions();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error On Search");
-		}
-	}
+    private async Task Search()
+    {
+        try
+        {
+            await LoadModuleDefinitions();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Search");
+        }
+    }
 
-	private async Task Reset()
-	{
-		try
-		{
-			_search = "";
-			await LoadModuleDefinitions();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error On Reset");
-		}
-	}
+    private async Task Reset()
+    {
+        try
+        {
+            _search = "";
+            await LoadModuleDefinitions();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Reset");
+        }
+    }
 
-	private void HideModal()
-	{
-		_productname = "";
-		_packagelicense = "";
-		StateHasChanged();
-	}
+    private void HideModal()
+    {
+        _productname = "";
+        _packagelicense = "";
+        StateHasChanged();
+    }
 
-	private async Task GetPackage(string packageid, string version)
-	{
-		try
-		{
-			var package = await PackageService.GetPackageAsync(packageid, version);
-			if (package != null)
-			{
-				_productname = package.Name;
-				_packageid = package.PackageId;
-				if (!string.IsNullOrEmpty(package.License))
-				{
-					_packagelicense = package.License.Replace("\n", "<br />");
-				}
-				_packageversion = package.Version;
-			}
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);
-			AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
-		}
-	}
+    private async Task GetPackage(string packageid, string version)
+    {
+        try
+        {
+            var package = await PackageService.GetPackageAsync(packageid, version);
+            if (package != null)
+            {
+                _productname = package.Name;
+                _packageid = package.PackageId;
+                if (!string.IsNullOrEmpty(package.License))
+                {
+                    _packagelicense = package.License.Replace("\n", "<br />");
+                }
+                _packageversion = package.Version;
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);
+            AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+        }
+    }
 
-	private async Task DownloadPackage()
-	{
-		try
-		{
-			await PackageService.DownloadPackageAsync(_packageid, _packageversion, Constants.PackagesFolder);
-			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _packageversion);
-			AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success);
-			_productname = "";
-			_packagelicense = "";
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _packageversion);
-			AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
-		}
-	}
+    private async Task DownloadPackage()
+    {
+        try
+        {
+            await PackageService.DownloadPackageAsync(_packageid, _packageversion, Constants.PackagesFolder);
+            await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _packageversion);
+            AddModuleMessage(string.Format(Localizer["Success.Module.Download"], NavigateUrl("admin/system")), MessageType.Success);
+            _productname = "";
+            _packagelicense = "";
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _packageversion);
+            AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+        }
+    }
 
-	private async Task InstallModules()
-	{
-		try
-		{
-			await ModuleDefinitionService.InstallModuleDefinitionsAsync();
-			AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Installing Modules");
-		}
-	}
+    private void OnUpload()
+    {
+        AddModuleMessage(string.Format(Localizer["Success.Module.Download"], NavigateUrl("admin/system")), MessageType.Success);
+    }
 }

Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor

@@ -139,7 +139,7 @@
     private bool IsValid(string name)
     {
         // must contain letters, underscores and digits and first character must be letter or underscore
-        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+		return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)

Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor

@@ -9,294 +9,304 @@
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Definition" ResourceKey="Definition">
-        <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-            <div class="container">
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
-                    <div class="col-sm-9">
-                        <input id="name" class="form-control" @bind="@_name" maxlength="200" required />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="description" HelpText="The description of the module" ResourceKey="Description">Description: </Label>
-                    <div class="col-sm-9">
-                        <textarea id="description" class="form-control" @bind="@_description" rows="2" maxlength="2000" required></textarea>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="categories" HelpText="Comma delimited list of module categories" ResourceKey="Categories">Categories: </Label>
-                    <div class="col-sm-9">
-                        <input id="categories" class="form-control" @bind="@_categories" maxlength="200" required />
-                    </div>
-                </div>
-            </div>
-        </form>
-        <Section Name="Information" ResourceKey="Information">
-            <div class="container">
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="moduledefinitionname" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
-                    <div class="col-sm-9">
-                        <input id="moduledefinitionname" class="form-control" @bind="@_moduledefinitionname" disabled />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="version" HelpText="The version of the module" ResourceKey="Version">Version: </Label>
-                    <div class="col-sm-9">
-                        <input id="version" class="form-control" @bind="@_version" disabled />
-                    </div>
-                </div>
-				<div class="row mb-1 align-items-center">
-					<Label Class="col-sm-3" For="packagename" HelpText="The unique name of the package from which this module was installed" ResourceKey="PackageName">Package Name: </Label>
-					<div class="col-sm-9">
-						<input id="packagename" class="form-control" @bind="@_packagename" disabled />
+@if (_initialized)
+{
+	<TabStrip>
+		<TabPanel Name="Definition" ResourceKey="Definition">
+			<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+				<div class="container">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
+						<div class="col-sm-9">
+							<input id="name" class="form-control" @bind="@_name" maxlength="200" required />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="description" HelpText="The description of the module" ResourceKey="Description">Description: </Label>
+						<div class="col-sm-9">
+							<textarea id="description" class="form-control" @bind="@_description" rows="2" maxlength="2000" required></textarea>
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="categories" HelpText="Comma delimited list of module categories" ResourceKey="Categories">Categories: </Label>
+						<div class="col-sm-9">
+							<input id="categories" class="form-control" @bind="@_categories" maxlength="200" required />
+						</div>
 					</div>
 				</div>
+			</form>
+			<Section Name="Information" ResourceKey="Information">
+				<div class="container">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="moduledefinitionname" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
+						<div class="col-sm-9">
+							<input id="moduledefinitionname" class="form-control" @bind="@_moduledefinitionname" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="version" HelpText="The version of the module" ResourceKey="Version">Version: </Label>
+						<div class="col-sm-9">
+							<input id="version" class="form-control" @bind="@_version" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="packagename" HelpText="The unique name of the package from which this module was installed" ResourceKey="PackageName">Package Name: </Label>
+						<div class="col-sm-9">
+							<input id="packagename" class="form-control" @bind="@_packagename" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the module" ResourceKey="Owner">Owner: </Label>
+						<div class="col-sm-9">
+							<input id="owner" class="form-control" @bind="@_owner" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="url" HelpText="The reference url of the module" ResourceKey="ReferenceUrl">Reference Url: </Label>
+						<div class="col-sm-9">
+							<input id="url" class="form-control" @bind="@_url" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="contact" HelpText="The contact for the module" ResourceKey="Contact">Contact: </Label>
+						<div class="col-sm-9">
+							<input id="contact" class="form-control" @bind="@_contact" disabled />
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="license" HelpText="The module license terms" ResourceKey="License">License: </Label>
+						<div class="col-sm-9">
+							<textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="runtimes" HelpText="The Blazor runtimes which this module supports" ResourceKey="Runtimes">Runtimes: </Label>
+						<div class="col-sm-9">
+							<input id="runtimes" class="form-control" @bind="@_runtimes" disabled />
+						</div>
+					</div>
+				</div>
+			</Section>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
+			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+			<br />
+			<br />
+			<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+		</TabPanel>
+		<TabPanel Name="Permissions" ResourceKey="Permissions">
+			<div class="container">
 				<div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the module" ResourceKey="Owner">Owner: </Label>
-                    <div class="col-sm-9">
-                        <input id="owner" class="form-control" @bind="@_owner" disabled />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="url" HelpText="The reference url of the module" ResourceKey="ReferenceUrl">Reference Url: </Label>
-                    <div class="col-sm-9">
-                        <input id="url" class="form-control" @bind="@_url" disabled />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="contact" HelpText="The contact for the module" ResourceKey="Contact">Contact: </Label>
-                    <div class="col-sm-9">
-                        <input id="contact" class="form-control" @bind="@_contact" disabled />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="license" HelpText="The module license terms" ResourceKey="License">License: </Label>
-                    <div class="col-sm-9">
-                        <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="runtimes" HelpText="The Blazor runtimes which this module supports" ResourceKey="Runtimes">Runtimes: </Label>
-                    <div class="col-sm-9">
-                        <input id="runtimes" class="form-control" @bind="@_runtimes" disabled />
-                    </div>
-                </div>
-            </div>
-		</Section>
-		<br />
-		<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
-		<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-		<br />
-		<br />
-		<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
-    </TabPanel>
-    <TabPanel Name="Permissions" ResourceKey="Permissions">
-        <div class="container">
-            <div class="row mb-1 align-items-center">
-                <PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" Permissions="@_permissions" @ref="_permissionGrid" />
-            </div>
-        </div>
-		<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
-		<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-    </TabPanel>
-	<TabPanel Name="Translations" ResourceKey="Translations">
-		@if (_languages != null && _languages.Count > 0)
-		{
-			<Pager Items="@_languages">
-				<Header>
+					<PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" PermissionList="@_permissions" @ref="_permissionGrid" />
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
+			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+		</TabPanel>
+		<TabPanel Name="Translations" ResourceKey="Translations">
+			@if (_languages != null && _languages.Count > 0)
+			{
+				<Pager Items="@_languages">
+					<Header>
 					<th>@SharedLocalizer["Name"]</th>
 					<th>@Localizer["Code"]</th>
 					<th style="width: 1px;">@Localizer["Version"]</th>
 					<th style="width: 1px;">&nbsp;</th>
-				</Header>
-				<Row>
-					<td>@context.Name</td>
-					<td>@context.Code</td>
-					<td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
-					<td>
-						@switch (TranslationAvailable(_packagename + "." + context.Code, context.Version))
-						{
-							case "install":
-								<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Download"]</button>
-								break;
-							case "upgrade":
-								<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Upgrade"]</button>
-								break;
-						}
-					</td>
-				</Row>
-			</Pager>
-			@if (_install)
-			{
-				<button type="button" class="btn btn-success" @onclick="InstallTranslations">@SharedLocalizer["Install"]</button>
+					</Header>
+					<Row>
+						<td>@context.Name</td>
+						<td>@context.Code</td>
+						<td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
+						<td>
+							@switch (TranslationAvailable(_packagename + "." + context.Code, context.Version))
+							{
+								case "install":
+									<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Download"]</button>
+									break;
+								case "upgrade":
+									<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Upgrade"]</button>
+									break;
+							}
+						</td>
+					</Row>
+				</Pager>
 			}
-		}
-		else
-		{
-			<br />
-			<div class="mx-auto text-center">
-				@if (string.IsNullOrEmpty(_packagename))
-				{
-					@Localizer["Search.PackageNameMissing"]
-				}
-				else
-				{
-					@Localizer["Search.NoResults"]					
-				}
-			</div>
-			<br />
-		}
-	</TabPanel>
-</TabStrip>
+			else
+			{
+				<br />
+				<div class="mx-auto text-center">
+					@if (string.IsNullOrEmpty(_packagename))
+					{
+						@Localizer["Search.PackageNameMissing"]
+					}
+					else
+					{
+						@Localizer["Search.NoResults"]
+					}
+				</div>
+				<br />
+			}
+		</TabPanel>
+	</TabStrip>
 
-@if (_package != null)
-{
-	<div class="app-actiondialog">
-		<div class="modal" tabindex="-1" role="dialog">
-			<div class="modal-dialog">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
-						<button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
-					</div>
-					<div class="modal-body">
-						<p style="height: 200px; overflow-y: scroll;">
-							<h4 style="display: inline;"><a href="@_package.ProductUrl" target="_new">@_package.Name</a></h4><br />
-							@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@_package.OwnerUrl" target="new">@_package.Owner</a></strong><br />
-							@(_package.Description.Length > 400 ? (_package.Description.Substring(0, 400) + "...") : _package.Description)<br />
-							<strong>@(String.Format("{0:n0}", _package.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
-							@SharedLocalizer["Search.Released"]: <strong>@_package.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
-							@SharedLocalizer["Search.Version"]: <strong>@_package.Version</strong>
-							@((MarkupString)(!string.IsNullOrEmpty(_package.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(_package.PackageUrl).Host + "</strong>" : ""))
-							<br /><br />
-							@if (!string.IsNullOrEmpty(_package.License))
-							{
-								@((MarkupString)_package.License.Replace("\n", "<br />"))
-							}
-							else
-							{
-								@SharedLocalizer["License Not Specified"]
-							}
-						</p>
-					</div>
-					<div class="modal-footer">
-						<button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
-						<button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+	@if (_package != null)
+	{
+		<div class="app-actiondialog">
+			<div class="modal" tabindex="-1" role="dialog">
+				<div class="modal-dialog">
+					<div class="modal-content">
+						<div class="modal-header">
+							<h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+							<button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+						</div>
+						<div class="modal-body">
+							<p style="height: 200px; overflow-y: scroll;">
+								<h4 style="display: inline;"><a href="@_package.ProductUrl" target="_new">@_package.Name</a></h4><br />
+								@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@_package.OwnerUrl" target="new">@_package.Owner</a></strong><br />
+								@(_package.Description.Length > 400 ? (_package.Description.Substring(0, 400) + "...") : _package.Description)<br />
+								<strong>@(String.Format("{0:n0}", _package.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
+								@SharedLocalizer["Search.Released"]: <strong>@_package.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
+								@SharedLocalizer["Search.Version"]: <strong>@_package.Version</strong>
+								@((MarkupString)(!string.IsNullOrEmpty(_package.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(_package.PackageUrl).Host + "</strong>" : ""))
+								<br /><br />
+								@if (!string.IsNullOrEmpty(_package.License))
+								{
+									@((MarkupString)_package.License.Replace("\n", "<br />"))
+								}
+								else
+								{
+									@SharedLocalizer["License Not Specified"]
+								}
+							</p>
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+							<button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
-	</div>
+	}
 }
 
 @code {
-	private ElementReference form;
-	private bool validated = false;
-	private int _moduleDefinitionId;
-	private string _name;
-	private string _description = "";
-	private string _categories;
-	private string _moduledefinitionname = "";
-	private string _version;
-	private string _packagename = "";
-	private string _owner = "";
-	private string _url = "";
-	private string _contact = "";
-	private string _license = "";
-	private string _runtimes = "";
-	private string _permissions;
-	private string _createdby;
-	private DateTime _createdon;
-	private string _modifiedby;
-	private DateTime _modifiedon;
+    private bool _initialized = false;
+    private ElementReference form;
+    private bool validated = false;
+    private int _moduleDefinitionId;
+    private string _name;
+    private string _description = "";
+    private string _categories;
+    private string _moduledefinitionname = "";
+    private string _version;
+    private string _packagename = "";
+    private string _owner = "";
+    private string _url = "";
+    private string _contact = "";
+    private string _license = "";
+    private string _runtimes = "";
+    private List<Permission> _permissions = null;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
 
 #pragma warning disable 649
-	private PermissionGrid _permissionGrid;
+    private PermissionGrid _permissionGrid;
 #pragma warning restore 649
 
-	private List<Package> _packages;
-	private List<Language> _languages;
-	private Package _package;
-	private bool _install = false;
+    private List<Package> _packages;
+    private List<Language> _languages;
+    private Package _package;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-	protected override async Task OnInitializedAsync()
-	{
-		try
-		{
-			_moduleDefinitionId = Int32.Parse(PageState.QueryString["id"]);
-			var moduleDefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
-			if (moduleDefinition != null)
-			{
-				_name = moduleDefinition.Name;
-				_description = moduleDefinition.Description;
-				_categories = moduleDefinition.Categories;
-				_moduledefinitionname = moduleDefinition.ModuleDefinitionName;
-				_version = moduleDefinition.Version;
-				_packagename = moduleDefinition.PackageName;
-				_owner = moduleDefinition.Owner;
-				_url = moduleDefinition.Url;
-				_contact = moduleDefinition.Contact;
-				_license = moduleDefinition.License;
-				_runtimes = moduleDefinition.Runtimes;
-				_permissions = moduleDefinition.Permissions;
-				_createdby = moduleDefinition.CreatedBy;
-				_createdon = moduleDefinition.CreatedOn;
-				_modifiedby = moduleDefinition.ModifiedBy;
-				_modifiedon = moduleDefinition.ModifiedOn;
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            _moduleDefinitionId = Int32.Parse(PageState.QueryString["id"]);
+            var moduleDefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
+            if (moduleDefinition != null)
+            {
+                _name = moduleDefinition.Name;
+                _description = moduleDefinition.Description;
+                _categories = moduleDefinition.Categories;
+                _moduledefinitionname = moduleDefinition.ModuleDefinitionName;
+                _version = moduleDefinition.Version;
+                _packagename = moduleDefinition.PackageName;
+                _owner = moduleDefinition.Owner;
+                _url = moduleDefinition.Url;
+                _contact = moduleDefinition.Contact;
+                _license = moduleDefinition.License;
+                _runtimes = moduleDefinition.Runtimes;
+                _permissions = moduleDefinition.PermissionList;
+                _createdby = moduleDefinition.CreatedBy;
+                _createdon = moduleDefinition.CreatedOn;
+                _modifiedby = moduleDefinition.ModifiedBy;
+                _modifiedon = moduleDefinition.ModifiedOn;
 
-				if (!string.IsNullOrEmpty(_packagename))
-				{
-					_packages = await PackageService.GetPackagesAsync("translation", "", "", _packagename);
-					_languages = await LanguageService.GetLanguagesAsync(-1, _packagename);
-					foreach (var package in _packages)
-					{
-						var code = package.PackageId.Split('.').Last();
-						if (!_languages.Any(item => item.Code == code))
-						{
-							_languages.Add(new Language { Code = code, Name = CultureInfo.GetCultureInfo(code).DisplayName, Version = package.Version, IsDefault = true });
-						}
-					}
-					_languages = _languages.OrderBy(item => item.Name).ToList();
-				}
-			}
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
-			AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
-		}
-	}
+                if (!string.IsNullOrEmpty(_packagename))
+                {
+                    _packages = await PackageService.GetPackagesAsync("translation", "", "", _packagename);
+                    _languages = await LanguageService.GetLanguagesAsync(-1, _packagename);
+                    foreach (var package in _packages)
+                    {
+                        var code = package.PackageId.Split('.').Last();
+                        if (!_languages.Any(item => item.Code == code))
+                        {
+                            _languages.Add(new Language { Code = code, Name = CultureInfo.GetCultureInfo(code).DisplayName, Version = package.Version, IsDefault = true });
+                        }
+                    }
+                    _languages = _languages.OrderBy(item => item.Name).ToList();
+                }
 
-	private async Task SaveModuleDefinition()
-	{
-		validated = true;
-		var interop = new Interop(JSRuntime);
-		if (await interop.FormValid(form))
-		{
-			try
-			{
-				var moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
-				if (moduledefinition.Name != _name)
-				{
-					moduledefinition.Name = _name;
-				}
-				if (moduledefinition.Description != _description)
-				{
-					moduledefinition.Description = _description;
-				}
-				if (moduledefinition.Categories != _categories)
-				{
-					moduledefinition.Categories = _categories;
-				}
-				moduledefinition.Permissions = _permissionGrid.GetPermissions();
-				await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
-				await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
-				NavigationManager.NavigateTo(NavigateUrl());
-			}
+                _initialized = true;
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
+            AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
+        }
+    }
+
+    private async Task SaveModuleDefinition()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            try
+            {
+                var moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+                if (!moduleDefinitions.Any(item => item.Name.ToLower() == _name.ToLower() && item.ModuleDefinitionId != _moduleDefinitionId))
+                {
+                    var moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
+                    if (moduledefinition.Name != _name)
+                    {
+                        moduledefinition.Name = _name;
+                    }
+                    if (moduledefinition.Description != _description)
+                    {
+                        moduledefinition.Description = _description;
+                    }
+                    if (moduledefinition.Categories != _categories)
+                    {
+                        moduledefinition.Categories = _categories;
+                    }
+                    moduledefinition.PermissionList = _permissionGrid.GetPermissionList();
+                    await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
+                    await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
+                    NavigationManager.NavigateTo(NavigateUrl());
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.DuplicateName"], MessageType.Warning);
+                }
+            }
 			catch (Exception ex)
 			{
 				await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
@@ -359,9 +369,8 @@
 		{
 			await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version, Constants.PackagesFolder);
 			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
-			AddModuleMessage(Localizer["Success.Translation.Download"], MessageType.Success);
+			AddModuleMessage(string.Format(Localizer["Success.Translation.Download"], NavigateUrl("admin/system")), MessageType.Success);
 			_package = null;
-			_install = true;
 			StateHasChanged();
 		}
 		catch (Exception ex)
@@ -370,19 +379,4 @@
 			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
 		}
 	}
-
-	private async Task InstallTranslations()
-	{
-		try
-		{
-			await PackageService.InstallPackagesAsync();
-			AddModuleMessage(string.Format(Localizer["Success.Translation.Install"], NavigateUrl("admin/system")), MessageType.Success);
-			_install = false;
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Installing Translations");
-		}
-	}
 }

Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor

@@ -149,7 +149,6 @@ else
 		{
 			await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
 			await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
-			await ModuleDefinitionService.InstallModuleDefinitionsAsync();
 			AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
 		}
 		catch (Exception ex)

Oqtane.Client/Modules/Admin/Modules/Settings.razor

@@ -46,7 +46,7 @@
                             <select id="page" class="form-select" @bind="@_pageId" required>
                                 @foreach (Page p in PageState.Pages)
                                 {
-                                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
                                     {
                                         <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
                                     }
@@ -62,7 +62,7 @@
             {
                 <div class="container">
                     <div class="row mb-1 align-items-center">
-                        <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
+                        <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" PermissionList="@_permissions" @ref="_permissionGrid" />
                     </div>
                 </div>
 
@@ -101,7 +101,7 @@
 	private string _containerType;
 	private string _allPages = "false";
 	private string _permissionNames = "";
-	private string _permissions = null;
+	private List<Permission> _permissions = null;
 	private string _pageId;
 	private PermissionGrid _permissionGrid;
 	private Type _moduleSettingsType;
@@ -123,7 +123,7 @@
 		_containers = ThemeService.GetContainerControls(_themes, PageState.Page.ThemeType);
 		_containerType = ModuleState.ContainerType;
 		_allPages = ModuleState.AllPages.ToString();
-		_permissions = ModuleState.Permissions;
+		_permissions = ModuleState.PermissionList;
 		_pageId = ModuleState.PageId.ToString();
 		createdby = ModuleState.CreatedBy;
 		createdon = ModuleState.CreatedOn;
@@ -207,7 +207,7 @@
 				var module = ModuleState;
 				module.AllPages = bool.Parse(_allPages);
 				module.PageModuleId = ModuleState.PageModuleId;
-				module.Permissions = _permissionGrid.GetPermissions();
+				module.PermissionList = _permissionGrid.GetPermissionList();
 				await ModuleService.UpdateModuleAsync(module);
 
                 if (_moduleSettingsType != null)

Oqtane.Client/Modules/Admin/Pages/Add.razor

@@ -183,7 +183,7 @@
 	private string _themetype = string.Empty;
 	private string _containertype = string.Empty;
 	private string _icon = string.Empty;
-	private string _permissions = string.Empty;
+	private string _permissions = null;
 	private PermissionGrid _permissionGrid;
 	private Type _themeSettingsType;
 	private object _themeSettings;
@@ -202,7 +202,6 @@
 			_containers = ThemeService.GetContainerControls(_themeList, _themetype);
 			_containertype = PageState.Site.DefaultContainerType;
 			_children = PageState.Pages.Where(item => item.ParentId == null).ToList();
-			_permissions = string.Empty;
 			ThemeSettings();
 		}
 		catch (Exception ex)
@@ -222,7 +221,7 @@
 			{
 				foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
 				{
-					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
 					{
 						_children.Add(p);
 					}
@@ -232,7 +231,7 @@
 			{
 				foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
 				{
-					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
 					{
 						_children.Add(p);
 					}
@@ -378,7 +377,7 @@
 						page.DefaultContainerType = string.Empty;
 					}
 					page.Icon = (_icon == null ? string.Empty : _icon);
-					page.Permissions = _permissionGrid.GetPermissions();
+					page.PermissionList = _permissionGrid.GetPermissionList();
 					page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
 					page.UserId = null;
 					page.Meta = _meta;

Oqtane.Client/Modules/Admin/Pages/Edit.razor

@@ -158,7 +158,7 @@
             {
                 <div class="container">
                     <div class="row mb-1 align-items-center">
-                        <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
+                        <PermissionGrid EntityName="@EntityNames.Page" PermissionList="@_permissions" @ref="_permissionGrid" />
                     </div>
                 </div>
             }
@@ -174,8 +174,8 @@
                         <th>@Localizer["ModuleDefinition"]</th>
                     </Header>
                     <Row>
-                        <td><ActionLink Action="Settings" Text="Edit" ModuleId="@context.ModuleId" Security="SecurityAccessLevel.Edit" Permissions="@context.Permissions" ResourceKey="ModuleSettings" /></td>
-                        <td><ActionDialog Header="Delete Module" Message="Are You Sure You Wish To Delete This Module?" Action="Delete" Security="SecurityAccessLevel.Edit" Permissions="@context.Permissions" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
+                        <td><ActionLink Action="Settings" Text="Edit" ModuleId="@context.ModuleId" Security="SecurityAccessLevel.Edit" PermissionList="@context.PermissionList" ResourceKey="ModuleSettings" /></td>
+                        <td><ActionDialog Header="Delete Module" Message="Are You Sure You Wish To Delete This Module?" Action="Delete" Security="SecurityAccessLevel.Edit" PermissionList="@context.PermissionList" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
                         <td>@context.Title</td>
                         <td>@context.ModuleDefinition?.Name</td>
                     </Row>
@@ -221,7 +221,7 @@
 	private string _themetype;
 	private string _containertype = "-";
 	private string _icon;
-	private string _permissions = null;
+	private List<Permission> _permissions = null;
 	private string _createdby;
 	private DateTime _createdon;
 	private string _modifiedby;
@@ -292,7 +292,7 @@
 					_containertype = PageState.Site.DefaultContainerType;
 				}
 				_icon = page.Icon;
-				_permissions = page.Permissions;
+				_permissions = page.PermissionList;
 				_createdby = page.CreatedBy;
 				_createdon = page.CreatedOn;
 				_modifiedby = page.ModifiedBy;
@@ -339,7 +339,7 @@
 			{
 				foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
 				{
-					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
 					{
 						_children.Add(p);
 					}
@@ -349,7 +349,7 @@
 			{
 				foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
 				{
-					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
 					{
 						_children.Add(p);
 					}
@@ -509,7 +509,7 @@
 						page.DefaultContainerType = string.Empty;
 					}
 					page.Icon = _icon ?? string.Empty;
-					page.Permissions = _permissionGrid.GetPermissions();
+					page.PermissionList = _permissionGrid.GetPermissionList();
 					page.IsPersonalizable = (_ispersonalizable != null && Boolean.Parse(_ispersonalizable));
 					page.UserId = null;
 					page.Meta = _meta;

Oqtane.Client/Modules/Admin/RecycleBin/Index.razor

@@ -22,7 +22,7 @@ else
 			}
 			else
 			{
-				<Pager Items="@_pages.Where(item => item.IsDeleted)">
+          <Pager Items="@_pages.Where(item => item.IsDeleted)" CurrentPage="@_pagePage.ToString()" OnPageChange="OnPageChangePage">
 					<Header>
 						<th style="width: 1px;">&nbsp;</th>
 						<th style="width: 1px;">&nbsp;</th>
@@ -50,7 +50,7 @@ else
 			}
 			else
 			{
-				<Pager Items="@_modules.Where(item => item.IsDeleted)">
+          <Pager Items="@_modules.Where(item => item.IsDeleted)" CurrentPage="@_pageModule.ToString()" OnPageChange="OnPageChangeModule">
 					<Header>
 						<th style="width: 1px;">&nbsp;</th>
 						<th style="width: 1px;">&nbsp;</th>
@@ -76,9 +76,10 @@ else
 }
 
 @code {
-	private List<Page> _pages;
-	private List<Module> _modules;
-
+	  private List<Page> _pages;
+	  private List<Module> _modules;
+    private int _pagePage = 1;
+    private int _pageModule = 1;
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
@@ -140,7 +141,7 @@ else
         try
         {
             ModuleInstance.ShowProgressIndicator();
-			foreach (Page page in _pages.Where(item => item.IsDeleted))
+            foreach (Page page in _pages.Where(item => item.IsDeleted))
             {
                 await PageService.DeletePageAsync(page.PageId);
                 await logger.LogInformation("Page Permanently Deleted {Page}", page);
@@ -185,7 +186,7 @@ else
             await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
 
             // check if there are any remaining module instances in the site
-            if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
+            if (!_modules.Exists (item => item.ModuleId == module.ModuleId && item.PageModuleId != module.PageModuleId))
             {
                 await ModuleService.DeleteModuleAsync(module.ModuleId);
             }
@@ -206,12 +207,14 @@ else
         try
         {
             ModuleInstance.ShowProgressIndicator();
-			foreach (Module module in _modules.Where(item => item.IsDeleted))
+            foreach (Module module in _modules.Where(item => item.IsDeleted).ToList())
             {
                 await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
 
+                // DeletePageModuleAsync does not update _modules so remove it.
+                _modules.Remove(module);
                 // check if there are any remaining module instances in the site
-                if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
+                if (!_modules.Exists(item => item.ModuleId == module.ModuleId && item.PageModuleId != module.PageModuleId))
                 {
                     await ModuleService.DeleteModuleAsync(module.ModuleId);
                 }
@@ -229,4 +232,12 @@ else
             ModuleInstance.HideProgressIndicator();
         }
     }
+    private void OnPageChangePage(int page)
+    {
+        _pagePage = page;
+    }
+    private void OnPageChangeModule(int page)
+    {
+        _pageModule = page;
+    }
 }

Oqtane.Client/Modules/Admin/Register/Index.razor

@@ -4,6 +4,7 @@
 @inject IUserService UserService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject ISettingService SettingService
 
 @if (PageState.Site.AllowRegistration)
 {
@@ -15,7 +16,7 @@
             <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
         </Authorized>
         <NotAuthorized>
-            <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" />
+            <ModuleMessage Message="@_passwordconstruction" Type="MessageType.Info" />
             <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
                 <div class="container">
                     <div class="row mb-1 align-items-center">
@@ -29,7 +30,7 @@
                         <div class="col-sm-9">
 							<div class="input-group">
 								<input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
-								<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 							</div>
                         </div>
                     </div>
@@ -38,7 +39,7 @@
                         <div class="col-sm-9">
 							<div class="input-group">
 								<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
-								<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 							</div>
                         </div>
                     </div>
@@ -68,21 +69,54 @@ else
 }
 
 @code {
-	private string _username = string.Empty;
-	private ElementReference form;
-	private bool validated = false;
-	private string _password = string.Empty;
-	private string _passwordtype = "password";
-	private string _togglepassword = string.Empty;
-	private string _confirm = string.Empty;
-	private string _email = string.Empty;
-	private string _displayname = string.Empty;
+    private string _username = string.Empty;
+    private ElementReference form;
+    private bool validated = false;
+    private string _password = string.Empty;
+    private string _passwordtype = "password";
+    private string _togglepassword = string.Empty;
+    private string _confirm = string.Empty;
+    private string _email = string.Empty;
+    private string _displayname = string.Empty;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+    //Password construction
+    private string _minimumlength;
+    private string _uniquecharacters;
+    private bool _requiredigit;
+    private bool _requireupper;
+    private bool _requirelower;
+    private bool _requirepunctuation;
+    private string _passwordconstruction;
 
-	protected override void OnParametersSet()
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+
+    protected override async Task OnInitializedAsync()
+    {
+        var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+        
+        _minimumlength = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredLength", "6");
+        _uniquecharacters = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", "1");
+        _requiredigit = bool.Parse(SettingService.GetSetting(settings, "IdentityOptions:Password:RequireDigit", "true"));
+        _requireupper = bool.Parse(SettingService.GetSetting(settings, "IdentityOptions:Password:RequireUppercase", "true"));
+        _requirelower = bool.Parse(SettingService.GetSetting(settings, "IdentityOptions:Password:RequireLowercase", "true"));
+        _requirepunctuation = bool.Parse(SettingService.GetSetting(settings, "IdentityOptions:Password:RequireNonAlphanumeric", "true"));
+        
+        // Replace the placeholders with the actual values of the variables
+        string digitRequirement = _requiredigit ? Localizer["Password.DigitRequirement"] + ", " : "";
+        string uppercaseRequirement = _requireupper ? Localizer["Password.UppercaseRequirement"] + ", " : "";
+        string lowercaseRequirement = _requirelower ? Localizer["Password.LowercaseRequirement"] + ", " : "";
+        string punctuationRequirement = _requirepunctuation ? Localizer["Password.PunctuationRequirement"] + ", " : "";
+ 
+        // Replace the placeholders with the actual values of the variables
+		string passwordValidationCriteriaTemplate = Localizer["Password.ValidationCriteria"];
+		_passwordconstruction = Localizer["Info.Registration.InvalidEmail"] + ". " + string.Format(passwordValidationCriteriaTemplate,
+            _minimumlength, _uniquecharacters, digitRequirement, uppercaseRequirement, lowercaseRequirement, punctuationRequirement);
+    }
+
+    protected override void OnParametersSet()
 	{
 		_togglepassword = SharedLocalizer["ShowPassword"];
+        
 	}
 
     private async Task Register()

Oqtane.Client/Modules/Admin/Reset/Index.razor

@@ -18,7 +18,7 @@
             <div class="col-sm-9">
 				<div class="input-group">
 					<input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
-					<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 				</div>
             </div>
         </div>
@@ -27,7 +27,7 @@
             <div class="col-sm-9">
 				<div class="input-group">
 					<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
-					<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 				</div>
             </div>
         </div>

Oqtane.Client/Modules/Admin/Site/Index.razor

@@ -78,7 +78,7 @@
 						<option value="-">&lt;@Localizer["Not Specified"]&gt;</option>
                         @foreach (Page page in PageState.Pages)
                         {
-							if (UserSecurity.ContainsRole(page.Permissions, PermissionNames.View, RoleNames.Everyone))
+							if (UserSecurity.ContainsRole(page.PermissionList, PermissionNames.View, RoleNames.Everyone))
 							{
 								<option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
 							}
@@ -95,6 +95,12 @@
 					</select>
 				</div>
 			</div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="sitemap" HelpText="The site map url for this site which can be submitted to search engines for indexing" ResourceKey="SiteMap">Site Map: </Label>
+				<div class="col-sm-9">
+					<input id="sitemap" class="form-control" @bind="@_sitemap" required disabled />
+				</div>
+			</div>
 		</div>
         <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
             <div class="container">
@@ -137,7 +143,7 @@
                     <div class="col-sm-9">
 						<div class="input-group">
 							<input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" />
-							<button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword">@_togglesmtppassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword" tabindex="-1">@_togglesmtppassword</button>
 						</div>
                     </div>
                 </div>
@@ -267,16 +273,16 @@
                     </div>
                 </div>
             </Section>
-            <Section Name="TenantInformation" Heading="Tenant Information" ResourceKey="TenantInformation">
+            <Section Name="TenantInformation" Heading="Database" ResourceKey="TenantInformation">
                 <div class="container">
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="tenant" HelpText="The tenant for the site" ResourceKey="Tenant">Tenant: </Label>
+						<Label Class="col-sm-3" For="tenant" HelpText="The name of the database used for the site" ResourceKey="Tenant">Database: </Label>
                         <div class="col-sm-9">
                             <input id="tenant" class="form-control" @bind="@_tenant" readonly />
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="database" HelpText="The database for the tenant" ResourceKey="Database">Database: </Label>
+                        <Label Class="col-sm-3" For="database" HelpText="The type of database" ResourceKey="Database">Type: </Label>
                         <div class="col-sm-9">
                             <input id="database" class="form-control" @bind="@_database" readonly />
                         </div>
@@ -284,7 +290,7 @@
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="connectionstring" HelpText="The connection information for the database" ResourceKey="ConnectionString">Connection: </Label>
                         <div class="col-sm-9">
-                            <textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="2" readonly></textarea>
+							<input id="connectionstring" class="form-control" @bind="@_connectionstring" readonly />
                         </div>
                     </div>
                 </div>
@@ -321,6 +327,7 @@
 	private string _containertype = "-";
 	private string _admincontainertype = "-";
 	private string _homepageid = "-";
+	private string _sitemap = "";
 	private string _smtphost = string.Empty;
 	private string _smtpport = string.Empty;
 	private string _smtpssl = "False";
@@ -361,6 +368,7 @@
 				_runtime = site.Runtime;
 				_prerender = site.RenderMode.Replace(_runtime, "");
 				_isdeleted = site.IsDeleted.ToString();
+				_sitemap = PageState.Alias.Protocol + PageState.Alias.Name + "/pages/sitemap.xml";
 
 				await GetAliases();
 

Oqtane.Client/Modules/Admin/Sites/Add.razor

@@ -103,7 +103,7 @@ else
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="tenant" HelpText="Select the tenant for the site" ResourceKey="Tenant">Tenant: </Label>
+                <Label Class="col-sm-3" For="tenant" HelpText="Select the database for the site" ResourceKey="Tenant">Database: </Label>
                 <div class="col-sm-9">
                     <select id="tenant" class="form-select" @onchange="(e => TenantChanged(e))" required>
                         <option value="-">&lt;@Localizer["Tenant.Select"]&gt;</option>
@@ -121,13 +121,13 @@ else
                     <hr class="app-rule" />
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="name" HelpText="Enter the name for the tenant" ResourceKey="TenantName">Tenant Name: </Label>
+                    <Label Class="col-sm-3" For="name" HelpText="Enter the name for the database" ResourceKey="TenantName">Name: </Label>
                     <div class="col-sm-9">
                         <input id="name" class="form-control" @bind="@_tenantName" maxlength="100" required />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label>
+                    <Label Class="col-sm-3" For="databaseType" HelpText="Select the database type" ResourceKey="DatabaseType">Type: </Label>
                     <div class="col-sm-9">
                         @if (_databases != null)
 						{
@@ -160,7 +160,7 @@ else
 				else
 				{
 					<div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">String:</Label>
+						<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">Settings:</Label>
 						<div class="col-sm-9">
 							<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
 						</div>
@@ -315,7 +315,7 @@ else
 				_urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
 				var duplicates = new List<string>();
 				var aliases = await AliasService.GetAliasesAsync();
-				foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+				foreach (string name in _urls.Split(',', StringSplitOptions.RemoveEmptyEntries))
 				{
 					if (aliases.Exists(item => item.Name == name))
 					{
@@ -329,7 +329,7 @@ else
 
 					if (_tenantid == "+")
 					{
-						if (!string.IsNullOrEmpty(_tenantName) && _tenants.FirstOrDefault(item => item.Name == _tenantName) == null)
+						if (!string.IsNullOrEmpty(_tenantName) && !_tenants.Exists(item => item.Name == _tenantName))
 						{
 							// validate host credentials
 							var user = new User();

Oqtane.Client/Modules/Admin/Sql/Index.razor

@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Sql
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
+@inject ISystemService SystemService
 @inject ITenantService TenantService
 @inject IDatabaseService DatabaseService
 @inject ISqlService SqlService
@@ -14,123 +15,284 @@
 else
 {
     <div class="container">
-
-        <div class="row mb-1 align-items-center">
-			<Label Class="col-sm-3" For="tenant" HelpText="Select the tenant associated with the database server" ResourceKey="Tenant">Tenant: </Label>
-            <div class="col-sm-9">
-                <select id="tenant" class="form-select" value="@_tenantid" @onchange="(e => TenantChanged(e))">
-                    <option value="-1">&lt;@Localizer["Tenant.Select"]&gt;</option>
-                    @foreach (Tenant tenant in _tenants)
-                    {
-                        <option value="@tenant.TenantId">@tenant.Name</option>
-                    }
-                </select>
-            </div>
-        </div>
-        @if (_tenantid != "-1")
-        {
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="database" HelpText="The database for the tenant" ResourceKey="Database">Database: </Label>
-                <div class="col-sm-9">
-                    <input id="database" class="form-control" @bind="@_database" readonly />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="connectionstring" HelpText="The connection information for the database" ResourceKey="ConnectionString">Connection: </Label>
-                <div class="col-sm-9">
-					<div class="input-group">
-						<input id="connectionstring" type="@_connectionstringtype" class="form-control" @bind="@_connectionstring" readonly />
-						<button type="button" class="btn btn-secondary" @onclick="@ToggleConnectionString">@_connectionstringtoggle</button>
-					</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="connection" HelpText="Select a database connection (from appsettings.json)" ResourceKey="Connection">Connection: </Label>
+			<div class="col-sm-9">
+				<select id="tenant" class="form-select" value="@_connection" @onchange="(e => ConnectionChanged(e))">
+					<option value="-">&lt;@Localizer["Connection.Select"]&gt;</option>
+					<option value="+">&lt;@Localizer["Connection.Add"]&gt;</option>
+					@foreach (var connection in _connections)
+					{
+						<option value="@connection.Key">@connection.Key</option>
+					}
+				</select>
+			</div>
+		</div>
+		@if (_connection == "+")
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="name" HelpText="Enter the name of the connection" ResourceKey="Name">Name: </Label>
+				<div class="col-sm-9">
+					<input id="name" class="form-control" @bind="@_name" maxlength="100" required />
 				</div>
 			</div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="sqlQuery" HelpText="Enter the SQL query for the database server" ResourceKey="SqlQuery">SQL Query: </Label>
-                <div class="col-sm-9">
-                    <textarea id="sqlQuery" class="form-control" @bind="@_sql" rows="3"></textarea>
-                </div>
-            </div>
-        }
-    </div>
-    <br />
-    <button type="button" class="btn btn-success" @onclick="Execute">@Localizer["Execute"]</button>
-    <br />
-    <br />
-    @if (_results != null)
-    {
-        @if (_results.Count > 0)
-        {
-            <Pager Class="table table-bordered" Items="@_results">
-                <Header>
-                    @foreach (KeyValuePair<string, string> kvp in _results.First())
-                    {
-                        <th>@kvp.Key</th>
-                    }
-                </Header>
-                <Row>
-                    @foreach (KeyValuePair<string, string> kvp in context)
-                    {
-                        <td>@kvp.Value</td>
-                    }
-                </Row>
-            </Pager>
-        }
-        else
-        {
-            @Localizer["Return.NoResult"]
-        }
-        <br />
-        <br />
-    }
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="databasetype" HelpText="Select the database type" ResourceKey="DatabaseType">Type: </Label>
+				<div class="col-sm-9">
+					@if (_databases != null)
+					{
+						<div class="input-group">
+							<select id="databasetype" class="form-select" value="@_databasetype" @onchange="(e => DatabaseTypeChanged(e))" required>
+								@foreach (var database in _databases)
+								{
+									<option value="@database.Name">@Localizer[@database.Name]</option>
+								}
+							</select>
+							@if (!_showConnectionString)
+							{
+								<button type="button" class="btn btn-secondary" @onclick="ShowConnectionString">@Localizer["EnterConnectionString"]</button>
+							}
+							else
+							{
+								<button type="button" class="btn btn-secondary" @onclick="ShowConnectionString">@Localizer["EnterConnectionParameters"]</button>
+							}
+						</div>
+					}
+				</div>
+			</div>
+			@if (!_showConnectionString)
+			{
+				if (_databaseConfigType != null)
+				{
+					@DatabaseConfigComponent
+				}
+			}
+			else
+			{
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">Settings:</Label>
+					<div class="col-sm-9">
+						<textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="3"></textarea>
+					</div>
+				</div>
+			}
+			<br />
+			<button type="button" class="btn btn-success" @onclick="Add">@Localizer["Add"]</button>
+		}
+		else
+		{
+			@if (_connection != "-")
+			{
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="databasetype" HelpText="The database type" ResourceKey="DatabaseType">Type: </Label>
+					<div class="col-sm-9">
+						@if (_databases != null)
+						{
+							<select id="databasetype" class="form-select" @bind="@_databasetype" required>
+								<option value="-">&lt;@Localizer["Type.Select"]&gt;</option>
+								@foreach (var database in _databases)
+								{
+									<option value="@database.Name">@Localizer[@database.Name]</option>
+								}
+							</select>
+						}
+					</div>
+				</div>
+				@if (!string.IsNullOrEmpty(_tenant))
+				{
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="tenant" HelpText="The database using this connection" ResourceKey="Tenant">Database: </Label>
+						<div class="col-sm-9">
+							<input id="tenant" class="form-control" @bind="@_tenant" readonly />
+						</div>
+					</div>
+				}
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="connectionstring" HelpText="The connection string" ResourceKey="ConnectionString">Settings: </Label>
+					<div class="col-sm-9">
+						<div class="input-group">
+							<input id="connectionstring" type="@_connectionstringtype" class="form-control" @bind="@_connectionstring" readonly />
+							<button type="button" class="btn btn-secondary" @onclick="@ToggleConnectionString">@_connectionstringtoggle</button>
+						</div>
+					</div>
+				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="sqlQuery" HelpText="Enter a valid SQL query for the database" ResourceKey="SqlQuery">SQL Query: </Label>
+					<div class="col-sm-9">
+						<textarea id="sqlQuery" class="form-control" @bind="@_sql" rows="3"></textarea>
+					</div>
+				</div>
+				<br />
+				<button type="button" class="btn btn-success" @onclick="Execute">@Localizer["Execute"]</button>
+				<br />
+				<br />
+				@if (_results != null)
+				{
+					@if (_results.Count > 0)
+					{
+						<Pager Class="table table-bordered" Items="@_results">
+							<Header>
+								@foreach (KeyValuePair<string, string> kvp in _results.First())
+								{
+								<th>@kvp.Key</th>
+								}
+							</Header>
+							<Row>
+								@foreach (KeyValuePair<string, string> kvp in context)
+								{
+									<td>@kvp.Value</td>
+								}
+							</Row>
+						</Pager>
+					}
+					else
+					{
+						@Localizer["Return.NoResult"]
+					}
+					<br />
+
+					<br />
+				}
+			}
+		}
+	</div>
 }
 
 @code {
-    private List<Tenant> _tenants;
-    private string _tenantid = "-1";
-    private string _database = string.Empty;
+	private string _connection = "-";
+	private Dictionary<string, object> _connections;
+	private List<Tenant> _tenants;
+	private List<Database> _databases;
+
+	private string _name = string.Empty;
+	private string _databasetype = string.Empty;
+	private Type _databaseConfigType;
+	private object _databaseConfig;
+	private RenderFragment DatabaseConfigComponent { get; set; }
+	private bool _showConnectionString = false;
+	private string _tenant = string.Empty;
 	private string _connectionstring = string.Empty;
 	private string _connectionstringtype = "password";
 	private string _connectionstringtoggle = string.Empty;
 	private string _sql = string.Empty;
-    private List<Dictionary<string, string>> _results;
+	private List<Dictionary<string, string>> _results;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _tenants = await TenantService.GetTenantsAsync();
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_connections = await SystemService.GetSystemInfoAsync("connectionstrings");
+			_tenants = await TenantService.GetTenantsAsync();
+			_databases = await DatabaseService.GetDatabasesAsync();
 			_connectionstringtoggle = SharedLocalizer["ShowPassword"];
 		}
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Tenants {Error}", ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Tenants {Error}", ex.Message);
+			AddModuleMessage(ex.Message, MessageType.Error);
+		}
+	}
 
-    private async void TenantChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _tenantid = (string)e.Value;
-            var tenants = await TenantService.GetTenantsAsync();
-            var _databases = await DatabaseService.GetDatabasesAsync();
-            var tenant = tenants.Find(item => item.TenantId == int.Parse(_tenantid));
-            if (tenant != null)
-            {
-                _database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
-                _connectionstring = tenant.DBConnectionString;
-            }
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Tenant {TenantId} {Error}", _tenantid, ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
+	private async void ConnectionChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_connection = (string)e.Value;
+			if (_connection != "-" && _connection != "+")
+			{
+				_connectionstring = _connections[_connection].ToString();
+				_tenant = "";
+				_databasetype = "-";
+				var tenant = _tenants.FirstOrDefault(item => item.DBConnectionString == _connection);
+				if (tenant != null)
+				{
+					_tenant = tenant.Name;
+					_databasetype = _databases.FirstOrDefault(item => item.DBType == tenant.DBType).Name;
+				}
+			}
+			else
+			{
+				if (_databases.Exists(item => item.IsDefault))
+				{
+					_databasetype = _databases.Find(item => item.IsDefault).Name;
+				}
+				else
+				{
+					_databasetype = "LocalDB";
+				}
+				_showConnectionString = false;
+				LoadDatabaseConfigComponent();
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Connection {Connection} {Error}", _connection, ex.Message);
+			AddModuleMessage(ex.Message, MessageType.Error);
+		}
+	}
+
+	private void DatabaseTypeChanged(ChangeEventArgs eventArgs)
+	{
+		try
+		{
+			_databasetype = (string)eventArgs.Value;
+			_showConnectionString = false;
+			LoadDatabaseConfigComponent();
+		}
+		catch
+		{
+			AddModuleMessage(Localizer["Error.Database.LoadConfig"], MessageType.Error);
+		}
+	}
+
+	private void LoadDatabaseConfigComponent()
+	{
+		var database = _databases.SingleOrDefault(d => d.Name == _databasetype);
+		if (database != null)
+		{
+			_databaseConfigType = Type.GetType(database.ControlType);
+			DatabaseConfigComponent = builder =>
+			{
+				builder.OpenComponent(0, _databaseConfigType);
+				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+				builder.CloseComponent();
+			};
+		}
+	}
+
+	private void ShowConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionstring = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
+
+	private async Task Add()
+	{
+		var connectionstring = _connectionstring;
+		if (!_showConnectionString && _databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			connectionstring = databaseConfigControl.GetConnectionString();
+		}
+		if (!string.IsNullOrEmpty(_name) && !string.IsNullOrEmpty(connectionstring))
+		{
+			var settings = new Dictionary<string, object>();
+			settings.Add($"{SettingKeys.ConnectionStringsSection}:{_name}", connectionstring);
+			await SystemService.UpdateSystemInfoAsync(settings);
+			_connections = await SystemService.GetSystemInfoAsync("connectionstrings");
+			_connection = "-";
+			AddModuleMessage(Localizer["Message.Connection.Added"], MessageType.Success);
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Message.Required.Connection"], MessageType.Warning);
+		}
+	}
 
 	private void ToggleConnectionString()
 	{
@@ -147,12 +309,13 @@ else
 	}
 
 	private async Task Execute()
-    {
-        try
-        {
-            if (_tenantid != "-1" && !string.IsNullOrEmpty(_sql))
-            {
-                var sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _sql };
+	{
+		try
+		{
+			if (_databasetype != "-" && !string.IsNullOrEmpty(_sql))
+			{
+				var dbtype = _databases.FirstOrDefault(item => item.Name == _databasetype).DBType;
+				var sqlquery = new SqlQuery { DBConnectionString = _connection, DBType = dbtype, Query = _sql };
                 sqlquery = await SqlService.ExecuteQueryAsync(sqlquery);
                 _results = sqlquery.Results;
                 AddModuleMessage(Localizer["Success.QueryExecuted"], MessageType.Success);

Oqtane.Client/Modules/Admin/SystemInfo/Index.razor

@@ -156,6 +156,8 @@
                 </div>
             </div>
 		</div>
+		<br /><br />
+		<button type="button" class="btn btn-danger" @onclick="ClearLog">@Localizer["Clear"]</button>
 	</TabPanel>
 </TabStrip>
 <br /><br />
@@ -188,7 +190,7 @@
 	{
 		_version = Constants.Version;
 
-		Dictionary<string, object> systeminfo = await SystemService.GetSystemInfoAsync("environment");
+		var systeminfo = await SystemService.GetSystemInfoAsync("environment");
 		if (systeminfo != null)
 		{
 			_clrversion = systeminfo["CLRVersion"].ToString();
@@ -222,24 +224,41 @@
 	}
 
 	private async Task SaveConfig()
-    {
-        try
-        {
-            var settings = new Dictionary<string, object>();
-            settings.Add("DetailedErrors", _detailederrors);
-            settings.Add("Logging:LogLevel:Default", _logginglevel);
-            settings.Add("Logging:LogLevel:Notify", _notificationlevel);
-            settings.Add("UseSwagger", _swagger);
-            settings.Add("PackageService", _packageservice);
-            await SystemService.UpdateSystemInfoAsync(settings);
-            AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Saving Configuration");
-            AddModuleMessage(Localizer["Error.UpdateConfig"], MessageType.Error);
-        }
-    }
+	{
+		try
+		{
+			var settings = new Dictionary<string, object>();
+			settings.Add("DetailedErrors", _detailederrors);
+			settings.Add("Logging:LogLevel:Default", _logginglevel);
+			settings.Add("Logging:LogLevel:Notify", _notificationlevel);
+			settings.Add("UseSwagger", _swagger);
+			settings.Add("PackageService", _packageservice);
+			await SystemService.UpdateSystemInfoAsync(settings);
+			AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Configuration");
+			AddModuleMessage(Localizer["Error.UpdateConfig"], MessageType.Error);
+		}
+	}
+
+	private async Task ClearLog()
+	{
+		try
+		{
+			var settings = new Dictionary<string, object>();
+			settings.Add("clearlog", "true");
+			await SystemService.UpdateSystemInfoAsync(settings);
+			_log = string.Empty;
+			AddModuleMessage(Localizer["Success.ClearLog"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Clearing Log");
+			AddModuleMessage(Localizer["Error.ClearLog"], MessageType.Error);
+		}
+	}
 
     private async Task RestartApplication()
     {

Oqtane.Client/Modules/Admin/Themes/Add.razor

@@ -65,13 +65,15 @@
                 </div>
             }
         }
+        <br />
+        <ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
     </TabPanel>
     <TabPanel Name="Upload" ResourceKey="Upload">
         <div class="container">
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
                 <div class="col-sm-9">
-                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
                 </div>
             </div>
         </div>
@@ -111,13 +113,8 @@
     </div>
 }
 
-<button type="button" class="btn btn-success" @onclick="InstallThemes">@SharedLocalizer["Install"]</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
-<br />
-<br />
-<ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
-
 @code {
     private List<Package> _packages;
     private string _price = "free";
@@ -236,7 +233,7 @@
         {
             await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
             await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
-            AddModuleMessage(Localizer["Success.Theme.Download"], MessageType.Success);
+			AddModuleMessage(string.Format(Localizer["Success.Theme.Download"], NavigateUrl("admin/system")), MessageType.Success);
             _productname = "";
             _license = "";
             StateHasChanged();
@@ -248,16 +245,8 @@
         }
     }
 
-    private async Task InstallThemes()
+    private void OnUpload()
     {
-        try
-        {
-            await ThemeService.InstallThemesAsync();
-            AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Installing Theme");
-        }
+        AddModuleMessage(string.Format(Localizer["Success.Theme.Download"], NavigateUrl("admin/system")), MessageType.Success);
     }
 }

Oqtane.Client/Modules/Admin/Themes/Create.razor

@@ -121,7 +121,7 @@
     private bool IsValid(string name)
     {
         // must contain letters, underscores and digits and first character must be letter or underscore
-        return !string.IsNullOrEmpty(name) && name.ToLower() != "theme" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+		return !string.IsNullOrEmpty(name) && name.ToLower() != "theme" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)

Oqtane.Client/Modules/Admin/Themes/Index.razor

@@ -116,7 +116,6 @@ else
         {
             await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
             await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", packagename, version);
-            await ThemeService.InstallThemesAsync();
             AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);
         }
         catch (Exception ex)

Oqtane.Client/Modules/Admin/UserProfile/Index.razor

@@ -34,7 +34,7 @@ else
 					<div class="col-sm-9">
                         <div class="input-group">
 						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
-						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
@@ -43,7 +43,7 @@ else
                     <div class="col-sm-9">
                         <div class="input-group">
 							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
-						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
@@ -211,8 +211,11 @@ else
                     </Detail>
                 </Pager>
             }
-            <br />
-            <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
+            @if (notifications.Any())
+            {
+                <br />
+                <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
+            }
             <br /><hr />
             <select class="form-select" @onchange="(e => FilterChanged(e))">
                 <option value="to">@Localizer["Inbox"]</option>

Oqtane.Client/Modules/Admin/Users/Add.razor

@@ -23,7 +23,7 @@
 					<div class="col-sm-9">
                         <div class="input-group">
 						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
-						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
@@ -32,7 +32,7 @@
                     <div class="col-sm-9">
                         <div class="input-group">
 							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" required />
-						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>

Oqtane.Client/Modules/Admin/Users/Edit.razor

@@ -32,7 +32,7 @@ else
 					<div class="col-sm-9">
                         <div class="input-group">
 						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
-						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
@@ -41,7 +41,7 @@ else
                     <div class="col-sm-9">
                         <div class="input-group">
 							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
-						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>

Oqtane.Client/Modules/Admin/Users/Index.razor

@@ -294,6 +294,12 @@ else
 										<input id="roleclaimtype" class="form-control" @bind="@_roleclaimtype" />
 									</div>
 								</div>
+								<div class="row mb-1 align-items-center">
+									<Label Class="col-sm-3" For="profileclaimtypes" HelpText="A comma delimited list of user profile claims provided by the provider, as well as mappings to your user profile definition. For example if the provider includes a 'given_name' claim and you have a 'FirstName' user profile definition you should specify 'given_name:FirstName'." ResourceKey="ProfileClaimTypes">User Profile Claims:</Label>
+									<div class="col-sm-9">
+										<input id="profileclaimtypes" class="form-control" @bind="@_profileclaimtypes" />
+									</div>
+								</div>
 							}
 							<div class="row mb-1 align-items-center">
 								<Label Class="col-sm-3" For="domainfilter" HelpText="Provide any email domain filter criteria (separated by commas). Domains to exclude should be prefixed with an exclamation point (!). For example 'microsoft.com,!hotmail.com' would include microsoft.com email addresses but not hotmail.com email addresses." ResourceKey="DomainFilter">Domain Filter:</Label>
@@ -395,6 +401,7 @@ else
 	private string _identifierclaimtype;
 	private string _emailclaimtype;
 	private string _roleclaimtype;
+	private string _profileclaimtypes;
 	private string _domainfilter;
 	private string _createusers;
 
@@ -449,6 +456,7 @@ else
 			_identifierclaimtype = SettingService.GetSetting(settings, "ExternalLogin:IdentifierClaimType", "sub");
 			_emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "email");
 			_roleclaimtype = SettingService.GetSetting(settings, "ExternalLogin:RoleClaimType", "");
+			_profileclaimtypes = SettingService.GetSetting(settings, "ExternalLogin:ProfileClaimTypes", "");
 			_domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
 			_createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
 
@@ -568,6 +576,7 @@ else
 				settings = SettingService.SetSetting(settings, "ExternalLogin:IdentifierClaimType", _identifierclaimtype, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:EmailClaimType", _emailclaimtype, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:RoleClaimType", _roleclaimtype, true);
+				settings = SettingService.SetSetting(settings, "ExternalLogin:ProfileClaimTypes", _profileclaimtypes, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:DomainFilter", _domainfilter, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
 

Oqtane.Client/Modules/Controls/ActionDialog.razor

@@ -1,4 +1,5 @@
 @namespace Oqtane.Modules.Controls
+@using System.Text.Json
 @inherits LocalizableComponent
 
 @if (_visible)
@@ -40,7 +41,7 @@
 
 @code {
     private bool _visible = false;
-	private string _permissions = string.Empty;
+	private List<Permission> _permissions;
     private bool _editmode = false;
     private bool _authorized = false;
     private string _iconSpan = string.Empty;
@@ -61,7 +62,10 @@
     public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
 
 	[Parameter]
-	public string Permissions { get; set; } // optional - can be used to specify a permission string
+	public string Permissions { get; set; } // deprecated - use PermissionList instead
+
+	[Parameter]
+	public List<Permission> PermissionList { get; set; } // optional - can be used to specify permissions
 
     [Parameter]
     public string Class { get; set; } // optional
@@ -78,7 +82,15 @@
     [Parameter]
     public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
 
-    protected override void OnParametersSet()
+	protected override void OnInitialized()
+	{
+		if (!string.IsNullOrEmpty(Permissions))
+		{
+			PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);
+		}
+	}
+	
+	protected override void OnParametersSet()
     {
         base.OnParametersSet();
 
@@ -109,7 +121,7 @@
         Header = Localize(nameof(Header), Header);
         Message = Localize(nameof(Message), Message);
 
-		_permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions;
+		_permissions = (PermissionList == null) ? ModuleState.PermissionList : PermissionList;
         _authorized = IsAuthorized();
     }
 

Oqtane.Client/Modules/Controls/ActionLink.razor

@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Controls
 @using System.Net
+@using System.Text.Json
 @inherits LocalizableComponent
 @inject IUserService UserService
 
@@ -26,7 +27,7 @@
 	private string _text = string.Empty;
 	private string _parameters = string.Empty;
 	private string _url = string.Empty;
-	private string _permissions = string.Empty;
+	private List<Permission> _permissions;
 	private bool _editmode = false;
 	private bool _authorized = false;
 	private string _classname = "btn btn-primary";
@@ -52,7 +53,10 @@
 	public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
 
 	[Parameter]
-	public string Permissions { get; set; } // optional - can be used to specify a permission string
+	public string Permissions { get; set; } // deprecated - use PermissionList instead
+
+	[Parameter]
+	public List<Permission> PermissionList { get; set; } // optional - can be used to specify permissions
 
 	[Parameter]
 	public bool Disabled { get; set; } // optional
@@ -75,6 +79,14 @@
 	[Parameter]
 	public string ReturnUrl { get; set; } // optional - used to set a url to redirect to
 
+	protected override void OnInitialized()
+	{
+		if (!string.IsNullOrEmpty(Permissions))
+		{
+			PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);
+		}
+	}
+
 	protected override void OnParametersSet()
 	{
 		base.OnParametersSet();
@@ -119,7 +131,7 @@
 			_iconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
 		}
 
-		_permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions;
+		_permissions = (PermissionList == null) ? ModuleState.PermissionList : PermissionList;
 		_text = Localize(nameof(Text), _text);
 		_url = (ModuleId == -1) ? EditUrl(Action, _parameters) : EditUrl(ModuleId, Action, _parameters);
 		if (!string.IsNullOrEmpty(ReturnUrl))

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -6,7 +6,7 @@
 @inject IStringLocalizer<FileManager> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_folders != null)
+@if (_initialized)
 {
     <div id="@Id" class="container-fluid px-0">
         <div class="row">
@@ -87,296 +87,306 @@
 }
 
 @code {
-	private List<Folder> _folders;
-	private List<File> _files = new List<File>();
-	private string _fileinputid = string.Empty;
-	private string _progressinfoid = string.Empty;
-	private string _progressbarid = string.Empty;
-	private string _filter = "*";
-	private bool _haseditpermission = false;
-	private string _image = string.Empty;
-	private File _file = null;
-	private string _guid;
-	private string _message = string.Empty;
-	private MessageType _messagetype;
+    private bool _initialized = false;
+    private List<Folder> _folders;
+    private List<File> _files = new List<File>();
+    private string _fileinputid = string.Empty;
+    private string _progressinfoid = string.Empty;
+    private string _progressbarid = string.Empty;
+    private string _filter = "*";
+    private bool _haseditpermission = false;
+    private string _image = string.Empty;
+    private File _file = null;
+    private string _guid;
+    private string _message = string.Empty;
+    private MessageType _messagetype;
 
-	[Parameter]
-	public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
+    [Parameter]
+    public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
 
-	[Parameter]
-	public int FolderId { get; set; } = -1; // optional - for setting a specific default folder by folderid 
+    [Parameter]
+    public int FolderId { get; set; } = -1; // optional - for setting a specific default folder by folderid 
 
-	[Parameter]
-	public string Folder { get; set; } = ""; // optional - for setting a specific default folder by folder path 
+    [Parameter]
+    public string Folder { get; set; } = ""; // optional - for setting a specific default folder by folder path 
 
-	[Parameter]
-	public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
+    [Parameter]
+    public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
 
-	[Parameter]
-	public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
+    [Parameter]
+    public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
 
-	[Parameter]
-	public bool ShowFiles { get; set; } = true; // optional - for indicating whether a list of files should be displayed - default is true
+    [Parameter]
+    public bool ShowFiles { get; set; } = true; // optional - for indicating whether a list of files should be displayed - default is true
 
-	[Parameter]
-	public bool ShowUpload { get; set; } = true; // optional - for indicating whether a Upload controls should be displayed - default is true
+    [Parameter]
+    public bool ShowUpload { get; set; } = true; // optional - for indicating whether a Upload controls should be displayed - default is true
 
-	[Parameter]
-	public bool ShowFolders { get; set; } = true; // optional - for indicating whether a list of folders should be displayed - default is true
+    [Parameter]
+    public bool ShowFolders { get; set; } = true; // optional - for indicating whether a list of folders should be displayed - default is true
 
-	[Parameter]
-	public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
+    [Parameter]
+    public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
 
-	[Parameter]
-	public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
+    [Parameter]
+    public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
 
-	[Parameter]
-	public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
+    [Parameter]
+    public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
 
-	[Parameter]
-	public EventCallback<int> OnUpload { get; set; } // optional - executes a method in the calling component when a file is uploaded
+    [Parameter]
+    public EventCallback<int> OnUpload { get; set; } // optional - executes a method in the calling component when a file is uploaded
 
-	[Parameter]
-	public EventCallback<int> OnSelect { get; set; } // optional - executes a method in the calling component when a file is selected
+    [Parameter]
+    public EventCallback<int> OnSelect { get; set; } // optional - executes a method in the calling component when a file is selected
 
-	[Parameter]
-	public EventCallback<int> OnDelete { get; set; } // optional - executes a method in the calling component when a file is deleted
+    [Parameter]
+    public EventCallback<int> OnDelete { get; set; } // optional - executes a method in the calling component when a file is deleted
 
-	protected override async Task OnInitializedAsync()
-	{
-		// packages folder is a framework folder for uploading installable nuget packages
-		if (Folder == Constants.PackagesFolder)
-		{
-			ShowFiles = false;
-			ShowFolders = false;
-			Filter = "nupkg";
-			ShowSuccess = true;
-		}
+    protected override async Task OnInitializedAsync()
+    {
+        // packages folder is a framework folder for uploading installable nuget packages
+        if (Folder == Constants.PackagesFolder)
+        {
+            ShowFiles = false;
+            ShowFolders = false;
+            Filter = "nupkg";
+            ShowSuccess = true;
+        }
 
-		if (!ShowFiles)
-		{
-			ShowImage = false;
-		}
+        if (!ShowFiles)
+        {
+            ShowImage = false;
+        }
 
-		_folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+        _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
 
-		if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
-		{
-			Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
-			if (folder != null)
-			{
-				FolderId = folder.FolderId;
-			}
-			else
-			{
-				FolderId = -1;
-				_message = "Folder Path " + Folder + "Does Not Exist";
-				_messagetype = MessageType.Error;
-			}
-		}
+        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
+        {
+            Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
+            if (folder != null)
+            {
+                FolderId = folder.FolderId;
+            }
+            else
+            {
+                FolderId = -1;
+                _message = "Folder Path " + Folder + "Does Not Exist";
+                _messagetype = MessageType.Error;
+            }
+        }
 
-		if (FileId != -1)
-		{
-			File file = await FileService.GetFileAsync(FileId);
-			if (file != null)
-			{
-				FolderId = file.FolderId;
-				await OnSelect.InvokeAsync(FileId);
-			}
-			else
-			{
-				FileId = -1; // file does not exist
-				_message = "FileId " + FileId.ToString() + "Does Not Exist";
-				_messagetype = MessageType.Error;
-			}
-		}
+        if (FileId != -1)
+        {
+            File file = await FileService.GetFileAsync(FileId);
+            if (file != null)
+            {
+                FolderId = file.FolderId;
+                await OnSelect.InvokeAsync(FileId);
+            }
+            else
+            {
+                FileId = -1; // file does not exist
+                _message = "FileId " + FileId.ToString() + "Does Not Exist";
+                _messagetype = MessageType.Error;
+            }
+        }
 
-		await SetImage();
+        await SetImage();
 
-		if (!string.IsNullOrEmpty(Filter))
-		{
-			_filter = "." + Filter.Replace(",", ",.");
-		}
+        if (!string.IsNullOrEmpty(Filter))
+        {
+            _filter = "." + Filter.Replace(",", ",.");
+        }
 
-		await GetFiles();
+        await GetFiles();
 
-		// create unique id for component
-		_guid = Guid.NewGuid().ToString("N");
-		_fileinputid = "FileInput_" + _guid;
-		_progressinfoid = "ProgressInfo_" + _guid;
-		_progressbarid = "ProgressBar_" + _guid;
-	}
+        // create unique id for component
+        _guid = Guid.NewGuid().ToString("N");
+        _fileinputid = "FileInput_" + _guid;
+        _progressinfoid = "ProgressInfo_" + _guid;
+        _progressbarid = "ProgressBar_" + _guid;
 
-	private async Task GetFiles()
-	{
-		_haseditpermission = false;
-		if (Folder == Constants.PackagesFolder)
-		{
-			_haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
-			_files = new List<File>();
-		}
-		else
-		{
-			Folder folder = _folders.FirstOrDefault(item => item.FolderId == FolderId);
-			if (folder != null)
-			{
-				_haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.Permissions);
-				_files = await FileService.GetFilesAsync(FolderId);
-			}
-			else
-			{
-				_haseditpermission = false;
-				_files = new List<File>();
-			}
-		}
-		if (_filter != "*")
-		{
-			List<File> filtered = new List<File>();
-			foreach (File file in _files)
-			{
-				if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
-				{
-					filtered.Add(file);
-				}
-			}
-			_files = filtered;
-		}
-	}
+        _initialized = true;
+    }
 
-	private async Task FolderChanged(ChangeEventArgs e)
-	{
-		_message = string.Empty;
-		try
-		{
-			FolderId = int.Parse((string)e.Value);
-			await GetFiles();
-			FileId = -1;
-			_file = null;
-			_image = string.Empty;
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-			_message = Localizer["Error.File.Load"];
-			_messagetype = MessageType.Error;
-		}
-	}
+    private async Task GetFiles()
+    {
+        _haseditpermission = false;
+        if (Folder == Constants.PackagesFolder)
+        {
+            _haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
+            _files = new List<File>();
+        }
+        else
+        {
+            Folder folder = _folders.FirstOrDefault(item => item.FolderId == FolderId);
+            if (folder != null)
+            {
+                _haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.PermissionList);
+                _files = await FileService.GetFilesAsync(FolderId);
+            }
+            else
+            {
+                _haseditpermission = false;
+                _files = new List<File>();
+            }
+            if (_filter != "*")
+            {
+                List<File> filtered = new List<File>();
+                foreach (File file in _files)
+                {
+                    if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
+                    {
+                        filtered.Add(file);
+                    }
+                }
+                _files = filtered;
+            }
+        }
+    }
 
-	private async Task FileChanged(ChangeEventArgs e)
-	{
-		_message = string.Empty;
-		FileId = int.Parse((string)e.Value);
-		if (FileId != -1)
-		{
-			await OnSelect.InvokeAsync(FileId);
-		}
+    private async Task FolderChanged(ChangeEventArgs e)
+    {
+        _message = string.Empty;
+        try
+        {
+            FolderId = int.Parse((string)e.Value);
+            await GetFiles();
+            FileId = -1;
+            _file = null;
+            _image = string.Empty;
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
+            _message = Localizer["Error.File.Load"];
+            _messagetype = MessageType.Error;
+        }
+    }
 
-		await SetImage();
-		StateHasChanged();
-	}
+    private async Task FileChanged(ChangeEventArgs e)
+    {
+        _message = string.Empty;
+        FileId = int.Parse((string)e.Value);
+        if (FileId != -1)
+        {
+            await OnSelect.InvokeAsync(FileId);
+        }
 
-	private async Task SetImage()
-	{
-		_image = string.Empty;
-		_file = null;
-		if (FileId != -1)
-		{
-			_file = await FileService.GetFileAsync(FileId);
-			if (_file != null && ShowImage && _file.ImageHeight != 0 && _file.ImageWidth != 0)
-			{
-				var maxwidth = 200;
-				var maxheight = 200;
+        await SetImage();
+        StateHasChanged();
+    }
 
-				var ratioX = (double)maxwidth / (double)_file.ImageWidth;
-				var ratioY = (double)maxheight / (double)_file.ImageHeight;
-				var ratio = ratioX < ratioY ? ratioX : ratioY;
+    private async Task SetImage()
+    {
+        _image = string.Empty;
+        _file = null;
+        if (FileId != -1)
+        {
+            _file = await FileService.GetFileAsync(FileId);
+            if (_file != null && ShowImage && _file.ImageHeight != 0 && _file.ImageWidth != 0)
+            {
+                var maxwidth = 200;
+                var maxheight = 200;
 
-				_image = "<img src=\"" + _file.Url + "\" alt=\"" + _file.Name +
-							"\" width=\"" + Convert.ToInt32(_file.ImageWidth * ratio).ToString() +
-							"\" height=\"" + Convert.ToInt32(_file.ImageHeight * ratio).ToString() + "\" />";
-			}
-		}
-	}
+                var ratioX = (double)maxwidth / (double)_file.ImageWidth;
+                var ratioY = (double)maxheight / (double)_file.ImageHeight;
+                var ratio = ratioX < ratioY ? ratioX : ratioY;
 
-	private async Task UploadFiles()
-	{
-		_message = string.Empty;
-		var interop = new Interop(JSRuntime);
-		var uploads = await interop.GetFiles(_fileinputid);
-		if (uploads.Length > 0)
-		{
-			string restricted = "";
-			foreach (var upload in uploads)
-			{
-				var extension = (upload.LastIndexOf(".") != -1) ? upload.Substring(upload.LastIndexOf(".") + 1) : "";
-				if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower()))
-				{
-					restricted += (restricted == "" ? "" : ",") + extension;
-				}
-			}
-			if (restricted == "")
-			{
-				try
-				{
-					// upload the files
-					var posturl = Utilities.TenantUrl(PageState.Alias, "/api/file/upload");
-					var folder = (Folder == Constants.PackagesFolder) ? Folder : FolderId.ToString();
-					await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken);
+                _image = "<img src=\"" + _file.Url + "\" alt=\"" + _file.Name +
+                            "\" width=\"" + Convert.ToInt32(_file.ImageWidth * ratio).ToString() +
+                            "\" height=\"" + Convert.ToInt32(_file.ImageHeight * ratio).ToString() + "\" />";
+            }
+        }
+    }
 
-					// uploading is asynchronous so we need to wait for the uploads to complete
-					// note that this will only wait a maximum of 15 seconds which may not be long enough for very large file uploads
-					bool success = false;
-					int attempts = 0;
-					while (attempts < 5 && !success)
-					{
-						attempts += 1;
-						Thread.Sleep(1000 * attempts); // progressive retry 
+    private async Task UploadFiles()
+    {
+        _message = string.Empty;
+        var interop = new Interop(JSRuntime);
+        var uploads = await interop.GetFiles(_fileinputid);
+        if (uploads.Length > 0)
+        {
+            string restricted = "";
+            foreach (var upload in uploads)
+            {
+                var extension = (upload.LastIndexOf(".") != -1) ? upload.Substring(upload.LastIndexOf(".") + 1) : "";
+                if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower()))
+                {
+                    restricted += (restricted == "" ? "" : ",") + extension;
+                }
+            }
+            if (restricted == "")
+            {
+                try
+                {
+                    // upload the files
+                    var posturl = Utilities.TenantUrl(PageState.Alias, "/api/file/upload");
+                    var folder = (Folder == Constants.PackagesFolder) ? Folder : FolderId.ToString();
+                    await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken);
 
-						success = true;
-						List<File> files = await FileService.GetFilesAsync(folder);
-						if (files.Count > 0)
-						{
-							foreach (string upload in uploads)
-							{
-								if (!files.Exists(item => item.Name == upload))
-								{
-									success = false;
-								}
-							}
-						}
-					}
+                    // uploading is asynchronous so we need to wait for the uploads to complete
+                    // note that this will only wait a maximum of 15 seconds which may not be long enough for very large file uploads
+                    bool success = false;
+                    int attempts = 0;
+                    while (attempts < 5 && !success)
+                    {
+                        attempts += 1;
+                        Thread.Sleep(1000 * attempts); // progressive retry 
 
-					// reset progress indicators
-					await interop.SetElementAttribute(_guid + "ProgressInfo", "style", "display: none;");
-					await interop.SetElementAttribute(_guid + "ProgressBar", "style", "display: none;");
+                        success = true;
+                        List<File> files = await FileService.GetFilesAsync(folder);
+                        if (files.Count > 0)
+                        {
+                            foreach (string upload in uploads)
+                            {
+                                if (!files.Exists(item => item.Name == upload))
+                                {
+                                    success = false;
+                                }
+                            }
+                        }
+                    }
 
-					if (success)
-					{
-						await logger.LogInformation("File Upload Succeeded {Files}", uploads);
-						if (ShowSuccess)
-						{
-							_message = Localizer["Success.File.Upload"];
-							_messagetype = MessageType.Success;
-						}
-					}
-					else
-					{
-						await logger.LogInformation("File Upload Failed Or Is Still In Progress {Files}", uploads);
-						_message = Localizer["Error.File.Upload"];
-						_messagetype = MessageType.Error;
-					}
+                    // reset progress indicators
+                    await interop.SetElementAttribute(_guid + "ProgressInfo", "style", "display: none;");
+                    await interop.SetElementAttribute(_guid + "ProgressBar", "style", "display: none;");
 
-					// set FileId to first file in upload collection
-					await GetFiles();
-					var file = _files.Where(item => item.Name == uploads[0]).FirstOrDefault();
-					if (file != null)
-					{
-						FileId = file.FileId;
-						await SetImage();
-						await OnUpload.InvokeAsync(FileId);
-					}
-					StateHasChanged();
+                    if (success)
+                    {
+                        await logger.LogInformation("File Upload Succeeded {Files}", uploads);
+                        if (ShowSuccess)
+                        {
+                            _message = Localizer["Success.File.Upload"];
+                            _messagetype = MessageType.Success;
+                        }
+                    }
+                    else
+                    {
+                        await logger.LogInformation("File Upload Failed Or Is Still In Progress {Files}", uploads);
+                        _message = Localizer["Error.File.Upload"];
+                        _messagetype = MessageType.Error;
+                    }
+
+                    if (Folder == Constants.PackagesFolder)
+                    {
+                        await OnUpload.InvokeAsync(-1);
+                    }
+                    else
+                    {
+                        // set FileId to first file in upload collection
+                        await GetFiles();
+                        var file = _files.Where(item => item.Name == uploads[0]).FirstOrDefault();
+                        if (file != null)
+                        {
+                            FileId = file.FileId;
+                            await SetImage();
+                            await OnUpload.InvokeAsync(FileId);
+                        }
+                        StateHasChanged();
+                    }
 				}
 				catch (Exception ex)
 				{

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -1,4 +1,5 @@
 @namespace Oqtane.Modules.Controls
+@using System.Text.Json
 @inherits ModuleControlBase
 @inject IRoleService RoleService
 @inject IUserService UserService
@@ -15,20 +16,19 @@
                 <tbody>
                     <tr>
                         <th scope="col">@Localizer["Role"]</th>
-                        @foreach (PermissionString permission in _permissions)
+                        @foreach (var permissionname in _permissionnames)
                         {
-							<th style="text-align: center; width: 1px;">@((MarkupString)GetPermissionName(permission).Replace(" ", "<br />"))</th>
+							<th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
 						}
                     </tr>
                     @foreach (Role role in _roles)
                     {
                         <tr>
                             <td>@role.Name</td>
-                            @foreach (PermissionString permission in _permissions)
+                            @foreach (var permissionname in _permissionnames)
                             {
-                                var p = permission;
                                 <td style="text-align: center;">
-									<TriStateCheckBox Value=@GetPermissionValue(p.Permissions, role.Name) Disabled="@GetPermissionDisabled(p.EntityName, p.PermissionName, role.Name)" OnChange="@(e => PermissionChanged(e, p.EntityName, p.PermissionName, role.Name))" />
+									<TriStateCheckBox Value=@GetPermissionValue(permissionname, role.Name, -1) Disabled="@GetPermissionDisabled(permissionname, role.Name)" OnChange="@(e => PermissionChanged(e, permissionname, role.Name, -1))" />
                                 </td>
                             }
                         </tr>
@@ -50,23 +50,21 @@
                     <thead>
                         <tr>
                             <th scope="col">@Localizer["User"]</th>
-                            @foreach (PermissionString permission in _permissions)
-                            {
-                                <th style="text-align: center; width: 1px;">@Localizer[permission.PermissionName]</th>
-                            }
-                        </tr>
+								@foreach (var permissionname in _permissionnames)
+								{
+									<th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
+								}
+							</tr>
                     </thead>
                     <tbody>
                         @foreach (User user in _users)
                         {
-                            string userid = "[" + user.UserId.ToString() + "]";
                             <tr>
                                 <td>@user.DisplayName</td>
-                                @foreach (PermissionString permission in _permissions)
+                                @foreach (var permissionname in _permissionnames)
                                 {
-                                    var p = permission;
                                     <td style="text-align: center; width: 1px;">
-										<TriStateCheckBox Value=@GetPermissionValue(p.Permissions, userid) Disabled="@GetPermissionDisabled(p.EntityName, p.PermissionName, "")" OnChange="@(e => PermissionChanged(e, p.EntityName, p.PermissionName, userid))" />
+										<TriStateCheckBox Value=@GetPermissionValue(permissionname, "", user.UserId) Disabled="@GetPermissionDisabled(permissionname, "")" OnChange="@(e => PermissionChanged(e, permissionname, "", user.UserId))" />
                                     </td>
                                 }
                             </tr>
@@ -94,9 +92,9 @@
 }
 
 @code {
-	private string _permissionnames = string.Empty;
+	private List<string> _permissionnames;
+	private List<Permission> _permissions;
 	private List<Role> _roles;
-	private List<PermissionString> _permissions;
 	private List<User> _users = new List<User>();
 	private AutoComplete _user;
 	private string _message = string.Empty;
@@ -108,17 +106,16 @@
 	public string PermissionNames { get; set; }
 
 	[Parameter]
-	public string Permissions { get; set; }
+	public string Permissions { get; set; } // deprecated - use PermissionList instead
+
+	[Parameter]
+	public List<Permission> PermissionList { get; set; }
 
 	protected override async Task OnInitializedAsync()
 	{
-		if (string.IsNullOrEmpty(PermissionNames))
+		if (!string.IsNullOrEmpty(Permissions))
 		{
-			_permissionnames = Shared.PermissionNames.View + "," + Shared.PermissionNames.Edit;
-		}
-		else
-		{
-			_permissionnames = PermissionNames;
+			PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);			
 		}
 
 		_roles = await RoleService.GetRolesAsync(ModuleState.SiteId, true);
@@ -127,88 +124,103 @@
 			_roles.RemoveAll(item => item.Name == RoleNames.Host);
 		}
 
-		_permissions = new List<PermissionString>();
-
-		foreach (string permissionname in _permissionnames.Split(',', StringSplitOptions.RemoveEmptyEntries))
+		// get permission names
+		if (string.IsNullOrEmpty(PermissionNames))
 		{
-			// permission names can be in the form of "EntityName:PermissionName:Roles"
-			if (permissionname.Contains(":"))
-			{
-				var segments = permissionname.Split(':');
-				if (segments.Length == 3)
-				{
-					if (!segments[2].Contains(RoleNames.Admin))
-					{
-						segments[2] = RoleNames.Admin + ";" + segments[2]; // ensure admin access
-					}
-					_permissions.Add(new PermissionString { EntityName = segments[0], PermissionName = segments[1], Permissions = segments[2] });
-				}
-			}
-			else
-			{
-				_permissions.Add(new PermissionString { EntityName = EntityName, PermissionName = permissionname, Permissions = RoleNames.Admin });
-			}
-		}
-
-		if (!string.IsNullOrEmpty(Permissions))
-		{
-			// populate permissions
-			foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
-			{
-				int index = _permissions.FindIndex(item => item.EntityName == permissionstring.EntityName && item.PermissionName == permissionstring.PermissionName);
-				if (index != -1)
-				{
-					_permissions[index].Permissions = permissionstring.Permissions;
-				}
-
-				if (permissionstring.Permissions.Contains("["))
-				{
-					foreach (string user in permissionstring.Permissions.Split('[', StringSplitOptions.RemoveEmptyEntries))
-					{
-						if (user.Contains("]"))
-						{
-							var userid = int.Parse(user.Substring(0, user.IndexOf("]")));
-							if (_users.Where(item => item.UserId == userid).FirstOrDefault() == null)
-							{
-								_users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId));
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private string GetPermissionName(PermissionString permission)
-	{
-		var permissionname = Localizer[permission.PermissionName].ToString();
-		if (!string.IsNullOrEmpty(EntityName))
-		{
-			permissionname += " " + Localizer[permission.EntityName].ToString();
-		}
-		return permissionname;
-	}
-
-	private bool? GetPermissionValue(string permissions, string securityKey)
-	{
-		if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
-		{
-			return false; // deny permission
+			_permissionnames = new List<string>();
+			_permissionnames.Add(Shared.PermissionNames.View);
+			_permissionnames.Add(Shared.PermissionNames.Edit);
 		}
 		else
 		{
-			if ((";" + permissions + ";").Contains(";" + securityKey + ";"))
+			_permissionnames = PermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries).ToList();
+		}
+
+		// initialize permissions
+		_permissions = new List<Permission>();
+		if (PermissionList != null && PermissionList.Any())
+		{
+			foreach (var permission in PermissionList)
 			{
-				return true; // grant permission
+				_permissions.Add(permission);
+				if (permission.UserId != null)
+				{
+					if (!_users.Any(item => item.UserId == permission.UserId.Value))
+					{
+						_users.Add(await UserService.GetUserAsync(permission.UserId.Value, ModuleState.SiteId));
+					}
+				}
 			}
-			else
+		}
+		else
+		{
+			foreach (string permissionname in _permissionnames)
 			{
-				return null; // not specified
+				// permission names can be in the form of "EntityName:PermissionName:Roles"
+				if (permissionname.Contains(":"))
+				{
+					var segments = permissionname.Split(':');
+					if (segments.Length == 3)
+					{
+						foreach (var role in segments[2].Split(';'))
+						{
+							_permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], role, null, true));
+						}
+						// ensure admin access
+						if (!_permissions.Any(item => item.EntityName == segments[0] && item.PermissionName == segments[1] && item.RoleName == RoleNames.Admin))
+						{
+							_permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], RoleNames.Admin, null, true));
+						}
+					}
+				}
+				else
+				{
+					_permissions.Add(new Permission(ModuleState.SiteId, EntityName, permissionname, RoleNames.Admin, null, true));
+				}
 			}
 		}
 	}
 
-	private bool GetPermissionDisabled(string entityName, string permissionName, string roleName)
+	private string GetPermissionName(string permissionName)
+	{
+		return (permissionName.Contains(":")) ? permissionName.Split(':')[1] : permissionName;
+	}
+
+	private string GetEntityName(string permissionName)
+	{
+		return (permissionName.Contains(":")) ? permissionName.Split(':')[0] : EntityName;
+	}
+
+	private string DisplayPermissionName(string permissionName)
+	{
+		var name = Localizer[GetPermissionName(permissionName)].ToString();
+		name += " " + Localizer[GetEntityName(permissionName)].ToString();
+		return name;
+	}
+
+	private bool? GetPermissionValue(string permissionName, string roleName, int userId)
+	{
+		bool? isauthorized = null;
+		if (roleName != "")
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
+			if (permission != null)
+			{
+				isauthorized = permission.IsAuthorized;
+			}
+		}
+		else
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
+			if (permission != null)
+			{
+				isauthorized = permission.IsAuthorized;
+			}			
+		}
+		return isauthorized;
+	}
+
+	private bool GetPermissionDisabled(string permissionName, string roleName)
 	{
 		if (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 		{
@@ -216,7 +228,7 @@
 		}
 		else
 		{
-			if (entityName != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+			if (GetEntityName(permissionName) != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
 			{
 				return true;
 			}
@@ -227,6 +239,34 @@
 		}
 	}
 
+	private void PermissionChanged(bool? value, string permissionName, string roleName, int userId)
+	{
+		if (roleName != "")
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
+			if (permission != null)
+			{
+				_permissions.Remove(permission);
+			}
+			if (value != null)
+			{
+				_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), roleName, null, value.Value));
+			}
+		}
+		else
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
+			if (permission != null)
+			{
+				_permissions.Remove(permission);
+			}
+			if (value != null)
+			{
+				_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), null, userId, value.Value));
+			}
+		}
+	}
+
 	private async Task<Dictionary<string, string>> GetUsers(string filter)
 	{
 		var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
@@ -251,62 +291,45 @@
 		_user.Clear();
 	}
 
-	private void PermissionChanged(bool? value, string entityName, string permissionName, string securityId)
-	{
-		var selected = value;
-		int index = _permissions.FindIndex(item => item.EntityName == entityName && item.PermissionName == permissionName);
-		if (index != -1)
-		{
-			var permission = _permissions[index];
-
-			var ids = permission.Permissions.Split(';').ToList();
-			ids.Remove(securityId); // remove grant permission
-			ids.Remove("!" + securityId); // remove deny permission
-
-			switch (selected)
-			{
-				case true:
-					ids.Add(securityId); // add grant permission
-					break;
-				case false:
-					ids.Add("!" + securityId); // add deny permission
-					break;
-				case null:
-					break; // permission not specified
-			}
-
-			_permissions[index].Permissions = string.Join(";", ids.ToArray());
-		}
-	}
-
 	public string GetPermissions()
 	{
 		ValidatePermissions();
-		return UserSecurity.SetPermissionStrings(_permissions);
+		return JsonSerializer.Serialize(_permissions);
+	}
+
+	public List<Permission> GetPermissionList()
+	{
+		ValidatePermissions();
+		return _permissions;
 	}
 
 	private void ValidatePermissions()
 	{
-		PermissionString permission;
-		for (int index = 0; index < _permissions.Count; index++)
+		// remove deny all users, unauthenticated, and registered users
+		var permissions = _permissions.Where(item => !item.IsAuthorized && 
+			(item.RoleName == RoleNames.Everyone || item.RoleName == RoleNames.Unauthenticated || item.RoleName == RoleNames.Registered)).ToList();
+		foreach (var permission in permissions)
 		{
-			permission = _permissions[index];
-			List<string> ids = permission.Permissions.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
-			ids.Remove("!" + RoleNames.Everyone); // remove deny all users
-			ids.Remove("!" + RoleNames.Unauthenticated); // remove deny unauthenticated
-			ids.Remove("!" + RoleNames.Registered); // remove deny registered users
-			if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			_permissions.Remove(permission);
+		}
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			// remove deny administrators and host users
+			permissions = _permissions.Where(item => !item.IsAuthorized &&
+				(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)).ToList();
+			foreach (var permission in permissions)
 			{
-				ids.Remove("!" + RoleNames.Admin); // remove deny administrators
-				ids.Remove("!" + RoleNames.Host); // remove deny host users
-				if (!ids.Contains(RoleNames.Host) && !ids.Contains(RoleNames.Admin))
+				_permissions.Remove(permission);
+			}
+			foreach (var permissionname in _permissionnames)
+			{
+				// add administrators role if neither host or administrator is assigned
+				if (!_permissions.Any(item => item.EntityName == GetEntityName(permissionname) && item.PermissionName == GetPermissionName(permissionname) &&
+					(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)))
 				{
-					// add administrators role if host user role is not assigned
-					ids.Add(RoleNames.Admin);				
+					_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionname), GetPermissionName(permissionname), RoleNames.Admin, null, true));
 				}
 			}
-			permission.Permissions = string.Join(";", ids.ToArray());
-            _permissions[index] = permission;
-        }
+		}
     }
 }

Oqtane.Client/Modules/Controls/TabStrip.razor

@@ -93,10 +93,10 @@
                 authorized = true;
                 break;
             case SecurityAccessLevel.View:
-                authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, ModuleState.Permissions);
+                authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, ModuleState.PermissionList);
                 break;
             case SecurityAccessLevel.Edit:
-                authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions);
+                authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.PermissionList);
                 break;
             case SecurityAccessLevel.Admin:
                 authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);

Oqtane.Client/Modules/ModuleBase.cs

@@ -190,12 +190,7 @@ namespace Oqtane.Modules
 
         public string AddUrlParameters(params object[] parameters)
         {
-            var url = "";
-            for (var i = 0; i < parameters.Length; i++)
-            {
-                url += "/" + parameters[i].ToString();
-            }
-            return url;
+            return Utilities.AddUrlParameters(parameters);
         }
 
         // template is in the form of a standard route template ie. "/{id}/{name}" and produces dictionary of key/value pairs

Oqtane.Client/Oqtane.Client.csproj

@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.3.0</Version>
+    <Version>3.4.3</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -13,7 +13,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>

Oqtane.Client/Program.cs

@@ -198,23 +198,37 @@ namespace Oqtane.Client
         private static void RegisterModuleServices(Assembly assembly, IServiceCollection services)
         {
             // dynamically register module scoped services
-            var implementationTypes = assembly.GetInterfaces<IService>();
-            foreach (var implementationType in implementationTypes)
+            try
             {
-                if (implementationType.AssemblyQualifiedName != null)
+                var implementationTypes = assembly.GetInterfaces<IService>();
+                foreach (var implementationType in implementationTypes)
                 {
-                    var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
-                    services.AddScoped(serviceType ?? implementationType, implementationType);
+                    if (implementationType.AssemblyQualifiedName != null)
+                    {
+                        var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
+                        services.AddScoped(serviceType ?? implementationType, implementationType);
+                    }
                 }
             }
+            catch
+            {
+                // could not interrogate assembly - likely missing dependencies
+            }
         }
 
         private static void RegisterClientStartups(Assembly assembly, IServiceCollection services)
         {
-            var startUps = assembly.GetInstances<IClientStartup>();
-            foreach (var startup in startUps)
+            try
             {
-                startup.ConfigureServices(services);
+                var startUps = assembly.GetInstances<IClientStartup>();
+                foreach (var startup in startUps)
+                {
+                    startup.ConfigureServices(services);
+                }
+            }
+            catch
+            {
+                // could not interrogate assembly - likely missing dependencies
             }
         }
 

Oqtane.Client/Resources/Installer/Installer.resx

@@ -172,7 +172,7 @@
     <value>Enter a complete connection string including all parameters and delimiters</value>
   </data>
   <data name="ConnectionString.Text" xml:space="preserve">
-    <value>String:</value>
+    <value>Settings:</value>
   </data>
   <data name="EnterConnectionParameters" xml:space="preserve">
     <value>Enter Connection Parameters</value>

Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -193,6 +193,6 @@
     <value>Execute Once</value>
   </data>
   <data name="Message.NoJobs" xml:space="preserve">
-    <value>Please Note That After An Initial Installation You Must &amp;lt;a href={0}&amp;gt;Restart&amp;lt;/a&amp;gt; The Application In Order To Activate The Default Scheduled Jobs.</value>
+    <value>Please Note That After An Initial Installation You Must &lt;a href={0}&gt;Restart&lt;/a&gt; The Application In Order To Activate The Default Scheduled Jobs.</value>
   </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx

@@ -120,29 +120,23 @@
   <data name="Error.Language.Add" xml:space="preserve">
     <value>Error Adding Language</value>
   </data>
-  <data name="Translated.HelpText" xml:space="preserve">
-    <value>Specify If You Wish To Select Languages That Have Translations Installed</value>
-  </data>
   <data name="Name.HelpText" xml:space="preserve">
     <value>Name Of The Langauage</value>
   </data>
   <data name="IsDefault.HelpText" xml:space="preserve">
     <value>Indicates Whether Or Not This Language Is The Default For The Site</value>
   </data>
-  <data name="Translated.Text" xml:space="preserve">
-    <value>Translated?</value>
-  </data>
   <data name="Name.Text" xml:space="preserve">
     <value>Name:</value>
   </data>
   <data name="IsDefault.Text" xml:space="preserve">
     <value>Default?</value>
   </data>
-  <data name="Success.Language.Install" xml:space="preserve">
-    <value>Translations Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+  <data name="Success.Language.Download" xml:space="preserve">
+    <value>Translation Package Saved Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; To Complete The Installation.</value>
   </data>
   <data name="LanguageUpload.HelpText" xml:space="preserve">
-    <value>Upload one or more translation packages. Once they are uploaded click Install to complete the installation.</value>
+    <value>Upload one or more translation packages.</value>
   </data>
   <data name="LanguageUpload.Text" xml:space="preserve">
     <value>Translation</value>

Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx

@@ -132,12 +132,12 @@
   <data name="DeleteLanguage.Header" xml:space="preserve">
     <value>Delete Language</value>
   </data>
+  <data name="Success.Language.Download" xml:space="preserve">
+    <value>Translation Package Saved Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Complete The Installation.</value>
+  </data>
   <data name="Error.Language.Download" xml:space="preserve">
     <value>Error Downloading Translation</value>
   </data>
-  <data name="Success.Language.Install" xml:space="preserve">
-    <value>Translation Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
-  </data>
   <data name="Default" xml:space="preserve">
     <value>Default</value>
   </data>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx

@@ -123,17 +123,14 @@
   <data name="Error.Package.Load" xml:space="preserve">
     <value>Error Loading Packages</value>
   </data>
-  <data name="Success.Module.Install" xml:space="preserve">
-    <value>Module Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
-  </data>
   <data name="Success.Module.Download" xml:space="preserve">
-    <value>Module Downloaded Successfully. Click Install To Complete Installation.</value>
+    <value>Module Package Saved Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Complete The Installation.</value>
   </data>
   <data name="Error.Module.Download" xml:space="preserve">
     <value>Error Downloading Module</value>
   </data>
   <data name="Module.HelpText" xml:space="preserve">
-    <value>Upload one or more module packages. Once they are uploaded click Install to complete the installation.</value>
+    <value>Upload one or more module packages.</value>
   </data>
   <data name="Search.NoResults" xml:space="preserve">
     <value>No Modules Match The Criteria Provided Or Package Service Is Disabled</value>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx

@@ -211,12 +211,12 @@
     <value>No Translations Exist For This Module Or Package Service Is Disabled</value>
   </data>
   <data name="Success.Translation.Download" xml:space="preserve">
-    <value>Translation Downloaded Successfully. Click Install To Complete Installation.</value>
-  </data>
-  <data name="Success.Translation.Install" xml:space="preserve">
-    <value>Translation Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Translation Package Saved Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Complete The Installation.</value>
   </data>
   <data name="Translations.Heading" xml:space="preserve">
     <value>Translations</value>
   </data>
+  <data name="Message.DuplicateName" xml:space="preserve">
+    <value>A Module With The Name Specified Already Exists</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Register/Index.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -166,7 +166,7 @@
     <value>Email:</value>
   </data>
   <data name="Password.HelpText" xml:space="preserve">
-    <value>Please choose a sufficiently secure password and enter it here</value>
+    <value>Please enter a sufficiently secure password which meets the password complexity requirements</value>
   </data>
   <data name="Password.Text" xml:space="preserve">
     <value>Password:</value>
@@ -177,4 +177,19 @@
   <data name="Username.Text" xml:space="preserve">
     <value>Username:</value>
   </data>
+  <data name="Password.ValidationCriteria" xml:space="preserve">
+    <value>Passwords Must Have A Minimum Length Of {0} Characters, Including At Least {1} Unique Character(s), {2}{3}{4}{5} To Satisfy Password Compexity Requirements For This Site.</value>
+  </data>
+  <data name="Password.DigitRequirement" xml:space="preserve">
+    <value>At Least One Digit</value>
+  </data>
+  <data name="Password.LowercaseRequirement" xml:space="preserve">
+    <value>At Least One Lowercase Letter</value>
+  </data>
+  <data name="Password.PunctuationRequirement" xml:space="preserve">
+    <value>At Least One Punctuation Mark</value>
+  </data>
+  <data name="Password.UppercaseRequirement" xml:space="preserve">
+    <value>At Least One Uppercase Letter</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Site/Index.resx

@@ -163,7 +163,7 @@
     <value>Enter the site name</value>
   </data>
   <data name="Tenant.HelpText" xml:space="preserve">
-    <value>Enter the tenant for the site</value>
+    <value>The name of the database used for the site</value>
   </data>
   <data name="Aliases.HelpText" xml:space="preserve">
     <value>The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder).</value>
@@ -214,7 +214,7 @@
     <value>Include a splash icon for your PWA. It should be a PNG which is 512 X 512 pixels in dimension.</value>
   </data>
   <data name="Tenant.Text" xml:space="preserve">
-    <value>Tenant: </value>
+    <value>Database: </value>
   </data>
   <data name="Aliases.Text" xml:space="preserve">
     <value>Aliases: </value>
@@ -292,7 +292,7 @@
     <value>Browse</value>
   </data>
   <data name="TenantInformation.Heading" xml:space="preserve">
-    <value>Tenant Information</value>
+    <value>Database</value>
   </data>
   <data name="PWASettings.Heading" xml:space="preserve">
     <value>PWA Settings</value>
@@ -304,13 +304,13 @@
     <value>Connection:</value>
   </data>
   <data name="Database.Text" xml:space="preserve">
-    <value>Database:</value>
+    <value>Type:</value>
   </data>
   <data name="ConnectionString.HelpText" xml:space="preserve">
     <value>The connection information for the database</value>
   </data>
   <data name="Database.HelpText" xml:space="preserve">
-    <value>The database for the tenant</value>
+    <value>The type of database</value>
   </data>
   <data name="DeleteSite.Text" xml:space="preserve">
     <value>Delete Site</value>
@@ -345,4 +345,10 @@
   <data name="SmtpRelay.Text" xml:space="preserve">
     <value>Relay Configured?</value>
   </data>
+  <data name="SiteMap.HelpText" xml:space="preserve">
+    <value>The site map url for this site which can be submitted to search engines for indexing</value>
+  </data>
+  <data name="SiteMap.Text" xml:space="preserve">
+    <value>Site Map:</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx

@@ -123,9 +123,6 @@
   <data name="SqlServer" xml:space="preserve">
     <value>SQL Server</value>
   </data>
-  <data name="Server.Text" xml:space="preserve">
-    <value>Server: </value>
-  </data>
   <data name="Container.Select" xml:space="preserve">
     <value>Select Container</value>
   </data>
@@ -145,7 +142,7 @@
     <value>Select the default container for the site</value>
   </data>
   <data name="Tenant.Text" xml:space="preserve">
-    <value>Tenant: </value>
+    <value>Database: </value>
   </data>
   <data name="Aliases.Text" xml:space="preserve">
     <value>Aliases: </value>
@@ -157,10 +154,10 @@
     <value>Select Site Template</value>
   </data>
   <data name="Tenant.Select" xml:space="preserve">
-    <value>Select Tenant</value>
+    <value>Select Database</value>
   </data>
   <data name="Tenant.Add" xml:space="preserve">
-    <value>Create New Tenant</value>
+    <value>Create Database</value>
   </data>
   <data name="Error.Theme.LoadContainers" xml:space="preserve">
     <value>Error Loading Containers For Theme</value>
@@ -172,19 +169,19 @@
     <value>Invalid Host Password</value>
   </data>
   <data name="Error.TenantName.Exists" xml:space="preserve">
-    <value>Tenant Name Is Missing Or Already Exists</value>
+    <value>Database Name Is Missing Or Already Exists</value>
   </data>
   <data name="Message.SiteName.InUse" xml:space="preserve">
     <value>{0} Already Used For Another Site</value>
   </data>
   <data name="Message.Required.Tenant" xml:space="preserve">
-    <value>You Must Provide A Tenant, Site Name, Alias, Default Theme/Container, And Site Template</value>
+    <value>You Must Provide A Database, Site Name, Alias, Default Theme/Container, And Site Template</value>
   </data>
   <data name="Name.HelpText" xml:space="preserve">
     <value>Enter the name of the site</value>
   </data>
   <data name="DefaultTheme.HelpText" xml:space="preserve">
-    <value>Select the default theme for the website</value>
+    <value>Select the default theme for the site</value>
   </data>
   <data name="AdminContainer.HelpText" xml:space="preserve">
     <value>Select the admin container for the site</value>
@@ -193,28 +190,13 @@
     <value>Select the site template</value>
   </data>
   <data name="Tenant.HelpText" xml:space="preserve">
-    <value>Select the tenant for the site</value>
+    <value>Select the database for the site</value>
   </data>
   <data name="TenantName.HelpText" xml:space="preserve">
-    <value>Enter the name for the tenant</value>
+    <value>Enter the name for the database</value>
   </data>
   <data name="DatabaseType.HelpText" xml:space="preserve">
-    <value>Select the database type for the tenant</value>
-  </data>
-  <data name="DatabaseServer.HelpText" xml:space="preserve">
-    <value>Enter the server for the tenant</value>
-  </data>
-  <data name="Database.HelpText" xml:space="preserve">
-    <value>Enter the database for the tenant</value>
-  </data>
-  <data name="IntegratedSecurity.HelpText" xml:space="preserve">
-    <value>Select if you want integrated security or not</value>
-  </data>
-  <data name="DatabaseUsername.HelpText" xml:space="preserve">
-    <value>Enter the username for the integrated security</value>
-  </data>
-  <data name="DatabasePassword.HelpText" xml:space="preserve">
-    <value>Enter the password for the integrated security</value>
+    <value>Select the database type</value>
   </data>
   <data name="HostUsername.HelpText" xml:space="preserve">
     <value>Enter the username of an existing host user</value>
@@ -232,23 +214,14 @@
     <value>Site Template: </value>
   </data>
   <data name="TenantName.Text" xml:space="preserve">
-    <value>Tenant Name: </value>
+    <value>Name: </value>
   </data>
   <data name="DatabaseType.Text" xml:space="preserve">
-    <value>Database Type: </value>
+    <value>Type: </value>
   </data>
   <data name="Database.Text" xml:space="preserve">
     <value>Database: </value>
   </data>
-  <data name="IntegratedSecurity.Text" xml:space="preserve">
-    <value>Integrated Security: </value>
-  </data>
-  <data name="DatabaseUsername.Text" xml:space="preserve">
-    <value>Database Username: </value>
-  </data>
-  <data name="DatabasePassword.Text" xml:space="preserve">
-    <value>Database Password: </value>
-  </data>
   <data name="HostUsername.Text" xml:space="preserve">
     <value>Host Username:</value>
   </data>
@@ -274,7 +247,7 @@
     <value>Enter a complete connection string including all parameters and delimiters</value>
   </data>
   <data name="ConnectionString.Text" xml:space="preserve">
-    <value>String:</value>
+    <value>Settings:</value>
   </data>
   <data name="EnterConnectionParameters" xml:space="preserve">
     <value>Enter Connection Parameters</value>

Oqtane.Client/Resources/Modules/Admin/Sql/Index.resx

@@ -117,30 +117,75 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Connection.Text" xml:space="preserve">
+    <value>Connection: </value>
+  </data>
+  <data name="Connection.HelpText" xml:space="preserve">
+    <value>Select a database connection (from appsettings.json)</value>
+  </data>
+  <data name="Connection.Select" xml:space="preserve">
+    <value>Select Connection</value>
+  </data>
+  <data name="Connection.Add" xml:space="preserve">
+    <value>Add Connection</value>
+  </data>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Enter the name of the connection</value>
+  </data>
+  <data name="DatabaseType.Text" xml:space="preserve">
+    <value>Type: </value>
+  </data>
+  <data name="DatabaseType.HelpText" xml:space="preserve">
+    <value>Select the database type</value>
+  </data>
+  <data name="Type.Select" xml:space="preserve">
+    <value>Select Type</value>
+  </data>
+  <data name="EnterConnectionParameters" xml:space="preserve">
+    <value>Enter Connection Parameters</value>
+  </data>
+  <data name="EnterConnectionString" xml:space="preserve">
+    <value>Enter Connection String</value>
+  </data>
+  <data name="ConnectionString.Text" xml:space="preserve">
+    <value>Settings: </value>
+  </data>
+  <data name="ConnectionString.HelpText" xml:space="preserve">
+    <value>A complete connection string including all parameters and delimiters</value>
+  </data>
+  <data name="Add" xml:space="preserve">
+    <value>Add</value>
+  </data>
   <data name="Tenant.Text" xml:space="preserve">
-    <value>Tenant: </value>
-  </data>
-  <data name="Tenant.Select" xml:space="preserve">
-    <value>Select Tenant</value>
-  </data>
-  <data name="Execute" xml:space="preserve">
-    <value>Execute</value>
-  </data>
-  <data name="Message.Required.Tenant" xml:space="preserve">
-    <value>You Must Select A Tenant And Provide A Valid SQL Query</value>
-  </data>
-  <data name="Return.NoResult" xml:space="preserve">
-    <value>No Results Returned</value>
+    <value>Database: </value>
   </data>
   <data name="Tenant.HelpText" xml:space="preserve">
-    <value>Select the tenant associated with the database server</value>
-  </data>
-  <data name="SqlQuery.HelpText" xml:space="preserve">
-    <value>Enter the SQL query for the database server</value>
+    <value>The database using this connection</value>
   </data>
   <data name="SqlQuery.Text" xml:space="preserve">
     <value>SQL Query: </value>
   </data>
+  <data name="SqlQuery.HelpText" xml:space="preserve">
+    <value>Enter a valid SQL query for the database</value>
+  </data>
+    <data name="Execute" xml:space="preserve">
+    <value>Execute</value>
+  </data>
+  <data name="Message.Required.Tenant" xml:space="preserve">
+    <value>You Must Select A Database Type And Provide A Valid SQL Query</value>
+  </data>
+  <data name="Message.Required.Connection" xml:space="preserve">
+    <value>You Must Provide A Connection Name And Settings</value>
+  </data>
+  <data name="Message.Connection.Added" xml:space="preserve">
+    <value>Connection Added Successfully</value>
+  </data>
+  <data name="Return.NoResult" xml:space="preserve">
+    <value>No Results Returned</value>
+  </data>
   <data name="Success.QueryExecuted" xml:space="preserve">
     <value>SQL Query Executed</value>
   </data>

Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx

@@ -285,4 +285,13 @@
   <data name="Log.HelpText" xml:space="preserve">
     <value>System log information for current day</value>
   </data>
+  <data name="Clear" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="Success.ClearLog" xml:space="preserve">
+    <value>System Log Has Been Successfully Cleared</value>
+  </data>
+  <data name="Error.ClearLog" xml:space="preserve">
+    <value>Ann Error Occurred Clearing The System Log</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx

@@ -123,17 +123,14 @@
   <data name="Theme.Text" xml:space="preserve">
     <value>Theme: </value>
   </data>
-  <data name="Success.Theme.Install" xml:space="preserve">
-    <value>Theme Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
-  </data>
   <data name="Success.Theme.Download" xml:space="preserve">
-    <value>Theme Downloaded Successfully. Click Install To Complete Installation.</value>
+    <value>Theme Package Saved Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Complete The Installation.</value>
   </data>
   <data name="Error.Theme.Download" xml:space="preserve">
     <value>Error Downloading Theme</value>
   </data>
   <data name="Theme.HelpText" xml:space="preserve">
-    <value>Upload one or more theme packages. Once they are uploaded click Install to complete the installation.</value>
+    <value>Upload one or more theme packages.</value>
   </data>
   <data name="Search.NoResults" xml:space="preserve">
     <value>No Themes Match The Criteria Provided Or Package Service Is Disabled</value>

Oqtane.Client/Resources/Modules/Admin/Users/Index.resx

@@ -387,7 +387,13 @@
   <data name="RoleClaimType.HelpText" xml:space="preserve">
     <value>Optionally provide the name of the role claim provided by the identity provider. These roles will be used in addition to any internal user roles assigned within the site.</value>
   </data>
-    <data name="RoleClaimType.Text" xml:space="preserve">
-    <value>Role Claim Type:</value>
+  <data name="RoleClaimType.Text" xml:space="preserve">
+    <value>Role Claim:</value>
+  </data>
+    <data name="ProfileClaimTypes.HelpText" xml:space="preserve">
+    <value>Optionally provide a comma delimited list of user profile claims provided by the identity provider, as well as mappings to your user profile definition. For example if the identity provider includes a 'given_name' claim and you have a 'FirstName' user profile definition you should specify 'given_name:FirstName'.</value>
+  </data>
+  <data name="ProfileClaimTypes.Text" xml:space="preserve">
+    <value>User Profile Claims:</value>
   </data>
 </root>

Oqtane.Client/Resources/SharedResources.resx

@@ -340,6 +340,48 @@
     <value>Visitor Management</value>
   </data>
   <data name="Oqtane.Marketplace" xml:space="preserve">
-    <value>Please note that the third party extensions displayed above have been registered in the &lt;a href="https://www.oqtane.net" target="_new"&gt;Oqtane Marketplace&lt;/a&gt; which enables them to be seamlessly downloaded and installed into the framework.</value>
+    <value>Please note that third party extensions are registered in the &lt;a href="https://www.oqtane.net" target="_new"&gt;Oqtane Marketplace&lt;/a&gt; which enables them to be seamlessly downloaded and installed into the framework.</value>
+  </data>
+  <data name="Home" xml:space="preserve">
+  <value>Home</value>
+  </data>
+  <data name="Close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="OK" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="Apply" xml:space="preserve">
+    <value>Apply</value>
+  </data>
+  <data name="Select" xml:space="preserve">
+    <value>Select</value>
+  </data>
+  <data name="Next" xml:space="preserve">
+    <value>Next</value>
+  </data>
+  <data name="Previous" xml:space="preserve">
+    <value>Previous</value>
+  </data>
+  <data name="Submit" xml:space="preserve">
+    <value>Submit</value>
+  </data>
+  <data name="Refresh" xml:space="preserve">
+    <value>Refresh</value>
+  </data>
+  <data name="Back" xml:space="preserve">
+    <value>Back</value>
+  </data>
+  <data name="Return" xml:space="preserve">
+    <value>Return</value>
+  </data>
+  <data name="New" xml:space="preserve">
+    <value>New</value>
+  </data>
+  <data name="View" xml:space="preserve">
+    <value>View</value>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Confirm</value>
   </data>
 </root>

Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs

@@ -33,13 +33,6 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task UpdateModuleDefinitionAsync(ModuleDefinition moduleDefinition);
 
-
-        /// <summary>
-        /// Installs all module definitions located in //TODO: 2dm where?
-        /// </summary>
-        /// <returns></returns>
-        Task InstallModuleDefinitionsAsync();
-
         /// <summary>
         /// Deletes a module definition
         /// </summary>

Oqtane.Client/Services/Interfaces/ISettingService.cs

@@ -62,7 +62,7 @@ namespace Oqtane.Services
         /// <summary>
         /// Returns a key-value dictionary of all page module settings for the given page module
         /// </summary>
-        /// <param name="pageId"></param>
+        /// <param name="pageModuleId"></param>
         /// <returns></returns>
         Task<Dictionary<string, string>> GetPageModuleSettingsAsync(int pageModuleId);
 
@@ -107,7 +107,7 @@ namespace Oqtane.Services
         /// <summary>
         /// Returns a key-value dictionary of all user settings for the given user
         /// </summary>
-        /// <param name="pageId"></param>
+        /// <param name="userId"></param>
         /// <returns></returns>
         Task<Dictionary<string, string>> GetUserSettingsAsync(int userId);
 
@@ -122,7 +122,7 @@ namespace Oqtane.Services
         /// <summary>
         /// Returns a key-value dictionary of all folder settings for the given folder
         /// </summary>
-        /// <param name="pageId"></param>
+        /// <param name="folderId"></param>
         /// <returns></returns>
         Task<Dictionary<string, string>> GetFolderSettingsAsync(int folderId);
 
@@ -148,6 +148,21 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task UpdateHostSettingsAsync(Dictionary<string, string> hostSettings);
 
+        /// <summary>
+        /// Returns a key-value dictionary of all settings for the given visitor
+        /// </summary>
+        /// <param name="visitorId"></param>
+        /// <returns></returns>
+        Task<Dictionary<string, string>> GetVisitorSettingsAsync(int visitorId);
+
+        /// <summary>
+        /// Updates a visitor setting
+        /// </summary>
+        /// <param name="visitorSettings"></param>
+        /// <param name="visitorId"></param>
+        /// <returns></returns>
+        Task UpdateVisitorSettingsAsync(Dictionary<string, string> visitorSettings, int visitorId);
+
         /// <summary>
         /// Returns a key-value dictionary of all settings for the given entityName
         /// </summary>

Oqtane.Client/Services/Interfaces/ISystemService.cs

@@ -32,11 +32,5 @@ namespace Oqtane.Services
         /// <param name="settings"></param>
         /// <returns></returns>
         Task UpdateSystemInfoAsync(Dictionary<string, object> settings);
-
-        /// <summary>
-        /// updates a config value
-        /// </summary>
-        /// <returns></returns>
-        Task UpdateSystemInfoAsync(string settingKey, object settingValue);
     }
 }

Oqtane.Client/Services/Interfaces/IThemeService.cs

@@ -39,12 +39,6 @@ namespace Oqtane.Services
         /// <returns></returns>
         List<ThemeControl> GetContainerControls(List<Theme> themes, string themeName);
 
-        /// <summary>
-        /// Installs all themes located in //TODO: 2dm where?
-        /// </summary>
-        /// <returns></returns>
-        Task InstallThemesAsync();
-
         /// <summary>
         /// Deletes a theme
         /// </summary>

Oqtane.Client/Services/ModuleDefinitionService.cs

@@ -34,11 +34,6 @@ namespace Oqtane.Services
             await PutJsonAsync($"{Apiurl}/{moduleDefinition.ModuleDefinitionId}", moduleDefinition);
         }
 
-        public async Task InstallModuleDefinitionsAsync()
-        {
-            await GetJsonAsync<List<string>>($"{Apiurl}/install");
-        }
-
         public async Task DeleteModuleDefinitionAsync(int moduleDefinitionId, int siteId)
         {
             await DeleteAsync($"{Apiurl}/{moduleDefinitionId}?siteid={siteId}");

Oqtane.Client/Services/ModuleService.cs

@@ -18,11 +18,7 @@ namespace Oqtane.Services
 
         public async Task<List<Module>> GetModulesAsync(int siteId)
         {
-            List<Module> modules = await GetJsonAsync<List<Module>>($"{Apiurl}?siteid={siteId}");
-            modules = modules
-                .OrderBy(item => item.Order)
-                .ToList();
-            return modules;
+            return await GetJsonAsync<List<Module>>($"{Apiurl}?siteid={siteId}");
         }
 
         public async Task<Module> GetModuleAsync(int moduleId)

Oqtane.Client/Services/SettingService.cs

@@ -111,14 +111,36 @@ namespace Oqtane.Services
             await UpdateSettingsAsync(hostSettings, EntityNames.Host, -1);
         }
 
+        public async Task<Dictionary<string, string>> GetVisitorSettingsAsync(int visitorId)
+        {
+            if (visitorId != -1)
+            {
+                return await GetSettingsAsync(EntityNames.Visitor, visitorId);
+            }
+            else
+            {
+                return new Dictionary<string, string>();
+            }
+        }
+
+        public async Task UpdateVisitorSettingsAsync(Dictionary<string, string> visitorSettings, int visitorId)
+        {
+            if (visitorId != -1)
+            {
+                await UpdateSettingsAsync(visitorSettings, EntityNames.Visitor, visitorId);
+            }
+        }
+
         public async Task<Dictionary<string, string>> GetSettingsAsync(string entityName, int entityId)
         {
             var dictionary = new Dictionary<string, string>();
             var settings = await GetJsonAsync<List<Setting>>($"{Apiurl}?entityname={entityName}&entityid={entityId}");
-            
-            foreach(Setting setting in settings.OrderBy(item => item.SettingName).ToList())
+            if (settings != null)
             {
-                dictionary.Add(setting.SettingName, setting.SettingValue);
+                foreach (Setting setting in settings.OrderBy(item => item.SettingName).ToList())
+                {
+                    dictionary.Add(setting.SettingName, setting.SettingValue);
+                }
             }
             return dictionary;
         }

Oqtane.Client/Services/SystemService.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using Oqtane.Documentation;
 using Oqtane.Shared;
+using System.Net;
 
 namespace Oqtane.Services
 {
@@ -32,9 +33,5 @@ namespace Oqtane.Services
         {
             await PostJsonAsync(Apiurl, settings);
         }
-        public async Task UpdateSystemInfoAsync(string settingKey, object settingValue)
-        {
-            await PutJsonAsync($"{Apiurl}/{settingKey}/{settingValue}", "");
-        }
     }
 }

Oqtane.Client/Services/ThemeService.cs

@@ -38,11 +38,6 @@ namespace Oqtane.Services
                 .SelectMany(item => item.Containers).ToList();
         }
 
-        public async Task InstallThemesAsync()
-        {
-            await GetJsonAsync<List<string>>($"{ApiUrl}/install");
-        }
-
         public async Task DeleteThemeAsync(string themeName)
         {
             await DeleteAsync($"{ApiUrl}/{themeName}");

Oqtane.Client/Themes/Controls/Container/ModuleActions.razor

@@ -2,7 +2,7 @@
 @inherits ModuleActionsBase 
 @attribute [OqtaneIgnore]
 
-@if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) && PageState.Action == Constants.DefaultAction)
+@if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList) && PageState.Action == Constants.DefaultAction)
 {
 	<div class="app-moduleactions py-2 px-3">
 		<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"></a>

Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs

@@ -30,11 +30,11 @@ namespace Oqtane.Themes.Controls
         {
             var actionList = new List<ActionViewModel>();
 
-            if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+            if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
             {
                 actionList.Add(new ActionViewModel { Icon = Icons.Cog, Name = "Manage Settings", Action = async (u, m) => await Settings(u, m) });
 
-                if (UserSecurity.ContainsRole(ModuleState.Permissions, PermissionNames.View, RoleNames.Everyone))
+                if (UserSecurity.ContainsRole(ModuleState.PermissionList, PermissionNames.View, RoleNames.Everyone))
                 {
                     actionList.Add(new ActionViewModel { Icon = Icons.CircleX, Name = "Unpublish Module", Action = async (s, m) => await Unpublish(s, m) });
                 }
@@ -44,7 +44,7 @@ namespace Oqtane.Themes.Controls
                 }
                 actionList.Add(new ActionViewModel { Icon = Icons.Trash, Name = "Delete Module", Action = async (u, m) => await DeleteModule(u, m) });
 
-                if (ModuleState.ModuleDefinition != null && ModuleState.ModuleDefinition.ServerManagerType != "")
+                if (ModuleState.ModuleDefinition != null && ModuleState.ModuleDefinition.IsPortable)
                 {
                     actionList.Add(new ActionViewModel { Name = "" });
                     actionList.Add(new ActionViewModel { Icon = Icons.CloudUpload, Name = "Import Content", Action = async (u, m) => await EditUrlAsync(u, m.ModuleId, "Import") });
@@ -93,7 +93,7 @@ namespace Oqtane.Themes.Controls
 
         protected async Task ModuleAction(ActionViewModel action)
         {
-            if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions))
+            if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.PermissionList))
             {
                 PageModule pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
 
@@ -136,36 +136,32 @@ namespace Oqtane.Themes.Controls
 
         private async Task<string> Publish(string url, PageModule pagemodule)
         {
-            var permissions = UserSecurity.GetPermissionStrings(pagemodule.Module.Permissions);
-            foreach (var permissionstring in permissions)
+            var permissions = pagemodule.Module.PermissionList;
+            if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone))
             {
-                if (permissionstring.PermissionName == PermissionNames.View)
-                {
-                    List<string> ids = permissionstring.Permissions.Split(';').ToList();
-                    if (!ids.Contains(RoleNames.Everyone)) ids.Add(RoleNames.Everyone);
-                    if (!ids.Contains(RoleNames.Registered)) ids.Add(RoleNames.Registered);
-                    permissionstring.Permissions = string.Join(";", ids.ToArray());
-                }
+                permissions.Add(new Permission(ModuleState.SiteId, EntityNames.Page, pagemodule.PageId, PermissionNames.View, RoleNames.Everyone, null, true));
             }
-            pagemodule.Module.Permissions = UserSecurity.SetPermissionStrings(permissions);
+            if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Registered))
+            {
+                permissions.Add(new Permission(ModuleState.SiteId, EntityNames.Page, pagemodule.PageId, PermissionNames.View, RoleNames.Registered, null, true));
+            }
+            pagemodule.Module.PermissionList = permissions;
             await ModuleService.UpdateModuleAsync(pagemodule.Module);
             return url;
         }
 
         private async Task<string> Unpublish(string url, PageModule pagemodule)
         {
-            var permissions = UserSecurity.GetPermissionStrings(pagemodule.Module.Permissions);
-            foreach (var permissionstring in permissions)
+            var permissions = pagemodule.Module.PermissionList;
+            if (permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone))
             {
-                if (permissionstring.PermissionName == PermissionNames.View)
-                {
-                    List<string> ids = permissionstring.Permissions.Split(';').ToList();
-                    ids.Remove(RoleNames.Everyone);
-                    ids.Remove(RoleNames.Registered);
-                    permissionstring.Permissions = string.Join(";", ids.ToArray());
-                }
+                permissions.Remove(permissions.First(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone));
             }
-            pagemodule.Module.Permissions = UserSecurity.SetPermissionStrings(permissions);
+            if (permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Registered))
+            {
+                permissions.Remove(permissions.First(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Registered));
+            }
+            pagemodule.Module.PermissionList = permissions;
             await ModuleService.UpdateModuleAsync(pagemodule.Module);
             return url;
         }

Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor

@@ -33,7 +33,7 @@
     }
 }
 
-@if (_canViewAdminDashboard || UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+@if (_canViewAdminDashboard || UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
 {
     <button type="button" class="btn @ButtonClass" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel">
         <span class="oi oi-cog"></span>
@@ -71,7 +71,7 @@
 					</div>
 					<div class="row d-flex">
 						<div class="col">
-							@if (UserSecurity.ContainsRole(PageState.Page.Permissions, PermissionNames.View, RoleNames.Everyone))
+							@if (UserSecurity.ContainsRole(PageState.Page.PermissionList, PermissionNames.View, RoleNames.Everyone))
 							{
 								<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button>
 							}
@@ -107,7 +107,7 @@
 					}
 				}
 
-				@if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+				@if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
 				{
 					<div class="row">
 						<div class="col text-center">
@@ -144,7 +144,7 @@
 										}
 										@foreach (var moduledefinition in _moduleDefinitions)
 										{
-											if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.Permissions))
+											if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.PermissionList))
 											{
 												if (moduledefinition.Runtimes == "" || moduledefinition.Runtimes.Contains(PageState.Runtime.ToString()))
 												{
@@ -294,14 +294,14 @@
 	{
 		_canViewAdminDashboard = CanViewAdminDashboard();
 		_showEditMode = false;
-		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
 		{
 			_showEditMode = true;
 			_pages?.Clear();
 
 			foreach (Page p in PageState.Pages)
 			{
-				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
 				{
 					_pages.Add(p);
 				}
@@ -319,7 +319,7 @@
 		{
 			foreach (var module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId))
 			{
-				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.Permissions))
+				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.PermissionList))
 				{
 					_showEditMode = true;
 					break;
@@ -335,7 +335,7 @@
 		{
 			foreach (var page in PageState.Pages.Where(item => item.ParentId == admin?.PageId))
 			{
-				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.Permissions))
+				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.PermissionList))
 				{
 					return true;
 				}
@@ -371,7 +371,7 @@
 		{
 			_modules = PageState.Modules
 				.Where(module => module.PageId == int.Parse(PageId) &&
-				UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
+				UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList))
 				.ToList();
 		}
 		ModuleId = "-";
@@ -380,7 +380,7 @@
 
 	private async Task AddModule()
 	{
-		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
 		{
 			if ((ModuleType == "new" && ModuleDefinitionName != "-") || (ModuleType != "new" && ModuleId != "-"))
 			{
@@ -392,18 +392,20 @@
 					module.ModuleDefinitionName = ModuleDefinitionName;
 					module.AllPages = false;
 
-					List<PermissionString> permissions = UserSecurity.GetPermissionStrings(PageState.Page.Permissions);
+					var permissions = new List<Permission>();
 					if (Visibility == "view")
 					{
 						// set module view permissions to page view permissions
-						permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions;
+						permissions = SetPermissions(permissions, module.SiteId, PermissionNames.View, PermissionNames.View);
 					}
 					else
 					{
 						// set module view permissions to page edit permissions
-						permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.Edit).Permissions;
+						permissions = SetPermissions(permissions, module.SiteId, PermissionNames.View, PermissionNames.Edit);
 					}
-					module.Permissions = UserSecurity.SetPermissionStrings(permissions);
+					// set module edit permissions to page edit permissions
+					permissions = SetPermissions(permissions, module.SiteId, PermissionNames.Edit, PermissionNames.Edit);
+					module.PermissionList = permissions;
 
 					module = await ModuleService.AddModuleAsync(module);
 					ModuleId = module.ModuleId.ToString();
@@ -454,6 +456,15 @@
 		}
 	}
 
+	private List<Permission> SetPermissions(List<Permission> permissions, int siteId, string modulePermission, string pagePermission)
+	{
+		foreach (var permission in PageState.Page.PermissionList.Where(item => item.PermissionName == pagePermission))
+		{
+			permissions.Add(new Permission { SiteId = siteId, EntityName = EntityNames.Module, PermissionName = modulePermission, RoleId = permission.RoleId, UserId = permission.UserId, IsAuthorized = permission.IsAuthorized });
+		}
+		return permissions;
+	}
+
 	private async Task ToggleEditMode(bool EditMode)
 	{
 		if (_showEditMode)
@@ -467,7 +478,7 @@
 				PageState.EditMode = true;
 			}
 
-			NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "edit=" + ((PageState.EditMode) ? "1" : "0")));
+			NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "edit=" + ((PageState.EditMode) ? "true" : "false")));
 		}
 		else
 		{
@@ -475,7 +486,7 @@
 			{
 				await PageService.AddPageAsync(PageState.Page.PageId, PageState.User.UserId);
 				PageState.EditMode = true;
-				NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "edit=" + ((PageState.EditMode) ? "1" : "0")));
+				NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "edit=" + ((PageState.EditMode) ? "true" : "false")));
 			}
 		}
 	}
@@ -523,34 +534,19 @@
 
 	private async void Publish(string action)
 	{
-		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
 		{
-			List<PermissionString> permissions;
-
-			// publish/unpublish page
-			var page = PageState.Page;
-			permissions = UserSecurity.GetPermissionStrings(page.Permissions);
-			foreach (var permissionstring in permissions)
-			{
-				if (permissionstring.PermissionName == PermissionNames.View)
-				{
-					List<string> ids = permissionstring.Permissions.Split(';').ToList();
-					switch (action)
-					{
-						case "publish":
-							if (!ids.Contains(RoleNames.Everyone)) ids.Add(RoleNames.Everyone);
-							if (!ids.Contains(RoleNames.Registered)) ids.Add(RoleNames.Registered);
-							break;
-						case "unpublish":
-							ids.Remove(RoleNames.Everyone);
-							ids.Remove(RoleNames.Registered);
-							break;
-					}
-					permissionstring.Permissions = string.Join(";", ids.ToArray());
-				}
-			}
-			page.Permissions = UserSecurity.SetPermissionStrings(permissions);
-			await PageService.UpdatePageAsync(page);
+			var permissions = PageState.Page.PermissionList;
+            if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone))
+            {
+				permissions.Add(new Permission(PageState.Site.SiteId, EntityNames.Page, PageState.Page.PageId, PermissionNames.View, RoleNames.Everyone, null, true));
+            }
+            if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Registered))
+            {
+				permissions.Add(new Permission(PageState.Site.SiteId, EntityNames.Page, PageState.Page.PageId, PermissionNames.View, RoleNames.Registered, null, true));
+            }
+			PageState.Page.PermissionList = permissions;
+			await PageService.UpdatePageAsync(PageState.Page);
 			NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
 		}
 	}

Oqtane.Client/Themes/Controls/Theme/LoginBase.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using Oqtane.Enums;
+using Oqtane.Models;
 using Oqtane.Providers;
 using Oqtane.Security;
 using Oqtane.Services;
@@ -22,21 +24,19 @@ namespace Oqtane.Themes.Controls
 
         protected void LoginUser()
         {
-            var returnurl = PageState.Alias.Path;
-            if (PageState.Page.Path != "/")
-            {
-                returnurl += "/" + PageState.Page.Path;
-            }
-            NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + returnurl));
+            Route route = new Route(PageState.Uri.AbsoluteUri, PageState.Alias.Path);
+            NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + WebUtility.UrlEncode(route.PathAndQuery)));
         }
 
         protected async Task LogoutUser()
         {
             await LoggingService.Log(PageState.Alias, PageState.Page.PageId, null, PageState.User?.UserId, GetType().AssemblyQualifiedName, "Logout", LogFunction.Security, LogLevel.Information, null, "User Logout For Username {Username}", PageState.User?.Username);
 
-            // check if anonymous user can access page
-            var url = PageState.Alias.Path + "/" + PageState.Page.Path;
-            if (!UserSecurity.IsAuthorized(null, PermissionNames.View, PageState.Page.Permissions))
+            Route route = new Route(PageState.Uri.AbsoluteUri, PageState.Alias.Path);
+            var url = route.PathAndQuery;
+
+            // verify if anonymous users can access page
+            if (!UserSecurity.IsAuthorized(null, PermissionNames.View, PageState.Page.PermissionList))
             {
                 url = PageState.Alias.Path;
             }

Oqtane.Client/Themes/Controls/Theme/MenuBase.cs

@@ -32,7 +32,7 @@ namespace Oqtane.Themes.Controls
             var securityLevel = int.MaxValue;
             foreach (Page p in PageState.Pages.Where(item => item.IsNavigation))
             {
-                if (p.Level <= securityLevel && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                if (p.Level <= securityLevel && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
                 {
                     securityLevel = int.MaxValue;
                     yield return p;

Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor

@@ -10,7 +10,7 @@
         </button>
     </span>
     <div class="app-menu navbar-expand-md">
-        <div class="collapse navbar-collapse" id="Menu">
+        <div class="collapse navbar-collapse navbar-nav-scroll" id="Menu">
             <MenuItemsHorizontal ParentPage="null" Pages="MenuPages" />
         </div>
     </div>

Oqtane.Client/UI/ContainerBuilder.razor

@@ -43,7 +43,7 @@
             container = (!string.IsNullOrEmpty(PageState.Site.AdminContainerType)) ? PageState.Site.AdminContainerType : Constants.DefaultAdminContainer;
         }
 
-        if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) && PageState.Action == Constants.DefaultAction)
+        if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList) && PageState.Action == Constants.DefaultAction)
         {
             _useadminborder = true;
         }

Oqtane.Client/UI/Pane.razor

@@ -30,7 +30,7 @@ else
 
 	protected override void OnParametersSet()
 	{
-		if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) && PageState.Action == Constants.DefaultAction)
+		if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList) && PageState.Action == Constants.DefaultAction)
 		{
 			_useadminborder = true;
 			_panetitle = "<div class=\"app-pane-admin-title\">" + Name + " Pane</div>";
@@ -58,7 +58,11 @@ else
 				}
 				if (Name.ToLower() == pane.ToLower())
 				{
-					Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
+					Module module = PageState.Modules.FirstOrDefault(item => item.PageId == PageState.Page.PageId && item.ModuleId == PageState.ModuleId);
+					if (module == null)
+					{
+						module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
+					}
 					if (module != null)
 					{
 						var moduleType = Type.GetType(module.ModuleType);
@@ -67,7 +71,7 @@ else
 							bool authorized = false;
 							if (Constants.DefaultModuleActions.Contains(PageState.Action))
 							{
-								authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions);
+								authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList);
                             }
                             else
                             {
@@ -77,10 +81,10 @@ else
                                         authorized = true;
                                         break;
                                     case SecurityAccessLevel.View:
-                                        authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions);
+                                        authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList);
                                         break;
                                     case SecurityAccessLevel.Edit:
-                                        authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.Permissions);
+                                        authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.PermissionList);
                                         break;
                                     case SecurityAccessLevel.Admin:
                                         authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
@@ -107,11 +111,15 @@ else
             {
                 if (PageState.ModuleId != -1)
                 {
-                    Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
-                    if (module != null && module.Pane.ToLower() == Name.ToLower())
+					Module module = PageState.Modules.FirstOrDefault(item => item.PageId == PageState.Page.PageId && item.ModuleId == PageState.ModuleId);
+					if (module == null)
+					{
+						module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
+					}
+					if (module != null && module.Pane.ToLower() == Name.ToLower())
                     {
                         // check if user is authorized to view module
-                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
+                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList))
                         {
                             CreateComponent(builder, module);
                         }
@@ -119,10 +127,10 @@ else
                 }
                 else
                 {
-                    foreach (Module module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId && item.Pane.ToLower() == Name.ToLower()).OrderBy(x => x.Order).ToArray())
+                    foreach (Module module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId && item.Pane.ToLower() == Name.ToLower()))
                     {
                         // check if user is authorized to view module
-                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
+                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList))
                         {
                             CreateComponent(builder, module);
                         }

Oqtane.Client/UI/SiteRouter.razor

@@ -124,6 +124,10 @@
 			editmode = PageState.EditMode;
 			lastsyncdate = PageState.LastSyncDate;
 		}
+		if (PageState?.Page.Path != route.PagePath)
+		{
+			editmode = false; // reset edit mode when navigating to different page
+		}
 
 		// get user
 		if (PageState == null || refresh || PageState.Alias.SiteId != SiteState.Alias.SiteId)
@@ -181,7 +185,6 @@
 			if (PageState == null || refresh || PageState.Page.Path != route.PagePath)
 			{
 				page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
-				editmode = false;
 			}
 			else
 			{
@@ -204,7 +207,7 @@
 			if (page != null)
 			{
 				// check if user is authorized to view page
-				if (UserSecurity.IsAuthorized(user, PermissionNames.View, page.Permissions))
+				if (UserSecurity.IsAuthorized(user, PermissionNames.View, page.PermissionList))
 				{
 					// load additional metadata for current page
 					page = await ProcessPage(page, site, user);
@@ -250,7 +253,7 @@
 					if (user == null)
 					{
 						// redirect to login page if user not logged in as they may need to be authenticated
-						NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "login", "?returnurl=" + route.AbsolutePath));
+						NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "login", "?returnurl=" + WebUtility.UrlEncode(route.PathAndQuery)));
 					}
 					else
 					{
@@ -299,18 +302,24 @@
 			{
 				query = query.Substring(1); // ignore "?"
 			}
-			foreach (string kvp in query.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries))
+			foreach (string kvp in query.Split('&', StringSplitOptions.RemoveEmptyEntries))
 			{
 				if (kvp != "")
 				{
 					if (kvp.Contains("="))
 					{
 						string[] pair = kvp.Split('=');
-						querystring.Add(pair[0], pair[1]);
+						if (!querystring.ContainsKey(pair[0]))
+						{
+							querystring.Add(pair[0], pair[1]);
+						}
 					}
 					else
 					{
-						querystring.Add(kvp, "true"); // default parameter when no value is provided
+						if (!querystring.ContainsKey(kvp))
+						{
+							querystring.Add(kvp, "true"); // default parameter when no value is provided
+						}
 					}
 				}
 			}
@@ -358,7 +367,7 @@
 			}
 			if (!string.IsNullOrEmpty(panes))
 			{
-				page.Panes = panes.Replace(";", ",").Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+				page.Panes = panes.Replace(";", ",").Split(',', StringSplitOptions.RemoveEmptyEntries).ToList();
 				if (!page.Panes.Contains(PaneNames.Default) && !page.Panes.Contains(PaneNames.Admin))
 				{
 					_error = "The Current Theme Does Not Contain A Default Or Admin Pane";
@@ -407,7 +416,7 @@
 					// check if the module defines custom action routes
 					if (module.ModuleDefinition.ControlTypeRoutes != "")
 					{
-						foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+						foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(';', StringSplitOptions.RemoveEmptyEntries))
 						{
 							if (route.StartsWith(action + "="))
 							{

Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.3.0</Version>
+    <Version>3.4.3</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.MySQL</id>
-        <version>3.3.0</version>
+        <version>3.4.3</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane MySQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.3.0</Version>
+    <Version>3.4.3</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.PostgreSQL</id>
-        <version>3.3.0</version>
+        <version>3.4.3</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane PostgreSQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.3.0</Version>
+    <Version>3.4.3</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.SqlServer</id>
-        <version>3.3.0</version>
+        <version>3.4.3</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQL Server Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.3.0</Version>
+    <Version>3.4.3</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.Sqlite</id>
-        <version>3.3.0</version>
+        <version>3.4.3</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQLite Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Maui/MauiProgram.cs

@@ -212,23 +212,37 @@ public static class MauiProgram
     private static void RegisterModuleServices(Assembly assembly, IServiceCollection services)
     {
         // dynamically register module scoped services
-        var implementationTypes = assembly.GetInterfaces<IService>();
-        foreach (var implementationType in implementationTypes)
+        try
         {
-            if (implementationType.AssemblyQualifiedName != null)
+            var implementationTypes = assembly.GetInterfaces<IService>();
+            foreach (var implementationType in implementationTypes)
             {
-                var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
-                services.AddScoped(serviceType ?? implementationType, implementationType);
+                if (implementationType.AssemblyQualifiedName != null)
+                {
+                    var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
+                    services.AddScoped(serviceType ?? implementationType, implementationType);
+                }
             }
         }
+        catch
+        {
+            // could not interrogate assembly - likely missing dependencies
+        }
     }
 
     private static void RegisterClientStartups(Assembly assembly, IServiceCollection services)
     {
-        var startUps = assembly.GetInstances<IClientStartup>();
-        foreach (var startup in startUps)
+        try
         {
-            startup.ConfigureServices(services);
+            var startUps = assembly.GetInstances<IClientStartup>();
+            foreach (var startup in startUps)
+            {
+                startup.ConfigureServices(services);
+            }
+        }
+        catch
+        {
+            // could not interrogate assembly - likely missing dependencies
         }
     }
 }

Oqtane.Maui/Oqtane.Maui.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
+    <!-- <TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks> -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
-    <Version>3.3.0</Version>
+    <Version>3.4.3</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -14,7 +14,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane.Maui</RootNamespace>
@@ -31,7 +31,7 @@
 		<ApplicationIdGuid>0E29FC31-1B83-48ED-B6E0-9F3C67B775D4</ApplicationIdGuid>
     
 		<!-- Versions -->
-		<ApplicationDisplayVersion>3.3.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>3.4.3</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
@@ -71,8 +71,8 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.3" />
     <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
-    <PackageReference Include="Oqtane.Client" Version="3.3.0" />
-    <PackageReference Include="Oqtane.Shared" Version="3.3.0" />
+    <PackageReference Include="Oqtane.Client" Version="3.4.3" />
+    <PackageReference Include="Oqtane.Shared" Version="3.4.3" />
   </ItemGroup>
 
 </Project>

Oqtane.Package/Oqtane.Client.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Client</id>
-    <version>3.3.0</version>
+    <version>3.4.3</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/Oqtane.Framework.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Framework</id>
-    <version>3.3.0</version>
+    <version>3.4.3</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -11,8 +11,8 @@
     <copyright>.NET Foundation</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
-    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v3.3.0/Oqtane.Framework.3.2.1.Upgrade.zip</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</releaseNotes>
+    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v3.4.3/Oqtane.Framework.3.4.3.Upgrade.zip</projectUrl>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane framework</tags>
   </metadata>

Oqtane.Package/Oqtane.Server.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Server</id>
-    <version>3.3.0</version>
+    <version>3.4.3</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/Oqtane.Shared.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Shared</id>
-    <version>3.3.0</version>
+    <version>3.4.3</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/Oqtane.Updater.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Updater</id>
-    <version>3.3.0</version>
+    <version>3.4.3</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/install.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.3.0.Install.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.4.3.Install.zip" -Force 

Oqtane.Package/upgrade.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.3.0.Upgrade.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.4.3.Upgrade.zip" -Force 

Oqtane.Server/Controllers/FileController.cs

@@ -20,7 +20,6 @@ using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Formats.Png;
 using System.Net.Http;
-using Oqtane.Migrations.Tenant;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1
 
@@ -57,7 +56,7 @@ namespace Oqtane.Controllers
             if (int.TryParse(folder, out folderid))
             {
                 Folder Folder = _folders.GetFolder(folderid);
-                if (Folder != null && Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, Folder.Permissions))
+                if (Folder != null && Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, Folder.PermissionList))
                 {
                     files = _files.GetFiles(folderid).ToList();
                 }
@@ -99,7 +98,7 @@ namespace Oqtane.Controllers
             List<Models.File> files;
 
             Folder folder = _folders.GetFolder(siteId, WebUtility.UrlDecode(path));
-            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.PermissionList))
             {
                 files = _files.GetFiles(folder.FolderId).ToList();
             }
@@ -118,7 +117,7 @@ namespace Oqtane.Controllers
         public Models.File Get(int id)
         {
             Models.File file = _files.GetFile(id);
-            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
+            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.PermissionList))
             {
                 return file;
             }
@@ -142,7 +141,7 @@ namespace Oqtane.Controllers
             {
                 if (File.Name != file.Name || File.FolderId != file.FolderId)
                 {
-                    file.Folder = _folders.GetFolder(file.FolderId);
+                    file.Folder = _folders.GetFolder(file.FolderId, false);
                     string folderpath = _folders.GetFolderPath(file.Folder);
                     if (!Directory.Exists(folderpath))
                     {
@@ -151,7 +150,7 @@ namespace Oqtane.Controllers
                     System.IO.File.Move(_files.GetFilePath(File), Path.Combine(folderpath, file.Name));
                 }
 
-                var newfile = CreateFile(file.Name, file.Folder.FolderId, _files.GetFilePath(file));
+                var newfile = CreateFile(File.Name, file.Folder.FolderId, _files.GetFilePath(file));
                 if (newfile != null)
                 {
                     file.Extension = newfile.Extension;
@@ -216,7 +215,7 @@ namespace Oqtane.Controllers
                 folder = _folders.GetFolder(FolderId);
             }
 
-            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Edit, folder.Permissions))
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Edit, folder.PermissionList))
             {
                 string folderPath = _folders.GetFolderPath(folder);
                 CreateDirectory(folderPath);
@@ -311,7 +310,7 @@ namespace Oqtane.Controllers
             if (int.TryParse(folder, out FolderId))
             {
                 Folder Folder = _folders.GetFolder(FolderId);
-                if (Folder != null && Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Edit, Folder.Permissions))
+                if (Folder != null && Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Edit, Folder.PermissionList))
                 {
                     folderPath = _folders.GetFolderPath(Folder);
                 }
@@ -498,7 +497,7 @@ namespace Oqtane.Controllers
         private IActionResult Download(int id, bool asAttachment)
         {
             var file = _files.GetFile(id);
-            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
+            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.PermissionList))
             {
                 var filepath = _files.GetFilePath(file);
                 if (System.IO.File.Exists(filepath))
@@ -533,7 +532,7 @@ namespace Oqtane.Controllers
         public IActionResult GetImage(int id, int width, int height, string mode, string position, string background, string rotate, string recreate)
         {
             var file = _files.GetFile(id);
-            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
+            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.PermissionList))
             {
                 if (Constants.ImageFiles.Split(',').Contains(file.Extension.ToLower()))
                 {
@@ -551,7 +550,7 @@ namespace Oqtane.Controllers
                         string imagepath = filepath.Replace(Path.GetExtension(filepath), "." + width.ToString() + "x" + height.ToString() + ".png");
                         if (!System.IO.File.Exists(imagepath) || bool.Parse(recreate))
                         {
-                            if ((_userPermissions.IsAuthorized(User, PermissionNames.Edit, file.Folder.Permissions) ||
+                            if ((_userPermissions.IsAuthorized(User, PermissionNames.Edit, file.Folder.PermissionList) ||
                               !string.IsNullOrEmpty(file.Folder.ImageSizes) && file.Folder.ImageSizes.ToLower().Split(",").Contains(width.ToString() + "x" + height.ToString())))
                             {
                                 imagepath = CreateImage(filepath, width, height, mode, position, background, rotate, imagepath);
@@ -659,10 +658,10 @@ namespace Oqtane.Controllers
             var file = _files.GetFile(folderid, filename);
 
             int size = 0;
-            var folder = _folders.GetFolder(folderid);
+            var folder = _folders.GetFolder(folderid, false);
             if (folder.Capacity != 0)
             {
-                foreach (var f in _files.GetFiles(folderid))
+                foreach (var f in _files.GetFiles(folderid, false))
                 {
                     size += f.Size;
                 }

Oqtane.Server/Controllers/FolderController.cs

@@ -43,7 +43,7 @@ namespace Oqtane.Controllers
             {
                 foreach (Folder folder in _folders.GetFolders(SiteId))
                 {
-                    if (_userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.PermissionList))
                     {
                         folders.Add(folder);
                     }
@@ -64,7 +64,7 @@ namespace Oqtane.Controllers
         public Folder Get(int id)
         {
             Folder folder = _folders.GetFolder(id);
-            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.PermissionList))
             {
                 return folder;
             }
@@ -85,7 +85,7 @@ namespace Oqtane.Controllers
                 folderPath += "/";
             }
             Folder folder = _folders.GetFolder(siteId, folderPath);
-            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.PermissionList))
             {
                 return folder;
             }
@@ -104,16 +104,16 @@ namespace Oqtane.Controllers
         {
             if (ModelState.IsValid && folder.SiteId == _alias.SiteId)
             {
-                string permissions;
+                List<Permission> permissions;
                 if (folder.ParentId != null)
                 {
-                    permissions = _folders.GetFolder(folder.ParentId.Value).Permissions;
+                    permissions = _folders.GetFolder(folder.ParentId.Value).PermissionList;
                 }
                 else
                 {
                     permissions = new List<Permission> {
                         new Permission(PermissionNames.Edit, RoleNames.Admin, true),
-                    }.EncodePermissions();
+                    };
                 }
                 if (_userPermissions.IsAuthorized(User, PermissionNames.Edit, permissions))
                 {

Oqtane.Server/Controllers/InstallationController.cs

@@ -52,7 +52,7 @@ namespace Oqtane.Controllers
         {
             var installation = new Installation { Success = false, Message = "" };
 
-            if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || string.IsNullOrEmpty(_configManager.GetSetting("ConnectionStrings:" + SettingKeys.ConnectionStringKey, ""))))
+            if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || string.IsNullOrEmpty(_configManager.GetSetting($"{SettingKeys.ConnectionStringsSection}:{SettingKeys.ConnectionStringKey}", ""))))
             {
                 installation = _databaseManager.Install(config);
 
@@ -120,6 +120,13 @@ namespace Oqtane.Controllers
                 var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
                 var assemblyList = new List<ClientAssembly>();
 
+                // testmode setting is used for validating that the API is downloading the appropriate assemblies to the client
+                bool hashfilename = true;
+                if (_configManager.GetSetting($"{SettingKeys.TestModeKey}", "false") == "true")
+                {
+                    hashfilename = false;
+                }
+                
                 // get list of assemblies which should be downloaded to client
                 var assemblies = AppDomain.CurrentDomain.GetOqtaneClientAssemblies();
                 var list = assemblies.Select(a => a.GetName().Name).ToList();            
@@ -127,7 +134,7 @@ namespace Oqtane.Controllers
                 // populate assemblies
                 for (int i = 0; i < list.Count; i++)
                 {
-                    assemblyList.Add(new ClientAssembly(Path.Combine(binFolder, list[i] + ".dll")));
+                    assemblyList.Add(new ClientAssembly(Path.Combine(binFolder, list[i] + ".dll"), hashfilename));
                 }
 
                 // insert satellite assemblies at beginning of list
@@ -143,7 +150,7 @@ namespace Oqtane.Controllers
                     {
                         foreach (var resourceFile in Directory.EnumerateFiles(assembliesFolderPath))
                         {
-                            assemblyList.Insert(0, new ClientAssembly(resourceFile));
+                            assemblyList.Insert(0, new ClientAssembly(resourceFile, hashfilename));
                         }
                     }
                     else
@@ -160,12 +167,12 @@ namespace Oqtane.Controllers
                         var instance = Activator.CreateInstance(type) as IModule;
                         foreach (string name in instance.ModuleDefinition.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Reverse())
                         {
-                            var filepath = Path.Combine(binFolder, name + ".dll");
+                            var filepath = Path.Combine(binFolder, name.ToLower().EndsWith(".dll") ? name : name + ".dll");
                             if (System.IO.File.Exists(filepath))
                             {
                                 if (!assemblyList.Exists(item => item.FilePath == filepath))
                                 {
-                                    assemblyList.Insert(0, new ClientAssembly(filepath));
+                                    assemblyList.Insert(0, new ClientAssembly(filepath, hashfilename));
                                 }
                             }
                             else
@@ -179,12 +186,12 @@ namespace Oqtane.Controllers
                         var instance = Activator.CreateInstance(type) as ITheme;
                         foreach (string name in instance.Theme.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Reverse())
                         {
-                            var filepath = Path.Combine(binFolder, name + ".dll");
+                            var filepath = Path.Combine(binFolder, name.ToLower().EndsWith(".dll") ? name : name + ".dll");
                             if (System.IO.File.Exists(filepath))
                             {
                                 if (!assemblyList.Exists(item => item.FilePath == filepath))
                                 {
-                                    assemblyList.Insert(0, new ClientAssembly(filepath));
+                                    assemblyList.Insert(0, new ClientAssembly(filepath, hashfilename));
                                 }
                             }
                             else
@@ -285,11 +292,18 @@ namespace Oqtane.Controllers
 
         public struct ClientAssembly
         {
-            public ClientAssembly(string filepath)
+            public ClientAssembly(string filepath, bool hashfilename)
             {
                 FilePath = filepath;
                 DateTime lastwritetime = System.IO.File.GetLastWriteTime(filepath);
-                HashedName = GetDeterministicHashCode(filepath).ToString("X8") + "." + lastwritetime.ToString("yyyyMMddHHmmss") + Path.GetExtension(filepath);
+                if (hashfilename)
+                {
+                    HashedName = GetDeterministicHashCode(filepath).ToString("X8") + "." + lastwritetime.ToString("yyyyMMddHHmmss") + Path.GetExtension(filepath);
+                }
+                else
+                {
+                    HashedName = Path.GetFileNameWithoutExtension(filepath) + "." + lastwritetime.ToString("yyyyMMddHHmmss") + Path.GetExtension(filepath);
+                }
             }
 
             public string FilePath { get; private set; }

Oqtane.Server/Controllers/ModuleController.cs

@@ -9,6 +9,7 @@ using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
 using System.Net;
+using System.Security.Policy;
 
 namespace Oqtane.Controllers
 {
@@ -47,17 +48,18 @@ namespace Oqtane.Controllers
             int SiteId;
             if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
+                List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(SiteId).ToList();
                 List<Setting> settings = _settings.GetSettings(EntityNames.Module).ToList();
 
                 foreach (PageModule pagemodule in _pageModules.GetPageModules(SiteId))
                 {
-                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.Permissions))
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.PermissionList))
                     {
                         Module module = new Module();
                         module.SiteId = pagemodule.Module.SiteId;
                         module.ModuleDefinitionName = pagemodule.Module.ModuleDefinitionName;
                         module.AllPages = pagemodule.Module.AllPages;
-                        module.Permissions = pagemodule.Module.Permissions;
+                        module.PermissionList = pagemodule.Module.PermissionList;
                         module.CreatedBy = pagemodule.Module.CreatedBy;
                         module.CreatedOn = pagemodule.Module.CreatedOn;
                         module.ModifiedBy = pagemodule.Module.ModifiedBy;
@@ -74,12 +76,15 @@ namespace Oqtane.Controllers
                         module.Order = pagemodule.Order;
                         module.ContainerType = pagemodule.ContainerType;
 
+                        module.ModuleDefinition = _moduleDefinitions.FilterModuleDefinition(moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName));
+
                         module.Settings = settings.Where(item => item.EntityId == pagemodule.ModuleId)
-                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, pagemodule.Module.Permissions))
+                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, pagemodule.Module.PermissionList))
                             .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
 
                         modules.Add(module);
                     }
+                    modules = modules.OrderBy(item => item.PageId).ThenBy(item => item.Pane).ThenBy(item => item.Order).ToList();
                 }
             }
             else
@@ -97,12 +102,12 @@ namespace Oqtane.Controllers
         public Module Get(int id)
         {
             Module module = _modules.GetModule(id);
-            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User,PermissionNames.View, module.Permissions))
+            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User,PermissionNames.View, module.PermissionList))
             {
                 List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
-                module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
+                module.ModuleDefinition = _moduleDefinitions.FilterModuleDefinition(moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName));
                 module.Settings = _settings.GetSettings(EntityNames.Module, id)
-                    .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, module.Permissions))
+                    .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, module.PermissionList))
                     .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
                 return module;
             }

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -15,6 +15,7 @@ using System;
 using Microsoft.Extensions.DependencyInjection;
 using System.Text.Json;
 using System.Net;
+using Oqtane.Modules;
 
 namespace Oqtane.Controllers
 {
@@ -22,6 +23,9 @@ namespace Oqtane.Controllers
     public class ModuleDefinitionController : Controller
     {
         private readonly IModuleDefinitionRepository _moduleDefinitions;
+        private readonly IModuleRepository _modules;
+        private readonly IPageModuleRepository _pagemodules;
+        private readonly IPermissionRepository _permissions;
         private readonly ITenantRepository _tenants;
         private readonly ISqlRepository _sql;
         private readonly IUserPermissions _userPermissions;
@@ -33,9 +37,12 @@ namespace Oqtane.Controllers
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public ModuleDefinitionController(IModuleDefinitionRepository moduleDefinitions, ITenantRepository tenants, ISqlRepository sql, IUserPermissions userPermissions, IInstallationManager installationManager, IWebHostEnvironment environment, IServiceProvider serviceProvider, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger)
+        public ModuleDefinitionController(IModuleDefinitionRepository moduleDefinitions, IModuleRepository module, IPageModuleRepository pageModule, IPermissionRepository permission, ITenantRepository tenants, ISqlRepository sql, IUserPermissions userPermissions, IInstallationManager installationManager, IWebHostEnvironment environment, IServiceProvider serviceProvider, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger)
         {
             _moduleDefinitions = moduleDefinitions;
+            _modules = module;
+            _pagemodules = pageModule;
+            _permissions = permission;
             _tenants = tenants;
             _sql = sql;
             _userPermissions = userPermissions;
@@ -58,7 +65,7 @@ namespace Oqtane.Controllers
                 List<ModuleDefinition> moduledefinitions = new List<ModuleDefinition>();
                 foreach (ModuleDefinition moduledefinition in _moduleDefinitions.GetModuleDefinitions(SiteId))
                 {
-                    if (_userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.Permissions))
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.PermissionList))
                     {
                         if (string.IsNullOrEmpty(moduledefinition.Version)) moduledefinition.Version = new Version(1, 0, 0).ToString();
                         moduledefinitions.Add(moduledefinition);
@@ -82,7 +89,7 @@ namespace Oqtane.Controllers
             if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
                 ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, SiteId);
-                if (_userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.Permissions))
+                if (_userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.PermissionList))
                 {
                     if (string.IsNullOrEmpty(moduledefinition.Version)) moduledefinition.Version = new Version(1, 0, 0).ToString();
                     return moduledefinition;
@@ -228,6 +235,27 @@ namespace Oqtane.Controllers
                     _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Static Resources Folder Removed For {ModuleDefinitionName}", moduledefinition.ModuleDefinitionName);
                 }
 
+                // remove PageModule and Module
+                List<Models.Module> modulesToRemove =  _modules.GetModules(moduledefinition.SiteId).Where(m => m.ModuleDefinitionName == moduledefinition.ModuleDefinitionName).ToList();
+                foreach (Models.Module moduleToRemove in modulesToRemove)
+                {
+                    // Get the PageModule items associated with the Module item to be removed
+                    List<PageModule> pageModulesToRemove = _pagemodules.GetPageModules(moduledefinition.SiteId).Where(pm => pm.ModuleId == moduleToRemove.ModuleId).ToList();
+
+                    foreach(PageModule pageModule in pageModulesToRemove)
+                    {
+                        // Remove the PageModule item
+                        _pagemodules.DeletePageModule(pageModule.PageModuleId);
+                    }
+
+                    // Remove Permissions
+                    _permissions.DeletePermissions(moduledefinition.SiteId, EntityNames.Module, moduleToRemove.ModuleId);
+
+                    // Remove the Module item
+                    _modules.DeleteModule(moduleToRemove.ModuleId);
+                }
+
+
                 // remove module definition
                 _moduleDefinitions.DeleteModuleDefinition(id);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.ModuleDefinition, moduledefinition.ModuleDefinitionId, SyncEventActions.Delete);
@@ -240,14 +268,6 @@ namespace Oqtane.Controllers
             }
         }
 
-        [HttpGet("install")]
-        [Authorize(Roles = RoleNames.Host)]
-        public void InstallModules()
-        {
-            _logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed");
-            _installationManager.InstallPackages();
-        }
-
         // GET: api/<controller>/templates
         [HttpGet("templates")]
         [Authorize(Roles = RoleNames.Host)]

Oqtane.Server/Controllers/PageController.cs

@@ -54,10 +54,10 @@ namespace Oqtane.Controllers
 
                 foreach (Page page in _pages.GetPages(SiteId))
                 {
-                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, page.Permissions))
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, page.PermissionList))
                     {
                         page.Settings = settings.Where(item => item.EntityId == page.PageId)
-                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
+                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.PermissionList))
                             .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
                         pages.Add(page);
                     }
@@ -86,10 +86,10 @@ namespace Oqtane.Controllers
             {
                 page = _pages.GetPage(id, int.Parse(userid));
             }
-            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User,PermissionNames.View, page.Permissions))
+            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, page.PermissionList))
             {
                 page.Settings = _settings.GetSettings(EntityNames.Page, page.PageId)
-                    .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
+                    .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.PermissionList))
                     .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
                 return page;
             }
@@ -106,10 +106,10 @@ namespace Oqtane.Controllers
         public Page Get(string path, int siteid)
         {
             Page page = _pages.GetPage(WebUtility.UrlDecode(path), siteid);
-            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, page.Permissions))
+            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, page.PermissionList))
             {
                 page.Settings = _settings.GetSettings(EntityNames.Page, page.PageId)
-                    .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
+                    .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.PermissionList))
                     .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
                 return page;
             }
@@ -128,19 +128,19 @@ namespace Oqtane.Controllers
         {
             if (ModelState.IsValid && page.SiteId == _alias.SiteId)
             {
-                string permissions;
+                List<Permission> permissions;
                 if (page.ParentId != null)
                 {
-                    permissions = _pages.GetPage(page.ParentId.Value).Permissions;
+                    permissions = _pages.GetPage(page.ParentId.Value).PermissionList;
                 }
                 else
                 {
                     permissions = new List<Permission> {
                         new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                    }.EncodePermissions();
+                    };
                 }
 
-                if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions))
+                if (_userPermissions.IsAuthorized(User, PermissionNames.Edit, permissions))
                 {
                     page = _pages.AddPage(page);
                     _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Create);
@@ -194,10 +194,10 @@ namespace Oqtane.Controllers
                 page.ThemeType = parent.ThemeType;
                 page.DefaultContainerType = parent.DefaultContainerType;
                 page.Icon = parent.Icon;
-                page.Permissions = new List<Permission> {
+                page.PermissionList = new List<Permission> {
                     new Permission(PermissionNames.View, int.Parse(userid), true),
                     new Permission(PermissionNames.Edit, int.Parse(userid), true)
-                }.EncodePermissions();
+                };
                 page.IsPersonalizable = false;
                 page.UserId = int.Parse(userid);
                 page = _pages.AddPage(page);
@@ -213,10 +213,10 @@ namespace Oqtane.Controllers
                     module.PageId = page.PageId;
                     module.ModuleDefinitionName = pm.Module.ModuleDefinitionName;
                     module.AllPages = false;
-                    module.Permissions = new List<Permission> {
+                    module.PermissionList = new List<Permission> {
                         new Permission(PermissionNames.View, int.Parse(userid), true),
                         new Permission(PermissionNames.Edit, int.Parse(userid), true)
-                    }.EncodePermissions();
+                    };
                     module = _modules.AddModule(module);
 
                     string content = _modules.ExportModule(pm.ModuleId);
@@ -274,9 +274,8 @@ namespace Oqtane.Controllers
                 }
 
                 // get differences between current and new page permissions
-                var newPermissions = _permissionRepository.DecodePermissions(page.Permissions, page.SiteId, EntityNames.Page, page.PageId).ToList();
-                var added = GetPermissionsDifferences(newPermissions, currentPermissions);
-                var removed = GetPermissionsDifferences(currentPermissions, newPermissions);
+                var added = GetPermissionsDifferences(page.PermissionList, currentPermissions);
+                var removed = GetPermissionsDifferences(currentPermissions, page.PermissionList);
 
                 // synchronize module permissions
                 if (added.Count > 0 || removed.Count > 0)
@@ -285,7 +284,7 @@ namespace Oqtane.Controllers
                     {
                         var modulePermissions = _permissionRepository.GetPermissions(pageModule.Module.SiteId, EntityNames.Module, pageModule.Module.ModuleId).ToList();
                         // permissions added
-                        foreach(Permission permission in added)
+                        foreach (Permission permission in added)
                         {
                             if (!modulePermissions.Any(item => item.PermissionName == permission.PermissionName
                               && item.RoleId == permission.RoleId && item.UserId == permission.UserId && item.IsAuthorized == permission.IsAuthorized))
@@ -346,7 +345,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public void Put(int siteid, int pageid, int? parentid)
         {
-            if (siteid == _alias.SiteId && siteid == _alias.SiteId && _pages.GetPage(pageid, false) != null && _userPermissions.IsAuthorized(User, siteid, EntityNames.Page, pageid, PermissionNames.Edit))
+            if (siteid == _alias.SiteId && _pages.GetPage(pageid, false) != null && _userPermissions.IsAuthorized(User, siteid, EntityNames.Page, pageid, PermissionNames.Edit))
             {
                 int order = 1;
                 List<Page> pages = _pages.GetPages(siteid).ToList();

Oqtane.Server/Controllers/PageModuleController.cs

@@ -38,7 +38,7 @@ namespace Oqtane.Controllers
         public PageModule Get(int id)
         {
             PageModule pagemodule = _pageModules.GetPageModule(id);
-            if (pagemodule != null && pagemodule.Module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.Permissions))
+            if (pagemodule != null && pagemodule.Module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.PermissionList))
             {
                 return pagemodule;
             }
@@ -55,7 +55,7 @@ namespace Oqtane.Controllers
         public PageModule Get(int pageid, int moduleid)
         {
             PageModule pagemodule = _pageModules.GetPageModule(pageid, moduleid);
-            if (pagemodule != null && pagemodule.Module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.Permissions))
+            if (pagemodule != null && pagemodule.Module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.PermissionList))
             {
                 return pagemodule;
             }

Oqtane.Server/Controllers/SettingController.cs

@@ -46,7 +46,7 @@ namespace Oqtane.Controllers
             _identityCache = identityCache;
             _logger = logger;
             _alias = tenantManager.GetAlias();
-            _visitorCookie = "APP_VISITOR_" + _alias.SiteId.ToString();
+            _visitorCookie = Constants.VisitorCookiePrefix + _alias.SiteId.ToString();
         }
 
         // GET: api/<controller>
@@ -64,8 +64,12 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityName, entityId);
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                // suppress unauthorized visitor logging as it is usually caused by clients that do not support cookies 
+                if (entityName != EntityNames.Visitor) 
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityName, entityId);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
             }
             return settings;
         }
@@ -85,8 +89,11 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Setting {EntityName} {SettingId}", entityName, id);
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                if (entityName != EntityNames.Visitor)
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Setting {EntityName} {SettingId}", entityName, id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
                 return null;
             }
         }
@@ -103,8 +110,11 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Setting {Setting}", setting);
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                if (setting.EntityName != EntityNames.Visitor)
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Setting {Setting}", setting);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
                 setting = null;
             }
             return setting;
@@ -122,8 +132,11 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Setting {Setting}", setting);
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                if (setting.EntityName != EntityNames.Visitor)
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Setting {Setting}", setting);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
                 setting = null;
             }
             return setting;
@@ -142,8 +155,11 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Setting {Setting}", setting);
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                if (entityName != EntityNames.Visitor)
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Setting {Setting}", setting);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
             }
         }
 
@@ -219,6 +235,7 @@ namespace Oqtane.Controllers
                     authorized = User.IsInRole(RoleNames.Admin);
                     if (!authorized)
                     {
+                        // a visitor may have cookies disabled
                         if (int.TryParse(Request.Cookies[_visitorCookie], out int visitorId))
                         {
                             authorized = (visitorId == entityId);

Oqtane.Server/Controllers/SiteController.cs

@@ -89,10 +89,10 @@ namespace Oqtane.Controllers
                 site.Pages = new List<Page>();
                 foreach (Page page in _pages.GetPages(site.SiteId))
                 {
-                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, page.Permissions))
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, page.PermissionList))
                     {
                         page.Settings = settings.Where(item => item.EntityId == page.PageId)
-                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
+                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.PermissionList))
                             .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
                         site.Pages.Add(page);
                     }
@@ -105,13 +105,13 @@ namespace Oqtane.Controllers
                 site.Modules = new List<Module>();
                 foreach (PageModule pagemodule in _pageModules.GetPageModules(site.SiteId))
                 {
-                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.Permissions))
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.PermissionList))
                     {
                         Module module = new Module();
                         module.SiteId = pagemodule.Module.SiteId;
                         module.ModuleDefinitionName = pagemodule.Module.ModuleDefinitionName;
                         module.AllPages = pagemodule.Module.AllPages;
-                        module.Permissions = pagemodule.Module.Permissions;
+                        module.PermissionList = pagemodule.Module.PermissionList;
                         module.CreatedBy = pagemodule.Module.CreatedBy;
                         module.CreatedOn = pagemodule.Module.CreatedOn;
                         module.ModifiedBy = pagemodule.Module.ModifiedBy;
@@ -128,14 +128,16 @@ namespace Oqtane.Controllers
                         module.Order = pagemodule.Order;
                         module.ContainerType = pagemodule.ContainerType;
 
-                        module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
+                        module.ModuleDefinition = _moduleDefinitions.FilterModuleDefinition(moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName));
+
                         module.Settings = settings.Where(item => item.EntityId == pagemodule.ModuleId)
-                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, pagemodule.Module.Permissions))
+                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, pagemodule.Module.PermissionList))
                             .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
 
                         site.Modules.Add(module);
                     }
                 }
+                site.Modules = site.Modules.OrderBy(item => item.PageId).ThenBy(item => item.Pane).ThenBy(item => item.Order).ToList();
 
                 // languages
                 site.Languages = _languages.GetLanguages(site.SiteId).ToList();

Oqtane.Server/Controllers/SqlController.cs

@@ -32,13 +32,23 @@ namespace Oqtane.Controllers
         {
             var results = new List<Dictionary<string, string>>();
             Dictionary<string, string> row;
-            Tenant tenant = _tenants.GetTenant(sqlquery.TenantId);
+
+            if (string.IsNullOrEmpty(sqlquery.DBType) || string.IsNullOrEmpty(sqlquery.DBConnectionString))
+            {
+                Tenant tenant = _tenants.GetTenant(sqlquery.TenantId);
+                if (tenant != null)
+                {
+                    sqlquery.DBType = tenant.DBType;
+                    sqlquery.DBConnectionString = tenant.DBConnectionString;
+                }
+            }
+
             try
             {
                 foreach (string query in sqlquery.Query.Split("GO", StringSplitOptions.RemoveEmptyEntries))
                 {
-                    IDataReader dr = _sql.ExecuteReader(tenant, query);
-                    _logger.Log(LogLevel.Information, this, LogFunction.Other, "Sql Query {Query} Executed on Tenant {TenantId}", query, sqlquery.TenantId);
+                    IDataReader dr = _sql.ExecuteReader(sqlquery.DBType, sqlquery.DBConnectionString, query);
+                    _logger.Log(LogLevel.Information, this, LogFunction.Other, "Sql Query {Query} Executed on Database {DBType} and Connection {DBConnectionString}", query, sqlquery.DBType, sqlquery.DBConnectionString);
                     while (dr.Read())
                     {
                         row = new Dictionary<string, string>();
@@ -53,7 +63,7 @@ namespace Oqtane.Controllers
             catch (Exception ex)
             {
                 results.Add(new Dictionary<string, string>() { { "Error", ex.Message } });
-                _logger.Log(LogLevel.Warning, this, LogFunction.Other, "Sql Query {Query} Executed on Tenant {TenantId} Resulted In An Error {Error}", sqlquery.Query, sqlquery.TenantId, ex.Message);
+                _logger.Log(LogLevel.Warning, this, LogFunction.Other, "Sql Query {Query} Executed on Database {DBType} and Connection {DBConnectionString} Resulted In An Error {Error}", sqlquery.Query, sqlquery.DBType, sqlquery.DBConnectionString, ex.Message);
             }
             sqlquery.Results = results;
             return sqlquery;

Oqtane.Server/Controllers/SystemController.cs

@@ -63,6 +63,12 @@ namespace Oqtane.Controllers
                     }
                     systeminfo.Add("Log", log);
                     break;
+                case "connectionstrings":
+                    foreach (var kvp in _configManager.GetSettings(SettingKeys.ConnectionStringsSection))
+                    {
+                        systeminfo.Add(kvp.Key, kvp.Value);
+                    }
+                    break;
             }
 
             return systeminfo;
@@ -84,16 +90,25 @@ namespace Oqtane.Controllers
         {
             foreach(KeyValuePair<string, object> kvp in settings)
             {
-                _configManager.AddOrUpdateSetting(kvp.Key, kvp.Value, false);
+                UpdateSetting(kvp.Key, kvp.Value);
             }
         }
 
-        // PUT: api/<controller>
-        [HttpPut("{key}/{value}")]
-        [Authorize(Roles = RoleNames.Host)]
-        public void Put(string key, object value)
+        private void UpdateSetting(string key, object value)
         {
-            _configManager.AddOrUpdateSetting(key, value, false);
+            switch (key.ToLower())
+            {
+                case "clearlog":
+                    string path = Path.Combine(_environment.ContentRootPath, "Content", "Log", "error.log");
+                    if (System.IO.File.Exists(path))
+                    {
+                        System.IO.File.Delete(path);
+                    }
+                    break;
+                default:
+                    _configManager.AddOrUpdateSetting(key, value, false);
+                    break;
+            }
         }
     }
 }

Oqtane.Server/Controllers/ThemeController.cs

@@ -41,14 +41,6 @@ namespace Oqtane.Controllers
             return _themes.GetThemes();
         }
 
-        [HttpGet("install")]
-        [Authorize(Roles = RoleNames.Host)]
-        public void InstallThemes()
-        {
-            _logger.Log(LogLevel.Information, this, LogFunction.Create, "Themes Installed");
-            _installationManager.InstallPackages();
-        }
-
         // DELETE api/<controller>/xxx
         [HttpDelete("{themename}")]
         [Authorize(Roles = RoleNames.Host)]

Oqtane.Server/Controllers/UserController.cs

@@ -330,11 +330,11 @@ namespace Oqtane.Controllers
                             // delete user
                             _users.DeleteUser(user.UserId);
                             _syncManager.AddSyncEvent(_tenantManager.GetAlias().TenantId, EntityNames.User, user.UserId, SyncEventActions.Delete);
-                            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Deleted {UserId}", user.UserId);
+                            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Deleted {UserId}", user.UserId, result.ToString());
                         }
                         else
                         {
-                            _logger.Log(LogLevel.Error, this, LogFunction.Delete, "Error Deleting User {UserId}", user.UserId, result.ToString());
+                            _logger.Log(LogLevel.Error, this, LogFunction.Delete, "Error Deleting User {UserId}", user.UserId);
                         }
                     }
                 }

Oqtane.Server/Controllers/VisitorController.cs

@@ -50,7 +50,7 @@ namespace Oqtane.Controllers
             bool authorized = User.IsInRole(RoleNames.Admin);
             if (!authorized)
             {
-                var visitorCookie = "APP_VISITOR_" + _alias.SiteId.ToString();
+                var visitorCookie = Constants.VisitorCookiePrefix + _alias.SiteId.ToString();
                 if (int.TryParse(Request.Cookies[visitorCookie], out int visitorId))
                 {
                     authorized = (visitorId == id);