Merge pull request #2557 from oqtane/master

Merge pull request #2556 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/Modules/Admin/Dashboard/Index.razor

@@ -22,11 +22,14 @@
 @code {
 	private List<Page> _pages;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
 	protected override void OnInitialized()
 	{
 		var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
+		if (admin != null)
+		{
 			_pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList();
 		}
+    }
 }

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,23 @@ 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="translated" HelpText="Specify If You Wish To Select Languages That Have Translations Installed" ResourceKey="Translated">Translated?</Label>
+						<div class="col-sm-9">
+							<select id="translated" class="form-select" value="@_translated" @onchange="(e => TranslatedChanged(e))" required>
+								<option value="True">@SharedLocalizer["Yes"]</option>
+								<option value="False">@SharedLocalizer["No"]</option>
+							</select>
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="name" HelpText="Name Of The Language" ResourceKey="Name">Name:</Label>
                         <div class="col-sm-9">
                             <select id="_code" class="form-select" @bind="@_code" required>
-                                    @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 +43,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,71 +53,6 @@ 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">
@@ -125,140 +63,58 @@ else
                     </div>
                 </div>
             </div>
-            <button type="button" class="btn btn-success" @onclick="InstallLanguages">@SharedLocalizer["Install"]</button>
+            <button type="button" class="btn btn-success" @onclick="InstallTranslations">@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 _isDefault = "False";
-	private string _message;
-	private IEnumerable<Culture> _supportedCultures;
-	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 = "";
+	private string _translated = "True";
+	private string _code = "-";
+	private string _default = "False";
+	private List<string> _languages;
+	private IEnumerable<Culture> _cultures;
 
 	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();
-		_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"];
-        }
+		await LoadCultures();
 	}
 
-    private async Task LoadTranslations()
+	private async Task LoadCultures()
 	{
-        _packages = await PackageService.GetPackagesAsync("translation", _search, _price, "");
+		_cultures = await LocalizationService.GetCulturesAsync(bool.Parse(_translated));
+		_cultures = _cultures.Where(c => !c.Name.Equals(Constants.DefaultCulture) && !_languages.Contains(c.Name));
+		_code = "-";
 	}
 
-    private async void PriceChanged(ChangeEventArgs e)
+	private async void TranslatedChanged(ChangeEventArgs e)
 	{
-        try
-        {
-            _price = (string)e.Value;
-            _search = "";
-            await LoadTranslations();
+		_translated = (string)e.Value;
+		await LoadCultures();
 		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,55 +142,7 @@ 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()
+	private async Task InstallTranslations()
     {
         try
         {

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

@@ -19,38 +19,92 @@ 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 (UpgradeAvailable(context.Code, context.Version))
+			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 			{
-                    <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>
+					@switch (TranslationAvailable(context.Code, context.Version))
+					{
+						case "install":
+							<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code))>@SharedLocalizer["Download"]</button>
+							break;
+						case "upgrade":
+							<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code))>@SharedLocalizer["Upgrade"]</button>
+							break;
 					}
 				</td>
+			}
         </Row>
     </Pager>
+	@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _install)
+	{
+		<button type="button" class="btn btn-success" @onclick="InstallTranslations">@SharedLocalizer["Install"]</button>
+	}
+}
+
+@if (_package != null)
+{
+	<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;
+	private bool _install = false;
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
 	protected override async Task OnParametersSetAsync()
 	{
-		_languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.PackageId);
-
-		var cultures = await LocalizationService.GetCulturesAsync();
-        var culture = cultures.First(c => c.Name.Equals(Constants.DefaultCulture));
+		await GetLanguages();
 
 		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 		{
@@ -58,13 +112,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 +134,83 @@ else
 		}
 	}
 
-    private bool UpgradeAvailable(string code, string version)
+	private string TranslationAvailable(string code, string version)
 	{
-        var upgradeavailable = false;
 		if (_packages != 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);
+				// package version needs to match current framework version
+				if (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0)
+				{
+					if (string.IsNullOrEmpty(version))
+					{
+						return "install";
+					}
+					else
+					{
+						if (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+						{
+							return "upgrade";
+						}
+					}
+				}					
+			}
+		}
+		return "";
 	}
 
-        }
-        return upgradeavailable;
-    }
-
-    private async Task DownloadLanguage(string code)
+	private async Task GetPackage(string code)
 	{
 		try
 		{
-            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-            {
-                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);
-            }
+			_package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, Constants.Version);
+			StateHasChanged();
 		}
 		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(Localizer["Success.Language.Download"], MessageType.Success);
+			_package = null;
+			_install = true;
+			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();
+	}
+
+	private async Task InstallTranslations()
+	{
+		try
+		{
+			await PackageService.InstallPackagesAsync();
+			AddModuleMessage(string.Format(Localizer["Success.Translation.Install"], NavigateUrl("admin/system")), MessageType.Success);
+			_install = false;
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Installing Translations");
+		}
+	}
 }

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

@@ -109,7 +109,7 @@ else
 			// 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={id}"));
+				NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"/{id}"));
 			}
 
 			if (UrlParameters.ContainsKey("level"))

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

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

@@ -102,51 +102,56 @@
 		<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     </TabPanel>
 	<TabPanel Name="Translations" ResourceKey="Translations">
-		@if (_languages != null)
-		{
-			@if (_languages.Count > 0)
+		@if (_languages != null && _languages.Count > 0)
 		{
 			<Pager Items="@_languages">
 				<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>
-							}
-							else
-							{
-								if (UpgradeAvailable(_packagename + "." + context.Code, context.Version))
-								{
-									<button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadPackage(_packagename + "." + context.Code))>@SharedLocalizer["Upgrade"]</button>
-								}
+							case "install":
+								<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Download"]</button>
+								break;
+							case "upgrade":
+								<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Upgrade"]</button>
+								break;
 						}
 					</td>
 				</Row>
 			</Pager>
+			@if (_install)
+			{
 				<button type="button" class="btn btn-success" @onclick="InstallTranslations">@SharedLocalizer["Install"]</button>
 			}
+		}
 		else
 		{
 			<br />
 			<div class="mx-auto text-center">
+				@if (string.IsNullOrEmpty(_packagename))
+				{
+					@Localizer["Search.PackageNameMissing"]
+				}
+				else
+				{
 					@Localizer["Search.NoResults"]					
+				}
 			</div>
 			<br />
 		}
-		}
 	</TabPanel>
 </TabStrip>
 
-@if (_productname != "")
+@if (_package != null)
 {
 	<div class="app-actiondialog">
 		<div class="modal" tabindex="-1" role="dialog">
@@ -158,10 +163,17 @@
 					</div>
 					<div class="modal-body">
 						<p style="height: 200px; overflow-y: scroll;">
-							<h3>@_productname</h3>
-							@if (!string.IsNullOrEmpty(_packagelicense))
+							<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)_packagelicense)
+								@((MarkupString)_package.License.Replace("\n", "<br />"))
 							}
 							else
 							{
@@ -170,7 +182,7 @@
 						</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>
@@ -206,9 +218,8 @@
 
 	private List<Package> _packages;
 	private List<Language> _languages;
-	private string _productname = "";
-	private string _packagelicense = "";
-	private string _packageid = "";
+	private Package _package;
+	private bool _install = false;
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -237,6 +248,8 @@
 				_modifiedby = moduleDefinition.ModifiedBy;
 				_modifiedon = moduleDefinition.ModifiedOn;
 
+				if (!string.IsNullOrEmpty(_packagename))
+				{
 					_packages = await PackageService.GetPackagesAsync("translation", "", "", _packagename);
 					_languages = await LanguageService.GetLanguagesAsync(-1, _packagename);
 					foreach (var package in _packages)
@@ -250,6 +263,7 @@
 					_languages = _languages.OrderBy(item => item.Name).ToList();
 				}
 			}
+		}
 		catch (Exception ex)
 		{
 			await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
@@ -297,24 +311,31 @@
 
 	private void HideModal()
 	{
-		_productname = "";
-		_packagelicense = "";
+		_package = null;
 		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 +343,7 @@
 		var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version;
 		try
 		{
-			var 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;
-			}
+			_package = await PackageService.GetPackageAsync(packagename, version);
 			StateHasChanged();
 		}
 		catch (Exception ex)
@@ -341,16 +353,15 @@
 		}
 	}
 
-	private async Task DownloadPackage(string packagename)
+	private async Task DownloadPackage()
 	{
 		try
 		{
-			var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version;
-			await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
-			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", packagename, version);
+			await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version, Constants.PackagesFolder);
+			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
 			AddModuleMessage(Localizer["Success.Translation.Download"], MessageType.Success);
-			_productname = "";
-			_packagelicense = "";
+			_package = null;
+			_install = true;
 			StateHasChanged();
 		}
 		catch (Exception ex)
@@ -366,6 +377,8 @@
 		{
 			await PackageService.InstallPackagesAsync();
 			AddModuleMessage(string.Format(Localizer["Success.Translation.Install"], NavigateUrl("admin/system")), MessageType.Success);
+			_install = false;
+			StateHasChanged();
 		}
 		catch (Exception ex)
 		{

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

@@ -50,7 +50,7 @@ else
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" ResourceKey="EditModule" /></td>
             <td>
-                @if (context.AssemblyName != "Oqtane.Client")
+                @if (context.AssemblyName != Constants.ClientId)
                 {
                     <ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete", context.Name])" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" />
                 }
@@ -58,7 +58,7 @@ else
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
-                @if(context.AssemblyName == "Oqtane.Client" || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
+				@if (context.AssemblyName == Constants.ClientId || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
                 {
                     <span>@SharedLocalizer["Yes"]</span>
                 }

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>

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>
@@ -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>

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><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><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" 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

@@ -7,16 +7,22 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
+@if (_pages == null || _modules == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+	<TabStrip>
 		<TabPanel Name="Pages" ResourceKey="Pages">
-        @if (_pages == null)
+			@if (!_pages.Where(item => item.IsDeleted).Any())
 			{
 				<br />
 				<p>@Localizer["NoPage.Deleted"]</p>
 			}
 			else
 			{
-            <Pager Items="@_pages">
+				<Pager Items="@_pages.Where(item => item.IsDeleted)">
 					<Header>
 						<th style="width: 1px;">&nbsp;</th>
 						<th style="width: 1px;">&nbsp;</th>
@@ -32,21 +38,19 @@
 						<td>@context.DeletedOn</td>
 					</Row>
 				</Pager>
-            @if (_pages.Any())
-            {
-                <br /><ActionDialog Header="Delete All Pages" Message="Are You Sure You Wish To Permanently Delete All Pages?" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
-            }
+				<br />
+				<ActionDialog Header="Remove All Deleted Pages" Message="Are You Sure You Wish To Permanently Remove All Deleted Pages?" Action="Remove All Deleted Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
 			}
 		</TabPanel>
 		<TabPanel Name="Modules" ResourceKey="Modules">
-        @if (_modules == null)
+			@if (!_modules.Where(item => item.IsDeleted).Any())
 			{
 				<br />
 				<p>@Localizer["NoModule.Deleted"]</p>
 			}
 			else
 			{
-            <Pager Items="@_modules">
+				<Pager Items="@_modules.Where(item => item.IsDeleted)">
 					<Header>
 						<th style="width: 1px;">&nbsp;</th>
 						<th style="width: 1px;">&nbsp;</th>
@@ -64,14 +68,12 @@
 						<td>@context.DeletedOn</td>
 					</Row>
 				</Pager>
-            @if (_modules.Any())
-            {
-                <br /><ActionDialog Header="Delete All Modules" Message="Are You Sure You Wish To Permanently Delete All Modules?" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
-            }
-
+				<br />
+				<ActionDialog Header="Remove All Deleted Modules" Message="Are You Sure You Wish To Permanently Remove All Deleted Modules?" Action="Remove All Deleted Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
 			}
 		</TabPanel>
-</TabStrip>
+	</TabStrip>
+}
 
 @code {
 	private List<Page> _pages;
@@ -95,10 +97,7 @@
     private async Task Load()
     {
         _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
-        _pages = _pages.Where(item => item.IsDeleted).ToList();
-
         _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-        _modules = _modules.Where(item => item.IsDeleted).ToList();
     }
 
     private async Task RestorePage(Page page)
@@ -141,7 +140,7 @@
         try
         {
             ModuleInstance.ShowProgressIndicator();
-            foreach (Page page in _pages)
+			foreach (Page page in _pages.Where(item => item.IsDeleted))
             {
                 await PageService.DeletePageAsync(page.PageId);
                 await logger.LogInformation("Page Permanently Deleted {Page}", page);
@@ -184,9 +183,8 @@
         try
         {
             await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
-            // check if there are any remaining module instances in the site
-            _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
 
+            // check if there are any remaining module instances in the site
             if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
             {
                 await ModuleService.DeleteModuleAsync(module.ModuleId);
@@ -208,12 +206,11 @@
         try
         {
             ModuleInstance.ShowProgressIndicator();
-            foreach (Module module in _modules)
+			foreach (Module module in _modules.Where(item => item.IsDeleted))
             {
                 await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
-                // check if there are any remaining module instances in the site
-                _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
 
+                // check if there are any remaining module instances in the site
                 if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
                 {
                     await ModuleService.DeleteModuleAsync(module.ModuleId);

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><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><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" ResourceKey="Users" /></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.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())" 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>
-                        <option value="-1">&lt;@Localizer["User.Select"]&gt;</option>
-                        @foreach (UserRole userrole in users)
-                        {
-                            <option value="@(userrole.UserId)">@userrole.User.DisplayName</option>
-                        }
-                    </select>
+					<AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["User.Select"]" @ref="user" />
                 </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 int userid = -1;
+	private AutoComplete user;
 	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

@@ -127,7 +127,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>
@@ -142,10 +142,19 @@
                     </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>
@@ -320,6 +329,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;
@@ -393,6 +403,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 +455,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 +543,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 +614,12 @@
 			try
 			{
 				var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-				SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
-				SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
-				SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
-				SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
-				SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
-				SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+				settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+				settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+				settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+				settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+				settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, 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/Sql/Index.razor

@@ -16,7 +16,7 @@ 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="tenant" HelpText="Select the tenant associated with the database server" ResourceKey="Tenant">Tenant: </Label>
             <div class="col-sm-9">
                 <select id="tenant" class="form-select" value="@_tenantid" @onchange="(e => TenantChanged(e))">
                     <option value="-1">&lt;@Localizer["Tenant.Select"]&gt;</option>
@@ -38,13 +38,16 @@ else
             <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>
+					<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="sqlQeury" HelpText="Enter the query for the SQL server" ResourceKey="SqlQuery">SQL Query: </Label>
+                <Label Class="col-sm-3" For="sqlQuery" HelpText="Enter the SQL query for the database server" ResourceKey="SqlQuery">SQL Query: </Label>
                 <div class="col-sm-9">
-                    <textarea id="sqlQeury" class="form-control" @bind="@_sql" rows="3"></textarea>
+                    <textarea id="sqlQuery" class="form-control" @bind="@_sql" rows="3"></textarea>
                 </div>
             </div>
         }
@@ -86,6 +89,8 @@ else
     private string _tenantid = "-1";
     private string _database = 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;
 
@@ -96,6 +101,7 @@ else
         try
         {
             _tenants = await TenantService.GetTenantsAsync();
+			_connectionstringtoggle = SharedLocalizer["ShowPassword"];
 		}
         catch (Exception ex)
         {
@@ -126,6 +132,20 @@ else
         }
     }
 
+	private void ToggleConnectionString()
+	{
+		if (_connectionstringtype == "password")
+		{
+			_connectionstringtype = "text";
+			_connectionstringtoggle = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_connectionstringtype = "password";
+			_connectionstringtoggle = SharedLocalizer["ShowPassword"];
+		}
+	}
+	
 	private async Task Execute()
     {
         try

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

@@ -147,6 +147,16 @@
         <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>
+	</TabPanel>
 </TabStrip>
 <br /><br />
 
@@ -172,6 +182,8 @@
 	private string _swagger = string.Empty;
 	private string _packageservice = string.Empty;
 
+	private string _log = string.Empty;
+
 	protected override async Task OnInitializedAsync()
 	{
 		_version = Constants.Version;
@@ -191,7 +203,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 +213,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()

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

@@ -29,7 +29,7 @@ else
         <Row>
             <td><ActionLink Action="View" Parameters="@($"name=" + WebUtility.UrlEncode(context.ThemeName))" ResourceKey="ViewTheme" /></td>
             <td>
-                @if (context.AssemblyName != "Oqtane.Client")
+				@if (context.AssemblyName != Constants.ClientId)
                     {
                     <ActionDialog Header="Delete Theme" Message="@string.Format(Localizer["Confirm.Theme.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTheme(context))" ResourceKey="DeleteTheme" />
                     }

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

@@ -305,7 +305,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 +344,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 +354,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

@@ -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

@@ -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">
@@ -286,6 +286,15 @@ else
 									<input id="emailclaimtype" class="form-control" @bind="@_emailclaimtype" />
 								</div>
 							</div>
+							@if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+							{
+								<div class="row mb-1 align-items-center">
+									<Label Class="col-sm-3" For="roleclaimtype" HelpText="The name of the role claim provided by the provider" ResourceKey="RoleClaimType">Role Claim:</Label>
+									<div class="col-sm-9">
+										<input id="roleclaimtype" class="form-control" @bind="@_roleclaimtype" />
+									</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>
 								<div class="col-sm-9">
@@ -385,6 +394,7 @@ else
 	private string _redirecturl;
 	private string _identifierclaimtype;
 	private string _emailclaimtype;
+	private string _roleclaimtype;
 	private string _domainfilter;
 	private string _createusers;
 
@@ -396,7 +406,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()
 	{
@@ -436,8 +446,9 @@ else
 			_parameters = SettingService.GetSetting(settings, "ExternalLogin:Parameters", "");
 			_pkce = SettingService.GetSetting(settings, "ExternalLogin:PKCE", "false");
 			_redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
-			_identifierclaimtype = SettingService.GetSetting(settings, "ExternalLogin:IdentifierClaimType", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier");
-			_emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress");
+			_identifierclaimtype = SettingService.GetSetting(settings, "ExternalLogin:IdentifierClaimType", "sub");
+			_emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "email");
+			_roleclaimtype = SettingService.GetSetting(settings, "ExternalLogin:RoleClaimType", "");
 			_domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
 			_createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
 
@@ -445,7 +456,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)
@@ -511,7 +523,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);
 	}
 
@@ -555,6 +567,7 @@ else
 				settings = SettingService.SetSetting(settings, "ExternalLogin:PKCE", _pkce, true);
 				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:DomainFilter", _domainfilter, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
 
@@ -590,14 +603,10 @@ else
 			if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
 			{
 				_scopes = "openid,profile,email";
-				_identifierclaimtype = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier";
-				_emailclaimtype = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress";
 			}
 			else
 			{
 				_scopes = "";
-				_identifierclaimtype = "sub";
-				_emailclaimtype = "email";
 			}			
 		}
 		_redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;

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/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,4 +1,5 @@
 @namespace Oqtane.Modules.Controls
+@using System.Threading
 @inherits ModuleControlBase
 @inject IFolderService FolderService
 @inject IFileService FileService
@@ -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,6 @@
 }
 
 @code {
-	private string _id;
 	private List<Folder> _folders;
 	private List<File> _files = new List<File>();
 	private string _fileinputid = string.Empty;
@@ -144,11 +144,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 +202,9 @@
 
 		// create unique id for component
 		_guid = Guid.NewGuid().ToString("N");
-		_fileinputid = _guid + "FileInput";
-		_progressinfoid = _guid + "ProgressInfo";
-		_progressbarid = _guid + "ProgressBar";
+		_fileinputid = "FileInput_" + _guid;
+		_progressinfoid = "ProgressInfo_" + _guid;
+		_progressbarid = "ProgressBar_" + _guid;
 	}
 
 	private async Task GetFiles()
@@ -304,17 +299,17 @@
 		}
 	}
 
-	private async Task UploadFile()
+	private async Task UploadFiles()
 	{
 		_message = string.Empty;
 		var interop = new Interop(JSRuntime);
-		var upload = await interop.GetFiles(_fileinputid);
-		if (upload.Length > 0)
+		var uploads = await interop.GetFiles(_fileinputid);
+		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 +319,57 @@
 			{
 				try
 				{
-					string result;
-					if (Folder == Constants.PackagesFolder)
+					// upload the files
+					var posturl = Utilities.TenantUrl(PageState.Alias, "/api/file/upload");
+					var folder = (Folder == Constants.PackagesFolder) ? Folder : FolderId.ToString();
+					await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken);
+
+					// 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;
+					}
 
 					// 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 +378,9 @@
 					}
 					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">
@@ -70,6 +70,9 @@
                         }
                     }
                 </tbody>
+                <tfoot>
+                    <tr class="@RowClass">@Footer</tr>
+                </tfoot>
             </table>
         </div>
     }
@@ -116,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++)
@@ -133,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">
@@ -185,6 +188,9 @@
     [Parameter]
     public RenderFragment<TableItem> Row { get; set; } = null; // required
 
+    [Parameter]
+    public RenderFragment Footer { get; set; } = null; // only applicable to Table layouts
+
     [Parameter]
     public RenderFragment<TableItem> Detail { get; set; } = null; // only applicable to Table layouts
 
@@ -293,6 +299,7 @@
         {
             _page = 1;
         }
+        if (_page < 1) _page = 1;
 
         _startPage = 0;
         _endPage = 0;
@@ -304,7 +311,6 @@
             {
                 _page = _pages;
             }
-            ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
             SetPagerSize();
         }
     }
@@ -317,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

@@ -2,6 +2,7 @@
 @inherits ModuleControlBase
 @inject IRoleService RoleService
 @inject IUserService UserService
+@inject IUserRoleService UserRoleService
 @inject IStringLocalizer<PermissionGrid> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -16,7 +17,7 @@
                         <th scope="col">@Localizer["Role"]</th>
                         @foreach (PermissionString permission in _permissions)
                         {
-                            <th style="text-align: center; width: 1px;">@Localizer[permission.PermissionName]</th>
+							<th style="text-align: center; width: 1px;">@((MarkupString)GetPermissionName(permission).Replace(" ", "<br />"))</th>
 						}
                     </tr>
                     @foreach (Role role in _roles)
@@ -27,7 +28,7 @@
                             {
                                 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(p.Permissions, role.Name) Disabled="@GetPermissionDisabled(p.EntityName, p.PermissionName, role.Name)" OnChange="@(e => PermissionChanged(e, p.EntityName, p.PermissionName, role.Name))" />
                                 </td>
                             }
                         </tr>
@@ -65,7 +66,7 @@
                                 {
                                     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(p.Permissions, userid) Disabled="@GetPermissionDisabled(p.EntityName, p.PermissionName, "")" OnChange="@(e => PermissionChanged(e, p.EntityName, p.PermissionName, userid))" />
                                     </td>
                                 }
                             </tr>
@@ -77,23 +78,16 @@
         </div>
     </div>
     <div class="row">
-        <div class="col">
-            <table class="table table-borderless">
-                <tbody>
-                    <tr>
-                        <td class="input-group">
-                            <input type="text" name="Username" class="form-control" placeholder="@Localizer["Username.Enter"]" @bind="@_username" />
+        <div class="col-11">
+			<AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["Username.Enter"]" @ref="_user" />
+		</div>
+		<div class="col-1">
 			<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>
@@ -104,7 +98,7 @@
 	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]
@@ -135,10 +129,25 @@
 
 		_permissions = new List<PermissionString>();
 
-		foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+		foreach (string permissionname in _permissionnames.Split(',', StringSplitOptions.RemoveEmptyEntries))
 		{
-			// initialize with admin role
-			_permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = RoleNames.Admin });
+			// permission names can be in the form of "EntityName:PermissionName:Roles"
+			if (permissionname.Contains(":"))
+			{
+				var segments = permissionname.Split(':');
+				if (segments.Length == 3)
+				{
+					if (!segments[2].Contains(RoleNames.Admin))
+					{
+						segments[2] = RoleNames.Admin + ";" + segments[2]; // ensure admin access
+					}
+					_permissions.Add(new PermissionString { EntityName = segments[0], PermissionName = segments[1], Permissions = segments[2] });
+				}
+			}
+			else
+			{
+				_permissions.Add(new PermissionString { EntityName = EntityName, PermissionName = permissionname, Permissions = RoleNames.Admin });
+			}
 		}
 
 		if (!string.IsNullOrEmpty(Permissions))
@@ -146,14 +155,15 @@
 			// populate permissions
 			foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
 			{
-				if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
+				int index = _permissions.FindIndex(item => item.EntityName == permissionstring.EntityName && item.PermissionName == permissionstring.PermissionName);
+				if (index != -1)
 				{
-					_permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
+					_permissions[index].Permissions = permissionstring.Permissions;
 				}
 
 				if (permissionstring.Permissions.Contains("["))
 				{
-					foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, StringSplitOptions.RemoveEmptyEntries))
+					foreach (string user in permissionstring.Permissions.Split('[', StringSplitOptions.RemoveEmptyEntries))
 					{
 						if (user.Contains("]"))
 						{
@@ -169,6 +179,16 @@
 		}
 	}
 
+	private string GetPermissionName(PermissionString permission)
+	{
+		var permissionname = Localizer[permission.PermissionName].ToString();
+		if (!string.IsNullOrEmpty(EntityName))
+		{
+			permissionname += " " + Localizer[permission.EntityName].ToString();
+		}
+		return permissionname;
+	}
+
 	private bool? GetPermissionValue(string permissions, string securityKey)
 	{
 		if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
@@ -188,38 +208,58 @@
 		}
 	}
 
-	private bool GetPermissionDisabled(string roleName)
-		=> (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) ? true : false;
+	private bool GetPermissionDisabled(string entityName, string permissionName, string roleName)
+	{
+		if (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			return true;
+		}
+		else
+		{
+			if (entityName != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+
+	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(_username, ModuleState.SiteId);
-				if (user != null)
+			var user = await UserService.GetUserAsync(int.Parse(_user.Key), ModuleState.SiteId);
+			if (user != null && !_users.Any(item => item.UserId == user.UserId))
 			{
 				_users.Add(user);
 			}
 		}
-			catch
+		else
 		{
 			_message = Localizer["Message.Username.DontExist"];
 		}
+		_user.Clear();
 	}
 
-		_username = string.Empty;
-	}
-
-	private void PermissionChanged(bool? value, string permissionName, string securityId)
+	private void PermissionChanged(bool? value, string entityName, string permissionName, string securityId)
 	{
 		var selected = value;
-		var permission = _permissions.Find(item => item.PermissionName == permissionName);
-		if (permission != null)
+		int index = _permissions.FindIndex(item => item.EntityName == entityName && item.PermissionName == permissionName);
+		if (index != -1)
 		{
-			var ids = permission.Permissions.Split(';').ToList();
+			var permission = _permissions[index];
 
+			var ids = permission.Permissions.Split(';').ToList();
 			ids.Remove(securityId); // remove grant permission
 			ids.Remove("!" + securityId); // remove deny permission
 
@@ -235,7 +275,7 @@
 					break; // permission not specified
 			}
 
-			_permissions[_permissions.FindIndex(item => item.PermissionName == permissionName)].Permissions = string.Join(";", ids.ToArray());
+			_permissions[index].Permissions = string.Join(";", ids.ToArray());
 		}
 	}
 
@@ -248,9 +288,9 @@
 	private void ValidatePermissions()
 	{
 		PermissionString permission;
-		for (int i = 0; i < _permissions.Count; i++)
+		for (int index = 0; index < _permissions.Count; index++)
 		{
-			permission = _permissions[i];
+			permission = _permissions[index];
 			List<string> ids = permission.Permissions.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
 			ids.Remove("!" + RoleNames.Everyone); // remove deny all users
 			ids.Remove("!" + RoleNames.Unauthenticated); // remove deny unauthenticated
@@ -266,7 +306,7 @@
 				}
 			}
 			permission.Permissions = string.Join(";", ids.ToArray());
-            _permissions[i] = permission;
+            _permissions[index] = permission;
         }
     }
 }

Oqtane.Client/Modules/Controls/RichTextEditor.razor

@@ -262,7 +262,7 @@
 			{
 				var interop = new Interop(JSRuntime);
 				int pos = await interop.GetCaretPosition("rawhtmleditor");
-				var image = "<img src=\"" + file.Url + "\" alt=\"" + ((!string.IsNullOrEmpty(file.Description)) ? file.Description : file.Name) + "\">";
+				var image = "<img src=\"" + file.Url + "\" alt=\"" + ((!string.IsNullOrEmpty(file.Description)) ? file.Description : file.Name) + "\" class=\"img-fluid\">";
 				_rawhtml = _rawhtml.Substring(0, pos) + image + _rawhtml.Substring(pos);
 				_rawfilemanager = false;
 			}

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"))

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))
                     {
-                        var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + "/" + resource.Url;
+                        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());
                     }
                 }
@@ -91,7 +100,7 @@ namespace Oqtane.Modules
 
         public string ModulePath()
         {
-            return "Modules/" + GetType().Namespace + "/";
+            return PageState?.Alias.BaseUrl + "/Modules/" + GetType().Namespace + "/";
         }
 
         // url methods
@@ -145,14 +154,23 @@ namespace Oqtane.Modules
             return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, parameters);
         }
 
-        public string ContentUrl(int fileid)
+        public string FileUrl(string folderpath, string filename)
         {
-            return ContentUrl(fileid, false);
+            return FileUrl(folderpath, filename, false);
         }
 
-        public string ContentUrl(int fileid, bool asAttachment)
+        public string FileUrl(string folderpath, string filename, bool download)
         {
-            return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
+            return Utilities.FileUrl(PageState.Alias, folderpath, filename, download);
+        }
+        public string FileUrl(int fileid)
+        {
+            return FileUrl(fileid, false);
+        }
+
+        public string FileUrl(int fileid, bool download)
+        {
+            return Utilities.FileUrl(PageState.Alias, fileid, download);
         }
 
         public string ImageUrl(int fileid, int width, int height)
@@ -297,15 +315,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
@@ -407,5 +420,17 @@ namespace Oqtane.Modules
                 await _moduleBase.Log(null, LogLevel.Critical, "", exception, message, args);
             }
         }
+
+        [Obsolete("ContentUrl(int fileId) is deprecated. Use FileUrl(int fileId) instead.", false)]
+        public string ContentUrl(int fileid)
+        {
+            return ContentUrl(fileid, false);
+        }
+
+        [Obsolete("ContentUrl(int fileId, bool asAttachment) is deprecated. Use FileUrl(int fileId, bool download) instead.", false)]
+        public string ContentUrl(int fileid, bool asAttachment)
+        {
+            return Utilities.FileUrl(PageState.Alias, fileid, asAttachment);
+        }
     }
 }

Oqtane.Client/Oqtane.Client.csproj

@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.2.0</Version>
+    <Version>3.3.0</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.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</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,14 +57,18 @@ 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)
         {
             var dlls = new Dictionary<string, byte[]>();
             var pdbs = new Dictionary<string, byte[]>();
-            var filter = new List<string>();
+            var list = new List<string>();
 
             var jsRuntime = serviceProvider.GetRequiredService<IJSRuntime>();
             var interop = new Interop(jsRuntime);
@@ -81,14 +86,14 @@ namespace Oqtane.Client
                     var file = files.FirstOrDefault(item => item.Contains(assembly));
                     if (file == null)
                     {
-                        filter.Add(assembly);
+                        list.Add(assembly);
                     }
                     else
                     {
                         // check if newer version available
                         if (GetFileDate(assembly) > GetFileDate(file))
                         {
-                            filter.Add(assembly);
+                            list.Add(assembly);
                         }
                     }
                 }
@@ -96,7 +101,7 @@ namespace Oqtane.Client
                 // get assemblies already downloaded
                 foreach (var file in files)
                 {
-                    if (assemblies.Contains(file) && !filter.Contains(file))
+                    if (assemblies.Contains(file) && !list.Contains(file))
                     {
                         try
                         {
@@ -117,6 +122,7 @@ namespace Oqtane.Client
                         try
                         {
                             await interop.RemoveIndexedDBItem(file);
+                            await interop.RemoveIndexedDBItem(file.Replace(".dll", ".pdb"));
                         }
                         catch
                         {
@@ -127,13 +133,13 @@ namespace Oqtane.Client
             }
             else
             {
-                filter.Add("*");
+                list.Add("*");
             }
 
-            if (filter.Count != 0)
+            if (list.Count != 0)
             {
                 // get assemblies from server and load into client app domain
-                var zip = await http.GetByteArrayAsync($"/api/Installation/load?list=" + string.Join(",", filter));
+                var zip = await http.GetByteArrayAsync($"/api/Installation/load?list=" + string.Join(",", list));
 
                 // asemblies and debug symbols are packaged in a zip file
                 using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))
@@ -219,7 +225,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>

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/Languages/Add.resx

@@ -117,45 +117,30 @@
   <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>
+  <data name="Translated.HelpText" xml:space="preserve">
+    <value>Specify If You Wish To Select Languages That Have Translations Installed</value>
+  </data>
   <data name="Name.HelpText" xml:space="preserve">
     <value>Name Of The Langauage</value>
   </data>
   <data name="IsDefault.HelpText" xml:space="preserve">
     <value>Indicates Whether Or Not This Language Is The Default For The Site</value>
   </data>
+  <data name="Translated.Text" xml:space="preserve">
+    <value>Translated?</value>
+  </data>
   <data name="Name.Text" xml:space="preserve">
     <value>Name:</value>
   </data>
   <data name="IsDefault.Text" xml:space="preserve">
     <value>Default?</value>
   </data>
-  <data name="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>
-  </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>
   </data>

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,6 +204,9 @@
   <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>

Oqtane.Client/Resources/Modules/Admin/RecycleBin/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,16 +166,22 @@
     <value>Error Permanently Deleting Modules</value>
   </data>
   <data name="DeleteAllPages.Header" xml:space="preserve">
-    <value>Delete All Pages</value>
+    <value>Remove All Deleted Pages</value>
   </data>
   <data name="DeleteAllPages.Message" xml:space="preserve">
-    <value>Are You Sure You Wish To Permanently Delete All Pages?</value>
+    <value>Are You Sure You Wish To Permanently Remove All Deleted Pages?</value>
+  </data>
+  <data name="DeleteAllPages.Text" xml:space="preserve">
+    <value>Remove All Deleted Pages</value>
   </data>
   <data name="DeleteAllModules.Header" xml:space="preserve">
-    <value>Delete All Modules</value>
+    <value>Remove All Deleted Modules</value>
   </data>
   <data name="DeleteAllModules.Message" xml:space="preserve">
-    <value>Are You Sure You Wish To Permanently Delete All Modules?</value>
+    <value>Are You Sure You Wish To Permanently Remove All Deleted Modules?</value>
+  </data>
+  <data name="DeleteAllModules.Text" xml:space="preserve">
+    <value>Remove All Deleted Modules</value>
   </data>
   <data name="Pages.Heading" xml:space="preserve">
     <value>Pages</value>

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

@@ -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">
@@ -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">
@@ -339,4 +339,10 @@
   <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>
 </root>

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 
@@ -133,10 +133,10 @@
     <value>No Results Returned</value>
   </data>
   <data name="Tenant.HelpText" xml:space="preserve">
-    <value>Select the tenant for the SQL server</value>
+    <value>Select the tenant associated with the database server</value>
   </data>
   <data name="SqlQuery.HelpText" xml:space="preserve">
-    <value>Enter the query for the SQL server</value>
+    <value>Enter the SQL query for the database server</value>
   </data>
   <data name="SqlQuery.Text" xml:space="preserve">
     <value>SQL Query: </value>

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,10 @@
   <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>
 </root>

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

@@ -211,25 +211,25 @@
     <value>Allow Login?</value>
   </data>
   <data name="Authority.HelpText" xml:space="preserve">
-    <value>The Authority Url or Issuer Url associated with the OpenID Connect provider</value>
+    <value>The authority url or issuer url associated with the identity provider</value>
   </data>
   <data name="Authority.Text" xml:space="preserve">
     <value>Authority:</value>
   </data>
   <data name="AuthorizationUrl.HelpText" xml:space="preserve">
-    <value>The endpoint for obtaining an Authorization Code</value>
+    <value>The endpoint for obtaining an authorization code</value>
   </data>
   <data name="AuthorizationUrl.Text" xml:space="preserve">
     <value>Authorization Url:</value>
   </data>
   <data name="ClientID.HelpText" xml:space="preserve">
-    <value>The Client ID from the provider</value>
+    <value>The client id for the identity provider</value>
   </data>
   <data name="ClientID.Text" xml:space="preserve">
     <value>Client ID:</value>
   </data>
   <data name="ClientSecret.HelpText" xml:space="preserve">
-    <value>The Client Secret from the provider</value>
+    <value>The client secret for the identity provider</value>
   </data>
   <data name="ClientSecret.Text" xml:space="preserve">
     <value>Client Secret:</value>
@@ -247,7 +247,7 @@
     <value>Domain Filter:</value>
   </data>
   <data name="EmailClaimType.HelpText" xml:space="preserve">
-    <value>The name of the email address claim provided by the provider</value>
+    <value>The name of the email address claim provided by the identity provider</value>
   </data>
   <data name="EmailClaimType.Text" xml:space="preserve">
     <value>Email Claim:</value>
@@ -259,7 +259,7 @@
     <value>Lockout Settings</value>
   </data>
   <data name="MetadataUrl.HelpText" xml:space="preserve">
-    <value>The discovery endpoint for obtaining metadata for this provider. Only specify if the OpenID Connect provider does not use the standard approach (ie. /.well-known/openid-configuration)</value>
+    <value>The discovery endpoint for obtaining metadata for this identity provider. Only specify if the identity provider does not use the standard approach (ie. /.well-known/openid-configuration)</value>
   </data>
   <data name="MetadataUrl.Text" xml:space="preserve">
     <value>Metadata Url:</value>
@@ -268,7 +268,7 @@
     <value>Password Settings</value>
   </data>
   <data name="PKCE.HelpText" xml:space="preserve">
-    <value>Indicate if the provider supports Proof Key for Code Exchange (PKCE)</value>
+    <value>Indicate if the identity provider supports proof key for code exchange (PKCE)</value>
   </data>
   <data name="PKCE.Text" xml:space="preserve">
     <value>Use PKCE?</value>
@@ -286,25 +286,25 @@
     <value>Provider Type:</value>
   </data>
   <data name="RedirectUrl.HelpText" xml:space="preserve">
-    <value>The Redirect Url (or Callback Url) which usually needs to be registered with the provider</value>
+    <value>The redirect url (or callback url) which usually needs to be registered with the identity provider</value>
   </data>
   <data name="RedirectUrl.Text" xml:space="preserve">
     <value>Redirect Url:</value>
   </data>
   <data name="Scopes.HelpText" xml:space="preserve">
-    <value>A list of Scopes to request from the provider (separated by commas). If none are specified, standard Scopes will be used by default.</value>
+    <value>A list of scopes to request from the identity provider (separated by commas). If none are specified, standard Scopes will be used by default.</value>
   </data>
   <data name="Scopes.Text" xml:space="preserve">
     <value>Scopes:</value>
   </data>
   <data name="TokenUrl.HelpText" xml:space="preserve">
-    <value>The endpoint for obtaining an Auth Token</value>
+    <value>The endpoint for obtaining an auth token</value>
   </data>
   <data name="TokenUrl.Text" xml:space="preserve">
     <value>Token Url:</value>
   </data>
   <data name="UserInfoUrl.HelpText" xml:space="preserve">
-    <value>The endpoint for obtaining user information. This should be an API or Page Url which contains the users email address.</value>
+    <value>The endpoint for obtaining user information. This should be an API endpoint or page url which contains the users email address.</value>
   </data>
   <data name="UserInfoUrl.Text" xml:space="preserve">
     <value>User Info Url:</value>
@@ -373,15 +373,21 @@
     <value>Last Login</value>
   </data>
   <data name="IdentifierClaimType.HelpText" xml:space="preserve">
-    <value>The name of the unique user identifier claim provided by the provider</value>
+    <value>The name of the unique user identifier claim provided by the identity provider</value>
   </data>
   <data name="IdentifierClaimType.Text" xml:space="preserve">
     <value>Identifier Claim:</value>
   </data>
   <data name="Parameters.HelpText" xml:space="preserve">
-    <value>Optionally specify any additional parameters as name/value pairs to send to the provider (separated by commas if there are multiple).</value>
+    <value>Optionally specify any additional parameters as name/value pairs to send to the identity provider (separated by commas if there are multiple).</value>
   </data>
   <data name="Parameters.Text" xml:space="preserve">
     <value>Parameters:</value>
   </data>
+  <data name="RoleClaimType.HelpText" xml:space="preserve">
+    <value>Optionally provide the name of the role claim provided by the identity provider. These roles will be used in addition to any internal user roles assigned within the site.</value>
+  </data>
+    <data name="RoleClaimType.Text" xml:space="preserve">
+    <value>Role Claim Type:</value>
+  </data>
 </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/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;
-        private readonly IJSRuntime _jsRuntime;
-
-        public FileService(HttpClient http, SiteState siteState, IJSRuntime jsRuntime) : base(http, siteState)
-        {
-            _siteState = siteState;
-            _jsRuntime = jsRuntime;
-        }
+        public FileService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
         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/ISettingService.cs

@@ -164,6 +164,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/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/SettingService.cs

@@ -170,6 +170,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/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.Permissions))
 {
     <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>
@@ -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.Permissions))
+				{
 					<div class="row">
 						<div class="col text-center">
 							<label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
@@ -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,6 +292,7 @@
 
 	protected override async Task OnParametersSetAsync()
 	{
+		_canViewAdminDashboard = CanViewAdminDashboard();
 		_showEditMode = false;
 		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
 		{
@@ -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.Permissions))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	private void CategoryChanged(ChangeEventArgs e)
 	{
 		Category = (string)e.Value;
@@ -465,12 +488,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":
@@ -551,19 +572,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 +617,8 @@
     private async Task UpdateSettingsAsync()
     {
         Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-        SettingService.SetSetting(settings, settingCategory, _category);
-        SettingService.SetSetting(settings, settingPane, _pane);
+		settings = SettingService.SetSetting(settings, settingCategory, _category);
+        settings = SettingService.SetSetting(settings, settingPane, _pane);
         await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
     }
 

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

@@ -32,7 +32,7 @@ namespace Oqtane.Themes.Controls
 
         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
             var url = PageState.Alias.Path + "/" + PageState.Page.Path;

Oqtane.Client/Themes/ThemeBase.cs

@@ -3,6 +3,7 @@ using Microsoft.JSInterop;
 using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.UI;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -31,14 +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))
                     {
-                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module });
+                        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());
                     }
                 }
@@ -49,7 +60,7 @@ namespace Oqtane.Themes
 
         public string ThemePath()
         {
-            return "Themes/" + GetType().Namespace + "/";
+            return PageState?.Alias.BaseUrl + "/Themes/" + GetType().Namespace + "/";
         }
 
         // url methods
@@ -94,14 +105,23 @@ namespace Oqtane.Themes
             return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, parameters);
         }
 
-        public string ContentUrl(int fileid)
+        public string FileUrl(string folderpath, string filename)
         {
-            return Utilities.ContentUrl(PageState.Alias, fileid);
+            return FileUrl(folderpath, filename, false);
         }
 
-        public string ContentUrl(int fileid, bool asAttachment)
+        public string FileUrl(string folderpath, string filename, bool download)
         {
-            return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
+            return Utilities.FileUrl(PageState.Alias, folderpath, filename, download);
+        }
+        public string FileUrl(int fileid)
+        {
+            return FileUrl(fileid, false);
+        }
+
+        public string FileUrl(int fileid, bool download)
+        {
+            return Utilities.FileUrl(PageState.Alias, fileid, download);
         }
 
         public string ImageUrl(int fileid, int width, int height)
@@ -118,5 +138,17 @@ namespace Oqtane.Themes
         {
             return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, position, background, rotate, recreate);
         }
+
+        [Obsolete("ContentUrl(int fileId) is deprecated. Use FileUrl(int fileId) instead.", false)]
+        public string ContentUrl(int fileid)
+        {
+            return ContentUrl(fileid, false);
+        }
+
+        [Obsolete("ContentUrl(int fileId, bool asAttachment) is deprecated. Use FileUrl(int fileId, bool download) instead.", false)]
+        public string ContentUrl(int fileid, bool asAttachment)
+        {
+            return Utilities.FileUrl(PageState.Alias, fileid, asAttachment);
+        }
     }
 }

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

@@ -1,9 +0,0 @@
-namespace Oqtane.UI
-{
-    public enum Refresh
-    {
-        None,
-        Site,
-        Application
-    }
-}

Oqtane.Client/UI/SiteRouter.razor

@@ -79,7 +79,7 @@
 		Page page;
 		User user = null;
 		var editmode = false;
-		var refresh = UI.Refresh.None;
+		var refresh = false;
 		var lastsyncdate = DateTime.UtcNow.AddHours(-1);
 		var runtime = (Shared.Runtime)Enum.Parse(typeof(Shared.Runtime), Runtime);
 		_error = "";
@@ -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);
@@ -116,7 +116,7 @@
 		// the refresh parameter is used to refresh the client-side PageState
 		if (querystring.ContainsKey("refresh"))
 		{
-			refresh = UI.Refresh.Site;
+			refresh = true;
 		}
 
 		if (PageState != null)
@@ -126,7 +126,7 @@
 		}
 
 		// get user
-		if (PageState == null || refresh == UI.Refresh.Site || PageState.Alias.SiteId != SiteState.Alias.SiteId)
+		if (PageState == null || refresh || PageState.Alias.SiteId != SiteState.Alias.SiteId)
 		{
 			var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
 			if (authState.User.Identity.IsAuthenticated)
@@ -149,27 +149,27 @@
 		if (sync.SyncEvents.Any())
 		{
 			// reload client application if server was restarted or site runtime/rendermode was modified
-			if (PageState != null && sync.SyncEvents.Exists(item => (item.TenantId == -1 || item.EntityName == EntityNames.Site && item.EntityId == SiteState.Alias.SiteId) && item.Reload))
+			if (PageState != null && sync.SyncEvents.Exists(item => (item.Action == SyncEventActions.Reload)))
 			{
 				NavigationManager.NavigateTo(_absoluteUri, true);
 				return;
 			}
-			// when a site has changed the state needs to be refreshed
+			// when site information has changed the PageState needs to be refreshed
 			if (sync.SyncEvents.Exists(item => item.EntityName == EntityNames.Site && item.EntityId == SiteState.Alias.SiteId))
 			{
-				refresh = UI.Refresh.Site;
+				refresh = true;
 			}
-			// when a user changed the site needs to be refreshed as the list of pages/modules may have changed
+			// when user information has changed the PageState needs to be refreshed as the list of pages/modules may have changed
 			if (user != null && sync.SyncEvents.Exists(item => item.EntityName == EntityNames.User && item.EntityId == user.UserId))
 			{
-				refresh = UI.Refresh.Site;
+				refresh = true;
 			}
 		}
 
-		if (PageState == null || refresh == UI.Refresh.Site || PageState.Alias.SiteId != SiteState.Alias.SiteId)
+		if (PageState == null || refresh || PageState.Alias.SiteId != SiteState.Alias.SiteId)
 		{
 			site = await SiteService.GetSiteAsync(SiteState.Alias.SiteId);
-			refresh = UI.Refresh.Site;
+			refresh = true;
 		}
 		else
 		{
@@ -178,7 +178,7 @@
 
 		if (site != null)
 		{
-			if (PageState == null || refresh == UI.Refresh.Site || PageState.Page.Path != route.PagePath)
+			if (PageState == null || refresh || PageState.Page.Path != route.PagePath)
 			{
 				page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
 				editmode = false;

Oqtane.Client/UI/ThemeBuilder.razor

@@ -36,7 +36,7 @@
 		foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
 		{
 			var prefix = "app-stylesheet-" + resource.Level.ToString().ToLower();
-			var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + "/" + resource.Url;
+			var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
 			links.Add(new { id = prefix + "-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", insertbefore = prefix });
         }
         if (links.Any())

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.2.0</Version>
+    <Version>3.3.0</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.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</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.0</version>
+        <version>3.3.0</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.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</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.0</Version>
+    <Version>3.3.0</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.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

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

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

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.2.0</Version>
+    <Version>3.3.0</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.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

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

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

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.2.0</Version>
+    <Version>3.3.0</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.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.3.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

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

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

Oqtane.Maui/MauiProgram.cs

@@ -12,7 +12,8 @@ namespace Oqtane.Maui;
 public static class MauiProgram
 {
     // the API service url
-    static string apiurl = "http://localhost:44357";
+    static string apiurl = "https://www.dnfprojects.com"; // for testing
+    //static string apiurl = "http://localhost:44357"; // for local development (Oqtane.Server must be already running for MAUI client to connect)
 
     public static MauiApp CreateMauiApp()
 	{
@@ -72,7 +73,7 @@ public static class MauiProgram
 
             var dlls = new Dictionary<string, byte[]>();
             var pdbs = new Dictionary<string, byte[]>();
-            var filter = new List<string>();
+            var list = new List<string>();
 
             var files = new List<string>();
             foreach (var file in Directory.EnumerateFiles(folder, "*.dll", SearchOption.AllDirectories))
@@ -92,14 +93,14 @@ public static class MauiProgram
                     var file = files.FirstOrDefault(item => item.Contains(assembly));
                     if (file == null)
                     {
-                        filter.Add(assembly);
+                        list.Add(assembly);
                     }
                     else
                     {
                         // check if newer version available
                         if (GetFileDate(assembly) > GetFileDate(file))
                         {
-                            filter.Add(assembly);
+                            list.Add(assembly);
                         }
                     }
                 }
@@ -107,7 +108,7 @@ public static class MauiProgram
                 // get assemblies already downloaded
                 foreach (var file in files)
                 {
-                    if (assemblies.Contains(file) && !filter.Contains(file))
+                    if (assemblies.Contains(file) && !list.Contains(file))
                     {
                         try
                         {
@@ -127,7 +128,10 @@ public static class MauiProgram
                     {
                         try
                         {
-                            File.Delete(Path.Combine(folder, file));
+                            foreach (var path in Directory.EnumerateFiles(folder, Path.GetFileNameWithoutExtension(file) + ".*"))
+                            {
+                                File.Delete(path);
+                            }
                         }
                         catch
                         {
@@ -138,13 +142,13 @@ public static class MauiProgram
             }
             else
             {
-                filter.Add("*");
+                list.Add("*");
             }
 
-            if (filter.Count != 0)
+            if (list.Count != 0)
             {
                 // get assemblies from server
-                var zip = Task.Run(() => http.GetByteArrayAsync("/api/Installation/load?list=" + string.Join(",", filter))).GetAwaiter().GetResult();
+                var zip = Task.Run(() => http.GetByteArrayAsync("/api/Installation/load?list=" + string.Join(",", list))).GetAwaiter().GetResult();
 
                 // asemblies and debug symbols are packaged in a zip file
                 using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))
@@ -159,11 +163,6 @@ public static class MauiProgram
                             // save assembly to local folder
                             try
                             {
-                                int subfolder = entry.FullName.IndexOf('/');
-                                if (subfolder != -1 && !Directory.Exists(Path.Combine(folder, entry.FullName.Substring(0, subfolder))))
-                                {
-                                    Directory.CreateDirectory(Path.Combine(folder, entry.FullName.Substring(0, subfolder)));
-                                }
                                 using var stream = File.Create(Path.Combine(folder, entry.FullName));
                                 stream.Write(file, 0, file.Length);
                             }

Oqtane.Maui/Oqtane.Maui.csproj

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

Oqtane.Package/Oqtane.Client.nuspec

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

Oqtane.Package/Oqtane.Framework.nuspec

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

Oqtane.Package/Oqtane.Server.nuspec

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

Oqtane.Package/Oqtane.Shared.nuspec

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

Oqtane.Package/Oqtane.Updater.nuspec

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

Oqtane.Package/install.ps1

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

Oqtane.Package/release.cmd

@@ -13,6 +13,23 @@ rmdir /Q/S "..\Oqtane.Server\bin\Release\net6.0\publish"
 dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
 del /F/Q/S "..\Oqtane.Server\bin\Release\net6.0\publish\wwwroot\Content" > NUL
 rmdir /Q/S "..\Oqtane.Server\bin\Release\net6.0\publish\wwwroot\Content"
+setlocal ENABLEDELAYEDEXPANSION
+set retain=Oqtane.Modules.Admin.Login,Oqtane.Modules.HtmlText,Templates
+for /D %%i in ("..\Oqtane.Server\bin\Release\net6.0\publish\wwwroot\Modules\*") do (
+set /A found=0
+for %%j in (%retain%) do (
+if "%%~nxi" == "%%j" set /A found=1
+)
+if not !found! == 1 rmdir /Q/S "%%i"
+)
+set retain=Oqtane.Themes.BlazorTheme,Oqtane.Themes.OqtaneTheme,Templates
+for /D %%i in ("..\Oqtane.Server\bin\Release\net6.0\publish\wwwroot\Themes\*") do (
+set /A found=0
+for %%j in (%retain%) do (
+if "%%~nxi" == "%%j" set /A found=1
+)
+if not !found! == 1 rmdir /Q/S "%%i"
+)
 del "..\Oqtane.Server\bin\Release\net6.0\publish\appsettings.json"
 ren "..\Oqtane.Server\bin\Release\net6.0\publish\appsettings.release.json" "appsettings.json"
 C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\install.ps1"

Oqtane.Package/upgrade.ps1

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

Oqtane.Server/Controllers/AliasController.cs

@@ -17,13 +17,15 @@ namespace Oqtane.Controllers
     {
         private readonly IAliasRepository _aliases;
         private readonly ITenantRepository _tenants;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public AliasController(IAliasRepository aliases, ITenantRepository tenants, ILogManager logger, ITenantManager tenantManager)
+        public AliasController(IAliasRepository aliases, ITenantRepository tenants, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager)
         {
             _aliases = aliases;
             _tenants = tenants;
+            _syncManager = syncManager;
             _logger = logger;
             _alias = tenantManager.GetAlias();
         }
@@ -57,6 +59,7 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid)
             {
                 alias = _aliases.AddAlias(alias);
+                _syncManager.AddSyncEvent(alias.TenantId, EntityNames.Alias, alias.AliasId, SyncEventActions.Create);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Alias Added {Alias}", alias);
             }
             else
@@ -76,6 +79,7 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid && _aliases.GetAlias(alias.AliasId, false) != null)
             {
                 alias = _aliases.UpdateAlias(alias);
+                _syncManager.AddSyncEvent(alias.TenantId, EntityNames.Alias, alias.AliasId, SyncEventActions.Update);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Alias Updated {Alias}", alias);
             }
             else
@@ -96,6 +100,7 @@ namespace Oqtane.Controllers
             if (alias != null)
             {
                 _aliases.DeleteAlias(id);
+                _syncManager.AddSyncEvent(alias.TenantId, EntityNames.Alias, alias.AliasId, SyncEventActions.Delete);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Alias Deleted {AliasId}", id);
 
                 var aliases = _aliases.GetAliases();

Oqtane.Server/Controllers/FileController.cs

@@ -20,6 +20,7 @@ using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Formats.Png;
 using System.Net.Http;
+using Oqtane.Migrations.Tenant;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1
 
@@ -32,15 +33,17 @@ namespace Oqtane.Controllers
         private readonly IFileRepository _files;
         private readonly IFolderRepository _folders;
         private readonly IUserPermissions _userPermissions;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public FileController(IWebHostEnvironment environment, IFileRepository files, IFolderRepository folders, IUserPermissions userPermissions, ILogManager logger, ITenantManager tenantManager)
+        public FileController(IWebHostEnvironment environment, IFileRepository files, IFolderRepository folders, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager)
         {
             _environment = environment;
             _files = files;
             _folders = folders;
             _userPermissions = userPermissions;
+            _syncManager = syncManager;
             _logger = logger;
             _alias = tenantManager.GetAlias();
         }
@@ -133,7 +136,9 @@ namespace Oqtane.Controllers
         public Models.File Put(int id, [FromBody] Models.File file)
         {
             var File = _files.GetFile(file.FileId, false);
-            if (ModelState.IsValid && File != null && File.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Folder, file.FolderId, PermissionNames.Edit))
+            if (ModelState.IsValid && file.Folder.SiteId == _alias.SiteId && File != null // ensure file exists
+                && _userPermissions.IsAuthorized(User, file.Folder.SiteId, EntityNames.Folder, File.FolderId, PermissionNames.Edit) // ensure user had edit rights to original folder
+                && _userPermissions.IsAuthorized(User, file.Folder.SiteId, EntityNames.Folder, file.FolderId, PermissionNames.Edit)) // ensure user has edit rights to new folder
             {
                 if (File.Name != file.Name || File.FolderId != file.FolderId)
                 {
@@ -146,8 +151,17 @@ namespace Oqtane.Controllers
                     System.IO.File.Move(_files.GetFilePath(File), Path.Combine(folderpath, file.Name));
                 }
 
-                file.Extension = Path.GetExtension(file.Name).ToLower().Replace(".", "");
+                var newfile = CreateFile(file.Name, file.Folder.FolderId, _files.GetFilePath(file));
+                if (newfile != null)
+                {
+                    file.Extension = newfile.Extension;
+                    file.Size = newfile.Size;
+                    file.ImageWidth = newfile.ImageWidth;
+                    file.ImageHeight = newfile.ImageHeight;
+                }
+
                 file = _files.UpdateFile(file);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.File, file.FileId, SyncEventActions.Update);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "File Updated {File}", file);
             }
             else
@@ -166,10 +180,8 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             Models.File file = _files.GetFile(id);
-            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Folder, file.Folder.FolderId, PermissionNames.Edit))
+            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, file.Folder.SiteId, EntityNames.Folder, file.Folder.FolderId, PermissionNames.Edit))
             {
-                _files.DeleteFile(id);
-
                 string filepath = _files.GetFilePath(file);
                 if (System.IO.File.Exists(filepath))
                 {
@@ -180,6 +192,8 @@ namespace Oqtane.Controllers
                     }
                 }
 
+                _files.DeleteFile(id);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.File, file.FileId, SyncEventActions.Delete);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "File Deleted {File}", file);
             }
             else
@@ -251,6 +265,7 @@ namespace Oqtane.Controllers
                     if (file != null)
                     {
                         file = _files.AddFile(file);
+                        _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.File, file.FileId, SyncEventActions.Create);
                     }
                 }
                 catch (Exception ex)
@@ -324,7 +339,16 @@ namespace Oqtane.Controllers
                     var file = CreateFile(upload, FolderId, Path.Combine(folderPath, upload));
                     if (file != null)
                     {
-                        _files.AddFile(file);
+                        if (file.FileId == 0)
+                        {
+                            file = _files.AddFile(file);
+                        }
+                        else
+                        {
+                            file = _files.UpdateFile(file);
+                        }
+                        _logger.Log(LogLevel.Information, this, LogFunction.Create, "File Upload Succeeded {File}", Path.Combine(folderPath, upload));
+                        _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.File, file.FileId, SyncEventActions.Create);
                     }
                 }
             }
@@ -345,16 +369,16 @@ namespace Oqtane.Controllers
             int totalparts = int.Parse(parts?.Substring(parts.IndexOf("_") + 1));
 
             filename = Path.GetFileNameWithoutExtension(filename); // base filename
-            string[] fileParts = Directory.GetFiles(folder, filename + token + "*"); // list of all file parts
+            string[] fileparts = Directory.GetFiles(folder, filename + token + "*"); // list of all file parts
 
             // if all of the file parts exist ( note that file parts can arrive out of order )
-            if (fileParts.Length == totalparts && CanAccessFiles(fileParts))
+            if (fileparts.Length == totalparts && CanAccessFiles(fileparts))
             {
-                // merge file parts
+                // merge file parts into temp file ( in case another user is trying to get the file )
                 bool success = true;
                 using (var stream = new FileStream(Path.Combine(folder, filename + ".tmp"), FileMode.Create))
                 {
-                    foreach (string filepart in fileParts)
+                    foreach (string filepart in fileparts)
                     {
                         try
                         {
@@ -370,52 +394,49 @@ namespace Oqtane.Controllers
                     }
                 }
 
-                // delete file parts and rename file
-                if (success)
+                // clean up file parts
+                foreach (var file in Directory.GetFiles(folder, "*" + token + "*"))
                 {
-                    foreach (string filepart in fileParts)
-                    {
-                        System.IO.File.Delete(filepart);
-                    }
-
-                    // remove file if it already exists
-                    if (System.IO.File.Exists(Path.Combine(folder, filename)))
-                    {
-                        System.IO.File.Delete(Path.Combine(folder, filename));
-                    }
-
-                    // rename file now that the entire process is completed
-                    System.IO.File.Move(Path.Combine(folder, filename + ".tmp"), Path.Combine(folder, filename));
-                    _logger.Log(LogLevel.Information, this, LogFunction.Create, "File Uploaded {File}", Path.Combine(folder, filename));
-
-                    merged = filename;
-                }
-            }
-
-            // clean up file parts which are more than 2 hours old ( which can happen if a prior file upload failed )
-            var cleanupFiles = Directory.EnumerateFiles(folder, "*" + token + "*")
-                .Where(f => Path.GetExtension(f).StartsWith(token) && !Path.GetFileName(f).StartsWith(filename));
-            foreach (var file in cleanupFiles)
-            {
-                var createdDate = System.IO.File.GetCreationTime(file).ToUniversalTime();
-                if (createdDate < DateTime.UtcNow.AddHours(-2))
+                    // file name matches part or is more than 2 hours old (ie. a prior file upload failed)
+                    if (fileparts.Contains(file) || System.IO.File.GetCreationTime(file).ToUniversalTime() < DateTime.UtcNow.AddHours(-2))
                     {
                         System.IO.File.Delete(file);
                     }
                 }
 
+                // rename temp file
+                if (success)
+                {
+                    // remove file if it already exists (as well as any thumbnails)
+                    foreach (var file in Directory.GetFiles(folder, Path.GetFileNameWithoutExtension(filename) + ".*"))
+                    {
+                        if (Path.GetExtension(file) != ".tmp")
+                        {
+                            System.IO.File.Delete(file);
+                        }
+                    }
+
+                    // rename temp file now that the entire process is completed
+                    System.IO.File.Move(Path.Combine(folder, filename + ".tmp"), Path.Combine(folder, filename));
+
+                    // return filename
+                    merged = filename;
+                }
+            }
+
             return merged;
         }
 
         private bool CanAccessFiles(string[] files)
         {
-            // ensure files are not locked by another process ( ie. still being written to )
-            bool canaccess = true;
+            // ensure files are not locked by another process
             FileStream stream = null;
+            bool locked = false;
             foreach (string file in files)
             {
+                locked = true;
                 int attempts = 0;
-                bool locked = true;
+                // note that this will wait a maximum of 15 seconds for a file to become unlocked
                 while (attempts < 5 && locked)
                 {
                     try
@@ -425,7 +446,8 @@ namespace Oqtane.Controllers
                     }
                     catch // file is locked by another process
                     {
-                        Thread.Sleep(1000); // wait 1 second
+                        attempts += 1;
+                        Thread.Sleep(1000 * attempts); // progressive retry
                     }
                     finally
                     {
@@ -434,20 +456,15 @@ namespace Oqtane.Controllers
                             stream.Close();
                         }
                     }
-
-                    attempts += 1;
                 }
-
-                if (locked && canaccess)
+                if (locked)
                 {
-                    canaccess = false;
+                    break; // file still locked after retrying
                 }
             }
-
-            return canaccess;
+            return !locked;
         }
 
-
         /// <summary>
         /// Get file with header
         /// Content-Disposition: inline
@@ -486,10 +503,15 @@ namespace Oqtane.Controllers
                 var filepath = _files.GetFilePath(file);
                 if (System.IO.File.Exists(filepath))
                 {
-                    var result = asAttachment
-                        ? PhysicalFile(filepath, file.GetMimeType(), file.Name)
-                        : PhysicalFile(filepath, file.GetMimeType());
-                    return result;
+                    if (asAttachment)
+                    {
+                        _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.File, file.FileId, "Download");
+                        return PhysicalFile(filepath, file.GetMimeType(), file.Name);
+                    }
+                    else
+                    {
+                        return PhysicalFile(filepath, file.GetMimeType());
+                    }
                 }
                 else
                 {
@@ -634,7 +656,7 @@ namespace Oqtane.Controllers
 
         private Models.File CreateFile(string filename, int folderid, string filepath)
         {
-            Models.File file = null;
+            var file = _files.GetFile(folderid, filename);
 
             int size = 0;
             var folder = _folders.GetFolder(folderid);
@@ -648,8 +670,11 @@ namespace Oqtane.Controllers
 
             FileInfo fileinfo = new FileInfo(filepath);
             if (folder.Capacity == 0 || ((size + fileinfo.Length) / 1000000) < folder.Capacity)
+            {
+                if (file == null)
                 {
                     file = new Models.File();
+                }
                 file.Name = filename;
                 file.FolderId = folderid;
 
@@ -679,7 +704,11 @@ namespace Oqtane.Controllers
             else
             {
                 System.IO.File.Delete(filepath);
-                _logger.Log(LogLevel.Warning, this, LogFunction.Create, "File Exceeds Folder Capacity {Folder} {File}", folder, filepath);
+                if (file != null)
+                {
+                    _files.DeleteFile(file.FileId);
+                }
+                _logger.Log(LogLevel.Warning, this, LogFunction.Create, "File Exceeds Folder Capacity And Has Been Removed {Folder} {File}", folder, filepath);
             }
 
             return file;

Oqtane.Server/Controllers/FolderController.cs

@@ -20,13 +20,15 @@ namespace Oqtane.Controllers
     {
         private readonly IFolderRepository _folders;
         private readonly IUserPermissions _userPermissions;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public FolderController(IFolderRepository folders, IUserPermissions userPermissions, ILogManager logger, ITenantManager tenantManager)
+        public FolderController(IFolderRepository folders, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager)
         {
             _folders = folders;
             _userPermissions = userPermissions;
+            _syncManager = syncManager;
             _logger = logger;
             _alias = tenantManager.GetAlias();
         }
@@ -124,6 +126,7 @@ namespace Oqtane.Controllers
                         }
                         folder.Path = folder.Path + "/";
                         folder = _folders.AddFolder(folder);
+                        _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Folder, folder.FolderId, SyncEventActions.Create);
                         _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", folder);
                     }
                     else
@@ -154,7 +157,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Folder Put(int id, [FromBody] Folder folder)
         {
-            if (ModelState.IsValid && folder.SiteId == _alias.SiteId && _folders.GetFolder(folder.FolderId, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Folder, folder.FolderId, PermissionNames.Edit))
+            if (ModelState.IsValid && folder.SiteId == _alias.SiteId && _folders.GetFolder(folder.FolderId, false) != null && _userPermissions.IsAuthorized(User, folder.SiteId, EntityNames.Folder, folder.FolderId, PermissionNames.Edit))
             {
                 if (folder.IsPathValid())
                 {
@@ -172,6 +175,7 @@ namespace Oqtane.Controllers
                     }
 
                     folder = _folders.UpdateFolder(folder);
+                    _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Folder, folder.FolderId, SyncEventActions.Update);
                     _logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", folder);
                 }
                 else
@@ -195,7 +199,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public void Put(int siteid, int folderid, int? parentid)
         {
-            if (siteid == _alias.SiteId && _folders.GetFolder(folderid, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Folder, folderid, PermissionNames.Edit))
+            if (siteid == _alias.SiteId && _folders.GetFolder(folderid, false) != null && _userPermissions.IsAuthorized(User, siteid, EntityNames.Folder, folderid, PermissionNames.Edit))
             {
                 int order = 1;
                 List<Folder> folders = _folders.GetFolders(siteid).ToList();
@@ -205,6 +209,7 @@ namespace Oqtane.Controllers
                     {
                         folder.Order = order;
                         _folders.UpdateFolder(folder);
+                        _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Folder, folder.FolderId, SyncEventActions.Update);
                     }
                     order += 2;
                 }
@@ -223,13 +228,14 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             var folder = _folders.GetFolder(id, false);
-            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Folder, id, PermissionNames.Edit))
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, folder.SiteId, EntityNames.Folder, id, PermissionNames.Edit))
             {
                 if (Directory.Exists(_folders.GetFolderPath(folder)))
                 {
                     Directory.Delete(_folders.GetFolderPath(folder));
                 }
                 _folders.DeleteFolder(id);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Folder, folder.FolderId, SyncEventActions.Delete);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Folder Deleted {FolderId}", id);
             }
             else

Oqtane.Server/Controllers/InstallationController.cs

@@ -103,10 +103,7 @@ namespace Oqtane.Controllers
         [HttpGet("list")]
         public List<string> List()
         {
-            return _cache.GetOrCreate("assemblieslist", entry =>
-            {
-                return GetAssemblyList();
-            });
+            return GetAssemblyList().Select(item => item.HashedName).ToList();
         }
 
         // GET api/<controller>/load?list=x,y
@@ -116,17 +113,21 @@ namespace Oqtane.Controllers
             return File(GetAssemblies(list), System.Net.Mime.MediaTypeNames.Application.Octet, "oqtane.dll");
         }
 
-        private List<string> GetAssemblyList()
+        private List<ClientAssembly> GetAssemblyList()
+        {
+            return _cache.GetOrCreate("assemblieslist", entry =>
             {
-            // get list of assemblies which should be downloaded to client
                 var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+                var assemblyList = new List<ClientAssembly>();
+
+                // get list of assemblies which should be downloaded to client
                 var assemblies = AppDomain.CurrentDomain.GetOqtaneClientAssemblies();
                 var list = assemblies.Select(a => a.GetName().Name).ToList();            
 
-            // include version numbers
+                // populate assemblies
                 for (int i = 0; i < list.Count; i++)
                 {
-                 list[i] = Path.GetFileName(AddFileDate(Path.Combine(binFolder, list[i] + ".dll")));
+                    assemblyList.Add(new ClientAssembly(Path.Combine(binFolder, list[i] + ".dll")));
                 }
 
                 // insert satellite assemblies at beginning of list
@@ -142,7 +143,7 @@ namespace Oqtane.Controllers
                     {
                         foreach (var resourceFile in Directory.EnumerateFiles(assembliesFolderPath))
                         {
-                        list.Insert(0, culture + "/" + Path.GetFileName(AddFileDate(resourceFile)));
+                            assemblyList.Insert(0, new ClientAssembly(resourceFile));
                         }
                     }
                     else
@@ -157,13 +158,15 @@ namespace Oqtane.Controllers
                     foreach (var type in assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(IModule))))
                     {
                         var instance = Activator.CreateInstance(type) as IModule;
-                    foreach (string name in instance.ModuleDefinition.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                        foreach (string name in instance.ModuleDefinition.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Reverse())
                         {
-                        var path = Path.Combine(binFolder, name + ".dll");
-                        if (System.IO.File.Exists(path))
+                            var filepath = Path.Combine(binFolder, name + ".dll");
+                            if (System.IO.File.Exists(filepath))
                             {
-                            path = Path.GetFileName(AddFileDate(path));
-                            if (!list.Contains(path)) list.Insert(0, path);
+                                if (!assemblyList.Exists(item => item.FilePath == filepath))
+                                {
+                                    assemblyList.Insert(0, new ClientAssembly(filepath));
+                                }
                             }
                             else
                             {
@@ -174,13 +177,15 @@ namespace Oqtane.Controllers
                     foreach (var type in assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(ITheme))))
                     {
                         var instance = Activator.CreateInstance(type) as ITheme;
-                    foreach (string name in instance.Theme.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                        foreach (string name in instance.Theme.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Reverse())
                         {
-                        var path = Path.Combine(binFolder, name + ".dll");
-                        if (System.IO.File.Exists(path))
+                            var filepath = Path.Combine(binFolder, name + ".dll");
+                            if (System.IO.File.Exists(filepath))
                             {
-                            path = Path.GetFileName(AddFileDate(path));
-                            if (!list.Contains(path)) list.Insert(0, path);
+                                if (!assemblyList.Exists(item => item.FilePath == filepath))
+                                {
+                                    assemblyList.Insert(0, new ClientAssembly(filepath));
+                                }
                             }
                             else
                             {
@@ -190,7 +195,8 @@ namespace Oqtane.Controllers
                     }
                 }
 
-            return list;
+                return assemblyList;
+            });
         }
 
         private byte[] GetAssemblies(string list)
@@ -213,14 +219,11 @@ namespace Oqtane.Controllers
             var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
 
             // get list of assemblies which should be downloaded to client
-            List<string> assemblies;
-            if (list == "*")
+            List<ClientAssembly> assemblies = GetAssemblyList();
+            if (list != "*")
             {
-                assemblies = GetAssemblyList();
-            }
-            else
-            {
-                assemblies = list.Split(',').ToList();
+                var filter = list.Split(',').ToList();
+                assemblies.RemoveAll(item => !filter.Contains(item.HashedName));
             }
 
             // create zip file containing assemblies and debug symbols
@@ -228,22 +231,21 @@ namespace Oqtane.Controllers
             {
                 using (var archive = new ZipArchive(memoryStream, ZipArchiveMode.Create, true))
                 {
-                    foreach (string file in assemblies)
+                    foreach (var assembly in assemblies)
                     {
-                        var filename = RemoveFileDate(file);
-                        if (System.IO.File.Exists(Path.Combine(binFolder, filename)))
+                        if (System.IO.File.Exists(assembly.FilePath))
                         {
-                            using (var filestream = new FileStream(Path.Combine(binFolder, filename), FileMode.Open, FileAccess.Read))
-                            using (var entrystream = archive.CreateEntry(file).Open())
+                            using (var filestream = new FileStream(assembly.FilePath, FileMode.Open, FileAccess.Read))
+                            using (var entrystream = archive.CreateEntry(assembly.HashedName).Open())
                             {
                                 filestream.CopyTo(entrystream);
                             }
                         }
-                        filename = filename.Replace(".dll", ".pdb");
-                        if (System.IO.File.Exists(Path.Combine(binFolder, filename)))
+                        var pdb = assembly.FilePath.Replace(".dll", ".pdb");
+                        if (System.IO.File.Exists(pdb))
                         {
-                            using (var filestream = new FileStream(Path.Combine(binFolder, filename), FileMode.Open, FileAccess.Read))
-                            using (var entrystream = archive.CreateEntry(file.Replace(".dll", ".pdb")).Open())
+                            using (var filestream = new FileStream(pdb, FileMode.Open, FileAccess.Read))
+                            using (var entrystream = archive.CreateEntry(assembly.HashedName.Replace(".dll", ".pdb")).Open())
                             {
                                 filestream.CopyTo(entrystream);
                             }
@@ -255,18 +257,6 @@ namespace Oqtane.Controllers
             }
         }
 
-        private string AddFileDate(string filepath)
-        {
-            DateTime lastwritetime = System.IO.File.GetLastWriteTime(filepath);
-            return Path.GetFileNameWithoutExtension(filepath) + "." + lastwritetime.ToString("yyyyMMddHHmmss") + Path.GetExtension(filepath);            
-        }
-
-        private string RemoveFileDate(string filepath)
-        {
-            var segments = filepath.Split(".");
-            return string.Join(".", segments, 0, segments.Length - 2) + Path.GetExtension(filepath);
-        }
-
         private async Task RegisterContact(string email)
         {
             try
@@ -292,5 +282,38 @@ namespace Oqtane.Controllers
         {
             await RegisterContact(email);
         }
+
+        public struct ClientAssembly
+        {
+            public ClientAssembly(string filepath)
+            {
+                FilePath = filepath;
+                DateTime lastwritetime = System.IO.File.GetLastWriteTime(filepath);
+                HashedName = GetDeterministicHashCode(filepath).ToString("X8") + "." + lastwritetime.ToString("yyyyMMddHHmmss") + Path.GetExtension(filepath);
+            }
+
+            public string FilePath { get; private set; }
+            public string HashedName { get; private set; }
+        }
+
+        private static int GetDeterministicHashCode(string value)
+        {
+            unchecked
+            {
+                int hash1 = (5381 << 16) + 5381;
+                int hash2 = hash1;
+
+                for (int i = 0; i < value.Length; i += 2)
+                {
+                    hash1 = ((hash1 << 5) + hash1) ^ value[i];
+                    if (i == value.Length - 1)
+                        break;
+                    hash2 = ((hash2 << 5) + hash2) ^ value[i + 1];
+                }
+
+                return hash1 + (hash2 * 1566083941);
+            }
+        }
+
     }
 }

Oqtane.Server/Controllers/LanguageController.cs

@@ -42,10 +42,13 @@ namespace Oqtane.Controllers
                 {
                     if (!string.IsNullOrEmpty(packagename))
                     {
-                        foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"{packagename}.*{Constants.SatelliteAssemblyExtension}", SearchOption.AllDirectories))
+                        foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"{packagename}*{Constants.SatelliteAssemblyExtension}", SearchOption.AllDirectories))
                         {
                             var code = Path.GetFileName(Path.GetDirectoryName(file));
-                            languages.Add(new Language { Code = code, Name = CultureInfo.GetCultureInfo(code).DisplayName, Version = FileVersionInfo.GetVersionInfo(file).FileVersion, IsDefault = false });
+                            if (!languages.Any(item => item.Code == code))
+                            {
+                                languages.Add(new Language { Code = code, Name = CultureInfo.GetCultureInfo(code).DisplayName, Version = FileVersionInfo.GetVersionInfo(file).ProductVersion, IsDefault = false });
+                            }
                         }
                     }
                 }
@@ -54,12 +57,12 @@ namespace Oqtane.Controllers
                     languages = _languages.GetLanguages(SiteId).ToList();
                     if (!string.IsNullOrEmpty(packagename))
                     {
-                        foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"{packagename}.*{Constants.SatelliteAssemblyExtension}", SearchOption.AllDirectories))
+                        foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"{packagename}*{Constants.SatelliteAssemblyExtension}", SearchOption.AllDirectories))
                         {
                             var code = Path.GetFileName(Path.GetDirectoryName(file));
                             if (languages.Any(item => item.Code == code))
                             {
-                                languages.Single(item => item.Code == code).Version = FileVersionInfo.GetVersionInfo(file).FileVersion;
+                                languages.Single(item => item.Code == code).Version = FileVersionInfo.GetVersionInfo(file).ProductVersion;
                             }
                         }
                     }
@@ -99,7 +102,8 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid && language.SiteId == _alias.SiteId)
             {
                 language = _languages.AddLanguage(language);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Language, language.LanguageId, SyncEventActions.Create);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Language Added {Language}", language);
             }
             else
@@ -119,7 +123,8 @@ namespace Oqtane.Controllers
             if (language != null && language.SiteId == _alias.SiteId)
             {
                 _languages.DeleteLanguage(id);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Language, language.LanguageId, SyncEventActions.Delete);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Language Deleted {LanguageId}", id);
             }
             else

Oqtane.Server/Controllers/LocalizationController.cs

@@ -21,9 +21,18 @@ namespace Oqtane.Controllers
 
         // GET: api/localization
         [HttpGet()]
-        public IEnumerable<Culture> Get()
+        public IEnumerable<Culture> Get(bool installed)
         {
-            var cultures = _localizationManager.GetSupportedCultures().Select(c => new Culture
+            string[] culturecodes;
+            if (installed)
+            {
+                culturecodes = _localizationManager.GetInstalledCultures();
+            }
+            else
+            {
+                culturecodes = _localizationManager.GetSupportedCultures();
+            }
+            var cultures = culturecodes.Select(c => new Culture
                {
                    Name = CultureInfo.GetCultureInfo(c).Name,
                    DisplayName = CultureInfo.GetCultureInfo(c).DisplayName,

Oqtane.Server/Controllers/ModuleController.cs

@@ -47,7 +47,6 @@ namespace Oqtane.Controllers
             int SiteId;
             if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(SiteId).ToList();
                 List<Setting> settings = _settings.GetSettings(EntityNames.Module).ToList();
 
                 foreach (PageModule pagemodule in _pageModules.GetPageModules(SiteId))
@@ -75,7 +74,6 @@ namespace Oqtane.Controllers
                         module.Order = pagemodule.Order;
                         module.ContainerType = pagemodule.ContainerType;
 
-                        module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
                         module.Settings = settings.Where(item => item.EntityId == pagemodule.ModuleId)
                             .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, pagemodule.Module.Permissions))
                             .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
@@ -121,10 +119,11 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Module Post([FromBody] Module module)
         {
-            if (ModelState.IsValid && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, module.PageId, PermissionNames.Edit))
+            if (ModelState.IsValid && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, module.SiteId, EntityNames.Page, module.PageId, PermissionNames.Edit))
             {
                 module = _modules.AddModule(module);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Module, module.ModuleId, SyncEventActions.Create);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Added {Module}", module);
             }
             else
@@ -143,7 +142,7 @@ namespace Oqtane.Controllers
         {
             var _module = _modules.GetModule(module.ModuleId, false);
 
-            if (ModelState.IsValid && module.SiteId == _alias.SiteId && _module != null && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
+            if (ModelState.IsValid && module.SiteId == _alias.SiteId && _module != null && _userPermissions.IsAuthorized(User, module.SiteId, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
             {
                 module = _modules.UpdateModule(module);
 
@@ -174,7 +173,8 @@ namespace Oqtane.Controllers
                     }
                 }
 
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Module, module.ModuleId, SyncEventActions.Update);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Updated {Module}", module);
             }
             else
@@ -192,10 +192,11 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             var module = _modules.GetModule(id);
-            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
+            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, module.SiteId, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
             {
                 _modules.DeleteModule(id);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Module, module.ModuleId, SyncEventActions.Delete);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleId}", id);
             }
             else
@@ -212,7 +213,7 @@ namespace Oqtane.Controllers
         {
             string content = "";
             var module = _modules.GetModule(moduleid);
-            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
+            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, module.SiteId, EntityNames.Page, pageid, PermissionNames.Edit))
             {
                 content = _modules.ExportModule(moduleid);
                 if (!string.IsNullOrEmpty(content))
@@ -239,7 +240,7 @@ namespace Oqtane.Controllers
         {
             bool success = false;
             var module = _modules.GetModule(moduleid);
-            if (ModelState.IsValid && module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
+            if (ModelState.IsValid && module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, module.SiteId, EntityNames.Page, pageid, PermissionNames.Edit))
             {
                 success = _modules.ImportModule(moduleid, content);
                 if (success)

Oqtane.Server/Controllers/ModuleControllerBase.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Http;
 using Oqtane.Infrastructure;
 using System.Collections.Generic;
 using System;
+using Oqtane.Shared;
 
 namespace Oqtane.Controllers
 {
@@ -48,5 +49,9 @@ namespace Oqtane.Controllers
             }
         }
 
+        protected bool IsAuthorizedEntityId(string entityname, int entityid)
+        {
+            return (entityid == AuthEntityId(entityname)) || User.IsInRole(RoleNames.Host);
+        }
     }
 }

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -29,10 +29,11 @@ namespace Oqtane.Controllers
         private readonly IWebHostEnvironment _environment;
         private readonly IServiceProvider _serviceProvider;
         private readonly ITenantManager _tenantManager;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public ModuleDefinitionController(IModuleDefinitionRepository moduleDefinitions, ITenantRepository tenants, ISqlRepository sql, IUserPermissions userPermissions, IInstallationManager installationManager, IWebHostEnvironment environment, IServiceProvider serviceProvider, ITenantManager tenantManager, ILogManager logger)
+        public ModuleDefinitionController(IModuleDefinitionRepository moduleDefinitions, ITenantRepository tenants, ISqlRepository sql, IUserPermissions userPermissions, IInstallationManager installationManager, IWebHostEnvironment environment, IServiceProvider serviceProvider, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger)
         {
             _moduleDefinitions = moduleDefinitions;
             _tenants = tenants;
@@ -42,6 +43,7 @@ namespace Oqtane.Controllers
             _environment = environment;
             _serviceProvider = serviceProvider;
             _tenantManager = tenantManager;
+            _syncManager = syncManager;
             _logger = logger;
             _alias = tenantManager.GetAlias();
         }
@@ -145,6 +147,7 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid && moduleDefinition.SiteId == _alias.SiteId && _moduleDefinitions.GetModuleDefinition(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId) != null)
             {
                 _moduleDefinitions.UpdateModuleDefinition(moduleDefinition);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.ModuleDefinition, moduleDefinition.ModuleDefinitionId, SyncEventActions.Update);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Definition Updated {ModuleDefinition}", moduleDefinition);
             }
             else
@@ -227,6 +230,7 @@ namespace Oqtane.Controllers
 
                 // remove module definition
                 _moduleDefinitions.DeleteModuleDefinition(id);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.ModuleDefinition, moduledefinition.ModuleDefinitionId, SyncEventActions.Delete);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Definition {ModuleDefinitionName} Deleted", moduledefinition.Name);
             }
             else

Oqtane.Server/Controllers/NotificationController.cs

@@ -8,6 +8,7 @@ using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
 using System.Net;
+using System.Reflection.Metadata;
 
 namespace Oqtane.Controllers
 {
@@ -16,13 +17,15 @@ namespace Oqtane.Controllers
     {
         private readonly INotificationRepository _notifications;
         private readonly IUserPermissions _userPermissions;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public NotificationController(INotificationRepository notifications, IUserPermissions userPermissions, ILogManager logger, ITenantManager tenantManager)
+        public NotificationController(INotificationRepository notifications, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager)
         {
             _notifications = notifications;
             _userPermissions = userPermissions;
+            _syncManager = syncManager;
             _logger = logger;
             _alias = tenantManager.GetAlias();
         }
@@ -83,6 +86,7 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid && notification.SiteId == _alias.SiteId && IsAuthorized(notification.FromUserId))
             {
                 notification = _notifications.AddNotification(notification);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Notification, notification.NotificationId, SyncEventActions.Create);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Notification Added {NotificationId}", notification.NotificationId);
             }
             else
@@ -102,6 +106,7 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid && notification.SiteId == _alias.SiteId && _notifications.GetNotification(notification.NotificationId, false) != null && IsAuthorized(notification.FromUserId))
             {
                 notification = _notifications.UpdateNotification(notification);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Notification, notification.NotificationId, SyncEventActions.Update);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Notification Updated {NotificationId}", notification.NotificationId);
             }
             else
@@ -122,6 +127,7 @@ namespace Oqtane.Controllers
             if (notification != null && notification.SiteId == _alias.SiteId && (IsAuthorized(notification.FromUserId) || IsAuthorized(notification.ToUserId)))
             {
                 _notifications.DeleteNotification(id);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Notification, notification.NotificationId, SyncEventActions.Delete);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Notification Deleted {NotificationId}", id);
             }
             else

Oqtane.Server/Controllers/PackageController.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Oqtane.Models;
-using Newtonsoft.Json;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -12,6 +11,7 @@ using Oqtane.Shared;
 using Oqtane.Infrastructure;
 using Oqtane.Enums;
 using System.Net.Http.Headers;
+using System.Text.Json;
 // ReSharper disable PartialTypeWithSinglePart
 
 namespace Oqtane.Controllers
@@ -106,11 +106,7 @@ namespace Oqtane.Controllers
                 var stream = await response.Content.ReadAsStreamAsync();
                 using (var streamReader = new StreamReader(stream))
                 {
-                    using (var jsonTextReader = new JsonTextReader(streamReader))
-                    {
-                        var serializer = new JsonSerializer();
-                        return serializer.Deserialize<T>(jsonTextReader);
-                    }
+                    return await JsonSerializer.DeserializeAsync<T>(stream, new JsonSerializerOptions(JsonSerializerDefaults.Web));
                 }
             }
             return default(T);

Oqtane.Server/Controllers/PageController.cs

@@ -143,7 +143,8 @@ namespace Oqtane.Controllers
                 if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions))
                 {
                     page = _pages.AddPage(page);
-                    _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId);
+                    _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Create);
+                    _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId, SyncEventActions.Refresh);
                     _logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Added {Page}", page);
 
                     if (!page.Path.StartsWith("admin/"))
@@ -200,7 +201,8 @@ namespace Oqtane.Controllers
                 page.IsPersonalizable = false;
                 page.UserId = int.Parse(userid);
                 page = _pages.AddPage(page);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Create);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId, SyncEventActions.Refresh);
 
                 // copy modules
                 List<PageModule> pagemodules = _pageModules.GetPageModules(page.SiteId).ToList();
@@ -251,10 +253,10 @@ namespace Oqtane.Controllers
             // get current page
             var currentPage = _pages.GetPage(page.PageId, false);
 
-            if (ModelState.IsValid && page.SiteId == _alias.SiteId && currentPage != null && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
+            if (ModelState.IsValid && page.SiteId == _alias.SiteId && currentPage != null && _userPermissions.IsAuthorized(User, page.SiteId, EntityNames.Page, page.PageId, PermissionNames.Edit))
             {
                 // get current page permissions
-                var currentPermissions = _permissionRepository.GetPermissions(EntityNames.Page, page.PageId).ToList();
+                var currentPermissions = _permissionRepository.GetPermissions(page.SiteId, EntityNames.Page, page.PageId).ToList();
 
                 page = _pages.UpdatePage(page);
 
@@ -279,9 +281,9 @@ namespace Oqtane.Controllers
                 // synchronize module permissions
                 if (added.Count > 0 || removed.Count > 0)
                 {
-                    foreach (PageModule pageModule in _pageModules.GetPageModules(page.PageId, "").ToList())
+                    foreach (PageModule pageModule in _pageModules.GetPageModules(page.SiteId).Where(item => item.PageId == page.PageId).ToList())
                     {
-                        var modulePermissions = _permissionRepository.GetPermissions(EntityNames.Module, pageModule.Module.ModuleId).ToList();
+                        var modulePermissions = _permissionRepository.GetPermissions(pageModule.Module.SiteId, EntityNames.Module, pageModule.Module.ModuleId).ToList();
                         // permissions added
                         foreach(Permission permission in added)
                         {
@@ -313,7 +315,8 @@ namespace Oqtane.Controllers
                     }
                 }
 
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Update);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Updated {Page}", page);
             }
             else
@@ -343,7 +346,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public void Put(int siteid, int pageid, int? parentid)
         {
-            if (siteid == _alias.SiteId && siteid == _alias.SiteId && _pages.GetPage(pageid, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
+            if (siteid == _alias.SiteId && siteid == _alias.SiteId && _pages.GetPage(pageid, false) != null && _userPermissions.IsAuthorized(User, siteid, EntityNames.Page, pageid, PermissionNames.Edit))
             {
                 int order = 1;
                 List<Page> pages = _pages.GetPages(siteid).ToList();
@@ -353,10 +356,12 @@ namespace Oqtane.Controllers
                     {
                         page.Order = order;
                         _pages.UpdatePage(page);
+                        _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Update);
                     }
                     order += 2;
                 }
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, siteid);
+
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, siteid, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Order Updated {SiteId} {PageId} {ParentId}", siteid, pageid, parentid);
             }
             else
@@ -372,10 +377,11 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             Page page = _pages.GetPage(id);
-            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
+            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, page.SiteId, EntityNames.Page, page.PageId, PermissionNames.Edit))
             {
                 _pages.DeletePage(page.PageId);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Delete);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Deleted {PageId}", page.PageId);
             }
             else

Oqtane.Server/Controllers/PageModuleController.cs

@@ -9,6 +9,7 @@ using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
 using System.Net;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace Oqtane.Controllers
 {
@@ -72,10 +73,11 @@ namespace Oqtane.Controllers
         public PageModule Post([FromBody] PageModule pageModule)
         {
             var page = _pages.GetPage(pageModule.PageId);
-            if (ModelState.IsValid && page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, pageModule.PageId, PermissionNames.Edit))
+            if (ModelState.IsValid && page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, page.SiteId, EntityNames.Page, pageModule.PageId, PermissionNames.Edit))
             {
                 pageModule = _pageModules.AddPageModule(pageModule);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.PageModule, pageModule.PageModuleId, SyncEventActions.Create);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Module Added {PageModule}", pageModule);
             }
             else
@@ -93,10 +95,11 @@ namespace Oqtane.Controllers
         public PageModule Put(int id, [FromBody] PageModule pageModule)
         {
             var page = _pages.GetPage(pageModule.PageId);
-            if (ModelState.IsValid && page != null && page.SiteId == _alias.SiteId && _pageModules.GetPageModule(pageModule.PageModuleId, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Page, pageModule.PageId, PermissionNames.Edit))
+            if (ModelState.IsValid && page != null && page.SiteId == _alias.SiteId && _pageModules.GetPageModule(pageModule.PageModuleId, false) != null && _userPermissions.IsAuthorized(User, page.SiteId, EntityNames.Page, pageModule.PageId, PermissionNames.Edit))
             {
                 pageModule = _pageModules.UpdatePageModule(pageModule);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.PageModule, pageModule.PageModuleId, SyncEventActions.Update);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Updated {PageModule}", pageModule);
             }
             else
@@ -114,20 +117,22 @@ namespace Oqtane.Controllers
         public void Put(int pageid, string pane)
         {
             var page = _pages.GetPage(pageid);
-            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
+            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, page.SiteId, EntityNames.Page, pageid, PermissionNames.Edit))
             {
                 int order = 1;
-                List<PageModule> pagemodules = _pageModules.GetPageModules(pageid, pane).OrderBy(item => item.Order).ToList();
+                List<PageModule> pagemodules = _pageModules.GetPageModules(page.SiteId)
+                    .Where(item => item.PageId == pageid && item.Pane == pane).OrderBy(item => item.Order).ToList();
                 foreach (PageModule pagemodule in pagemodules)
                 {
                     if (pagemodule.Order != order)
                     {
                         pagemodule.Order = order;
                         _pageModules.UpdatePageModule(pagemodule);
+                        _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.PageModule, pagemodule.PageModuleId, SyncEventActions.Update);
                     }
                     order += 2;
                 }
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Order Updated {PageId} {Pane}", pageid, pane);
             }
             else
@@ -143,10 +148,11 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             PageModule pagemodule = _pageModules.GetPageModule(id);
-            if (pagemodule != null && pagemodule.Module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, pagemodule.PageId, PermissionNames.Edit))
+            if (pagemodule != null && pagemodule.Module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, pagemodule.Module.SiteId, EntityNames.Page, pagemodule.PageId, PermissionNames.Edit))
             {
                 _pageModules.DeletePageModule(id);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.PageModule, pagemodule.PageModuleId, SyncEventActions.Delete);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId, SyncEventActions.Refresh);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Module Deleted {PageModuleId}", id);
             }
             else