Merge pull request #2784 from oqtane/master

Merge pull request #2783 from oqtane/dev

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2022 .NET Foundation
+Copyright (c) 2018-2023 .NET Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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,10 +4,12 @@
 @inject IUserService UserService
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<div class="row">
+@if (_pages != null)
+{
+    <div class="row">
         @foreach (var p in _pages)
         {
-        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+            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">
@@ -17,16 +19,20 @@
                 </div>
             }
         }
-</div>
+    </div>
+}
 
 @code {
 	private List<Page> _pages;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
 	protected override void OnInitialized()
 	{
 		var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
-        _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList();
+		if (admin != null)
+		{
+			_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

@@ -9,7 +9,7 @@
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_supportedCultures == null)
+@if (_cultures == null)
 {
     <p><em>@SharedLocalizer["Loading"]</em></p>
 }
@@ -17,20 +17,14 @@ else
 {
     <TabStrip>
         <TabPanel Name="Manage" ResourceKey="Manage">
-            @if (_availableCultures.Count() == 0)
-            {
-                <ModuleMessage Type="MessageType.Info" Message="@_message"></ModuleMessage>
-				<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-            }
-            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="name" HelpText="Name Of The Language" ResourceKey="Name">Name:</Label>
                         <div class="col-sm-9">
                             <select id="_code" class="form-select" @bind="@_code" required>
-                                    @foreach (var culture in _availableCultures)
+								<option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+								@foreach (var culture in _cultures)
                                 {
                                     <option value="@culture.Name">@(culture.DisplayName + " (" + culture.Name + ")")</option>
                                 }
@@ -40,7 +34,7 @@ else
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label>
                         <div class="col-sm-9">
-                                <select id="default" class="form-select" @bind="@_isDefault" required>
+                            <select id="default" class="form-select" @bind="@_default" required>
                                 <option value="True">@SharedLocalizer["Yes"]</option>
                                 <option value="False">@SharedLocalizer["No"]</option>
                             </select>
@@ -50,215 +44,59 @@ else
                 <button type="button" class="btn btn-success" @onclick="SaveLanguage">@SharedLocalizer["Save"]</button>
 				<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
             </form>
-            }
-        </TabPanel>
-		<TabPanel Name="Translations" Heading="Translations" ResourceKey="Download" Security="SecurityAccessLevel.Host">
-            <div class="row justify-content-center mb-3">
-                <div class="col-sm-6">
-                    <div class="input-group">
-                        <select id="price" class="form-select custom-select" @onchange="(e => PriceChanged(e))">
-                            <option value="free">@SharedLocalizer["Free"]</option>
-                            <option value="paid">@SharedLocalizer["Paid"]</option>
-                        </select>
-                        <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
-                        <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>
-                        <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
-                    </div>
-                </div>
-            </div>
-
-            @if (_packages != null)
-            {
-                @if (_packages.Count > 0)
-                {
-                    <Pager Items="@_packages">
-                        <Row>
-                            <td>
-                                <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
-                                @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
-                                <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
-                                @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
-                                @SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
-                                @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(context.PackageUrl).Host + "</strong>" : ""))
-                                @((MarkupString)(context.TrialPeriod > 0 ? "&nbsp;&nbsp;|&nbsp;&nbsp;<strong>" + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "</strong>" : ""))
-                            </td>
-                            <td style="width: 1px; vertical-align: middle;">
-                                @if (context.Price != null && !string.IsNullOrEmpty(context.PackageUrl))
-                                {
-                                    <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
-                                }
-                            </td>
-                            <td style="width: 1px; vertical-align: middle;">
-                                @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
-                                {
-                                    <a class="btn btn-primary" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@context.Price.Value.ToString("$#,##0.00")</a>
-                                }
-                                else
-                                {
-                                    <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
-                                }
-                            </td>
-                        </Row>
-                    </Pager>
-                }
-                else
-                {
-                    <br />
-                    <div class="mx-auto text-center">
-                        @Localizer["Search.NoResults"]
-                    </div>
-                }
-                <button type="button" class="btn btn-success" @onclick="InstallLanguages">@SharedLocalizer["Install"]</button>
-                <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-
-				<br />
-				<br />
-				<ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
-            }
         </TabPanel>
         <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="InstallLanguages">@SharedLocalizer["Install"]</button>
             <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
         </TabPanel>
     </TabStrip>
 }
 
-@if (_productname != "")
-{
-    <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;">
-                            <h3>@_productname</h3>
-                            @if (!string.IsNullOrEmpty(_license))
-                            {
-                                @((MarkupString)_license)
-                            }
-                            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>
-}
-
 @code {
 	private ElementReference form;
 	private bool validated = false;
 
-	private string _code = string.Empty;
+	private string _code = "-";
-	private string _isDefault = "False";
+	private string _default = "False";
-	private string _message;
+	private List<string> _languages;
-	private IEnumerable<Culture> _supportedCultures;
+	private IEnumerable<Culture> _cultures;
-	private IEnumerable<Culture> _availableCultures;
-	private List<Package> _packages;
-	private string _price = "free";
-	private string _search = "";
-	private string _productname = "";
-	private string _license = "";
-	private string _packageid = "";
-	private string _version = "";
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
 	protected override async Task OnParametersSetAsync()
 	{
 		var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
-		var languagesCodes = languages.Select(l => l.Code).ToList();
+		_languages = languages.Select(l => l.Code).ToList();
 
-		_supportedCultures = await LocalizationService.GetCulturesAsync();
+		await LoadCultures();
-		_availableCultures = _supportedCultures.Where(c => !c.Name.Equals(Constants.DefaultCulture) && !languagesCodes.Contains(c.Name));
-		await LoadTranslations();
-
-        if (_supportedCultures.Count() == 1)
-        {
-            _message = Localizer["OnlyEnglish"];
-        }
-        else if (_availableCultures.Count() == 0)
-        {
-            _message = Localizer["AllLanguages"];
-        }
 	}
 
-    private async Task LoadTranslations()
+	private async Task LoadCultures()
 	{
-        _packages = await PackageService.GetPackagesAsync("translation", _search, _price, "");
+		_cultures = await LocalizationService.GetCulturesAsync(false);
-    }
+		_cultures = _cultures.Where(c => !c.Name.Equals(Constants.DefaultCulture) && !_languages.Contains(c.Name));
-
+		_code = "-";
-    private async void PriceChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _price = (string)e.Value;
-            _search = "";
-            await LoadTranslations();
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On PriceChanged");
-        }
-    }
-
-    private async Task Search()
-    {
-        try
-        {
-            await LoadTranslations();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Search");
-        }
-    }
-
-    private async Task Reset()
-    {
-        try
-        {
-            _search = "";
-            await LoadTranslations();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Reset");
-        }
 	}
 
 	private async Task SaveLanguage()
 	{
 		validated = true;
 		var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
+		if (await interop.FormValid(form) && _code != "-")
 		{
 			var language = new Language
 				{
 					SiteId = PageState.Page.SiteId,
 					Name = CultureInfo.GetCultureInfo(_code).DisplayName,
 					Code = _code,
-                IsDefault = (_isDefault == null ? false : Boolean.Parse(_isDefault))
+					IsDefault = (_default == null ? false : Boolean.Parse(_default))
 				};
 
 			try
@@ -286,67 +124,6 @@ else
 		}
 	}
 
-
-    private void HideModal()
-    {
-        _productname = "";
-        _license = "";
-        StateHasChanged();
-    }
-
-    private async Task GetPackage(string packageid, string version)
-    {
-        try
-        {
-            var package = await PackageService.GetPackageAsync(packageid, version);
-            if (package != null)
-            {
-                _productname = package.Name;
-                if (!string.IsNullOrEmpty(package.License))
-                {
-                    _license = package.License.Replace("\n", "<br />");
-                }
-                _packageid = package.PackageId;
-                _version = 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, _version, Constants.PackagesFolder);
-            await logger.LogInformation("Language Package {Name} {Version} Downloaded Successfully", _packageid, _version);
-            AddModuleMessage(Localizer["Success.Language.Download"], MessageType.Success);
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Downloading Translation {Name} {Version}", _packageid, _version);
-            AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
-        }
-    }
-
-    private async Task InstallLanguages()
-    {
-        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");
-        }
-    }
-
     private async Task SetCultureAsync(string culture)
     {
         if (culture != CultureInfo.CurrentUICulture.Name)
@@ -358,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

@@ -19,38 +19,95 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@Localizer["Code"]</th>
-			<th>@Localizer["Translation"]</th>
             <th>@Localizer["Default"]</th>
+			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+				<th style="width: 1px;">@Localizer["Translation"]</th>
 				<th style="width: 1px;">&nbsp;</th>
+			}
         </Header>
         <Row>
             <td><ActionDialog Header="Delete Language" Message="@string.Format(Localizer["Confirm.Language.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteLanguage(context))" Disabled="@((context.IsDefault && _languages.Count > 2) || context.Code == Constants.DefaultCulture)" ResourceKey="DeleteLanguage" /></td>
             <td>@context.Name</td>
             <td>@context.Code</td>
-			<td>@context.Version</td>
 			<td><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
-			<td>
+			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                @if (UpgradeAvailable(context.Code, context.Version))
 			{
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadLanguage(context.Code))>@SharedLocalizer["Upgrade"]</button>
+				<td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
+				<td>
+					@{
+						var translation = TranslationAvailable(context.Code, context.Version);
+					}
+					@if (translation != null)
+					{
+						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 (_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>
+}
+
 @code {
 	private List<Language> _languages;
 	private List<Package> _packages;
+	private Package _package;
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
 	protected override async Task OnParametersSetAsync()
 	{
-		_languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.ClientId);
+		await GetLanguages();
-
-		var cultures = await LocalizationService.GetCulturesAsync();
-        var culture = cultures.First(c => c.Name.Equals(Constants.DefaultCulture));
 
 		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 		{
@@ -58,13 +115,18 @@ else
 		}
 	}
 
+	private async Task GetLanguages()
+	{
+		_languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.ClientId);
+	}
+
 	private async Task DeleteLanguage(Language language)
 	{
 		try
 		{
 			await LanguageService.DeleteLanguageAsync(language.LanguageId);
 			await logger.LogInformation("Language Deleted {Language}", language);
-
+			await GetLanguages();
 			StateHasChanged();
 		}
 		catch (Exception ex)
@@ -75,38 +137,45 @@ else
 		}
 	}
 
-    private bool UpgradeAvailable(string code, string version)
+	private Package TranslationAvailable(string code, string version)
 	{
-        var upgradeavailable = false;
+		return _packages?.FirstOrDefault(item => item.PackageId == (Constants.PackageId + "." + code));
-        if (_packages != null && version != null)
-        {
-			var package = _packages.Where(item => item.PackageId == (Constants.PackageId + "." + code)).FirstOrDefault();
-			if (package != null)
-            {
-				upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0) &&
-					(Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
 	}
 
-        }
+	private async Task GetPackage(string code, string version)
-        return upgradeavailable;
-    }
-
-    private async Task DownloadLanguage(string code)
 	{
 		try
 		{
-            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			_package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, version);
-            {
+			StateHasChanged();
-                await PackageService.DownloadPackageAsync(Constants.PackageId + "." + code, Constants.Version, Constants.PackagesFolder);
-                await logger.LogInformation("Translation Downloaded {Code} {Version}", code, Constants.Version);
-                await PackageService.InstallPackagesAsync();
-                AddModuleMessage(string.Format(Localizer["Success.Language.Install"], NavigateUrl("admin/system")), MessageType.Success);
-            }
 		}
 		catch (Exception ex)
 		{
-            await logger.LogError(ex, "Error Downloading Translation {Code} {Version} {Error}", code, Constants.Version, ex.Message);
+			await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", Constants.PackageId + "." + code, Constants.Version);
+			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task DownloadPackage()
+	{
+		try
+		{
+			await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version, Constants.PackagesFolder);
+			await logger.LogInformation("Language Package {Name} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
+			AddModuleMessage(string.Format(Localizer["Success.Language.Download"], NavigateUrl("admin/system")), MessageType.Success);
+			_package = null;
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Downloading Translation {Name} {Version}", _package.PackageId, _package.Version);
 			AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
 		}
 	}
+
+	private void HideModal()
+	{
+		_package = null;
+		StateHasChanged();
+	}
 }

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

@@ -131,7 +131,7 @@ else
 					moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
 
 					var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-					SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
+					settings = SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
 					await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
 
 					GetLocation();
@@ -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,13 +113,8 @@
     </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";
@@ -236,7 +233,7 @@
         {
             await PackageService.DownloadPackageAsync(_packageid, _packageversion, Constants.PackagesFolder);
             await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _packageversion);
-			AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success);
+            AddModuleMessage(string.Format(Localizer["Success.Module.Download"], NavigateUrl("admin/system")), MessageType.Success);
             _productname = "";
             _packagelicense = "";
             StateHasChanged();
@@ -248,16 +245,8 @@
         }
     }
 
-	private async Task InstallModules()
+    private void OnUpload()
     {
-		try
+        AddModuleMessage(string.Format(Localizer["Success.Module.Download"], NavigateUrl("admin/system")), MessageType.Success);
-		{
-			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");
-		}
     }
 }

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,7 +9,9 @@
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
+@if (_initialized)
+{
+	<TabStrip>
 		<TabPanel Name="Definition" ResourceKey="Definition">
 			<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
 				<div class="container">
@@ -95,9 +97,10 @@
 		<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" />
+					<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>
@@ -108,43 +111,47 @@
 					<Header>
 					<th>@SharedLocalizer["Name"]</th>
 					<th>@Localizer["Code"]</th>
-					<th>@Localizer["Version"]</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>@context.Version</td>
+						<td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
 						<td>
-						@if (context.IsDefault)
+							@switch (TranslationAvailable(_packagename + "." + context.Code, context.Version))
 							{
-							<button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Download"]</button>
+								case "install":
-						}
+									<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Download"]</button>
-						else
+									break;
-						{
+								case "upgrade":
-							if (UpgradeAvailable(_packagename + "." + context.Code, context.Version))
+									<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Upgrade"]</button>
-							{
+									break;
-								<button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadPackage(_packagename + "." + context.Code))>@SharedLocalizer["Upgrade"]</button>
-							}
 							}
 						</td>
 					</Row>
 				</Pager>
-			<button type="button" class="btn btn-success" @onclick="InstallTranslations">@SharedLocalizer["Install"]</button>
 			}
 			else
 			{
 				<br />
 				<div class="mx-auto text-center">
+					@if (string.IsNullOrEmpty(_packagename))
+					{
+						@Localizer["Search.PackageNameMissing"]
+					}
+					else
+					{
 						@Localizer["Search.NoResults"]
+					}
 				</div>
 				<br />
 			}
 		</TabPanel>
-</TabStrip>
+	</TabStrip>
 
-@if (_productname != "")
+	@if (_package != null)
-{
+	{
 		<div class="app-actiondialog">
 			<div class="modal" tabindex="-1" role="dialog">
 				<div class="modal-dialog">
@@ -155,10 +162,17 @@
 						</div>
 						<div class="modal-body">
 							<p style="height: 200px; overflow-y: scroll;">
-							<h3>@_productname</h3>
+								<h4 style="display: inline;"><a href="@_package.ProductUrl" target="_new">@_package.Name</a></h4><br />
-							@if (!string.IsNullOrEmpty(_packagelicense))
+								@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)_packagelicense)
+									@((MarkupString)_package.License.Replace("\n", "<br />"))
 								}
 								else
 								{
@@ -167,16 +181,18 @@
 							</p>
 						</div>
 						<div class="modal-footer">
-						<button type="button" class="btn btn-success" @onclick=@(async () => await DownloadPackage(_packageid))>@SharedLocalizer["Accept"]</button>
+							<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>
+	}
 }
 
 @code {
+    private bool _initialized = false;
     private ElementReference form;
     private bool validated = false;
     private int _moduleDefinitionId;
@@ -191,7 +207,7 @@
     private string _contact = "";
     private string _license = "";
     private string _runtimes = "";
-	private string _permissions;
+    private List<Permission> _permissions = null;
     private string _createdby;
     private DateTime _createdon;
     private string _modifiedby;
@@ -203,9 +219,7 @@
 
     private List<Package> _packages;
     private List<Language> _languages;
-	private string _productname = "";
+    private Package _package;
-	private string _packagelicense = "";
-	private string _packageid = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -228,7 +242,7 @@
                 _contact = moduleDefinition.Contact;
                 _license = moduleDefinition.License;
                 _runtimes = moduleDefinition.Runtimes;
-				_permissions = moduleDefinition.Permissions;
+                _permissions = moduleDefinition.PermissionList;
                 _createdby = moduleDefinition.CreatedBy;
                 _createdon = moduleDefinition.CreatedOn;
                 _modifiedby = moduleDefinition.ModifiedBy;
@@ -248,6 +262,8 @@
                     }
                     _languages = _languages.OrderBy(item => item.Name).ToList();
                 }
+
+                _initialized = true;
             }
         }
         catch (Exception ex)
@@ -264,6 +280,9 @@
         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)
@@ -278,10 +297,15 @@
                     {
                         moduledefinition.Categories = _categories;
                     }
-				moduledefinition.Permissions = _permissionGrid.GetPermissions();
+                    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)
 			{
@@ -297,24 +321,31 @@
 
 	private void HideModal()
 	{
-		_productname = "";
+		_package = null;
-		_packagelicense = "";
 		StateHasChanged();
 	}
 
-	private bool UpgradeAvailable(string packagename, string version)
+	private string TranslationAvailable(string packagename, string version)
 	{
-		var upgradeavailable = false;
 		if (_packages != null)
 		{
 			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
 			if (package != null)
 			{
-				upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+				if (string.IsNullOrEmpty(version))
+				{
+					return "install";
 				}
-
+				else
+				{
+					if (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+					{
+						return "upgrade";
 					}
-		return upgradeavailable;
+				}
+			}
+		}
+		return "";
 	}
 
 	private async Task GetPackage(string packagename)
@@ -322,16 +353,7 @@
 		var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version;
 		try
 		{
-			var package = await PackageService.GetPackageAsync(packagename, version);
+			_package = await PackageService.GetPackageAsync(packagename, version);
-			if (package != null)
-			{
-				_productname = package.Name;
-				if (!string.IsNullOrEmpty(package.License))
-				{
-					_packagelicense = package.License.Replace("\n", "<br />");
-				}
-				_packageid = package.PackageId;
-			}
 			StateHasChanged();
 		}
 		catch (Exception ex)
@@ -341,16 +363,14 @@
 		}
 	}
 
-	private async Task DownloadPackage(string packagename)
+	private async Task DownloadPackage()
 	{
 		try
 		{
-			var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version;
+			await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version, Constants.PackagesFolder);
-			await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
+			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
-			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", packagename, version);
+			AddModuleMessage(string.Format(Localizer["Success.Translation.Download"], NavigateUrl("admin/system")), MessageType.Success);
-			AddModuleMessage(Localizer["Success.Translation.Download"], MessageType.Success);
+			_package = null;
-			_productname = "";
-			_packagelicense = "";
 			StateHasChanged();
 		}
 		catch (Exception ex)
@@ -359,17 +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);
-		}
-		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

@@ -157,6 +157,7 @@
             </TabPanel>
         }
     </TabStrip>
+	<br />
 	<button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
     <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
 </form>
@@ -182,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;
@@ -201,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)
@@ -221,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);
 					}
@@ -231,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);
 					}
@@ -377,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

@@ -148,7 +148,8 @@
                         </div>
                     </div>
                 </Section>
-                <br /><br />
+                <br />
+				<br />
                 <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
             }
         </TabPanel>
@@ -157,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>
             }
@@ -173,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><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" Permissions="@context.Permissions" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></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>
@@ -189,6 +190,7 @@
             <br />
         }
     </TabStrip>
+	<br />
 	<button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
     <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
 </form>
@@ -219,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;
@@ -290,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;
@@ -337,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);
 					}
@@ -347,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);
 					}
@@ -507,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/Profiles/Edit.razor

@@ -104,7 +104,7 @@
     private string modifiedby;
     private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     public override string Actions => "Add,Edit";
 

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

@@ -10,7 +10,7 @@
 }
 else
 {
-    <ActionLink Action="Add" Security="SecurityAccessLevel.Admin" Text="Add Profile" ResourceKey="AddProfile" />
+	<ActionLink Action="Add" Text="Add Profile" Security="SecurityAccessLevel.Edit" ResourceKey="AddProfile" />
 
     <Pager Items="@_profiles">
         <Header>
@@ -19,8 +19,8 @@ else
             <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" ResourceKey="EditProfile" /></td>
+			<td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="EditProfile" /></td>
-            <td><ActionDialog Header="Delete Profile" Message="@string.Format(Localizer["Confirm.Profile.Delete"], context.Name)" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
+			<td><ActionDialog Header="Delete Profile" Message="@string.Format(Localizer["Confirm.Profile.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
@@ -29,7 +29,7 @@ else
 @code {
     private List<Profile> _profiles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
     protected override async Task OnParametersSetAsync()
     {

Oqtane.Client/Modules/Admin/Profiles/ModuleInfo.cs

@@ -0,0 +1,20 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Profiles
+{
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "Profiles",
+            Description = "Manage Profiles",
+            Categories = "Admin",
+            Version = Constants.Version,
+            PermissionNames = $"{PermissionNames.View},{PermissionNames.Edit}," +
+                $"{EntityNames.Profile}:{PermissionNames.Write}:{RoleNames.Admin}"
+        };
+    }
+}

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>
@@ -78,7 +78,8 @@ else
 @code {
 	  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()
@@ -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>
@@ -78,11 +79,44 @@ else
     private string _email = string.Empty;
     private string _displayname = string.Empty;
 
+    //Password construction
+    private string _minimumlength;
+    private string _uniquecharacters;
+    private bool _requiredigit;
+    private bool _requireupper;
+    private bool _requirelower;
+    private bool _requirepunctuation;
+    private string _passwordconstruction;
+
     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/Roles/Add.razor

@@ -42,7 +42,7 @@
     private string _description = string.Empty;
     private string _isautoassigned = "False";
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     private async Task SaveRole()
     {

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

@@ -49,7 +49,7 @@
     private string _modifiedby;
     private DateTime _modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     protected override async Task OnInitializedAsync()
     {

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

@@ -10,7 +10,7 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Role" ResourceKey="AddRole" />
+	<ActionLink Action="Add" Text="Add Role" Security="SecurityAccessLevel.Edit" ResourceKey="AddRole" />
 
     <Pager Items="@_roles">
         <Header>
@@ -20,9 +20,9 @@ else
             <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Disabled="@(context.IsSystem)" ResourceKey="Edit" /></td>
+			<td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Security="SecurityAccessLevel.Edit" Disabled="@(context.IsSystem)" ResourceKey="Edit" /></td>
-            <td><ActionDialog Header="Delete Role" Message="@string.Format(Localizer["Confirm.DeleteUser"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
+            <td><ActionDialog Header="Delete Role" Message="@string.Format(Localizer["Confirm.DeleteUser"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
-            <td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" ResourceKey="Users" /></td>
+			<td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="Users" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
@@ -31,7 +31,7 @@ else
 @code {
     private List<Role> _roles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
     protected override async Task OnParametersSetAsync()
     {

Oqtane.Client/Modules/Admin/Roles/ModuleInfo.cs

@@ -0,0 +1,21 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Roles
+{
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "Roles",
+            Description = "Manage Roles",
+            Categories = "Admin",
+            Version = Constants.Version,
+            PermissionNames = $"{PermissionNames.View},{PermissionNames.Edit}," +
+                $"{EntityNames.Role}:{PermissionNames.Write}:{RoleNames.Admin}," +
+                $"{EntityNames.UserRole}:{PermissionNames.Write}:{RoleNames.Admin}"
+        };
+    }
+}

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

@@ -23,13 +23,7 @@ else
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="user" HelpText="Select a user" ResourceKey="User">User: </Label>
                 <div class="col-sm-9">
-                    <select id="user" class="form-select" @bind="@userid" required>
+					<AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["User.Select"]" @ref="user" />
-                        <option value="-1">&lt;@Localizer["User.Select"]&gt;</option>
-                        @foreach (UserRole userrole in users)
-                        {
-                            <option value="@(userrole.UserId)">@userrole.User.DisplayName</option>
-                        }
-                    </select>
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
@@ -64,7 +58,7 @@ else
                             <td>@context.EffectiveDate</td>
                             <td>@context.ExpiryDate</td>
                             <td>
-                                <ActionDialog Header="Remove User" Message="@string.Format(Localizer["Confirm.User.DeleteRole"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || PageState.User.Username == UserNames.Host)" ResourceKey="DeleteUserRole" />
+								<ActionDialog Header="Remove User" Message="@string.Format(Localizer["Confirm.User.DeleteRole"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || context.User.Username == UserNames.Host || context.User.UserId == PageState.User.UserId)" ResourceKey="DeleteUserRole" />
                             </td>
                         </Row>
                     </Pager>
@@ -80,13 +74,12 @@ else
 
 	private int roleid;
 	private string name = string.Empty;
-    private List<UserRole> users;
+	private AutoComplete user;
-    private int userid = -1;
 	private DateTime? effectivedate = null;
 	private DateTime? expirydate = null;
 	private List<UserRole> userroles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
 	protected override async Task OnInitializedAsync()
 	{
@@ -95,7 +88,6 @@ else
 			roleid = Int32.Parse(PageState.QueryString["id"]);
 			Role role = await RoleService.GetRoleAsync(roleid);
 			name = role.Name;
-            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
 			await GetUserRoles();
 		}
 		catch (Exception ex)
@@ -105,6 +97,22 @@ else
 		}
 	}
 
+	private async Task<Dictionary<string, string>> GetUsers(string filter)
+	{
+		try
+		{
+			var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+			return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase))
+				.ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Users {filter} {Error}", filter, ex.Message);
+			AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
+		}
+		return new Dictionary<string, string>();
+	}
+
 	private async Task GetUserRoles()
 	{
 		try
@@ -126,7 +134,7 @@ else
 		{
 			try
 			{
-                if (userid != -1)
+				if (!string.IsNullOrEmpty(user.Key) && int.TryParse(user.Key, out int userid))
 				{
 					var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
 					if (userrole != null)
@@ -149,6 +157,7 @@ else
 					await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
 					AddModuleMessage(Localizer["Success.User.AssignedRole"], MessageType.Success);
 					await GetUserRoles();
+					user.Clear();
 					StateHasChanged();
                 }
                 else

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">
@@ -127,7 +133,7 @@
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="username" HelpText="Enter the username for your SMTP account" ResourceKey="SmptUsername">Username: </Label>
+                    <Label Class="col-sm-3" For="username" HelpText="Enter the username for your SMTP account" ResourceKey="SmtpUsername">Username: </Label>
                     <div class="col-sm-9">
                         <input id="username" class="form-control" @bind="@_smtpusername" />
                     </div>
@@ -137,15 +143,24 @@
                     <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>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="sender" HelpText="Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server." ResourceKey="SmptSender">Email Sender: </Label>
+                    <Label Class="col-sm-3" For="sender" HelpText="Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server." ResourceKey="SmtpSender">Email Sender: </Label>
                     <div class="col-sm-9">
                         <input id="sender" class="form-control" @bind="@_smtpsender" />
                     </div>
+                </div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="relay" HelpText="Only specify this option if you have properly configured an SMTP Relay Service to route your outgoing mail. This option will send notifications from the user's email rather than from the Email Sender specified above." ResourceKey="SmtpRelay">Relay Configured? </Label>
+					<div class="col-sm-9">
+						<select id="relay" class="form-select" @bind="@_smtprelay" 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="retention" HelpText="Number of days of notifications to retain" ResourceKey="Retention">Retention (Days): </Label>
@@ -258,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>
@@ -275,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>
@@ -312,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";
@@ -320,6 +336,7 @@
 	private string _smtppasswordtype = "password";
 	private string _togglesmtppassword = string.Empty;
 	private string _smtpsender = string.Empty;
+	private string _smtprelay = "False";
 	private string _retention = string.Empty;
 	private string _pwaisenabled;
 	private int _pwaappiconfileid = -1;
@@ -351,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();
 
@@ -393,6 +411,7 @@
 				_smtppassword = SettingService.GetSetting(settings, "SMTPPassword", string.Empty);
 				_togglesmtppassword = SharedLocalizer["ShowPassword"];
 				_smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
+				_smtprelay = SettingService.GetSetting(settings, "SMTPRelay", "False");
 				_retention = SettingService.GetSetting(settings, "NotificationRetention", "30");
 
 				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
@@ -444,7 +463,7 @@
 		}
 		catch (Exception ex)
 		{
-			await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
+			await logger.LogError(ex, "Error Loading Containers For Theme {ThemeType} {Error}", _themetype, ex.Message);
 			AddModuleMessage(Localizer["Error.Theme.LoadPane"], MessageType.Error);
 		}
 	}
@@ -532,6 +551,7 @@
 						settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
 						settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
 						settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+						settings = SettingService.SetSetting(settings, "SMTPRelay", _smtprelay, true);
 						settings = SettingService.SetSetting(settings, "NotificationRetention", _retention, true);
 						await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
@@ -602,12 +622,12 @@
 			try
 			{
 				var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-				SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+				settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
-				SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+				settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
-				SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+				settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
-				SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+				settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
-				SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+				settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
-				SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+				settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
 				await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
 				await logger.LogInformation("Site SMTP Settings Saved");
 

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,40 +15,112 @@
 else
 {
     <div class="container">
-
 		<div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="tenant" HelpText="Select the tenant for the SQL server" ResourceKey="Tenant">Tenant: </Label>
+			<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="@_tenantid" @onchange="(e => TenantChanged(e))">
+				<select id="tenant" class="form-select" value="@_connection" @onchange="(e => ConnectionChanged(e))">
-                    <option value="-1">&lt;@Localizer["Tenant.Select"]&gt;</option>
+					<option value="-">&lt;@Localizer["Connection.Select"]&gt;</option>
-                    @foreach (Tenant tenant in _tenants)
+					<option value="+">&lt;@Localizer["Connection.Add"]&gt;</option>
+					@foreach (var connection in _connections)
 					{
-                        <option value="@tenant.TenantId">@tenant.Name</option>
+						<option value="@connection.Key">@connection.Key</option>
 					}
 				</select>
 			</div>
 		</div>
-        @if (_tenantid != "-1")
+		@if (_connection == "+")
 		{
 			<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="name" HelpText="Enter the name of the connection" ResourceKey="Name">Name: </Label>
 				<div class="col-sm-9">
-                    <input id="database" class="form-control" @bind="@_database" readonly />
+					<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="connectionstring" HelpText="The connection information for the database" ResourceKey="ConnectionString">Connection: </Label>
+				<Label Class="col-sm-3" For="databasetype" HelpText="Select the database type" ResourceKey="DatabaseType">Type: </Label>
 				<div class="col-sm-9">
-                    <textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="2" readonly></textarea>
+					@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="sqlQeury" HelpText="Enter the query for the SQL server" ResourceKey="SqlQuery">SQL Query: </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="sqlQeury" class="form-control" @bind="@_sql" rows="3"></textarea>
+						<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>
@@ -77,15 +150,30 @@ else
 						@Localizer["Return.NoResult"]
 					}
 					<br />
+
 					<br />
 				}
+			}
+		}
+	</div>
 }
 
 @code {
+	private string _connection = "-";
+	private Dictionary<string, object> _connections;
 	private List<Tenant> _tenants;
-    private string _tenantid = "-1";
+	private List<Database> _databases;
-    private string _database = string.Empty;
+
+	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;
 
@@ -95,7 +183,10 @@ else
 	{
 		try
 		{
+			_connections = await SystemService.GetSystemInfoAsync("connectionstrings");
 			_tenants = await TenantService.GetTenantsAsync();
+			_databases = await DatabaseService.GetDatabasesAsync();
+			_connectionstringtoggle = SharedLocalizer["ShowPassword"];
 		}
 		catch (Exception ex)
 		{
@@ -104,35 +195,127 @@ else
 		}
 	}
 
-    private async void TenantChanged(ChangeEventArgs e)
+	private async void ConnectionChanged(ChangeEventArgs e)
 	{
 		try
 		{
-            _tenantid = (string)e.Value;
+			_connection = (string)e.Value;
-            var tenants = await TenantService.GetTenantsAsync();
+			if (_connection != "-" && _connection != "+")
-            var _databases = await DatabaseService.GetDatabasesAsync();
+			{
-            var tenant = tenants.Find(item => item.TenantId == int.Parse(_tenantid));
+				_connectionstring = _connections[_connection].ToString();
+				_tenant = "";
+				_databasetype = "-";
+				var tenant = _tenants.FirstOrDefault(item => item.DBConnectionString == _connection);
 				if (tenant != null)
 				{
-                _database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
+					_tenant = tenant.Name;
-                _connectionstring = tenant.DBConnectionString;
+					_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 Tenant {TenantId} {Error}", _tenantid, ex.Message);
+			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()
+	{
+		if (_connectionstringtype == "password")
+		{
+			_connectionstringtype = "text";
+			_connectionstringtoggle = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_connectionstringtype = "password";
+			_connectionstringtoggle = SharedLocalizer["ShowPassword"];
+		}
+	}
+
 	private async Task Execute()
 	{
 		try
 		{
-            if (_tenantid != "-1" && !string.IsNullOrEmpty(_sql))
+			if (_databasetype != "-" && !string.IsNullOrEmpty(_sql))
 			{
-                var sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _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

@@ -147,6 +147,18 @@
         <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>&nbsp;
         <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
     </TabPanel>
+    <TabPanel Name="Log" Heading="Log" ResourceKey="Log">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="log" HelpText="System log information for current day" ResourceKey="Log">Log: </Label>
+                <div class="col-sm-9">
+                    <textarea id="log" class="form-control" rows="10" @bind="@_log" readonly />
+                </div>
+            </div>
+		</div>
+		<br /><br />
+		<button type="button" class="btn btn-danger" @onclick="ClearLog">@Localizer["Clear"]</button>
+	</TabPanel>
 </TabStrip>
 <br /><br />
 
@@ -172,11 +184,13 @@
 	private string _swagger = string.Empty;
 	private string _packageservice = string.Empty;
 
+	private string _log = string.Empty;
+
 	protected override async Task OnInitializedAsync()
 	{
 		_version = Constants.Version;
 
-		Dictionary<string, object> systeminfo = await SystemService.GetSystemInfoAsync("environment");
+		var systeminfo = await SystemService.GetSystemInfoAsync("environment");
 		if (systeminfo != null)
 		{
 			_clrversion = systeminfo["CLRVersion"].ToString();
@@ -191,7 +205,7 @@
 			_workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
 		}
 
-		systeminfo = await SystemService.GetSystemInfoAsync();
+		systeminfo = await SystemService.GetSystemInfoAsync("configuration");
 		if (systeminfo != null)
 		{
 			_installationid = systeminfo["InstallationId"].ToString();
@@ -201,6 +215,12 @@
 			_swagger = systeminfo["UseSwagger"].ToString();
 			_packageservice = systeminfo["PackageService"].ToString();
 		}
+
+		systeminfo = await SystemService.GetSystemInfoAsync("log");
+		if (systeminfo != null)
+		{
+			_log = systeminfo["Log"].ToString();
+		}
 	}
 
 	private async Task SaveConfig()
@@ -223,6 +243,23 @@
 		}
 	}
 
+	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()
     {
         try

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
+        AddModuleMessage(string.Format(Localizer["Success.Theme.Download"], NavigateUrl("admin/system")), MessageType.Success);
-        {
-            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");
-        }
     }
 }

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>
             }
+            @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>
@@ -305,7 +308,14 @@ else
 	}
 
 	private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+	{
+		string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+		if (value.Contains("]"))
+		{
+			value = value.Substring(value.IndexOf("]") + 1);
+		}
+		return value;
+	}
 
 	private async Task Save()
 	{
@@ -337,7 +347,9 @@ else
 						photo = null;
 					}
 
-                    await UserService.UpdateUserAsync(user);
+					user = await UserService.UpdateUserAsync(user);
+					if (user != null)
+					{
 						await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
 						await logger.LogInformation("User Profile Saved");
 
@@ -345,6 +357,11 @@ else
 						StateHasChanged();
 					}
 					else
+					{
+						AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);						
+					}
+				}
+                else
                 {
                     AddModuleMessage(Localizer["Message.Password.Invalid"], MessageType.Warning);
                 }

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>
@@ -104,7 +104,7 @@
     private Dictionary<string, string> settings;
     private string category = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     protected override async Task OnInitializedAsync()
     {
@@ -122,7 +122,14 @@
     }
 
 	private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+	{
+		string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+		if (value.Contains("]"))
+		{
+			value = value.Substring(value.IndexOf("]") + 1);
+		}
+		return value;
+	}
 
     private async Task SaveUser()
     {

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>
@@ -174,7 +174,7 @@ else
 	private string deletedby;
 	private DateTime? deletedon;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
 	protected override async Task OnParametersSetAsync()
 	{
@@ -223,7 +223,14 @@ else
 	}
 
 	private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+	{
+		string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+		if (value.Contains("]"))
+		{
+			value = value.Substring(value.IndexOf("]") + 1);
+		}
+		return value;
+	}
 
 	private async Task SaveUser()
 	{
@@ -249,12 +256,18 @@ else
 					user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
 
 					user = await UserService.UpdateUserAsync(user);
+					if (user != null)
+					{
 						await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
 						await logger.LogInformation("User Saved {User}", user);
-
 						NavigationManager.NavigateTo(NavigateUrl());
 					}
 					else
+					{
+						AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);
+					}
+                }
+                else
                 {
                     AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
                 }

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

@@ -20,7 +20,7 @@ else
 			<div class="container">
 				<div class="row mb-1 align-items-center">
 					<div class="col-sm-4">
-						<ActionLink Action="Add" Text="Add User" ResourceKey="AddUser" />
+						<ActionLink Action="Add" Text="Add User" Security="SecurityAccessLevel.Edit" ResourceKey="AddUser" />
 					</div>
 					<div class="col-sm-4">
 						<input class="form-control" @bind="@_search" />
@@ -41,21 +41,21 @@ else
 				</Header>
 				<Row>
 					<td>
-						<ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="EditUser" />
+						<ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="EditUser" />
 					</td>
 					<td>
-						<ActionDialog Header="Delete User" Message="@string.Format(Localizer["Confirm.User.Delete"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" Disabled="@(context.UserId == PageState.User.UserId)" ResourceKey="DeleteUser" />
+						<ActionDialog Header="Delete User" Message="@string.Format(Localizer["Confirm.User.Delete"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" Disabled="@(context.UserId == PageState.User.UserId)" ResourceKey="DeleteUser" />
 					</td>
 					<td>
-						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
+						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="Roles" />
 					</td>
 					<td>@context.User.Username</td>
 					<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.DisplayName))</td>
-					<td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn)</td>
+					<td>@((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn) : "")</td>
 				</Row>
 			</Pager>
 		</TabPanel>
-        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings" Security="SecurityAccessLevel.Admin">
 			<div class="container">
 				<Section Name="User" Heading="User Settings" ResourceKey="UserSettings">
 					<div class="row mb-1 align-items-center">
@@ -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;
 
@@ -406,7 +413,7 @@ else
 	private string _lifetime;
 	private string _token;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
 	protected override async Task OnInitializedAsync()
 	{
@@ -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");
 
@@ -456,7 +464,8 @@ else
 			_togglesecret = SharedLocalizer["ShowPassword"];
 			_issuer = SettingService.GetSetting(settings, "JwtOptions:Issuer", PageState.Uri.Scheme + "://" + PageState.Alias.Name);
 			_audience = SettingService.GetSetting(settings, "JwtOptions:Audience", "");
-			_lifetime = SettingService.GetSetting(settings, "JwtOptions:Lifetime", "20");		}
+			_lifetime = SettingService.GetSetting(settings, "JwtOptions:Lifetime", "20");
+		}
 	}
 
 	private async Task LoadUsersAsync(bool load)
@@ -522,7 +531,7 @@ else
 	private async Task UpdateUserSettingsAsync()
 	{
 		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-		SettingService.SetSetting(settings, settingSearch, _search);
+		settings = SettingService.SetSetting(settings, settingSearch, _search);
 		await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
 	}
 
@@ -567,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/Admin/Users/ModuleInfo.cs

@@ -0,0 +1,21 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Users
+{
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "Users",
+            Description = "Manage Users",
+            Categories = "Admin",
+            Version = Constants.Version,
+            PermissionNames = $"{PermissionNames.View},{PermissionNames.Edit}," +
+                $"{EntityNames.User}:{PermissionNames.Write}:{RoleNames.Admin}," +
+                $"{EntityNames.UserRole}:{PermissionNames.Write}:{RoleNames.Admin}"
+        };
+    }
+}

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

@@ -63,7 +63,7 @@ else
                 <td>@context.EffectiveDate</td>
                 <td>@context.ExpiryDate</td>
                 <td>
-                    <ActionDialog Header="Remove Role" Message="@string.Format(Localizer["Confirm.User.RemoveRole"], context.Role.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || (context.Role.Name == RoleNames.Host && userid == PageState.User.UserId))" ResourceKey="DeleteUserRole" />
+                    <ActionDialog Header="Remove Role" Message="@string.Format(Localizer["Confirm.User.RemoveRole"], context.Role.Name)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || (context.Role.Name == RoleNames.Host && userid == PageState.User.UserId))" ResourceKey="DeleteUserRole" />
                 </td>
             </Row>
         </Pager>
@@ -79,7 +79,7 @@ else
     private string expirydate = string.Empty;
     private List<UserRole> userroles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     protected override async Task OnInitializedAsync()
     {

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,6 +82,14 @@
     [Parameter]
     public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
 
+	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/AutoComplete.razor

@@ -0,0 +1,153 @@
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
+
+<div class="app-autocomplete">
+	<input class="form-control" value="@Value" @oninput="OnInput" @onkeyup="OnKeyUp" placeholder="@Placeholder" autocomplete="off" />
+	@if (_results != null)
+	{
+		<select class="form-select" style="position: relative;" value="@Value" size="@Rows" @onkeyup="OnKeyUp" @onchange="(e => OnChange(e))">
+			@if (_results.Any())
+			{
+				@foreach (var result in _results)
+				{
+					if (result.Value == Value)
+					{
+						<option selected>@result.Value</option>
+					}
+					else
+					{
+						<option>@result.Value</option>
+					}
+				}
+			}
+			else
+			{
+				<option disabled>No Results</option>
+			}
+		</select>
+	}
+</div>
+
+@code {
+	Dictionary<string, string> _results;
+
+	[Parameter]
+	public Func<string, Task<Dictionary<string, string>>> OnSearch { get; set; } // required - an async delegate method which accepts a filter string parameter and returns a dictionary
+
+	[Parameter]
+	public int Characters { get; set; } = 3; // optional - number of characters before search is initiated
+
+	[Parameter]
+	public int Rows { get; set; } = 3; // optional - number of result rows to display
+
+	[Parameter]
+	public string Placeholder { get; set; } // optional - placeholder input text
+
+	[Parameter]
+	public string Value { get; set; } // value of item selected
+
+	[Parameter]
+	public string Key { get; set; } // key of item selected
+
+	private async Task OnInput(ChangeEventArgs e)
+	{
+		Value = e.Value?.ToString();
+		if (Value?.Length >= Characters)
+		{
+			_results = await OnSearch?.Invoke(Value);
+		}
+		else
+		{
+			_results = null;
+		}
+		SetKey();
+	}
+
+	private async Task OnKeyUp(KeyboardEventArgs e)
+	{
+		var index = -1;
+		switch (e.Key)
+		{
+			case "ArrowDown":
+				if (_results == null)
+				{
+					if (Value?.Length >= Characters)
+					{
+						_results = await OnSearch?.Invoke(Value);
+					}
+				}
+				else
+				{
+					index = GetIndex();
+					if (index < _results.Count - 1)
+					{
+						Value = _results.ElementAt(index + 1).Value;
+						Key = _results.ElementAt(index + 1).Key;
+					}
+				}
+				break;
+			case "ArrowUp":
+				index = GetIndex();
+				if (index > 0)
+				{
+					Value = _results.ElementAt(index - 1).Value;
+					Key = _results.ElementAt(index - 1).Key;
+				}
+				break;
+			case "ArrowRight":
+			case "Tab":
+				_results = null;
+				break;
+			case "Enter": // note within a form the enter key submits the entire form
+			case "NumpadEnter":
+				_results = null;
+				break;
+			case "Escape":
+				Value = "";
+				_results = null;
+				break;
+		}
+	}
+
+	private void OnChange(ChangeEventArgs e)
+	{
+		Value = (string)e.Value;
+		SetKey();
+		_results = null;
+	}
+
+	private int GetIndex()
+	{
+		if (_results != null)
+		{
+			for (int index = 0; index < _results.Count; index++)
+			{
+				if (_results.ElementAt(index).Value == Value)
+				{
+					return index;
+				}
+			}
+		}
+		return -1;
+	}
+
+	private void SetKey()
+	{
+		var index = GetIndex();
+		if (index != -1)
+		{
+			Key = _results.ElementAt(index).Key;
+		}
+		else
+		{
+			Key = "";
+		}
+	}
+
+	public void Clear()
+	{
+		Value = "";
+		Key = "";
+		_results = null;
+	}
+}

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -1,11 +1,12 @@
 @namespace Oqtane.Modules.Controls
+@using System.Threading
 @inherits ModuleControlBase
 @inject IFolderService FolderService
 @inject IFileService FileService
 @inject IStringLocalizer<FileManager> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_folders != null)
+@if (_initialized)
 {
     <div id="@Id" class="container-fluid px-0">
         <div class="row">
@@ -53,7 +54,7 @@
                                 }
                             </div>
                             <div class="col mt-2 text-end">
-                                <button type="button" class="btn btn-success" @onclick="UploadFile">@SharedLocalizer["Upload"]</button>
+                                <button type="button" class="btn btn-success" @onclick="UploadFiles">@SharedLocalizer["Upload"]</button>
                                 @if (ShowFiles && GetFileId() != -1)
                                 {
                                     <button type="button" class="btn btn-danger mx-1" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button>
@@ -86,7 +87,7 @@
 }
 
 @code {
-	private string _id;
+    private bool _initialized = false;
     private List<Folder> _folders;
     private List<File> _files = new List<File>();
     private string _fileinputid = string.Empty;
@@ -144,11 +145,6 @@
 
     protected override async Task OnInitializedAsync()
     {
-		if (!string.IsNullOrEmpty(Id))
-		{
-			_id = Id;
-		}
-
         // packages folder is a framework folder for uploading installable nuget packages
         if (Folder == Constants.PackagesFolder)
         {
@@ -207,9 +203,11 @@
 
         // create unique id for component
         _guid = Guid.NewGuid().ToString("N");
-		_fileinputid = _guid + "FileInput";
+        _fileinputid = "FileInput_" + _guid;
-		_progressinfoid = _guid + "ProgressInfo";
+        _progressinfoid = "ProgressInfo_" + _guid;
-		_progressbarid = _guid + "ProgressBar";
+        _progressbarid = "ProgressBar_" + _guid;
+
+        _initialized = true;
     }
 
     private async Task GetFiles()
@@ -225,7 +223,7 @@
             Folder folder = _folders.FirstOrDefault(item => item.FolderId == FolderId);
             if (folder != null)
             {
-				_haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.Permissions);
+                _haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.PermissionList);
                 _files = await FileService.GetFilesAsync(FolderId);
             }
             else
@@ -233,7 +231,6 @@
                 _haseditpermission = false;
                 _files = new List<File>();
             }
-		}
             if (_filter != "*")
             {
                 List<File> filtered = new List<File>();
@@ -247,6 +244,7 @@
                 _files = filtered;
             }
         }
+    }
 
     private async Task FolderChanged(ChangeEventArgs e)
     {
@@ -304,17 +302,17 @@
         }
     }
 
-	private async Task UploadFile()
+    private async Task UploadFiles()
     {
         _message = string.Empty;
         var interop = new Interop(JSRuntime);
-		var upload = await interop.GetFiles(_fileinputid);
+        var uploads = await interop.GetFiles(_fileinputid);
-		if (upload.Length > 0)
+        if (uploads.Length > 0)
         {
             string restricted = "";
-			foreach (var file in upload)
+            foreach (var upload in uploads)
             {
-				var extension = (file.LastIndexOf(".") != -1) ? file.Substring(file.LastIndexOf(".") + 1) : "";
+                var extension = (upload.LastIndexOf(".") != -1) ? upload.Substring(upload.LastIndexOf(".") + 1) : "";
                 if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower()))
                 {
                     restricted += (restricted == "" ? "" : ",") + extension;
@@ -324,28 +322,63 @@
             {
                 try
                 {
-					string result;
+                    // upload the files
-					if (Folder == Constants.PackagesFolder)
+                    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);
+
+                    // 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)
                     {
-						result = await FileService.UploadFilesAsync(Folder, upload, _guid);
+                        attempts += 1;
+                        Thread.Sleep(1000 * attempts); // progressive retry 
+
+                        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;
+                                }
+                            }
                         }
-					else
-					{
-						result = await FileService.UploadFilesAsync(FolderId, upload, _guid);
                     }
 
-					if (result == string.Empty)
+                    // reset progress indicators
+                    await interop.SetElementAttribute(_guid + "ProgressInfo", "style", "display: none;");
+                    await interop.SetElementAttribute(_guid + "ProgressBar", "style", "display: none;");
+
+                    if (success)
                     {
-						await logger.LogInformation("File Upload Succeeded {Files}", upload);
+                        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 == upload[0]).FirstOrDefault();
+                        var file = _files.Where(item => item.Name == uploads[0]).FirstOrDefault();
                         if (file != null)
                         {
                             FileId = file.FileId;
@@ -354,18 +387,10 @@
                         }
                         StateHasChanged();
                     }
-					else
-					{
-						await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
-
-						_message = Localizer["Error.File.Upload"];
-						_messagetype = MessageType.Error;
-					}
 				}
 				catch (Exception ex)
 				{
 					await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
-
 					_message = Localizer["Error.File.Upload"];
 					_messagetype = MessageType.Error;
 				}

Oqtane.Client/Modules/Controls/Pager.razor

@@ -8,16 +8,16 @@
     @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
     {
         <ul class="pagination justify-content-center my-2">
-            <li class="page-item@((_page > 1) ? "" : " disabled")">
+            <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
             </li>
             @if (_pages > _displayPages && _displayPages > 1)
             {
-                <li class="page-item@((_page > _displayPages) ? "" : " disabled")">
+                <li class="page-item@((_page > _displayPages) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
                 </li>
             }
-            <li class="page-item@((_page > 1) ? "" : " disabled")">
+            <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
             </li>
             @for (int i = _startPage; i <= _endPage; i++)
@@ -25,27 +25,27 @@
                 var pager = i;
                 if (pager == _page)
                 {
-                    <li class="page-item active">
+                    <li class="page-item app-pager-pointer active">
                         <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
                     </li>
                 }
                 else
                 {
-                    <li class="page-item">
+                    <li class="page-item app-pager-pointer">
                         <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
                     </li>
                 }
             }
-            <li class="page-item@((_page < _pages) ? "" : " disabled")">
+            <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
             </li>
             @if (_pages > _displayPages && _displayPages > 1)
             {
-                <li class="page-item@((_endPage < _pages) ? "" : " disabled")">
+                <li class="page-item@((_endPage < _pages) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
                 </li>
             }
-            <li class="page-item@((_page < _pages) ? "" : " disabled")">
+            <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
             </li>
             <li class="page-item disabled">
@@ -119,16 +119,16 @@
     @if ((Toolbar == "Bottom" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
     {
         <ul class="pagination justify-content-center my-2">
-            <li class="page-item@((_page > 1) ? "" : " disabled")">
+            <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
             </li>
             @if (_pages > _displayPages && _displayPages > 1)
             {
-                <li class="page-item@((_page > _displayPages) ? "" : " disabled")">
+                <li class="page-item@((_page > _displayPages) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
                 </li>
             }
-            <li class="page-item@((_page > 1) ? "" : " disabled")">
+            <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
             </li>
             @for (int i = _startPage; i <= _endPage; i++)
@@ -136,27 +136,27 @@
                 var pager = i;
                 if (pager == _page)
                 {
-                    <li class="page-item active">
+                    <li class="page-item app-pager-pointer active">
                         <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
                     </li>
                 }
                 else
                 {
-                    <li class="page-item">
+                    <li class="page-item app-pager-pointer">
                         <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
                     </li>
                 }
             }
-            <li class="page-item@((_page < _pages) ? "" : " disabled")">
+            <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
             </li>
             @if (_pages > _displayPages && _displayPages > 1)
             {
-                <li class="page-item@((_endPage < _pages) ? "" : " disabled")">
+                <li class="page-item@((_endPage < _pages) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
                 </li>
             }
-            <li class="page-item@((_page < _pages) ? "" : " disabled")">
+            <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
             </li>
             <li class="page-item disabled">
@@ -311,7 +311,6 @@
             {
                 _page = _pages;
             }
-            ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
             SetPagerSize();
         }
     }
@@ -324,13 +323,13 @@
         {
             _endPage = _pages;
         }
-        OnPageChange?.Invoke(_page);
+		ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
 		StateHasChanged();
+		OnPageChange?.Invoke(_page);
 	}
 
     public void UpdateList(int page)
     {
-        ItemList = Items.Skip((page - 1) * _maxItems).Take(_maxItems);
         _page = page;
         SetPagerSize();
     }

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -1,7 +1,9 @@
 @namespace Oqtane.Modules.Controls
+@using System.Text.Json
 @inherits ModuleControlBase
 @inject IRoleService RoleService
 @inject IUserService UserService
+@inject IUserRoleService UserRoleService
 @inject IStringLocalizer<PermissionGrid> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -14,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;">@Localizer[permission.PermissionName]</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(role.Name) OnChange="@(e => PermissionChanged(e, 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>
@@ -49,23 +50,21 @@
                     <thead>
                         <tr>
                             <th scope="col">@Localizer["User"]</th>
-                            @foreach (PermissionString permission in _permissions)
+								@foreach (var permissionname in _permissionnames)
 								{
-                                <th style="text-align: center; width: 1px;">@Localizer[permission.PermissionName]</th>
+									<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=false OnChange="@(e => PermissionChanged(e, p.PermissionName, userid))" />
+										<TriStateCheckBox Value=@GetPermissionValue(permissionname, "", user.UserId) Disabled="@GetPermissionDisabled(permissionname, "")" OnChange="@(e => PermissionChanged(e, permissionname, "", user.UserId))" />
                                     </td>
                                 }
                             </tr>
@@ -77,34 +76,27 @@
         </div>
     </div>
     <div class="row">
-        <div class="col">
+        <div class="col-11">
-            <table class="table table-borderless">
+			<AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["Username.Enter"]" @ref="_user" />
-                <tbody>
+		</div>
-                    <tr>
+		<div class="col-1">
-                        <td class="input-group">
-                            <input type="text" name="Username" class="form-control" placeholder="@Localizer["Username.Enter"]" @bind="@_username" />
 			<button type="button" class="btn btn-primary" @onclick="AddUser">@SharedLocalizer["Add"]</button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-            <br />
         </div>
     </div>
     <div class="row">
         <div class="col">
-            <ModuleMessage Type="MessageType.Error" Message="@_message" />
+            <ModuleMessage Type="MessageType.Warning" Message="@_message" />
         </div>
     </div>
 </div>
 }
 
 @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 string _username = string.Empty;
+	private AutoComplete _user;
 	private string _message = string.Empty;
 
 	[Parameter]
@@ -114,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;
+			PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);			
-		}
-		else
-		{
-			_permissionnames = PermissionNames;
 		}
 
 		_roles = await RoleService.GetRolesAsync(ModuleState.SiteId, true);
@@ -133,140 +124,212 @@
 			_roles.RemoveAll(item => item.Name == RoleNames.Host);
 		}
 
-		_permissions = new List<PermissionString>();
+		// get permission names
-
+		if (string.IsNullOrEmpty(PermissionNames))
-		foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
 		{
-			// initialize with admin role
+			_permissionnames = new List<string>();
-			_permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = RoleNames.Admin });
+			_permissionnames.Add(Shared.PermissionNames.View);
-		}
+			_permissionnames.Add(Shared.PermissionNames.Edit);
-
-		if (!string.IsNullOrEmpty(Permissions))
-		{
-			// populate permissions
-			foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
-			{
-				if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
-				{
-					_permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
-				}
-
-				if (permissionstring.Permissions.Contains("["))
-				{
-					foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, 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 bool? GetPermissionValue(string permissions, string securityKey)
-	{
-		if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
-		{
-			return false; // deny permission
 		}
 		else
 		{
-			if ((";" + permissions + ";").Contains(";" + securityKey + ";"))
+			_permissionnames = PermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries).ToList();
+		}
+
+		// initialize permissions
+		_permissions = new List<Permission>();
+		if (PermissionList != null && PermissionList.Any())
 		{
-				return true; // grant permission
+			foreach (var permission in PermissionList)
+			{
+				_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
 		{
-				return null; // not specified
+			foreach (string permissionname in _permissionnames)
+			{
+				// 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 roleName)
+	private string GetPermissionName(string permissionName)
-		=> (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) ? true : false;
+	{
+		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))
+		{
+			return true;
+		}
+		else
+		{
+			if (GetEntityName(permissionName) != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+
+	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);
+		return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase))
+			.ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName);
+	}
 
 	private async Task AddUser()
 	{
-		if (_users.Where(item => item.Username == _username).FirstOrDefault() == null)
+		if (!string.IsNullOrEmpty(_user.Key))
 		{
-			try
+			var user = await UserService.GetUserAsync(int.Parse(_user.Key), ModuleState.SiteId);
-			{
+			if (user != null && !_users.Any(item => item.UserId == user.UserId))
-				var user = await UserService.GetUserAsync(_username, ModuleState.SiteId);
-				if (user != null)
 			{
 				_users.Add(user);
 			}
 		}
-			catch
+		else
 		{
 			_message = Localizer["Message.Username.DontExist"];
 		}
-		}
+		_user.Clear();
-
-		_username = string.Empty;
-	}
-
-	private void PermissionChanged(bool? value, string permissionName, string securityId)
-	{
-		var selected = value;
-		var permission = _permissions.Find(item => item.PermissionName == permissionName);
-		if (permission != null)
-		{
-			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[_permissions.FindIndex(item => item.PermissionName == permissionName)].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;
+		// remove deny all users, unauthenticated, and registered users
-		for (int i = 0; i < _permissions.Count; i++)
+		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[i];
+			_permissions.Remove(permission);
-			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))
 		{
-				ids.Remove("!" + RoleNames.Admin); // remove deny administrators
+			// remove deny administrators and host users
-				ids.Remove("!" + RoleNames.Host); // remove deny host users
+			permissions = _permissions.Where(item => !item.IsAuthorized &&
-				if (!ids.Contains(RoleNames.Host) && !ids.Contains(RoleNames.Admin))
+				(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)).ToList();
+			foreach (var permission in permissions)
 			{
-					// add administrators role if host user role is not assigned
+				_permissions.Remove(permission);
-					ids.Add(RoleNames.Admin);				
+			}
+			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)))
+				{
+					_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionname), GetPermissionName(permissionname), RoleNames.Admin, null, true));
 				}
 			}
-			permission.Permissions = string.Join(";", ids.ToArray());
-            _permissions[i] = permission;
 		}
     }
 }

Oqtane.Client/Modules/Controls/TabPanel.razor

@@ -3,13 +3,13 @@
 
 @if (Name == Parent.ActiveTab)
 {
-    <div id="@Name" class="tab-pane fade show active" role="tabpanel">
+    <div id="@(Parent.Id + Name)" class="tab-pane fade show active" role="tabpanel">
         @ChildContent
     </div>
 }
 else
 {
-    <div id="@Name" class="tab-pane fade" role="tabpanel">
+	<div id="@(Parent.Id + Name)" class="tab-pane fade" role="tabpanel">
         @ChildContent
     </div>
 }

Oqtane.Client/Modules/Controls/TabStrip.razor

@@ -10,13 +10,13 @@
                     <li class="nav-item" @key="tabPanel.Name">
                         @if (tabPanel.Name == ActiveTab)
                         {
-                            <a class="nav-link active" data-bs-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
+                            <a class="nav-link active" data-bs-toggle="tab" href="#@(Id + tabPanel.Name)" role="tab" @onclick:preventDefault="true">
                                 @tabPanel.DisplayHeading()
                             </a>
                         }
                         else
                         {
-                            <a class="nav-link" data-bs-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
+							<a class="nav-link" data-bs-toggle="tab" href="#@(Id + tabPanel.Name)" role="tab" @onclick:preventDefault="true">
                                 @tabPanel.DisplayHeading()
                             </a>
                         }
@@ -33,6 +33,7 @@
 
 @code {
 	private List<TabPanel> _tabPanels;
+	private string _tabpanelid = string.Empty;
 
 	[Parameter]
 	public RenderFragment ChildContent { get; set; } // contains the TabPanels
@@ -43,6 +44,18 @@
 	[Parameter]
 	public bool Refresh { get; set; } // optional - used in scenarios where TabPanels are added/removed dynamically within a parent form. ActiveTab may need to be reset as well when this property is used.
 
+	[Parameter]
+	public string Id { get; set; } // optional - used to uniquely identify an instance of a tab strip component (will be set automatically if no value provided)
+
+	protected override void OnInitialized()
+	{
+		if (string.IsNullOrEmpty(Id))
+		{
+			// create unique id for component
+			Id = "TabStrip_" + Guid.NewGuid().ToString("N") + "_" ;
+		}
+	}
+	
 	protected override void OnParametersSet()
     {
         if (PageState.QueryString.ContainsKey("tab"))
@@ -80,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

@@ -72,15 +72,24 @@ namespace Oqtane.Modules
             {
                 if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
                 {
+                    var interop = new Interop(JSRuntime);
                     var scripts = new List<object>();
+                    var inline = 0;
                     foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
+                    {
+                        if (!string.IsNullOrEmpty(resource.Url))
                         {
                             var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
                             scripts.Add(new { href = url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module });
                         }
+                        else
+                        {
+                            inline += 1;
+                            await interop.IncludeScript(GetType().Namespace.ToLower() + inline.ToString(), "", "", "", resource.Content, resource.Location.ToString().ToLower());
+                        }
+                    }
                     if (scripts.Any())
                     {
-                        var interop = new Interop(JSRuntime);
                         await interop.IncludeScripts(scripts.ToArray());
                     }
                 }
@@ -181,12 +190,7 @@ namespace Oqtane.Modules
 
         public string AddUrlParameters(params object[] parameters)
         {
-            var url = "";
+            return Utilities.AddUrlParameters(parameters);
-            for (var i = 0; i < parameters.Length; i++)
-            {
-                url += "/" + parameters[i].ToString();
-            }
-            return url;
         }
 
         // template is in the form of a standard route template ie. "/{id}/{name}" and produces dictionary of key/value pairs
@@ -306,15 +310,10 @@ namespace Oqtane.Modules
         {
             int pageId = ModuleState.PageId;
             int moduleId = ModuleState.ModuleId;
-            int? userId = null;
-            if (PageState.User != null)
-            {
-                userId = PageState.User.UserId;
-            }
             string category = GetType().AssemblyQualifiedName;
             string feature = Utilities.GetTypeNameLastSegment(category, 1);
 
-            await LoggingService.Log(alias, pageId, moduleId, userId, category, feature, function, level, exception, message, args);
+            await LoggingService.Log(alias, pageId, moduleId, PageState.User?.UserId, category, feature, function, level, exception, message, args);
         }
 
         public class Logger

Oqtane.Client/Oqtane.Client.csproj

@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.2.1</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.2.1</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

@@ -16,6 +16,7 @@ using Microsoft.JSInterop;
 using Oqtane.Documentation;
 using Oqtane.Modules;
 using Oqtane.Services;
+using Oqtane.Shared;
 using Oqtane.UI;
 
 namespace Oqtane.Client
@@ -56,7 +57,11 @@ namespace Oqtane.Client
                 RegisterClientStartups(assembly, builder.Services);
             }
 
-            await builder.Build().RunAsync();
+            var host = builder.Build();
+
+            await SetCultureFromLocalizationCookie(host.Services);
+
+            await host.RunAsync();
         }
 
         private static async Task LoadClientAssemblies(HttpClient http, IServiceProvider serviceProvider)
@@ -193,6 +198,8 @@ namespace Oqtane.Client
         private static void RegisterModuleServices(Assembly assembly, IServiceCollection services)
         {
             // dynamically register module scoped services
+            try
+            {
                 var implementationTypes = assembly.GetInterfaces<IService>();
                 foreach (var implementationType in implementationTypes)
                 {
@@ -203,8 +210,15 @@ namespace Oqtane.Client
                     }
                 }
             }
+            catch
+            {
+                // could not interrogate assembly - likely missing dependencies
+            }
+        }
 
         private static void RegisterClientStartups(Assembly assembly, IServiceCollection services)
+        {
+            try
             {
                 var startUps = assembly.GetInstances<IClientStartup>();
                 foreach (var startup in startUps)
@@ -212,6 +226,11 @@ namespace Oqtane.Client
                     startup.ConfigureServices(services);
                 }
             }
+            catch
+            {
+                // could not interrogate assembly - likely missing dependencies
+            }
+        }
 
         private static async Task SetCultureFromLocalizationCookie(IServiceProvider serviceProvider)
         {
@@ -220,7 +239,7 @@ namespace Oqtane.Client
             var localizationCookie = await interop.GetCookie(CookieRequestCultureProvider.DefaultCookieName);
             var culture = CookieRequestCultureProvider.ParseCookieValue(localizationCookie)?.UICultures?[0].Value;
             var localizationService = serviceProvider.GetRequiredService<ILocalizationService>();
-            var cultures = await localizationService.GetCulturesAsync();
+            var cultures = await localizationService.GetCulturesAsync(false);
 
             if (culture == null || !cultures.Any(c => c.Name.Equals(culture, StringComparison.OrdinalIgnoreCase)))
             {

Oqtane.Client/Resources/Installer/Installer.resx

@@ -136,7 +136,7 @@
     <value>Please Enter All Required Fields. Ensure Passwords Match And Email Address Provided Is Valid.</value>
   </data>
   <data name="Message.Password.Invalid" xml:space="preserve">
-    <value>The Password Provided Does Not Meet The Password Policy. Please Verify The Minimum Password Length And Complexity Requirements.</value>
+    <value>The Password Provided Does Not Meet The Complexity Policy. Passwords Must Be At Least 6 Characters In Length And Contain Uppercase, Lowercase, Numeric, And Punctuation Characters.</value>
   </data>
   <data name="Register" xml:space="preserve">
     <value>Please Register Me For Major Product Updates And Security Bulletins</value>
@@ -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/Api/Edit.resx

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="EntityName.HelpText" xml:space="preserve">
+    <value>The Name Of The Entity</value>
+  </data>
+  <data name="EntityName.Text" xml:space="preserve">
+    <value>Entity:</value>
+  </data>
+</root>

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

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Entity" xml:space="preserve">
+    <value>Entity</value>
+  </data>
+  <data name="Permissions" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+</root>

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

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="The Only Supported Culture That Has Been Defined Is English" xml:space="preserve">
-    <value>The Only Supported Culture That Has Been Defined Is English</value>
-  </data>
   <data name="Error.Language.Add" xml:space="preserve">
     <value>Error Adding Language</value>
   </data>
@@ -135,29 +132,11 @@
   <data name="IsDefault.Text" xml:space="preserve">
     <value>Default?</value>
   </data>
-  <data name="AllLanguages" xml:space="preserve">
-    <value>All The Installed Languages Have Been Added.</value>
-  </data>
-  <data name="Error.Language.Download" xml:space="preserve">
-    <value>Error Downloading Translation</value>
-  </data>
-  <data name="OnlyEnglish" xml:space="preserve">
-    <value>The Only Installed Language Is English</value>
-  </data>
   <data name="Success.Language.Download" xml:space="preserve">
-    <value>Translation Downloaded Successfully. Click Install To Complete Installation.</value>
+    <value>Translation Package Saved Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; To Complete The Installation.</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>
-  <data name="Search.NoResults" xml:space="preserve">
-    <value>No Translations Match The Criteria Provided Or Package Service Is Disabled</value>
-  </data>
-  <data name="Download.Heading" xml:space="preserve">
-    <value>Translations</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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -204,16 +204,19 @@
   <data name="Error.Translation.Download" xml:space="preserve">
     <value>Error Downloading Translation</value>
   </data>
+  <data name="Search.PackageNameMissing" xml:space="preserve">
+    <value>A Package Name Was Not Provided For The Module</value>
+  </data>
   <data name="Search.NoResults" xml:space="preserve">
     <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>
+    <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="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>
   </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/Roles/Users.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -121,7 +121,7 @@
     <value>User: </value>
   </data>
   <data name="User.Select" xml:space="preserve">
-    <value>Select User</value>
+    <value>Enter User's Name</value>
   </data>
   <data name="Users" xml:space="preserve">
     <value>Users</value>
@@ -129,9 +129,6 @@
   <data name="Error.User.Load" xml:space="preserve">
     <value>Error Loading Users</value>
   </data>
-  <data name="Error.User.LoadRole" xml:space="preserve">
-    <value>Error Loading User Roles</value>
-  </data>
   <data name="Success.User.AssignedRole" xml:space="preserve">
     <value>User Assigned To Role</value>
   </data>
@@ -151,7 +148,7 @@
     <value>The role you are assigning users to</value>
   </data>
   <data name="User.HelpText" xml:space="preserve">
-    <value>Select a user</value>
+    <value>Enter the name of a user</value>
   </data>
   <data name="EffectiveDate.HelpText" xml:space="preserve">
     <value>The date that this role assignment is active</value>

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>
@@ -195,13 +195,13 @@
   <data name="UseSsl.HelpText" xml:space="preserve">
     <value>Specify if SSL is required for your SMTP server</value>
   </data>
-  <data name="SmptUsername.HelpText" xml:space="preserve">
+  <data name="SmtpUsername.HelpText" xml:space="preserve">
     <value>Enter the username for your SMTP account</value>
   </data>
   <data name="SmtpPassword.HelpText" xml:space="preserve">
     <value>Enter the password for your SMTP account</value>
   </data>
-  <data name="SmptSender.HelpText" xml:space="preserve">
+  <data name="SmtpSender.HelpText" xml:space="preserve">
     <value>Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server.</value>
   </data>
   <data name="EnablePWA.HelpText" xml:space="preserve">
@@ -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>
@@ -243,13 +243,13 @@
   <data name="UseSsl.Text" xml:space="preserve">
     <value>SSL Enabled: </value>
   </data>
-  <data name="SmptUsername.Text" xml:space="preserve">
+  <data name="SmtpUsername.Text" xml:space="preserve">
     <value>Username: </value>
   </data>
   <data name="SmtpPassword.Text" xml:space="preserve">
     <value>Password: </value>
   </data>
-  <data name="SmptSender.Text" xml:space="preserve">
+  <data name="SmtpSender.Text" xml:space="preserve">
     <value>Email Sender: </value>
   </data>
   <data name="EnablePWA.Text" xml:space="preserve">
@@ -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>
@@ -339,4 +339,16 @@
   <data name="HomePage.Text" xml:space="preserve">
     <value>Home Page:</value>
   </data>
+  <data name="SmtpRelay.HelpText" xml:space="preserve">
+    <value>Only specify this option if you have properly configured an SMTP Relay Service to route your outgoing mail. This option will send notifications from the user's email rather than from the Email Sender specified above.</value>
+  </data>
+  <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>
+    <value>Select the database type</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>
   </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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -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="Tenant.Text" xml:space="preserve">
+  <data name="Connection.Text" xml:space="preserve">
-    <value>Tenant: </value>
+    <value>Connection: </value>
   </data>
-  <data name="Tenant.Select" xml:space="preserve">
+  <data name="Connection.HelpText" xml:space="preserve">
-    <value>Select Tenant</value>
+    <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>Database: </value>
+  </data>
+  <data name="Tenant.HelpText" xml:space="preserve">
+    <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 Tenant And Provide A Valid SQL Query</value>
+    <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="Tenant.HelpText" xml:space="preserve">
-    <value>Select the tenant for the SQL server</value>
-  </data>
-  <data name="SqlQuery.HelpText" xml:space="preserve">
-    <value>Enter the query for the SQL server</value>
-  </data>
-  <data name="SqlQuery.Text" xml:space="preserve">
-    <value>SQL Query: </value>
-  </data>
   <data name="Success.QueryExecuted" xml:space="preserve">
     <value>SQL Query Executed</value>
   </data>

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

@@ -209,6 +209,9 @@
   </data>
   <data name="Options.Heading" xml:space="preserve">
     <value>Options</value>
+  </data>
+  <data name="Log.Heading" xml:space="preserve">
+    <value>Log</value>
   </data>
     <data name="Register" xml:space="preserve">
     <value>Please Register Me For Major Product Updates And Security Bulletins</value>
@@ -276,4 +279,19 @@
   <data name="Environment.Text" xml:space="preserve">
     <value>Environment:</value>
   </data>
+  <data name="Log.Text" xml:space="preserve">
+    <value>Log:</value>
+  </data>
+  <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/UserProfile/Index.resx

@@ -120,6 +120,9 @@
   <data name="Message.Password.Invalid" xml:space="preserve">
     <value>Passwords Entered Do Not Match</value>
   </data>
+  <data name="Message.Password.Complexity" xml:space="preserve">
+    <value>Password Provided Does Not Meet The Complexity Policy</value>
+  </data>
   <data name="From" xml:space="preserve">
     <value>From</value>
   </data>

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

@@ -120,6 +120,9 @@
   <data name="Message.Password.NoMatch" xml:space="preserve">
     <value>Passwords Entered Do Not Match</value>
   </data>
+  <data name="Message.Password.Complexity" xml:space="preserve">
+    <value>Password Provided Does Not Meet The Complexity Policy</value>
+  </data>
   <data name="Identity.Name" xml:space="preserve">
     <value>Identity</value>
   </data>

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

@@ -388,6 +388,12 @@
     <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>
+    <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/Modules/Controls/FileManager.resx

@@ -127,7 +127,7 @@
     <value>Error Loading Files</value>
   </data>
   <data name="Error.File.Upload" xml:space="preserve">
-    <value>File Upload Failed</value>
+    <value>File Upload Failed Or Is Still In Progress</value>
   </data>
   <data name="Message.File.NotSelected" xml:space="preserve">
     <value>You Have Not Selected A File To Upload</value>

Oqtane.Client/Resources/Modules/Controls/PermissionGrid.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -124,9 +124,9 @@
     <value>User</value>
   </data>
   <data name="Username.Enter" xml:space="preserve">
-    <value>Enter Username</value>
+    <value>Enter User's Name</value>
   </data>
   <data name="Message.Username.DontExist" xml:space="preserve">
-    <value>Username Does Not Exist</value>
+    <value>User Does Not Exist With Name Specified</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/FileService.cs

@@ -2,27 +2,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.JSInterop;
 using Oqtane.Documentation;
 using Oqtane.Models;
 using Oqtane.Shared;
-using Oqtane.UI;
 
 namespace Oqtane.Services
 {
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class FileService : ServiceBase, IFileService
     {
-        private readonly SiteState _siteState;
+        public FileService(HttpClient http, SiteState siteState) : base(http, siteState) { }
-        private readonly IJSRuntime _jsRuntime;
-
-        public FileService(HttpClient http, SiteState siteState, IJSRuntime jsRuntime) : base(http, siteState)
-        {
-            _siteState = siteState;
-            _jsRuntime = jsRuntime;
-        }
 
         private string Apiurl => CreateApiUrl("File");
 
@@ -75,54 +65,6 @@ namespace Oqtane.Services
             return await GetJsonAsync<File>($"{Apiurl}/upload?url={WebUtility.UrlEncode(url)}&folderid={folderId}&name={name}");
         }
 
-        public async Task<string> UploadFilesAsync(int folderId, string[] files, string id)
-        {
-            return await UploadFilesAsync(folderId.ToString(), files, id);
-        }
-
-        public async Task<string> UploadFilesAsync(string folder, string[] files, string id)
-        {
-            string result = "";
-
-            var interop = new Interop(_jsRuntime);
-            await interop.UploadFiles($"{Apiurl}/upload", folder, id, _siteState.AntiForgeryToken);
-
-            // uploading files is asynchronous so we need to wait for the upload to complete
-            bool success = false;
-            int attempts = 0;
-            while (attempts < 5 && success == false)
-            {
-                Thread.Sleep(2000); // wait 2 seconds
-                result = "";
-
-                List<File> fileList = await GetFilesAsync(folder);
-                if (fileList.Count > 0)
-                {
-                    success = true;
-                    foreach (string file in files)
-                    {
-                        if (!fileList.Exists(item => item.Name == file))
-                        {
-                            success = false;
-                            result += file + ",";
-                        }
-                    }
-                }
-
-                attempts += 1;
-            }
-
-            await interop.SetElementAttribute(id + "ProgressInfo", "style", "display: none;");
-            await interop.SetElementAttribute(id + "ProgressBar", "style", "display: none;");
-
-            if (!success)
-            {
-                result = result.Substring(0, result.Length - 1);
-            }
-
-            return result;
-        }
-
         public async Task<byte[]> DownloadFileAsync(int fileId)
         {
             return await GetByteArrayAsync($"{Apiurl}/download/{fileId}");

Oqtane.Client/Services/Interfaces/IFileService.cs

@@ -66,27 +66,6 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<File> UploadFileAsync(string url, int folderId, string name);
 
-        /// <summary>
-        /// Upload one or more files.
-        /// </summary>
-        /// <param name="folderId">Target <see cref="Folder"/></param>
-        /// <param name="files">The files to upload, serialized as a string.</param>
-        /// <param name="fileUploadName">A task-identifier, to ensure communication about this upload.</param>
-        /// <returns></returns>
-        Task<string> UploadFilesAsync(int folderId, string[] files, string fileUploadName);
-
-
-        /// <summary>
-        /// Upload one or more files.
-        /// </summary>
-        /// <param name="folder">Target <see cref="Folder"/>
-        /// TODO: todoc verify exactly from where the folder path must start
-        /// </param>
-        /// <param name="files">The files to upload, serialized as a string.</param>
-        /// <param name="fileUploadName">A task-identifier, to ensure communication about this upload.</param>
-        /// <returns></returns>
-        Task<string> UploadFilesAsync(string folder, string[] files, string fileUploadName);
-
         /// <summary>
         /// Get / download a file (the body).
         /// </summary>

Oqtane.Client/Services/Interfaces/ILocalizationService.cs

@@ -13,6 +13,6 @@ namespace Oqtane.Services
         /// Returns a collection of supported cultures
         /// </summary>
         /// <returns></returns>
-        Task<IEnumerable<Culture>> GetCulturesAsync();
+        Task<IEnumerable<Culture>> GetCulturesAsync(bool installed);
     }
 }

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>
@@ -164,6 +179,24 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task UpdateSettingsAsync(Dictionary<string, string> settings, string entityName, int entityId);
 
+        /// <summary>
+        /// Returns a specific setting
+        /// </summary>
+        /// <param name="entityName"></param>
+        /// <param name="entityId"></param>
+        /// <param name="settingName"></param>
+        /// <returns></returns>
+        Task DeleteSettingAsync(string entityName, int entityId, string settingName);
+
+        /// <summary>
+        /// Returns a specific setting
+        /// </summary>
+        /// <param name="entityName"></param>
+        /// <param name="entityId"></param>
+        /// <param name="settingName"></param>
+        /// <returns></returns>
+        Task<List<Setting>> GetSettingsAsync(string entityName, int entityId, string settingName);
+
         /// <summary>
         /// Returns a specific setting
         /// </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/LocalizationService.cs

@@ -14,6 +14,6 @@ namespace Oqtane.Services
 
         private string Apiurl => CreateApiUrl("Localization");
 
-        public async Task<IEnumerable<Culture>> GetCulturesAsync() => await GetJsonAsync<IEnumerable<Culture>>(Apiurl);
+        public async Task<IEnumerable<Culture>> GetCulturesAsync(bool installed) => await GetJsonAsync<IEnumerable<Culture>>($"{Apiurl}?installed={installed}");
     }
 }

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}");
+            return await GetJsonAsync<List<Module>>($"{Apiurl}?siteid={siteId}");
-            modules = modules
-                .OrderBy(item => item.Order)
-                .ToList();
-            return modules;
         }
 
         public async Task<Module> GetModuleAsync(int moduleId)

Oqtane.Client/Services/SettingService.cs

@@ -111,15 +111,37 @@ 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}");
-            
+            if (settings != null)
-            foreach(Setting setting in settings.OrderBy(item => item.SettingName).ToList())
+            {
+                foreach (Setting setting in settings.OrderBy(item => item.SettingName).ToList())
                 {
                     dictionary.Add(setting.SettingName, setting.SettingValue);
                 }
+            }
             return dictionary;
         }
 
@@ -170,6 +192,26 @@ namespace Oqtane.Services
             }
         }
 
+        public async Task DeleteSettingAsync(string entityName, int entityId, string settingName)
+        {
+            var settings = await GetJsonAsync<List<Setting>>($"{Apiurl}?entityname={entityName}&entityid={entityId}");
+            var setting = settings.FirstOrDefault(item => item.SettingName == settingName);
+            if (setting != null)
+            {
+                await DeleteAsync($"{Apiurl}/{setting.SettingId}/{entityName}");
+            }
+        }
+
+        public async Task<List<Setting>> GetSettingsAsync(string entityName, int entityId, string settingName)
+        {
+            var settings = await GetJsonAsync<List<Setting>>($"{Apiurl}?entityname={entityName}&entityid={entityId}");
+            if (!string.IsNullOrEmpty(settingName))
+            {
+                settings = settings.Where(item => item.SettingName == settingName).ToList();
+            }
+            return settings;
+        }
+
         public async Task<Setting> GetSettingAsync(string entityName, int settingId)
         {
             return await GetJsonAsync<Setting>($"{Apiurl}/{settingId}/{entityName}");

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);
+            var permissions = pagemodule.Module.PermissionList;
-            foreach (var permissionstring in permissions)
+            if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone))
             {
-                if (permissionstring.PermissionName == PermissionNames.View)
+                permissions.Add(new Permission(ModuleState.SiteId, EntityNames.Page, pagemodule.PageId, PermissionNames.View, RoleNames.Everyone, null, true));
+            }
+            if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Registered))
             {
-                    List<string> ids = permissionstring.Permissions.Split(';').ToList();
+                permissions.Add(new Permission(ModuleState.SiteId, EntityNames.Page, pagemodule.PageId, PermissionNames.View, RoleNames.Registered, null, true));
-                    if (!ids.Contains(RoleNames.Everyone)) ids.Add(RoleNames.Everyone);
-                    if (!ids.Contains(RoleNames.Registered)) ids.Add(RoleNames.Registered);
-                    permissionstring.Permissions = string.Join(";", ids.ToArray());
             }
-            }
+            pagemodule.Module.PermissionList = permissions;
-            pagemodule.Module.Permissions = UserSecurity.SetPermissionStrings(permissions);
             await ModuleService.UpdateModuleAsync(pagemodule.Module);
             return url;
         }
 
         private async Task<string> Unpublish(string url, PageModule pagemodule)
         {
-            var permissions = UserSecurity.GetPermissionStrings(pagemodule.Module.Permissions);
+            var permissions = pagemodule.Module.PermissionList;
-            foreach (var permissionstring in permissions)
+            if (permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone))
             {
-                if (permissionstring.PermissionName == PermissionNames.View)
+                permissions.Remove(permissions.First(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone));
+            }
+            if (permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Registered))
             {
-                    List<string> ids = permissionstring.Permissions.Split(';').ToList();
+                permissions.Remove(permissions.First(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Registered));
-                    ids.Remove(RoleNames.Everyone);
-                    ids.Remove(RoleNames.Registered);
-                    permissionstring.Permissions = string.Join(";", ids.ToArray());
             }
-            }
+            pagemodule.Module.PermissionList = permissions;
-            pagemodule.Module.Permissions = UserSecurity.SetPermissionStrings(permissions);
             await ModuleService.UpdateModuleAsync(pagemodule.Module);
             return url;
         }

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

@@ -33,7 +33,7 @@
     }
 }
 
-@if (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>
@@ -46,16 +46,17 @@
 		</div>
 		<div class="@BodyClass">
 			<div class="container-fluid">
-				@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+				@if (_canViewAdminDashboard)
 				{
 					<div class="row d-flex">
 						<div class="col">
 							<button type="button" data-bs-dismiss="offcanvas" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
 						</div>
 					</div>
-
 					<hr class="app-rule" />
-
+				}
+				@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+				{
 					<div class="row">
 						<div class="col text-center">
 							<label class="control-label">@Localizer["Page.Manage"] </label>
@@ -70,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>
 							}
@@ -80,7 +81,7 @@
 							}
 						</div>
 					</div>
-				}
+					<hr class="app-rule" />
 
 					@if (_deleteConfirmation)
 					{
@@ -104,7 +105,10 @@
 							</div>
 						</div>
 					}
-				<hr class="app-rule" />
+				}
+
+				@if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
+				{
 					<div class="row">
 						<div class="col text-center">
 							<label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
@@ -140,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()))
 												{
@@ -205,19 +209,21 @@
 						<div class="col text-center">
 							<label for="visibility" class="control-label">@Localizer["Visibility"]</label>
 							<select class="form-select" @bind="@Visibility">
-							<option value="edit" selected>@Localizer["VisibilityEdit"]</option>
 								<option value="view">@Localizer["VisibilityView"]</option>
+								<option value="edit">@Localizer["VisibilityEdit"]</option>
 							</select>
 						</div>
 					</div>
 					<button type="button" class="btn btn-primary col-12 mt-4" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
-				@((MarkupString) Message)
+					@((MarkupString)Message)
+				}
 			</div>
 		</div>
 	</div>
 }
 
 @code{
+	private bool _canViewAdminDashboard = false;
 	private bool _showEditMode = false;
 	private bool _deleteConfirmation = false;
 	private List<string> _categories = new List<string>();
@@ -265,7 +271,7 @@
 
 	protected string Title { get; private set; } = "";
 	protected string ContainerType { get; private set; } = "";
-	protected string Visibility { get; private set; } = "edit";
+	protected string Visibility { get; private set; } = "view";
 	protected string Message { get; private set; } = "";
 
 	[Parameter]
@@ -286,15 +292,16 @@
 
 	protected override async Task OnParametersSetAsync()
 	{
+		_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);
 				}
@@ -312,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;
@@ -321,6 +328,22 @@
 		}
 	}
 
+	private bool CanViewAdminDashboard()
+	{
+		var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
+		if (admin != null)
+		{
+			foreach (var page in PageState.Pages.Where(item => item.ParentId == admin?.PageId))
+			{
+				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.PermissionList))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	private void CategoryChanged(ChangeEventArgs e)
 	{
 		Category = (string)e.Value;
@@ -348,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 = "-";
@@ -357,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 != "-"))
 			{
@@ -369,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();
@@ -431,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)
@@ -444,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
 		{
@@ -452,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")));
 			}
 		}
 	}
@@ -465,12 +499,10 @@
 			case "Admin":
 			// get admin dashboard moduleid
 				module = PageState.Modules.FirstOrDefault(item => item.ModuleDefinitionName == Constants.AdminDashboardModule);
-
 				if (module != null)
 				{
 					NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, module.ModuleId, "Index", ""));
 				}
-
 				break;
 			case "Add":
 			case "Edit":
@@ -502,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;
+			var permissions = PageState.Page.PermissionList;
-
+            if (!permissions.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Everyone))
-			// publish/unpublish page
-			var page = PageState.Page;
-			permissions = UserSecurity.GetPermissionStrings(page.Permissions);
-			foreach (var permissionstring in permissions)
             {
-				if (permissionstring.PermissionName == PermissionNames.View)
+				permissions.Add(new Permission(PageState.Site.SiteId, EntityNames.Page, PageState.Page.PageId, PermissionNames.View, RoleNames.Everyone, null, true));
-				{
-					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());
+            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;
-			page.Permissions = UserSecurity.SetPermissionStrings(permissions);
+			await PageService.UpdatePageAsync(PageState.Page);
-			await PageService.UpdatePageAsync(page);
 			NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
 		}
 	}
@@ -551,19 +568,19 @@
 			{
 				page.IsDeleted = true;
 				await PageService.UpdatePageAsync(page);
-				await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page);
+				await logger.Log(page.PageId, null, PageState.User?.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page);
 				NavigationManager.NavigateTo(NavigateUrl(""));
 			}
 			else // personalized page
 			{
 				await PageService.DeletePageAsync(page.PageId);
-				await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page);
+				await logger.Log(page.PageId, null, PageState.User?.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page);
 				NavigationManager.NavigateTo(NavigateUrl());
 			}
 		}
 		catch (Exception ex)
 		{
-			await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, ex, "Page Deleted {Page} {Error}", page, ex.Message);
+			await logger.Log(page.PageId, null, PageState.User?.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, ex, "Page Deleted {Page} {Error}", page, ex.Message);
 		}
 	}
 
@@ -596,8 +613,8 @@
     private async Task UpdateSettingsAsync()
     {
         Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-        SettingService.SetSetting(settings, settingCategory, _category);
+		settings = SettingService.SetSetting(settings, settingCategory, _category);
-        SettingService.SetSetting(settings, settingPane, _pane);
+        settings = SettingService.SetSetting(settings, settingPane, _pane);
         await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
     }
 

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;
+            Route route = new Route(PageState.Uri.AbsoluteUri, PageState.Alias.Path);
-            if (PageState.Page.Path != "/")
+            NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + WebUtility.UrlEncode(route.PathAndQuery)));
-            {
-                returnurl += "/" + PageState.Page.Path;
-            }
-            NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + returnurl));
         }
 
         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);
+            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
+            Route route = new Route(PageState.Uri.AbsoluteUri, PageState.Alias.Path);
-            var url = PageState.Alias.Path + "/" + PageState.Page.Path;
+            var url = route.PathAndQuery;
-            if (!UserSecurity.IsAuthorized(null, PermissionNames.View, PageState.Page.Permissions))
+
+            // 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/Themes/ThemeBase.cs

@@ -32,15 +32,24 @@ namespace Oqtane.Themes
             {
                 if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
                 {
+                    var interop = new Interop(JSRuntime);
                     var scripts = new List<object>();
+                    var inline = 0;
                     foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
+                    {
+                        if (!string.IsNullOrEmpty(resource.Url))
                         {
                             var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
                             scripts.Add(new { href = url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module });
                         }
+                        else
+                        {
+                            inline += 1;
+                            await interop.IncludeScript(GetType().Namespace.ToLower() + inline.ToString(), "", "", "", resource.Content, resource.Location.ToString().ToLower());
+                        }
+                    }
                     if (scripts.Any())
                     {
-                        var interop = new Interop(JSRuntime);
                         await interop.IncludeScripts(scripts.ToArray());
                     }
                 }

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/Interop.cs

@@ -60,13 +60,13 @@ namespace Oqtane.UI
             }
         }
 
-        public Task IncludeMeta(string id, string attribute, string name, string content, string key)
+        public Task IncludeMeta(string id, string attribute, string name, string content)
         {
             try
             {
                 _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.includeMeta",
-                    id, attribute, name, content, key);
+                    id, attribute, name, content);
                 return Task.CompletedTask;
             }
             catch
@@ -105,6 +105,7 @@ namespace Oqtane.UI
             }
         }
 
+        // external scripts need to specify src, inline scripts need to specify id and content
         public Task IncludeScript(string id, string src, string integrity, string crossorigin, string content, string location)
         {
             try

Oqtane.Client/UI/ModuleInstance.razor

@@ -87,10 +87,9 @@ else
 		// retrieve friendly localized error
 		_error =  Localizer["Error.Module.Exception"];
 		// log error
-		int? userId = (PageState.User != null) ? PageState.User.UserId : null;
 		string category = GetType().AssemblyQualifiedName;
 		string feature = Utilities.GetTypeNameLastSegment(category, 1);
-		await LoggingService.Log(null, ModuleState.PageId, ModuleState.ModuleId, userId, category, feature, LogFunction.Other, LogLevel.Error, exception, "An Unexpected Error Has Occurred In {ModuleDefinitionName}: {Error}", ModuleState.ModuleDefinitionName, exception.Message);
+		await LoggingService.Log(null, ModuleState.PageId, ModuleState.ModuleId, PageState.User?.UserId, category, feature, LogFunction.Other, LogLevel.Error, exception, "An Unexpected Error Has Occurred In {ModuleDefinitionName}: {Error}", ModuleState.ModuleDefinitionName, exception.Message);
 		await base.OnErrorAsync(exception);
 		return;
 	}

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);
+					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

@@ -97,7 +97,7 @@
 		// reload the client application from the server if there is a forced reload or the user navigated to a site with a different alias 
 		if (querystring.ContainsKey("reload") || (!NavigationManager.ToBaseRelativePath(_absoluteUri).ToLower().StartsWith(SiteState.Alias.Path.ToLower()) && !string.IsNullOrEmpty(SiteState.Alias.Path)))
 		{
-			if (querystring["reload"] == "post")
+			if (querystring.ContainsKey("reload") && querystring["reload"] == "post")
 			{
 				// post back so that the cookies are set correctly - required on any change to the principal 
 				var interop = new Interop(JSRuntime);
@@ -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,22 +302,28 @@
 			{
 				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('=');
+						if (!querystring.ContainsKey(pair[0]))
+						{
 							querystring.Add(pair[0], pair[1]);
 						}
+					}
 					else
+					{
+						if (!querystring.ContainsKey(kvp))
 						{
 							querystring.Add(kvp, "true"); // default parameter when no value is provided
 						}
 					}
 				}
 			}
+		}
 		return querystring;
 	}
 
@@ -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.2.1</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.2.1</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.2.1</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.2.1</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.2.1</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.2.1</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>