Merge pull request #4944 from oqtane/master

6.0.1 Release

.gitignore

@@ -22,6 +22,9 @@ Oqtane.Server/Packages
 Oqtane.Server/wwwroot/Content
 Oqtane.Server/wwwroot/Packages/*.log
 
+Oqtane.Server/wwwroot/_content/*
+!Oqtane.Server/wwwroot/_content/Placeholder.txt
+
 Oqtane.Server/wwwroot/Modules/*
 !Oqtane.Server/wwwroot/Modules/Oqtane.Modules.*
 !Oqtane.Server/wwwroot/Modules/Templates

CONTRIBUTING.md

@@ -0,0 +1,24 @@
+# Contributing to Oqtane
+
+## How to Contribute
+
+We track all of our issues on Github. If you want to contribute, everything starts with an issue. If you don't have an issue yet, you can add one. Then a core contributor will tag it as either an enhancement [ENH] or a bug [BUG].  Tagged issues are open for contribution.
+
+## Use GitHub-flow process
+- Make a comment on the issue that you intend to work on it and read all the comments to gain a full understanding.
+- Fork the repository
+- Create a new branch and update your comment on the issue with a llink to the branch
+- Make your changes and commit them
+- Push to the branch
+- Create a pull request
+
+## Reporting Bugs
+
+- Check if the issue has already been reported.
+- Open a new issue if it hasn’t been reported.
+
+## Requesting Features
+
+- Use the feature request template in the Issues tab.
+
+Thank you for contributing!

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -51,6 +51,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<IUrlMappingService, UrlMappingService>();
             services.AddScoped<IVisitorService, VisitorService>();
             services.AddScoped<ISyncService, SyncService>();
+            services.AddScoped<ILocalizationCookieService, LocalizationCookieService>();
 
             // providers
             services.AddScoped<ITextEditor, Oqtane.Modules.Controls.QuillJSTextEditor>();

Oqtane.Client/Installer/Installer.razor

@@ -15,7 +15,7 @@
     <div class="row">
         <div class="mx-auto text-center">
             <img src="oqtane-black.png" />
-            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version (.NET 8)</div>
+            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version (.NET 9)</div>
         </div>
     </div>
     <hr class="app-rule" />
@@ -156,129 +156,130 @@
     private List<SiteTemplate> _templates;
     private string _template = Constants.DefaultSiteTemplate;
     private bool _register = true;
-	private string _message = string.Empty;
-	private string _loadingDisplay = "display: none;";
+    private string _message = string.Empty;
+    private string _loadingDisplay = "display: none;";
 
-	protected override async Task OnInitializedAsync()
-	{
+    protected override async Task OnInitializedAsync()
+    {
         // include CSS
         var content = $"<link rel=\"stylesheet\" href=\"{Constants.BootstrapStylesheetUrl}\" integrity=\"{Constants.BootstrapStylesheetIntegrity}\" crossorigin=\"anonymous\" type=\"text/css\"/>";
         SiteState.AppendHeadContent(content);
 
         _togglePassword = SharedLocalizer["ShowPassword"];
-		_toggleConfirmPassword = SharedLocalizer["ShowPassword"];
+        _toggleConfirmPassword = SharedLocalizer["ShowPassword"];
 
-		_databases = await DatabaseService.GetDatabasesAsync();
-		if (_databases.Exists(item => item.IsDefault))
-		{
-			_databaseName = _databases.Find(item => item.IsDefault).Name;
-		}
-		else
-		{
-			_databaseName = "LocalDB";
-		}
-		LoadDatabaseConfigComponent();
+        _databases = await DatabaseService.GetDatabasesAsync();
+        if (_databases.Exists(item => item.IsDefault))
+        {
+            _databaseName = _databases.Find(item => item.IsDefault).Name;
+        }
+        else
+        {
+            _databaseName = "LocalDB";
+        }
+        LoadDatabaseConfigComponent();
 
         _templates = await SiteTemplateService.GetSiteTemplatesAsync();
     }
 
-	private void DatabaseChanged(ChangeEventArgs eventArgs)
-	{
-		try
-		{
-			_databaseName = (string)eventArgs.Value;
-			_showConnectionString = false;
-			LoadDatabaseConfigComponent();
-		}
-		catch
-		{
-			_message = Localizer["Error.DbConfig.Load"];
-		}
-	}
+    private void DatabaseChanged(ChangeEventArgs eventArgs)
+    {
+        try
+        {
+            _databaseName = (string)eventArgs.Value;
+            _showConnectionString = false;
+            LoadDatabaseConfigComponent();
+        }
+        catch
+        {
+            _message = Localizer["Error.DbConfig.Load"];
+        }
+    }
 
-	private void LoadDatabaseConfigComponent()
-	{
-		var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
-		if (database != null)
-		{
-			_databaseConfigType = Type.GetType(database.ControlType);
-			DatabaseConfigComponent = builder =>
-			{
-				builder.OpenComponent(0, _databaseConfigType);
-				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
-				builder.CloseComponent();
-			};
-		}
-	}
+    private void LoadDatabaseConfigComponent()
+    {
+        var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+        if (database != null)
+        {
+            _databaseConfigType = Type.GetType(database.ControlType);
+            DatabaseConfigComponent = builder =>
+            {
+                builder.OpenComponent(0, _databaseConfigType);
+                builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+                builder.CloseComponent();
+            };
+        }
+    }
 
-	protected override async Task OnAfterRenderAsync(bool firstRender)
-	{
-		if (firstRender)
-		{
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
             // include JavaScript
-			var interop = new Interop(JSRuntime);
+            var interop = new Interop(JSRuntime);
             await interop.IncludeScript("", Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous", "", "head");
-		}
-	}
+        }
+    }
 
-	private async Task Install()
-	{
-		var connectionString = String.Empty;
-		if (_showConnectionString)
-		{
-			connectionString = _connectionString;
-		}
-		else
-		{
-			if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
-			{
-				connectionString = databaseConfigControl.GetConnectionString();
-			}
-		}
+    private async Task Install()
+    {
+        var connectionString = String.Empty;
+        if (_showConnectionString)
+        {
+            connectionString = _connectionString;
+        }
+        else
+        {
+            if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+            {
+                connectionString = databaseConfigControl.GetConnectionString();
+            }
+        }
 
-		if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@"))
-		{
-			if (await UserService.ValidatePasswordAsync(_hostPassword))
-			{
-				_loadingDisplay = "";
-				StateHasChanged();
+        if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@"))
+        {
+            var result = await UserService.ValidateUserAsync(_hostUsername, _hostEmail, _hostPassword);
+            if (result.Succeeded)
+            {
+                _loadingDisplay = "";
+                StateHasChanged();
 
-				Uri uri = new Uri(NavigationManager.Uri);
+                Uri uri = new Uri(NavigationManager.Uri);
 
-				var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+                var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
 
-				var config = new InstallConfig
-				{
-					DatabaseType = database.DBType,
-					ConnectionString = connectionString,
-					Aliases = uri.Authority,
-					HostUsername = _hostUsername,
-					HostPassword = _hostPassword,
-					HostEmail = _hostEmail,
-					HostName = _hostUsername,
-					TenantName = TenantNames.Master,
-					IsNewTenant = true,
-					SiteName = Constants.DefaultSite,
-					Register = _register,
-                    SiteTemplate = _template,
-                    RenderMode = RenderModes.Static,
-                    Runtime = Runtimes.Server
-                };
+                var config = new InstallConfig
+                    {
+                        DatabaseType = database.DBType,
+                        ConnectionString = connectionString,
+                        Aliases = uri.Authority,
+                        HostUsername = _hostUsername,
+                        HostPassword = _hostPassword,
+                        HostEmail = _hostEmail,
+                        HostName = _hostUsername,
+                        TenantName = TenantNames.Master,
+                        IsNewTenant = true,
+                        SiteName = Constants.DefaultSite,
+                        Register = _register,
+                        SiteTemplate = _template,
+                        RenderMode = RenderModes.Static,
+                        Runtime = Runtimes.Server
+                    };
 
-				var installation = await InstallationService.Install(config);
-				if (installation.Success)
-				{
-					NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
-				}
-				else
-				{
-					_message = installation.Message;
-					_loadingDisplay = "display: none;";
-				}				
-			}
-			else
-			{
-				_message = Localizer["Message.Password.Invalid"];				
+                var installation = await InstallationService.Install(config);
+                if (installation.Success)
+                {
+                    NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
+                }
+                else
+                {
+                    _message = installation.Message;
+                    _loadingDisplay = "display: none;";
+                }
+            }
+            else
+            {
+                _message = string.Join("<br />", result.Errors.Select(i => !string.IsNullOrEmpty(i.Value) ? i.Value : Localizer[i.Key]));
 			}
 		}
 		else

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

@@ -1,7 +1,6 @@
 @namespace Oqtane.Modules.Admin.Languages
 @inherits ModuleBase
 @using System.Globalization
-@using Microsoft.AspNetCore.Localization
 @inject NavigationManager NavigationManager
 @inject ILocalizationService LocalizationService
 @inject ILanguageService LanguageService

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

@@ -1,7 +1,6 @@
 @namespace Oqtane.Modules.Admin.Languages
 @inherits ModuleBase
 @using System.Globalization
-@using Microsoft.AspNetCore.Localization
 @inject NavigationManager NavigationManager
 @inject ILocalizationService LocalizationService
 @inject ILanguageService LanguageService

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

@@ -27,7 +27,7 @@
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="description" HelpText="Enter a short description for the module" ResourceKey="Description">Description: </Label>
                 <div class="col-sm-9">
-                    <textarea id="description" class="form-control" @bind="@_description" rows="3" maxlength="2000" required></textarea>
+                    <textarea id="description" class="form-control" @bind="@_description" rows="3" maxlength="2000"></textarea>
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
@@ -118,6 +118,7 @@
             {
                 if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
                 {
+                    if (string.IsNullOrEmpty(_description)) _description = _module;
                     if (IsValidXML(_description))
                     {
                         var template = _templates.FirstOrDefault(item => item.Name == _template);

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

@@ -1,7 +1,6 @@
 @namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @using System.Globalization
-@using Microsoft.AspNetCore.Localization
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
 @inject ILanguageService LanguageService

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

@@ -12,7 +12,7 @@
 @if (_initialized)
 {
     <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-        <TabStrip>
+        <TabStrip ActiveTab="@_activetab">
             <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
                 @if (_containers != null)
                 {
@@ -162,6 +162,7 @@
     private DateTime? _effectivedate = null;
     private DateTime? _expirydate = null;
     private List<Page> _pages;
+    private string _activetab = "";
 
     protected override async Task OnInitializedAsync()
     {
@@ -241,6 +242,7 @@
 
     private async Task SaveModule()
     {
+
         validated = true;
         var interop = new Interop(JSRuntime);
         if (await interop.FormValid(form))
@@ -261,21 +263,21 @@
                 pagemodule.ExpiryDate = Utilities.LocalDateAndTimeAsUtc(_expirydate);
                 pagemodule.ContainerType = (_containerType != "-") ? _containerType : string.Empty;
                 if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Page.DefaultContainerType)
-				{
-					pagemodule.ContainerType = string.Empty;
-				}
-				if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
-				{
-					pagemodule.ContainerType = string.Empty;
-				}
-				await PageModuleService.UpdatePageModuleAsync(pagemodule);
-				await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+                {
+                    pagemodule.ContainerType = string.Empty;
+                }
+                if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
+                {
+                    pagemodule.ContainerType = string.Empty;
+                }
+                await PageModuleService.UpdatePageModuleAsync(pagemodule);
+                await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
 
-				var module = ModuleState;
-				module.AllPages = bool.Parse(_allPages);
-				module.PageModuleId = ModuleState.PageModuleId;
-				module.PermissionList = _permissionGrid.GetPermissionList();
-				await ModuleService.UpdateModuleAsync(module);
+                var module = ModuleState;
+                module.AllPages = bool.Parse(_allPages);
+                module.PageModuleId = ModuleState.PageModuleId;
+                module.PermissionList = _permissionGrid.GetPermissionList();
+                await ModuleService.UpdateModuleAsync(module);
 
                 if (_moduleSettingsType != null)
                 {
@@ -300,11 +302,13 @@
             }
             else
             {
+                _activetab = "Settings";
                 AddModuleMessage(Localizer["Message.Required.Title"], MessageType.Warning);
             }
         }
         else
         {
+            _activetab = "Settings";
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }

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

@@ -316,10 +316,11 @@
         {
             await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
             AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
+            await ScrollToPageTop();
         }
     }
 
-    private void ThemeChanged(ChangeEventArgs e)
+    private async Task ThemeChanged(ChangeEventArgs e)
     {
         _themetype = (string)e.Value;
         _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
@@ -330,6 +331,7 @@
         if (ThemeService.GetTheme(PageState.Site.Themes, _themetype)?.ThemeName != ThemeService.GetTheme(PageState.Site.Themes, PageState.Site.DefaultThemeType)?.ThemeName)
         {
             AddModuleMessage(Localizer["ThemeChanged.Message"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 
@@ -345,6 +347,7 @@
                 if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate))
                 {
                     AddModuleMessage(SharedLocalizer["Message.EffectiveExpiryDateError"], MessageType.Warning);
+                    await ScrollToPageTop();
                     return;
                 }
                 if (!string.IsNullOrEmpty(_themetype) && !string.IsNullOrEmpty(_containertype))
@@ -395,12 +398,14 @@
                     if (_pages.Any(item => item.Path == page.Path))
                     {
                         AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
+                        await ScrollToPageTop();
                         return;
                     }
 
                     if (page.ParentId == null && Constants.ReservedRoutes.Contains(page.Name.ToLower()))
                     {
                         AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], page.Name), MessageType.Warning);
+                        await ScrollToPageTop();
                         return;
                     }
 
@@ -468,6 +473,7 @@
                 else
                 {
                     AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning);
+                    await ScrollToPageTop();
                 }
 
             }
@@ -475,11 +481,13 @@
             {
                 await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message);
                 AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error);
+                await ScrollToPageTop();
             }
         }
         else
         {
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 

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

@@ -466,7 +466,7 @@
             _parentid = (string)e.Value;
             _children = new List<Page>();
             foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
-        {
+            {
                 if (p.PageId != _pageId && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
                 {
                     _children.Add(p);
@@ -479,10 +479,11 @@
         {
             await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
             AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
+            await ScrollToPageTop();
         }
     }
 
-    private void ThemeChanged(ChangeEventArgs e)
+    private async Task ThemeChanged(ChangeEventArgs e)
     {
         _themetype = (string)e.Value;
         _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
@@ -494,6 +495,7 @@
         if (ThemeService.GetTheme(PageState.Site.Themes, _themetype)?.ThemeName != ThemeService.GetTheme(PageState.Site.Themes, PageState.Site.DefaultThemeType)?.ThemeName)
         {
             AddModuleMessage(Localizer["ThemeChanged.Message"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 
@@ -531,6 +533,7 @@
                 if (!Utilities.ValidateEffectiveExpiryDates(_effectivedate, _expirydate))
                 {
                     AddModuleMessage(SharedLocalizer["Message.EffectiveExpiryDateError"], MessageType.Warning);
+                    await ScrollToPageTop();
                     return;
                 }
                 if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
@@ -581,12 +584,14 @@
                     if (_pages.Any(item => item.Path == _page.Path && item.PageId != _page.PageId))
                     {
                         AddModuleMessage(string.Format(Localizer["Mesage.Page.PathExists"], _path), MessageType.Warning);
+                        await ScrollToPageTop();
                         return;
                     }
 
                     if (_page.ParentId == null && Constants.ReservedRoutes.Contains(_page.Name.ToLower()))
                     {
                         AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], _page.Name), MessageType.Warning);
+                        await ScrollToPageTop();
                         return;
                     }
 
@@ -671,17 +676,20 @@
                 else
                 {
                     AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning);
+                    await ScrollToPageTop();
                 }
             }
             catch (Exception ex)
             {
                 await logger.LogError(ex, "Error Saving Page {Page} {Error}", _page, ex.Message);
                 AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error);
+                await ScrollToPageTop();
             }
         }
         else
         {
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+            await ScrollToPageTop();
         }
     }
 

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

@@ -63,7 +63,7 @@
     private string _enabled = "True";
     private string _lastIndexedOn = "";
     private string _ignorePages = "";
-    private string _ignoreEntities = "";
+    private string _ignoreEntities = "File";
     private string _minimumWordLength = "3";
     private string _ignoreWords = "the,be,to,of,and,a,i,in,that,have,it,for,not,on,with,he,as,you,do,at,this,but,his,by,from,they,we,say,her,she,or,an,will,my,one,all,would,there,their,what,so,up,out,if,about,who,get,which,go,me,when,make,can,like,time,no,just,him,know,take,people,into,year,your,good,some,could,them,see,other,than,then,now,look,only,come,its,over,think,also,back,after,use,two,how,our,work,first,well,way,even,new,want,because,any,these,give,day,most,us";
 
@@ -85,7 +85,7 @@
         {
             var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
             settings = SettingService.SetSetting(settings, "Search_SearchProvider", _searchProvider);
-            settings = SettingService.SetSetting(settings, "Search_Enabled", _enabled, true);
+            settings = SettingService.SetSetting(settings, "Search_Enabled", _enabled);
             settings = SettingService.SetSetting(settings, "Search_LastIndexedOn", _lastIndexedOn, true);
             settings = SettingService.SetSetting(settings, "Search_IgnorePages", _ignorePages, true);
             settings = SettingService.SetSetting(settings, "Search_IgnoreEntities", _ignoreEntities, true);
@@ -106,9 +106,7 @@
         try
         {
             _lastIndexedOn = DateTime.MinValue.ToString();
-            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-            settings = SettingService.SetSetting(settings, "Search_LastIndexedOn", _lastIndexedOn, true);
-            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+            await Save();
             AddModuleMessage(Localizer["Message.Reindex"], MessageType.Success);
         }
         catch (Exception ex)

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

@@ -32,32 +32,32 @@
                         <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                         @foreach (Page page in _pages)
                         {
-							if (UserSecurity.ContainsRole(page.PermissionList, PermissionNames.View, RoleNames.Everyone))
-							{
-								<option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
-							}
+                            if (UserSecurity.ContainsRole(page.PermissionList, PermissionNames.View, RoleNames.Everyone))
+                            {
+                                <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+                            }
                         }
                     </select>
                 </div>
             </div>
-			<div class="row mb-1 align-items-center">
-				<Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
-				<div class="col-sm-9">
-					<select id="isDeleted" class="form-select" @bind="@_isdeleted" 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="sitemap" HelpText="The site map url for this site which can be submitted to search engines for indexing" ResourceKey="SiteMap">Site Map: </Label>
-				<div class="col-sm-9">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
+                <div class="col-sm-9">
+                    <select id="isDeleted" class="form-select" @bind="@_isdeleted" 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="sitemap" HelpText="The site map url for this site which can be submitted to search engines for indexing" ResourceKey="SiteMap">Site Map: </Label>
+                <div class="col-sm-9">
                     <div class="input-group">
                         <input id="sitemap" class="form-control" @bind="@_sitemap" disabled />
                         <a href="@_sitemap" class="btn btn-secondary" target="_new">@Localizer["Browse"]</a>
                     </div>
                 </div>
-			</div>
+            </div>
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="siteguid" HelpText="The Unique Identifier For The Site" ResourceKey="SiteGuid">ID: </Label>
                 <div class="col-sm-9">
@@ -159,8 +159,8 @@
             </div>
         </Section>
         <Section Name="PageContent" Heading="Page Content" ResourceKey="PageContent">
-           <div class="container">
-               <div class="row mb-1 align-items-center">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
                     <div class="col-sm-9">
                         <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
@@ -213,10 +213,10 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="Enter the password for your SMTP account" ResourceKey="SmtpPassword">Password: </Label>
                     <div class="col-sm-9">
-						<div class="input-group">
-							<input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" autocomplete="off"/>
+                        <div class="input-group">
+                            <input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" autocomplete="off"/>
                             <button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword" tabindex="-1">@_togglesmtppassword</button>
-						</div>
+                        </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -225,15 +225,15 @@
                         <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="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="smtpenabled" HelpText="Specify if SMTP is enabled for this site" ResourceKey="SMTPEnabled">Enabled? </Label>
                     <div class="col-sm-9">
@@ -244,10 +244,10 @@
                     </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>
-					<div class="col-sm-9">
+                    <Label Class="col-sm-3" For="retention" HelpText="Number of days of notifications to retain" ResourceKey="Retention">Retention (Days): </Label>
+                    <div class="col-sm-9">
                         <input id="retention" class="form-control" type="number" min="0" step="1" @bind="@_retention" />
-					</div>
+                    </div>
                 </div>
                 <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button>
                 <br /><br />
@@ -280,57 +280,57 @@
         </Section>
         @if (_aliases != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-			<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
-	            <div class="container">
-					<div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="aliases" HelpText="The urls for the site. This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder)." ResourceKey="Aliases">Aliases: </Label>
-						<div class="col-sm-9">
-							<button type="button" class="btn btn-primary" @onclick="AddAlias">@SharedLocalizer["Add"]</button>
-							<Pager Items="@_aliases">
-								<Header>
-									<th style="width: 1px;">&nbsp;</th>
-									<th style="width: 1px;">&nbsp;</th>
-									<th>@Localizer["AliasName"]</th>
-									<th>@Localizer["AliasDefault"]</th>
-								</Header>
-								<Row>
-									@if (context.AliasId != _aliasid)
-									{
-										<td>
-											@if (_aliasid == -1)
-											{
-												<button type="button" class="btn btn-primary" @onclick="@(() => EditAlias(context))">@SharedLocalizer["Edit"]</button>
-											}
-										</td>
-										<td>
-											@if (_aliasid == -1)
-											{
-												<ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteAlias" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
-											}
-										</td>
-										<td>@context.Name</td>
+            <Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="aliases" HelpText="The urls for the site. This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder)." ResourceKey="Aliases">Aliases: </Label>
+                        <div class="col-sm-9">
+                            <button type="button" class="btn btn-primary" @onclick="AddAlias">@SharedLocalizer["Add"]</button>
+                            <Pager Items="@_aliases">
+                                <Header>
+                                    <th style="width: 1px;">&nbsp;</th>
+                                    <th style="width: 1px;">&nbsp;</th>
+                                    <th>@Localizer["AliasName"]</th>
+                                    <th>@Localizer["AliasDefault"]</th>
+                                </Header>
+                                <Row>
+                                    @if (context.AliasId != _aliasid)
+                                    {
+                                        <td>
+                                            @if (_aliasid == -1)
+                                            {
+                                                <button type="button" class="btn btn-primary" @onclick="@(() => EditAlias(context))">@SharedLocalizer["Edit"]</button>
+                                            }
+                                        </td>
+                                        <td>
+                                            @if (_aliasid == -1)
+                                            {
+                                                <ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteAlias" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
+                                            }
+                                        </td>
+                                        <td>@context.Name</td>
                                         <td>@((context.IsDefault) ? SharedLocalizer["Yes"] : SharedLocalizer["No"])</td>
-									}
-									else
-									{
-										<td><button type="button" class="btn btn-success" @onclick="@(async () => await SaveAlias())">@SharedLocalizer["Save"]</button></td>
-										<td><button type="button" class="btn btn-secondary" @onclick="@(async () => await CancelAlias())">@SharedLocalizer["Cancel"]</button></td>
-										<td>
-											<input id="aliasname" class="form-control" @bind="@_aliasname" />
-										</td>
-										<td>
-											<select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
-												<option value="True">@SharedLocalizer["Yes"]</option>
-												<option value="False">@SharedLocalizer["No"]</option>
-											</select>
-										</td>
-									}
-								</Row>
-							</Pager>
-						</div>
-					</div>
-				</div>
-			</Section>
+                                    }
+                                    else
+                                    {
+                                        <td><button type="button" class="btn btn-success" @onclick="@(async () => await SaveAlias())">@SharedLocalizer["Save"]</button></td>
+                                        <td><button type="button" class="btn btn-secondary" @onclick="@(async () => await CancelAlias())">@SharedLocalizer["Cancel"]</button></td>
+                                        <td>
+                                            <input id="aliasname" class="form-control" @bind="@_aliasname" />
+                                        </td>
+                                        <td>
+                                            <select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
+                                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                                <option value="False">@SharedLocalizer["No"]</option>
+                                            </select>
+                                        </td>
+                                    }
+                                </Row>
+                            </Pager>
+                        </div>
+                    </div>
+                </div>
+            </Section>
             <Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting">
                 <div class="container">
                     <div class="row mb-1 align-items-center">
@@ -376,7 +376,7 @@
             <Section Name="TenantInformation" Heading="Database" ResourceKey="TenantInformation">
                 <div class="container">
                     <div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="tenant" HelpText="The name of the database used for the site. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database." ResourceKey="Tenant">Database: </Label>
+                        <Label Class="col-sm-3" For="tenant" HelpText="The name of the database used for the site. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database." ResourceKey="Tenant">Database: </Label>
                         <div class="col-sm-9">
                             <input id="tenant" class="form-control" @bind="@_tenant" readonly />
                         </div>
@@ -390,7 +390,7 @@
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="connectionstring" HelpText="The name of the connection string in appsettings.json which will be used to connect to the database" ResourceKey="ConnectionString">Connection: </Label>
                         <div class="col-sm-9">
-							<input id="connectionstring" class="form-control" @bind="@_connectionstring" readonly />
+                            <input id="connectionstring" class="form-control" @bind="@_connectionstring" readonly />
                         </div>
                     </div>
                 </div>
@@ -481,6 +481,11 @@
     {
         try
         {
+            if (PageState.QueryString.ContainsKey("updated"))
+            {
+                AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
+            }
+
             Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
             if (site != null)
             {
@@ -736,7 +741,7 @@
 
                         await logger.LogInformation("Site Settings Saved {Site}", site);
 
-                        NavigationManager.NavigateTo(NavigateUrl(), true); // reload
+                        NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "updated=true"), true); // reload
                     }
                 }
                 else

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

@@ -105,7 +105,7 @@
                             }
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
-                                    <div class="col-sm-9">
+                                <div class="col-sm-9">
                                     @if (!string.IsNullOrEmpty(p.Options))
                                     {
                                         @if (!string.IsNullOrEmpty(p.Autocomplete))
@@ -149,22 +149,26 @@
                                             {
                                                 @if (p.IsRequired)
                                                 {
-                                                    <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete" />
+                                                    <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
+                                                           @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                                 }
                                                 else
                                                 {
-                                                    <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete" />
+                                                    <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
+                                                           @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                                 }
                                             }
                                             else
                                             {
                                                 @if (p.IsRequired)
                                                 {
-                                                    <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                                    <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))"
+                                                           @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                                 }
                                                 else
                                                 {
-                                                    <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                                    <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))"
+                                                           @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                                 }
                                             }
                                         }
@@ -174,22 +178,26 @@
                                             {
                                                 @if (p.IsRequired)
                                                 {
-                                                    <textarea id="@p.Name" class="form-control" maxlength="@p.MaxLength" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"></textarea>
+                                                    <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
+                                                              @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                                 }
                                                 else
                                                 {
-                                                    <textarea id="@p.Name" class="form-control" maxlength="@p.MaxLength" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"></textarea>
+                                                    <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
+                                                              @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                                 }
                                             }
                                             else
                                             {
                                                 @if (p.IsRequired)
                                                 {
-                                                    <textarea id="@p.Name" class="form-control" maxlength="@p.MaxLength" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))"></textarea>
+                                                    <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))"
+                                                              @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                                 }
                                                 else
                                                 {
-                                                    <textarea id="@p.Name" class="form-control" maxlength="@p.MaxLength" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))"></textarea>
+                                                    <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))"
+                                                              @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                                 }
                                             }
                                         }
@@ -218,11 +226,11 @@
                 {
                     <Pager Items="@notifications">
                         <Header>
-                        <th style="width: 1px;">&nbsp;</th>
-                        <th style="width: 1px;">&nbsp;</th>
-                        <th>@Localizer["From"]</th>
-                        <th>@Localizer["Subject"]</th>
-                        <th>@Localizer["Received"]</th>
+                            <th style="width: 1px;">&nbsp;</th>
+                            <th style="width: 1px;">&nbsp;</th>
+                            <th>@Localizer["From"]</th>
+                            <th>@Localizer["Subject"]</th>
+                            <th>@Localizer["Received"]</th>
                         </Header>
                         <Row>
                             <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" ReturnUrl="@NavigateUrl(PageState.Page.Path, "tab=Notifications")" /></td>
@@ -230,13 +238,13 @@
 
                             @if (context.IsRead)
                             {
-                                <td>@context.FromDisplayName</td>
+                                <td>@(string.IsNullOrEmpty(context.FromDisplayName) ? SharedLocalizer["System"] : context.FromDisplayName)</td>
                                 <td>@context.Subject</td>
                                 <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
                             }
                             else
                             {
-                                <td><b>@context.FromDisplayName</b></td>
+                                <td><b>@(string.IsNullOrEmpty(context.FromDisplayName) ? SharedLocalizer["System"] : context.FromDisplayName)</b></td>
                                 <td><b>@context.Subject</b></td>
                                 <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
                             }
@@ -281,11 +289,11 @@
                 {
                     <Pager Items="@notifications">
                         <Header>
-                        <th style="width: 1px;"></th>
-                        <th style="width: 1px;"></th>
-                        <th>@Localizer["To"]</th>
-                        <th>@Localizer["Subject"]</th>
-                        <th>@Localizer["Sent"]</th>
+                            <th style="width: 1px;"></th>
+                            <th style="width: 1px;"></th>
+                            <th>@Localizer["To"]</th>
+                            <th>@Localizer["Subject"]</th>
+                            <th>@Localizer["Sent"]</th>
                         </Header>
                         <Row>
                             <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" ReturnUrl="@NavigateUrl(PageState.Page.Path, "tab=Notifications")" /></td>
@@ -363,7 +371,7 @@
     private File photo = null;
     private string _ImageFiles = string.Empty;
     private List<Profile> profiles;
-    private Dictionary<string, string> settings;
+    private Dictionary<string, string> userSettings;
     private string category = string.Empty;
 
     private string filter = "to";
@@ -411,9 +419,9 @@
                     photo = null;
                 }
 
-                settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+                userSettings = PageState.User.Settings;
                 var sitesettings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-                _ImageFiles = SettingService.GetSetting(settings, "ImageFiles", Constants.ImageFiles);
+                _ImageFiles = SettingService.GetSetting(userSettings, "ImageFiles", Constants.ImageFiles);
                 _ImageFiles = (string.IsNullOrEmpty(_ImageFiles)) ? Constants.ImageFiles : _ImageFiles;
 
                 await LoadNotificationsAsync();
@@ -440,7 +448,7 @@
 
     private string GetProfileValue(string SettingName, string DefaultValue)
     {
-        string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+        string value = SettingService.GetSetting(userSettings, SettingName, DefaultValue);
         if (value.Contains("]"))
         {
             value = value.Substring(value.IndexOf("]") + 1);
@@ -483,7 +491,7 @@
                         user = await UserService.UpdateUserAsync(user);
                         if (user != null)
                         {
-                            await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
+                            await SettingService.UpdateUserSettingsAsync(userSettings, PageState.User.UserId);
                             await logger.LogInformation("User Profile Saved");
 
                             if (!string.IsNullOrEmpty(PageState.ReturnUrl))
@@ -554,7 +562,7 @@
             var value = GetProfileValue(profile.Name, string.Empty);
             if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
+                userSettings = SettingService.SetSetting(userSettings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
@@ -586,7 +594,7 @@
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        settings = SettingService.SetSetting(settings, SettingName, value);
+        userSettings = SettingService.SetSetting(userSettings, SettingName, value);
     }
 
     private async Task Delete(Notification Notification)

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

@@ -128,7 +128,7 @@
                 createdon = notification.CreatedOn.ToString();
                 body = notification.Body;
 
-                if (title == "From")
+                if (title == "From" && !notification.IsRead)
                 {
                     notification.IsRead = true;
                     notification = await NotificationService.UpdateNotificationAsync(notification);

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

@@ -81,11 +81,11 @@
                                 {
                                     @if (p.Rows == 1)
                                     {
-                                        <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                        <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                     }
                                     else
                                     {
-                                        <textarea id="@p.Name" class="form-control" maxlength="@p.MaxLength" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))"></textarea>
+                                        <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                     }
                                 }
                             </div>

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

@@ -89,8 +89,8 @@
                         }
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
-                                <div class="col-sm-9">
-                                    @if (!string.IsNullOrEmpty(p.Options))
+                            <div class="col-sm-9">
+                                @if (!string.IsNullOrEmpty(p.Options))
                                 {
                                     <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
                                         @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
@@ -110,11 +110,11 @@
                                 {
                                     @if (p.Rows == 1)
                                     {
-                                        <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                        <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                     }
                                     else
                                     {
-                                        <textarea id="@p.Name" class="form-control" maxlength="@p.MaxLength" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))"></textarea>
+                                        <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                     }
                                 }
                             </div>
@@ -132,7 +132,7 @@
     <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
 }
 
- @code {
+@code {
     private bool _initialized = false;
     private string _passwordrequirements;
     private int userid;
@@ -148,7 +148,7 @@
     private string lastipaddress;
 
     private List<Profile> profiles;
-    private Dictionary<string, string> settings;
+    private Dictionary<string, string> userSettings;
     private string category = string.Empty;
 
     private string createdby;
@@ -181,7 +181,7 @@
                     lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn);
                     lastipaddress = user.LastIPAddress;
 
-                    settings = await SettingService.GetUserSettingsAsync(user.UserId);
+                    userSettings = user.Settings;
                     createdby = user.CreatedBy;
                     createdon = user.CreatedOn;
                     modifiedby = user.ModifiedBy;
@@ -202,7 +202,7 @@
 
     private string GetProfileValue(string SettingName, string DefaultValue)
     {
-        string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+        string value = SettingService.GetSetting(userSettings, SettingName, DefaultValue);
         if (value.Contains("]"))
         {
             value = value.Substring(value.IndexOf("]") + 1);
@@ -232,7 +232,7 @@
                         user = await UserService.UpdateUserAsync(user);
                         if (user != null)
                         {
-                            await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
+                            await SettingService.UpdateUserSettingsAsync(userSettings, user.UserId);
                             await logger.LogInformation("User Saved {User}", user);
                             NavigationManager.NavigateTo(NavigateUrl());
                         }
@@ -266,7 +266,7 @@
             var value = GetProfileValue(profile.Name, string.Empty);
             if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
+                userSettings = SettingService.SetSetting(userSettings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
@@ -293,7 +293,7 @@
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        settings = SettingService.SetSetting(settings, SettingName, value);
+        userSettings = SettingService.SetSetting(userSettings, SettingName, value);
     }
 
     private void TogglePassword()

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

@@ -691,6 +691,10 @@ else
             await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
             AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
         }
+        finally
+        {
+            await ScrollToPageTop();
+        }
     }
 
     private void ProviderChanged(ChangeEventArgs e)

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -196,7 +196,7 @@
             else
             {
                 FolderId = -1;
-                _message = "Folder Path " + Folder + "Does Not Exist";
+                _message = "Folder Path " + Folder + " Does Not Exist";
                 _messagetype = MessageType.Error;
             }
         }
@@ -226,9 +226,9 @@
             }
             else
             {
-                FileId = -1; // file does not exist
-                _message = "FileId " + FileId.ToString() + "Does Not Exist";
+                _message = "FileId " + FileId.ToString() + " Does Not Exist";
                 _messagetype = MessageType.Error;
+                FileId = -1; // file does not exist
             }
         }
 

Oqtane.Client/Modules/Controls/Pager.razor

@@ -21,7 +21,7 @@
 
         @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
         {
-            <ul class="pagination justify-content-center my-2">
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
                 <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link shadow-none" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
                 </li>
@@ -84,7 +84,7 @@
 
         @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
         {
-            <ul class="pagination justify-content-center my-2">
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
                 <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link shadow-none" href="@PageUrl(1, _search)"><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
                 </li>
@@ -200,7 +200,7 @@
     {
         @if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Interactive)
         {
-            <ul class="pagination justify-content-center my-2">
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
                 <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link shadow-none" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
                 </li>
@@ -248,7 +248,7 @@
         }
         else
         {
-            <ul class="pagination justify-content-center my-2">
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
                 <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link shadow-none" href="@PageUrl(1, _search)"><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
                 </li>
@@ -368,6 +368,12 @@
     [SupplyParameterFromForm(FormName = "PagerForm")]
     public string _Search { get => ""; set => _search = value; }
 
+    /// <summary>
+    /// Accepted values are Start or Center or End. The default value is Center
+    /// </summary>
+    [Parameter]
+    public string PaginationAlignment { get; set; } = "center"; // Alignment of the Page Numbering start, center, end
+
     private IEnumerable<TableItem> ItemList { get; set; }
 
     protected override void OnInitialized()

Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor

@@ -277,7 +277,7 @@
 		{
             // include CSS theme
             var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("", "stylesheet", $"css/quill/quill.{_theme}.css", "text/css", "", "", "");
+            await interop.IncludeLink("", "stylesheet", $"{PageState?.Alias.BaseUrl}/css/quill/quill.{_theme}.css", "text/css", "", "", "");
         }
 
         await base.OnAfterRenderAsync(firstRender);

Oqtane.Client/Modules/Controls/TabPanel.razor

@@ -36,14 +36,7 @@ else
 
         Parent.AddTabPanel((TabPanel)this);
 
-        if (string.IsNullOrEmpty(Heading))
-        {
-            Heading = Localize(nameof(Name), Name);
-        }
-        else
-        {
-            Heading = Localize(nameof(Heading), Heading);
-        }
+        Heading = string.IsNullOrEmpty(Heading) ? Localize(nameof(Name), Name) : Localize(nameof(Heading), Heading);
     }
 
     public string DisplayHeading()

Oqtane.Client/Modules/ModuleBase.cs

@@ -98,17 +98,17 @@ namespace Oqtane.Modules
                     var inline = 0;
                     foreach (Resource resource in resources)
                     {
-                        if (string.IsNullOrEmpty(resource.RenderMode) || resource.RenderMode == RenderModes.Interactive)
+                        if ((string.IsNullOrEmpty(resource.RenderMode) || resource.RenderMode == RenderModes.Interactive) && !resource.Reload)
                         {
                             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, location = resource.Location.ToString().ToLower() });
+                                scripts.Add(new { href = url, type = resource.Type ?? "", bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", location = resource.Location.ToString().ToLower(), dataAttributes = resource.DataAttributes });
                             }
                             else
                             {
                                 inline += 1;
-                                await interop.IncludeScript(GetType().Namespace.ToLower() + inline.ToString(), "", "", "", resource.Content, resource.Location.ToString().ToLower());
+                                await interop.IncludeScript(GetType().Namespace.ToLower() + inline.ToString(), "", "", "", resource.Type ?? "", resource.Content, resource.Location.ToString().ToLower());
                             }
                         }
                     }

Oqtane.Client/Oqtane.Client.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <Configurations>Debug;Release</Configurations>
-    <Version>5.2.4</Version>
+    <Version>6.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -12,7 +12,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/v5.2.4</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -22,11 +22,10 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Client/Program.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
@@ -13,13 +12,13 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.JSInterop;
 using Oqtane.Documentation;
 using Oqtane.Models;
 using Oqtane.Modules;
 using Oqtane.Services;
+using Oqtane.Shared;
 using Oqtane.UI;
 
 namespace Oqtane.Client
@@ -258,7 +257,7 @@ namespace Oqtane.Client
             var jsRuntime = serviceProvider.GetRequiredService<IJSRuntime>();
             var interop = new Interop(jsRuntime);
             var localizationCookie = await interop.GetCookie(CookieRequestCultureProvider.DefaultCookieName);
-            var culture = CookieRequestCultureProvider.ParseCookieValue(localizationCookie)?.UICultures?[0].Value;
+            var culture = CookieRequestCultureProvider.ParseCookieValue(localizationCookie)?.UICulture.Name;
             var localizationService = serviceProvider.GetRequiredService<ILocalizationService>();
             var cultures = await localizationService.GetCulturesAsync(false);
 

Oqtane.Client/Resources/Installer/Installer.resx

@@ -183,4 +183,7 @@
   <data name="Template" xml:space="preserve">
     <value>Select a site template</value>
   </data>
+  <data name="Message.Username.Invalid" xml:space="preserve">
+    <value>The Username Provided Does Not Meet The System Requirement, It Can Only Contains Letters Or Digits.</value>
+  </data>
 </root>

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

@@ -267,4 +267,4 @@
   <data name="ExpiryDate.Text" xml:space="preserve">
     <value>Expiry Date: </value>
   </data>
-</root>
+</root>

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

@@ -297,4 +297,4 @@
   <data name="ExpiryDate.Text" xml:space="preserve">
     <value>Expiry Date: </value>
   </data>
-</root>
+</root>

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

@@ -139,7 +139,7 @@
     <value>Ignore Entities: </value>
   </data>
   <data name="IgnoreEntities.HelpText" xml:space="preserve">
-    <value>Comma delimited list of entities which should be ignored</value>
+    <value>Comma delimited list of entities which should be ignored. By default File entities are ignored.</value>
   </data>
   <data name="MinimumWordLength.Text" xml:space="preserve">
     <value>Word Length: </value>
@@ -154,7 +154,7 @@
     <value>Comma delimited list of words which should be ignored</value>
   </data>
   <data name="Success.Save" xml:space="preserve">
-    <value>Search Settings Saved Successfully</value>
+    <value>Search Settings Saved Successfully. You Will Need Reindex For Your Changes To Be Reflected In The Search Results.</value>
   </data>
   <data name="Error.Save" xml:space="preserve">
     <value>Error Saving Search Settings</value>

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

@@ -435,4 +435,7 @@
   <data name="Functionality" xml:space="preserve">
     <value>Functionality</value>
   </data>
+  <data name="System" xml:space="preserve">
+    <value>System</value>
+  </data>
 </root>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -151,6 +151,6 @@
     <value>You Cannot Perform A System Update In A Development Environment</value>
   </data>
   <data name="Disclaimer.Text" xml:space="preserve">
-    <value>Please Note That The System Update Capability Is A Simplified Upgrade Process Intended For Small To Medium Sized Installations. For Larger Enterprise Installations You Will Want To Use A Manual Upgrade Process. Also Note That The System Update Capability Is Not Recommended When Using Microsoft Azure Due To The Limitations Of That Environment. </value>
+    <value>Please Note That The System Update Capability Is A Simplified Upgrade Process Intended For Small To Medium Sized Installations. For Larger Enterprise Installations You Will Want To Use A Manual Upgrade Process. Also Note That The System Update Capability Is Not Recommended When Using Microsoft Azure Due To Environmental Limitations.</value>
   </data>
 </root>

Oqtane.Client/Services/Interfaces/ILocalizationCookieService.cs

@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+
+namespace Oqtane.Services
+{
+    /// <summary>
+    /// Service to set localization cookie
+    /// </summary>
+    public interface ILocalizationCookieService
+    {
+        /// <summary>
+        /// Set the localization cookie
+        /// </summary>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        Task SetLocalizationCookieAsync(string culture);
+    }
+}

Oqtane.Client/Services/Interfaces/IUserService.cs

@@ -113,6 +113,15 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<User> VerifyTwoFactorAsync(User user, string token);
 
+        /// <summary>
+        /// Validate identity user info.
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="email"></param>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        Task<UserValidateResult> ValidateUserAsync(string username, string email, string password);
+
         /// <summary>
         /// Validate a users password against the password policy 
         /// </summary>

Oqtane.Client/Services/LocalizationCookieService.cs

@@ -0,0 +1,18 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using Oqtane.Documentation;
+using Oqtane.Shared;
+
+namespace Oqtane.Services
+{
+    [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
+    public class LocalizationCookieService : ServiceBase, ILocalizationCookieService
+    {
+        public LocalizationCookieService(HttpClient http, SiteState siteState) : base(http, siteState) { }
+
+        public Task SetLocalizationCookieAsync(string culture)
+        {
+            return Task.CompletedTask; // only used in server side rendering
+        }
+    }
+}

Oqtane.Client/Services/RemoteServiceBase.cs

@@ -4,7 +4,6 @@ using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Net.Http.Headers;
 using Oqtane.Shared;
 
 namespace Oqtane.Services
@@ -28,9 +27,9 @@ namespace Oqtane.Services
         private HttpClient GetHttpClient(string AuthorizationToken)
         {
             var httpClient = _httpClientFactory.CreateClient("Remote");
-            if (!httpClient.DefaultRequestHeaders.Contains(HeaderNames.Authorization) && !string.IsNullOrEmpty(AuthorizationToken))
+            if (!httpClient.DefaultRequestHeaders.Contains("Authorization") && !string.IsNullOrEmpty(AuthorizationToken))
             {
-                httpClient.DefaultRequestHeaders.Add(HeaderNames.Authorization, "Bearer " + AuthorizationToken);
+                httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer " + AuthorizationToken);
             }
             return httpClient;
         }

Oqtane.Client/Services/UserService.cs

@@ -89,6 +89,11 @@ namespace Oqtane.Services
             return await PostJsonAsync<User>($"{Apiurl}/twofactor?token={token}", user);
         }
 
+        public async Task<UserValidateResult> ValidateUserAsync(string username, string email, string password)
+        {
+            return await GetJsonAsync<UserValidateResult>($"{Apiurl}/validateuser?username={WebUtility.UrlEncode(username)}&email={WebUtility.UrlEncode(email)}&password={WebUtility.UrlEncode(password)}");
+        }
+
         public async Task<bool> ValidatePasswordAsync(string password)
         {
             return await GetJsonAsync<bool>($"{Apiurl}/validate/{WebUtility.UrlEncode(password)}");

Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor

@@ -37,11 +37,8 @@
     public override List<Resource> Resources => new List<Resource>()
     {
 		// obtained from https://cdnjs.com/libraries
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css", 
-            Integrity = "sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==", 
-            CrossOrigin = "anonymous" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
-        new Resource { ResourceType = ResourceType.Script, Url = Constants.BootstrapScriptUrl, Integrity = Constants.BootstrapScriptIntegrity, CrossOrigin = "anonymous", Location = ResourceLocation.Body },
+        new Stylesheet("https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css", "sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==", "anonymous"),
+        new Stylesheet(ThemePath() + "Theme.css"),
+        new Script(Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous")
     };
-
 }

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

@@ -9,7 +9,7 @@
     <LanguageSwitcher ButtonClass="@ButtonClass" DropdownAlignment="@LanguageDropdownAlignment" />
 }
 
-@if (_showEditMode || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)))
+@if (ShowEditMode && (_showEditMode || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered))))
 {
     <form method="post" class="app-form-inline" @formname="EditModeForm" @onsubmit="@(async () => await ToggleEditMode(PageState.EditMode))" data-enhance>
         <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
@@ -59,9 +59,15 @@
     [Parameter]
     public string LanguageDropdownAlignment { get; set; } = string.Empty; // Empty or Left or Right
 
+    /// <summary>
+    /// Ability to hide the Edit Mode toggle button
+    /// </summary>
+    [Parameter]
+    public bool ShowEditMode { get; set; } = true;
+
     private PageState _pageState;
     private bool _canViewAdminDashboard = false;
-    private bool _showEditMode = false;
+    private bool _showEditMode = false; // internal state (not the same as ShowEditMode parameter)
 
     protected override void OnParametersSet()
     {

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

@@ -15,7 +15,6 @@
 @inject ILogService LoggingService
 @inject IStringLocalizer<ControlPanelInteractive> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
-@inject IServiceProvider ServiceProvider
 
 <button type="button" class="btn @ButtonClass ms-1" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel" @onclick="ClearMessage">
     <span class="oi oi-cog"></span>

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

@@ -1,10 +1,9 @@
 @using System.Globalization
-@using Microsoft.AspNetCore.Localization
-@using Microsoft.AspNetCore.Http
 @using Oqtane.Models
 @namespace Oqtane.Themes.Controls
 @inherits ThemeControlBase
 @inject ILanguageService LanguageService
+@inject ILocalizationCookieService LocalizationCookieService
 @inject NavigationManager NavigationManager
 
 @if (_supportedCultures?.Count() > 1)
@@ -38,10 +37,7 @@
     [Parameter]
     public string ButtonClass { get; set; } = "btn-outline-secondary";
 
-    [CascadingParameter]
-    HttpContext HttpContext { get; set; }
-
-    protected override void OnParametersSet()
+    protected override async Task OnParametersSetAsync()
     {
         MenuAlignment = DropdownAlignment.ToLower() == "right" ? "dropdown-menu-end" : string.Empty;
 
@@ -52,17 +48,7 @@
             var culture = PageState.QueryString["culture"];
             if (_supportedCultures.Any(item => item.Name == culture))
             {
-                var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
-
-                HttpContext.Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, new CookieOptions
-                {
-                    Path = "/",
-                    Expires = DateTimeOffset.UtcNow.AddYears(365),
-                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.Lax, // Set SameSite attribute
-                    Secure = true, // Ensure the cookie is only sent over HTTPS
-                    HttpOnly = false // cookie is updated using JS Interop in Interactive render mode
-                });
-
+                await LocalizationCookieService.SetLocalizationCookieAsync(culture);
             }
             NavigationManager.NavigateTo(NavigationManager.Uri.Replace($"?culture={culture}", ""));
         }

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

@@ -18,7 +18,7 @@
                         placeholder="@Localizer["SearchPlaceHolder"]"
                         aria-label="Search" />
             }
-            <button type="submit" class="btn btn-search">
+            <button type="submit" class="btn btn-search" aria-label="Search Button">
                 <span class="oi oi-magnifying-glass align-middle"></span>
             </button>
         </form>

Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs

@@ -17,11 +17,9 @@ namespace Oqtane.Themes.OqtaneTheme
             Resources = new List<Resource>()
             {
 		        // obtained from https://cdnjs.com/libraries
-                new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.3.3/cyborg/bootstrap.min.css",
-                    Integrity = "sha512-M+Wrv9LTvQe81gFD2ZE3xxPTN5V2n1iLCXsldIxXvfs6tP+6VihBCwCMBkkjkQUZVmEHBsowb9Vqsq1et1teEg==",
-                    CrossOrigin = "anonymous" },
-                new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Theme.css" },
-                new Resource { ResourceType = ResourceType.Script, Url = Constants.BootstrapScriptUrl, Integrity = Constants.BootstrapScriptIntegrity, CrossOrigin = "anonymous", Location = ResourceLocation.Body }
+                new Stylesheet("https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.3.3/cyborg/bootstrap.min.css", "sha512-M+Wrv9LTvQe81gFD2ZE3xxPTN5V2n1iLCXsldIxXvfs6tP+6VihBCwCMBkkjkQUZVmEHBsowb9Vqsq1et1teEg==", "anonymous"),
+                new Stylesheet("~/Theme.css"),
+                new Script(Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous")
             }
         };
     }

Oqtane.Client/Themes/ThemeBase.cs

@@ -62,17 +62,17 @@ namespace Oqtane.Themes
                     var inline = 0;
                     foreach (Resource resource in resources)
                     {
-                        if (string.IsNullOrEmpty(resource.RenderMode) || resource.RenderMode == RenderModes.Interactive)
+                        if ((string.IsNullOrEmpty(resource.RenderMode) || resource.RenderMode == RenderModes.Interactive) && !resource.Reload)
                         {
                             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, location = resource.Location.ToString().ToLower() });
+                                scripts.Add(new { href = url, type = resource.Type ?? "", bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", location = resource.Location.ToString().ToLower(), dataAttributes = resource.DataAttributes });
                             }
                             else
                             {
                                 inline += 1;
-                                await interop.IncludeScript(GetType().Namespace.ToLower() + inline.ToString(), "", "", "", resource.Content, resource.Location.ToString().ToLower());
+                                await interop.IncludeScript(GetType().Namespace.ToLower() + inline.ToString(), "", "", "", resource.Type ?? "", resource.Content, resource.Location.ToString().ToLower());
                             }
                         }
                     }

Oqtane.Client/UI/Head.razor

@@ -41,7 +41,7 @@
                 }
                 break;
             case "HeadContent":
-                var content = RemoveScripts(SiteState.Properties.HeadContent) + "\n";
+                var content = FormatScripts(SiteState.Properties.HeadContent) + "\n";
                 if (content != _content)
                 {
                     _content = content;
@@ -51,15 +51,29 @@
         }
     }
 
-    private string RemoveScripts(string headcontent)
+    private string FormatScripts(string headcontent)
     {
-        if (!string.IsNullOrEmpty(headcontent) && RenderMode == RenderModes.Interactive)
+        if (!string.IsNullOrEmpty(headcontent))
         {
             var index = headcontent.IndexOf("<script");
             while (index >= 0)
             {
-                headcontent = headcontent.Remove(index, headcontent.IndexOf("</script>") + 9 - index);
-                index = headcontent.IndexOf("<script");
+                var script = headcontent.Substring(index, headcontent.IndexOf("</script>", index) - index + 9);
+                if (RenderMode == RenderModes.Interactive)
+                {
+                    // remove scripts when interactive rendering
+                    headcontent = headcontent.Remove(index, script.Length);
+                    index = headcontent.IndexOf("<script");
+                }
+                else
+                {
+                    if (!script.Contains("><") && !script.Contains("data-reload"))
+                    {
+                        // add data-reload attribute to inline script
+                        headcontent = headcontent.Replace(script, script.Replace("<script", "<script data-reload=\"true\""));
+                    }
+                    index = headcontent.IndexOf("<script", index + 1);
+                }
             }
         }
         return headcontent;

Oqtane.Client/UI/Interop.cs

@@ -117,12 +117,17 @@ namespace Oqtane.UI
         }
 
         public Task IncludeScript(string id, string src, string integrity, string crossorigin, string type, string content, string location)
+        {
+            return IncludeScript(id, src, integrity, crossorigin, type, content, location, null);
+        }
+
+        public Task IncludeScript(string id, string src, string integrity, string crossorigin, string type, string content, string location, Dictionary<string, string> dataAttributes)
         {
             try
             {
                 _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.includeScript",
-                    id, src, integrity, crossorigin, type, content, location);
+                    id, src, integrity, crossorigin, type, content, location, dataAttributes);
                 return Task.CompletedTask;
             }
             catch

Oqtane.Client/UI/Routes.razor

@@ -1,7 +1,5 @@
 @namespace Oqtane.UI
-@using Microsoft.AspNetCore.Http
 @inject IInstallationService InstallationService
-@inject IJSRuntime JSRuntime
 @inject SiteState SiteState
 
 @if (_initialized)
@@ -48,9 +46,6 @@
     [Parameter]
     public string Platform { get; set; } = "";
 
-    [CascadingParameter]
-    HttpContext HttpContext { get; set; }
-
     private bool _initialized = false;
     private bool _installed = false;
     private string _display = "display: none;";
@@ -62,7 +57,7 @@
         SiteState.AntiForgeryToken = AntiForgeryToken;
         SiteState.AuthorizationToken = AuthorizationToken;
         SiteState.Platform = Platform;
-        SiteState.IsPrerendering = (HttpContext != null) ? true : false;
+        SiteState.IsPrerendering = !RendererInfo.IsInteractive;
 
         if (Runtime == Runtimes.Hybrid)
         {

Oqtane.Client/UI/SiteRouter.razor

@@ -1,6 +1,5 @@
 @using System.Diagnostics.CodeAnalysis
 @using System.Net
-@using Microsoft.AspNetCore.Http
 @using System.Globalization
 @using System.Security.Claims
 @namespace Oqtane.UI

Oqtane.Client/UI/ThemeBuilder.razor

@@ -11,6 +11,8 @@
 
     RenderFragment DynamicComponent { get; set; }
 
+    private string lastPagePath = "";
+
     protected override void OnParametersSet()
     {
         // handle page redirection
@@ -26,7 +28,7 @@
             NavigationManager.NavigateTo(Utilities.NavigateUrl(PageState.Alias.Path, "profile", "returnurl=" + WebUtility.UrlEncode(PageState.Route.PathAndQuery)));
             return;
         }
-        
+
         // set page title
         if (!string.IsNullOrEmpty(PageState.Page.Title))
         {
@@ -90,8 +92,16 @@
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (!firstRender)
+        if (!firstRender && PageState.Page.Path != lastPagePath)
         {
+            if (!string.IsNullOrEmpty(PageState.Site.HeadContent) && PageState.Site.HeadContent.Contains("<script"))
+            {
+                await InjectScripts(PageState.Site.HeadContent, ResourceLocation.Head);
+            }
+            if (!string.IsNullOrEmpty(PageState.Site.BodyContent) && PageState.Site.BodyContent.Contains("<script"))
+            {
+                await InjectScripts(PageState.Site.BodyContent, ResourceLocation.Body);
+            }
             if (!string.IsNullOrEmpty(PageState.Page.HeadContent) && PageState.Page.HeadContent.Contains("<script"))
             {
                 await InjectScripts(PageState.Page.HeadContent, ResourceLocation.Head);
@@ -100,6 +110,7 @@
             {
                 await InjectScripts(PageState.Page.BodyContent, ResourceLocation.Body);
             }
+            lastPagePath = PageState.Page.Path;
         }
 
         // style sheets
@@ -176,18 +187,20 @@
             if (!string.IsNullOrEmpty(src))
             {
                 src = (src.Contains("://")) ? src : PageState.Alias.BaseUrl + src;
-                scripts.Add(new { href = src, bundle = "", integrity = integrity, crossorigin = crossorigin, es6module = (type == "module"), location = location.ToString().ToLower(), dataAttributes = dataAttributes });
+                scripts.Add(new { href = src, type = type, bundle = "", integrity = integrity, crossorigin = crossorigin, location = location.ToString().ToLower(), dataAttributes = dataAttributes });
             }
             else
             {
-                // inline script must have an id attribute
-                if (id == "")
+                if (dataAttributes == null || !dataAttributes.ContainsKey("data-reload") || dataAttributes["data-reload"] != "false")
                 {
-                    count += 1;
-                    id = $"page{PageState.Page.PageId}-script{count}";
+                    if (id == "")
+                    {
+                        count += 1;
+                        id = $"page{PageState.Page.PageId}-script{count}";
+                    }
+                    var pos = script.IndexOf(">") + 1;
+                    await interop.IncludeScript(id, "", "", "", type, script.Substring(pos, script.IndexOf("</script>") - pos), location.ToString().ToLower(), dataAttributes);
                 }
-                index = script.IndexOf(">") + 1;
-                await interop.IncludeScript(id, "", "", "", "", script.Substring(index, script.IndexOf("</script>") - index), location.ToString().ToLower());
             }
             index = content.IndexOf("<script", index + 1);
         }

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

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Version>5.2.4</Version>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>6.0.1</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/v5.2.4</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -33,7 +33,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MySql.EntityFrameworkCore" Version="8.0.5" />
+    <PackageReference Include="MySql.EntityFrameworkCore" Version="9.0.0-preview" />
     <PackageReference Include="MySql.Data" Version="9.1.0" />
   </ItemGroup>
 
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <MySQLFiles Include="$(OutputPath)Oqtane.Database.MySQL.dll;$(OutputPath)Oqtane.Database.MySQL.pdb;$(OutputPath)MySql.EntityFrameworkCore.dll;$(OutputPath)MySql.Data.dll" DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net8.0\%(Filename)%(Extension)" />
+    <MySQLFiles Include="$(OutputPath)Oqtane.Database.MySQL.dll;$(OutputPath)Oqtane.Database.MySQL.pdb;$(OutputPath)MySql.EntityFrameworkCore.dll;$(OutputPath)MySql.Data.dll" DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net9.0\%(Filename)%(Extension)" />
   </ItemGroup>
 
   <Target Name="PublishProvider" AfterTargets="PostBuildEvent" Inputs="@(MySQLFiles)" Outputs="@(MySQLFiles->'%(DestinationPath)')">

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

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Version>5.2.4</Version>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>6.0.1</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/v5.2.4</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;EF1001;AD0001</NoWarn>
+    <NoWarn>1701;1702;EF1001;AD0001;NU1608</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -33,9 +33,9 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" />
+    <PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PostgreSQLFiles Include="$(OutputPath)Oqtane.Database.PostgreSQL.dll;$(OutputPath)Oqtane.Database.PostgreSQL.pdb;$(OutputPath)EFCore.NamingConventions.dll;$(OutputPath)Npgsql.EntityFrameworkCore.PostgreSQL.dll;$(OutputPath)Npgsql.dll" DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net8.0\%(Filename)%(Extension)" />
+    <PostgreSQLFiles Include="$(OutputPath)Oqtane.Database.PostgreSQL.dll;$(OutputPath)Oqtane.Database.PostgreSQL.pdb;$(OutputPath)EFCore.NamingConventions.dll;$(OutputPath)Npgsql.EntityFrameworkCore.PostgreSQL.dll;$(OutputPath)Npgsql.dll" DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net9.0\%(Filename)%(Extension)" />
   </ItemGroup>
 
   <Target Name="PublishProvider" AfterTargets="PostBuildEvent" Inputs="@(PostgreSQLFiles)" Outputs="@(PostgreSQLFiles->'%(DestinationPath)')">

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

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Version>5.2.4</Version>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>6.0.1</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/v5.2.4</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -33,7 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <SqlServerFiles Include="$(OutputPath)Oqtane.Database.SqlServer.dll;$(OutputPath)Oqtane.Database.SqlServer.pdb;$(OutputPath)Microsoft.EntityFrameworkCore.SqlServer.dll" DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net8.0\%(Filename)%(Extension)" />
+    <SqlServerFiles Include="$(OutputPath)Oqtane.Database.SqlServer.dll;$(OutputPath)Oqtane.Database.SqlServer.pdb;$(OutputPath)Microsoft.EntityFrameworkCore.SqlServer.dll" DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net9.0\%(Filename)%(Extension)" />
   </ItemGroup>
 
   <Target Name="PublishProvider" AfterTargets="PostBuildEvent" Inputs="@(SqlServerFiles)" Outputs="@(SqlServerFiles->'%(DestinationPath)')">

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

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Version>5.2.4</Version>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>6.0.1</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/v5.2.4</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -33,7 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <SqliteFiles Include="$(OutputPath)Oqtane.Database.Sqlite.dll;$(OutputPath)Oqtane.Database.Sqlite.pdb;$(OutputPath)Microsoft.EntityFrameworkCore.Sqlite.dll" DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net8.0\%(Filename)%(Extension)" />
+    <SqliteFiles Include="$(OutputPath)Oqtane.Database.Sqlite.dll;$(OutputPath)Oqtane.Database.Sqlite.pdb;$(OutputPath)Microsoft.EntityFrameworkCore.Sqlite.dll" DestinationPath="..\Oqtane.Server\bin\$(Configuration)\net9.0\%(Filename)%(Extension)" />
   </ItemGroup>
 
   <Target Name="PublishProvider" AfterTargets="PostBuildEvent" Inputs="@(SqliteFiles)" Outputs="@(SqliteFiles->'%(DestinationPath)')">

Oqtane.Maui/App.xaml.cs

@@ -5,7 +5,10 @@ public partial class App : Application
 	public App()
 	{
 		InitializeComponent();
-
-		MainPage = new MainPage();
 	}
+
+    protected override Window CreateWindow(IActivationState activationState)
+    {
+        return new Window(new MainPage());
+    }
 }

Oqtane.Maui/Oqtane.Maui.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-    <!-- <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks> -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+    <!-- <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
-    <Version>5.2.4</Version>
+    <Version>6.0.1</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/v5.2.4</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane.Maui</RootNamespace>
@@ -28,19 +28,21 @@
 
 		<!-- App Identifier -->
 		<ApplicationId>com.oqtane.maui</ApplicationId>
-		<ApplicationIdGuid>0E29FC31-1B83-48ED-B6E0-9F3C67B775D4</ApplicationIdGuid>
     
 		<!-- Versions -->
-		<ApplicationDisplayVersion>5.2.4</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>6.0.1</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
-	</PropertyGroup>
+    <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+    <WindowsPackageType>None</WindowsPackageType>
+    
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+  </PropertyGroup>
 
 	<ItemGroup>
 		<!-- App Icon -->
@@ -65,23 +67,22 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.10" />
-    <PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.91" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.91" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.91" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="Oqtane.Client">
-      <HintPath>..\Oqtane.Server\bin\Debug\net8.0\Oqtane.Client.dll</HintPath>
+      <HintPath>..\Oqtane.Server\bin\Debug\net9.0\Oqtane.Client.dll</HintPath>
     </Reference>
     <Reference Include="Oqtane.Shared">
-      <HintPath>..\Oqtane.Server\bin\Debug\net8.0\Oqtane.Shared.dll</HintPath>
+      <HintPath>..\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll</HintPath>
     </Reference>
   </ItemGroup>
 

Oqtane.Maui/Properties/launchSettings.json

@@ -1,7 +1,7 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
+      "commandName": "Project",
       "nativeDebugging": false
     }
   }

Oqtane.Maui/wwwroot/js/interop.js

@@ -417,11 +417,20 @@ Oqtane.Interop = {
         }
     },
     scrollTo: function (top, left, behavior) {
-        window.scrollTo({
-            top: top,
-            left: left,
-            behavior: behavior
-        });
+        const modal = document.querySelector('.modal');
+        if (modal) {
+            modal.scrollTo({
+                top: top,
+                left: left,
+                behavior: behavior
+            });
+        } else {
+            window.scrollTo({
+                top: top,
+                left: left,
+                behavior: behavior
+            });
+        }
     },
     scrollToId: function (id) {
         var element = document.getElementById(id);

Oqtane.Package/Oqtane.Client.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Client</id>
-    <version>5.2.4</version>
+    <version>6.0.1</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,14 +12,14 @@
     <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/v5.2.4</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
   <files>
-    <file src="..\Oqtane.Client\bin\Release\net8.0\Oqtane.Client.dll" target="lib\net8.0" /> 
-    <file src="..\Oqtane.Client\bin\Release\net8.0\Oqtane.Client.pdb" target="lib\net8.0" /> 
+    <file src="..\Oqtane.Client\bin\Release\net9.0\Oqtane.Client.dll" target="lib\net9.0" /> 
+    <file src="..\Oqtane.Client\bin\Release\net9.0\Oqtane.Client.pdb" target="lib\net9.0" /> 
     <file src="icon.png" target="" />
     <file src="readme.md" target="" />
   </files>

Oqtane.Package/Oqtane.Framework.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Framework</id>
-    <version>5.2.4</version>
+    <version>6.0.1</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/v5.2.4/Oqtane.Framework.5.2.4.Upgrade.zip</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.2.4</releaseNotes>
+    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v6.0.1/Oqtane.Framework.6.0.1.Upgrade.zip</projectUrl>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane framework</tags>

Oqtane.Package/Oqtane.Server.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Server</id>
-    <version>5.2.4</version>
+    <version>6.0.1</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,14 +12,14 @@
     <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/v5.2.4</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
   <files>
-    <file src="..\Oqtane.Server\bin\Release\net8.0\Oqtane.Server.dll" target="lib\net8.0" /> 
-    <file src="..\Oqtane.Server\bin\Release\net8.0\Oqtane.Server.pdb" target="lib\net8.0" /> 
+    <file src="..\Oqtane.Server\bin\Release\net9.0\Oqtane.Server.dll" target="lib\net9.0" /> 
+    <file src="..\Oqtane.Server\bin\Release\net9.0\Oqtane.Server.pdb" target="lib\net9.0" /> 
     <file src="icon.png" target="" />
     <file src="readme.md" target="" />
   </files>

Oqtane.Package/Oqtane.Shared.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Shared</id>
-    <version>5.2.4</version>
+    <version>6.0.1</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,14 +12,14 @@
     <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/v5.2.4</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
   <files>
-    <file src="..\Oqtane.Shared\bin\Release\net8.0\Oqtane.Shared.dll" target="lib\net8.0" />
-    <file src="..\Oqtane.Shared\bin\Release\net8.0\Oqtane.Shared.pdb" target="lib\net8.0" />
+    <file src="..\Oqtane.Shared\bin\Release\net9.0\Oqtane.Shared.dll" target="lib\net9.0" />
+    <file src="..\Oqtane.Shared\bin\Release\net9.0\Oqtane.Shared.pdb" target="lib\net9.0" />
     <file src="icon.png" target="" />
     <file src="readme.md" target="" />
   </files>

Oqtane.Package/Oqtane.Updater.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Updater</id>
-    <version>5.2.4</version>
+    <version>6.0.1</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,13 +12,13 @@
     <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/v5.2.4</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
   <files>
-    <file src="..\Oqtane.Updater\bin\Release\net8.0\publish\*.*" target="lib\net8.0" />
+    <file src="..\Oqtane.Updater\bin\Release\net9.0\publish\*.*" target="lib\net9.0" />
     <file src="icon.png" target="" />
     <file src="readme.md" target="" />
   </files>

Oqtane.Package/install.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net8.0\publish\*" -DestinationPath "Oqtane.Framework.5.2.4.Install.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.0.1.Install.zip" -Force 

Oqtane.Package/release.cmd

@@ -6,14 +6,22 @@ nuget.exe pack Oqtane.Client.nuspec
 nuget.exe pack Oqtane.Server.nuspec
 nuget.exe pack Oqtane.Shared.nuspec                  
 nuget.exe pack Oqtane.Framework.nuspec
-del /F/Q/S "..\Oqtane.Server\bin\Release\net8.0\publish" > NUL
-rmdir /Q/S "..\Oqtane.Server\bin\Release\net8.0\publish"
+del /F/Q/S "..\Oqtane.Server\bin\Release\net9.0\publish" > NUL
+rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish"
 dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
-del /F/Q/S "..\Oqtane.Server\bin\Release\net8.0\publish\wwwroot\Content" > NUL
-rmdir /Q/S "..\Oqtane.Server\bin\Release\net8.0\publish\wwwroot\Content"
+del /F/Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Content" > NUL
+rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Content"
 setlocal ENABLEDELAYEDEXPANSION
+set retain=Placeholder.txt
+for /D %%i in ("..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\_content\*") 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.Modules.Admin.Login,Oqtane.Modules.HtmlText
-for /D %%i in ("..\Oqtane.Server\bin\Release\net8.0\publish\wwwroot\Modules\*") do (
+for /D %%i in ("..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Modules\*") do (
 set /A found=0
 for %%j in (%retain%) do (
 if "%%~nxi" == "%%j" set /A found=1
@@ -21,18 +29,18 @@ if "%%~nxi" == "%%j" set /A found=1
 if not !found! == 1 rmdir /Q/S "%%i"
 )
 set retain=Oqtane.Themes.BlazorTheme,Oqtane.Themes.OqtaneTheme
-for /D %%i in ("..\Oqtane.Server\bin\Release\net8.0\publish\wwwroot\Themes\*") do (
+for /D %%i in ("..\Oqtane.Server\bin\Release\net9.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\net8.0\publish\appsettings.json"
-ren "..\Oqtane.Server\bin\Release\net8.0\publish\appsettings.release.json" "appsettings.json"
+del "..\Oqtane.Server\bin\Release\net9.0\publish\appsettings.json"
+ren "..\Oqtane.Server\bin\Release\net9.0\publish\appsettings.release.json" "appsettings.json"
 C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\install.ps1"
-del "..\Oqtane.Server\bin\Release\net8.0\publish\appsettings.json"
-del "..\Oqtane.Server\bin\Release\net8.0\publish\web.config"
+del "..\Oqtane.Server\bin\Release\net9.0\publish\appsettings.json"
+del "..\Oqtane.Server\bin\Release\net9.0\publish\web.config"
 C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\upgrade.ps1"
 dotnet clean -c Release ..\Oqtane.Updater.sln 
 dotnet build -c Release ..\Oqtane.Updater.sln

Oqtane.Package/upgrade.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net8.0\publish\*" -DestinationPath "Oqtane.Framework.5.2.4.Upgrade.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.0.1.Upgrade.zip" -Force 

Oqtane.Server/Components/App.razor

@@ -76,6 +76,10 @@
 
             @((MarkupString)_scripts)
             @((MarkupString)_bodyResources)
+            @if (_renderMode == RenderModes.Static)
+            {
+                <page-script src="./js/reload.js"></page-script>
+            }
         }
         else
         {
@@ -179,10 +183,6 @@
                     ManageScripts(resources, alias);
 
                     // generate scripts
-                    if (_renderMode == RenderModes.Interactive && _runtime == Runtimes.Server)
-                    {
-                        _scripts += CreateReconnectScript();
-                    }
                     if (site.PwaIsEnabled && site.PwaAppIconFileId != null && site.PwaSplashIconFileId != null)
                     {
                         _scripts += CreatePWAScript(alias, site, route);
@@ -192,32 +192,30 @@
                         _scripts += CreateScrollPositionScript();
                     }
 
-                    _headResources += ParseScripts(site.HeadContent);
-                    _bodyResources += ParseScripts(site.BodyContent);
-
                     // set culture if not specified
-                    string culture = Context.Request.Cookies[CookieRequestCultureProvider.DefaultCookieName];
-                    if (culture == null)
+                    string cultureCookie = Context.Request.Cookies[Shared.CookieRequestCultureProvider.DefaultCookieName];
+                    if (cultureCookie == null)
                     {
                         // get default language for site
                         if (site.Languages.Any())
                         {
                             // use default language if specified otherwise use first language in collection
-                            culture = (site.Languages.Where(l => l.IsDefault).SingleOrDefault() ?? site.Languages.First()).Code;
+                            cultureCookie = (site.Languages.Where(l => l.IsDefault).SingleOrDefault() ?? site.Languages.First()).Code;
                         }
                         else
                         {
-                            culture = LocalizationManager.GetDefaultCulture();
+                            // fallback language
+                            cultureCookie = LocalizationManager.GetDefaultCulture();
                         }
-                        SetLocalizationCookie(culture);
+                        // convert language code to culture cookie format (ie. "c=en|uic=en")
+                        cultureCookie = Shared.CookieRequestCultureProvider.MakeCookieValue(new Models.RequestCulture(cultureCookie));
+                        SetLocalizationCookie(cultureCookie);
                     }
 
                     // set language for page
-                    if (!string.IsNullOrEmpty(culture))
+                    if (!string.IsNullOrEmpty(cultureCookie))
                     {
-                        // localization cookie value in form of c=en|uic=en
-                        _language = culture.Split('|')[0];
-                        _language = _language.Replace("c=", "");
+                        _language = Shared.CookieRequestCultureProvider.ParseCookieValue(cultureCookie).Culture.Name;
                     }
 
                     // create initial PageState
@@ -494,25 +492,6 @@
         "</script>" + Environment.NewLine;
     }
 
-    private string CreateReconnectScript()
-    {
-        return Environment.NewLine +
-        "<script>" + Environment.NewLine +
-        "    // Interactive Blazor Server Reconnect" + Environment.NewLine +
-        "    new MutationObserver((mutations, observer) => {" + Environment.NewLine +
-        "        if (document.querySelector('#components-reconnect-modal h5 a')) {" + Environment.NewLine +
-        "            async function attemptReload() {" + Environment.NewLine +
-        "                await fetch('');" + Environment.NewLine +
-        "                location.reload();" + Environment.NewLine +
-        "            }" + Environment.NewLine +
-        "            observer.disconnect();" + Environment.NewLine +
-        "            attemptReload();" + Environment.NewLine +
-        "            setInterval(attemptReload, 5000);" + Environment.NewLine +
-        "        }" + Environment.NewLine +
-        "    }).observe(document.body, { childList: true, subtree: true });" + Environment.NewLine +
-        "</script>" + Environment.NewLine;
-    }
-
     private string CreateScrollPositionScript()
     {
         return Environment.NewLine +
@@ -532,26 +511,10 @@
         "</script>" + Environment.NewLine;
     }
 
-    private string ParseScripts(string content)
-    {
-        var scripts = "";
-        // in interactive render mode, parse scripts from content and inject into page
-        if (_renderMode == RenderModes.Interactive && !string.IsNullOrEmpty(content))
-        {
-            var index = content.IndexOf("<script");
-            while (index >= 0)
-            {
-                scripts += content.Substring(index, content.IndexOf("</script>", index) + 9 - index);
-                index = content.IndexOf("<script", index + 1);
-            }
-        }
-        return scripts;
-    }
-
     private void AddScript(Resource resource, Alias alias)
     {
         var script = CreateScript(resource, alias);
-        if (resource.Location == Shared.ResourceLocation.Head)
+        if (resource.Location == Shared.ResourceLocation.Head && !resource.Reload)
         {
             if (!_headResources.Contains(script))
             {
@@ -569,40 +532,33 @@
 
     private string CreateScript(Resource resource, Alias alias)
     {
-        if (!string.IsNullOrEmpty(resource.Url))
+        if (!resource.Reload)
         {
-            if (!resource.Reload)
+            var url = (resource.Url.Contains("://")) ? resource.Url : alias.BaseUrl + resource.Url;
+
+            var dataAttributes = "";
+            if (resource.DataAttributes != null && resource.DataAttributes.Count > 0)
             {
-                var url = (resource.Url.Contains("://")) ? resource.Url : alias.BaseUrl + resource.Url;
-                return "<script" +
-                    ((!string.IsNullOrEmpty(resource.Integrity)) ? " integrity=\"" + resource.Integrity + "\"" : "") +
-                    ((!string.IsNullOrEmpty(resource.CrossOrigin)) ? " crossorigin=\"" + resource.CrossOrigin + "\"" : "") +
-                    ((resource.ES6Module) ? " type=\"module\"" : "") +
-                    " src=\"" + url + "\"></script>"; // src at end of element due to enhanced navigation patch algorithm
-            }
-            else
-            {
-                // use custom element which can execute script on every page transition
-                @if (string.IsNullOrEmpty(resource.Integrity) && string.IsNullOrEmpty(resource.CrossOrigin))
+                foreach (var attribute in resource.DataAttributes)
                 {
-                    return "<page-script src=\"" + resource.Url + "\"></page-script>";
-                }
-                else
-                {
-                    // use modulepreload for external resources
-                    return "<link rel=\"modulepreload\" href=\"" + resource.Url + "\" integrity=\"" + resource.Integrity + "\" crossorigin=\"" + resource.CrossOrigin + "\" />\n" +
-                        "<page-script src=\"" + resource.Url + "\"></page-script>";
+                    dataAttributes += " " + attribute.Key + "=\"" + attribute.Value + "\"";
                 }
             }
+
+            return "<script src=\"" + url + "\"" +
+                ((!string.IsNullOrEmpty(resource.Type)) ? " type=\"" + resource.Type + "\"" : "") +
+                ((!string.IsNullOrEmpty(resource.Integrity)) ? " integrity=\"" + resource.Integrity + "\"" : "") +
+                ((!string.IsNullOrEmpty(resource.CrossOrigin)) ? " crossorigin=\"" + resource.CrossOrigin + "\"" : "") +
+                ((!string.IsNullOrEmpty(dataAttributes)) ? dataAttributes : "") +
+                "></script>";
         }
         else
         {
-            // inline script
-            return "<script>" + resource.Content + "</script>";
+            return "<page-script src=\"" + resource.Url + "\"></page-script>";
         }
     }
 
-    private void SetLocalizationCookie(string culture)
+    private void SetLocalizationCookie(string cookieValue)
     {
         var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions
         {
@@ -613,8 +569,8 @@
         };
 
         Context.Response.Cookies.Append(
-            CookieRequestCultureProvider.DefaultCookieName,
-            CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture)),
+            Shared.CookieRequestCultureProvider.DefaultCookieName,
+            cookieValue,
             cookieOptions
         );
     }

Oqtane.Server/Controllers/FileController.cs

@@ -517,7 +517,7 @@ namespace Oqtane.Controllers
                 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.Order())
                     {
                         try
                         {

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -351,9 +351,9 @@ namespace Oqtane.Controllers
                     return new Dictionary<string, object>()
                             {
                                 { "FrameworkVersion", Constants.Version },
-                                { "ClientReference", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Client.dll</HintPath></Reference>" },
-                                { "ServerReference", $"<Reference Include=\"Oqtane.Server\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Server.dll</HintPath></Reference>" },
-                                { "SharedReference", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Shared.dll</HintPath></Reference>" },
+                                { "ClientReference", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net9.0\\Oqtane.Client.dll</HintPath></Reference>" },
+                                { "ServerReference", $"<Reference Include=\"Oqtane.Server\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net9.0\\Oqtane.Server.dll</HintPath></Reference>" },
+                                { "SharedReference", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net9.0\\Oqtane.Shared.dll</HintPath></Reference>" },
                             };
                 });
             }

Oqtane.Server/Controllers/NotificationController.cs

@@ -183,7 +183,7 @@ namespace Oqtane.Controllers
         {
             if (ModelState.IsValid && notification.SiteId == _alias.SiteId && notification.NotificationId == id && _notifications.GetNotification(notification.NotificationId, false) != null && (IsAuthorized(notification.FromUserId) || IsAuthorized(notification.ToUserId)))
             {
-                if (!User.IsInRole(RoleNames.Admin))
+                if (!User.IsInRole(RoleNames.Admin) && notification.FromUserId != null)
                 {
                     // content must be HTML encoded for non-admins to prevent HTML injection
                     notification.Subject = WebUtility.HtmlEncode(notification.Subject);
@@ -223,7 +223,7 @@ namespace Oqtane.Controllers
 
         private bool IsAuthorized(int? userid)
         {
-            bool authorized = true;
+            bool authorized = false;
             if (userid != null)
             {
                 authorized = (_userPermissions.GetUser(User).UserId == userid);

Oqtane.Server/Controllers/PageController.cs

@@ -9,7 +9,7 @@ using System.Net;
 using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
-using System.IO;
+using System;
 
 namespace Oqtane.Controllers
 {

Oqtane.Server/Controllers/SettingController.cs

@@ -269,11 +269,7 @@ namespace Oqtane.Controllers
                     authorized = _userPermissions.IsAuthorized(User, _alias.SiteId, entityName, entityId, permissionName);
                     break;
                 case EntityNames.User:
-                    authorized = true;
-                    if (permissionName == PermissionNames.Edit)
-                    {
-                        authorized = _userPermissions.IsAuthorized(User, _alias.SiteId, entityName, -1, PermissionNames.Write, RoleNames.Admin) || (_userPermissions.GetUser(User).UserId == entityId);
-                    }
+                    authorized = _userPermissions.IsAuthorized(User, _alias.SiteId, entityName, -1, PermissionNames.Write, RoleNames.Admin) || (_userPermissions.GetUser(User).UserId == entityId);
                     break;
                 case EntityNames.Visitor:
                     authorized = User.IsInRole(RoleNames.Admin);
@@ -319,7 +315,7 @@ namespace Oqtane.Controllers
                     filter = !_userPermissions.IsAuthorized(User, _alias.SiteId, entityName, entityId, PermissionNames.Edit);
                     break;
                 case EntityNames.User:
-                    filter = !User.IsInRole(RoleNames.Admin) && _userPermissions.GetUser(User).UserId != entityId;
+                    filter = !_userPermissions.IsAuthorized(User, _alias.SiteId, entityName, -1, PermissionNames.Write, RoleNames.Admin) && _userPermissions.GetUser(User).UserId != entityId;
                     break;
                 case EntityNames.Visitor:
                     if (!User.IsInRole(RoleNames.Admin))

Oqtane.Server/Controllers/ThemeController.cs

@@ -267,8 +267,8 @@ namespace Oqtane.Controllers
                     return new Dictionary<string, object>()
                             {
                                 { "FrameworkVersion", Constants.Version },
-                                { "ClientReference", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Client.dll</HintPath></Reference>" },
-                                { "SharedReference", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Shared.dll</HintPath></Reference>" },
+                                { "ClientReference", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net9.0\\Oqtane.Client.dll</HintPath></Reference>" },
+                                { "SharedReference", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net9.0\\Oqtane.Shared.dll</HintPath></Reference>" },
                             };
                 });
             }

Oqtane.Server/Controllers/UserController.cs

@@ -28,9 +28,10 @@ namespace Oqtane.Controllers
         private readonly IJwtManager _jwtManager;
         private readonly IFileRepository _files;
         private readonly ISettingRepository _settings;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public UserController(IUserRepository users, ITenantManager tenantManager, IUserManager userManager, ISiteRepository sites, IUserPermissions userPermissions, IJwtManager jwtManager, IFileRepository files, ISettingRepository settings, ILogManager logger)
+        public UserController(IUserRepository users, ITenantManager tenantManager, IUserManager userManager, ISiteRepository sites, IUserPermissions userPermissions, IJwtManager jwtManager, IFileRepository files, ISettingRepository settings, ISyncManager syncManager, ILogManager logger)
         {
             _users = users;
             _tenantManager = tenantManager;
@@ -40,6 +41,7 @@ namespace Oqtane.Controllers
             _jwtManager = jwtManager;
             _files = files;
             _settings = settings;
+            _syncManager = syncManager;
             _logger = logger;
         }
 
@@ -136,7 +138,7 @@ namespace Oqtane.Controllers
                     filtered.PhotoFileId = user.PhotoFileId;
                     filtered.LastLoginOn = user.LastLoginOn;
                     filtered.LastIPAddress = user.LastIPAddress;
-                    filtered.TwoFactorRequired = false;
+                    filtered.TwoFactorRequired = user.TwoFactorRequired;
                     filtered.Roles = user.Roles;
                     filtered.CreatedBy = user.CreatedBy;
                     filtered.CreatedOn = user.CreatedOn;
@@ -145,20 +147,7 @@ namespace Oqtane.Controllers
                     filtered.DeletedBy = user.DeletedBy;
                     filtered.DeletedOn = user.DeletedOn;
                     filtered.IsDeleted = user.IsDeleted;
-                }
-
-                // if authenticated user is accessing their own user account
-                if (_userPermissions.GetUser(User).UserId == user.UserId)
-                {
-                    // include all settings
-                    filtered.Settings = user.Settings;
-                }
-                else
-                {
-                    // include only public settings
-                    filtered.Settings = _settings.GetSettings(EntityNames.User, user.UserId)
-                        .Where(item => !item.IsPrivate)
-                        .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
+                    filtered.Settings = user.Settings; // include all settings
                 }
             }
 
@@ -266,6 +255,7 @@ namespace Oqtane.Controllers
             if (_userPermissions.GetUser(User).UserId == user.UserId)
             {
                 await HttpContext.SignOutAsync(Constants.AuthenticationScheme);
+                _syncManager.AddSyncEvent(_tenantManager.GetAlias(), EntityNames.User, user.UserId, "Logout");
                 _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", (user != null) ? user.Username : "");
             }
         }
@@ -279,6 +269,7 @@ namespace Oqtane.Controllers
             {
                 await _userManager.LogoutUserEverywhere(user);
                 await HttpContext.SignOutAsync(Constants.AuthenticationScheme);
+                _syncManager.AddSyncEvent(_tenantManager.GetAlias(), EntityNames.User, user.UserId, "Logout");
                 _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout Everywhere {Username}", (user != null) ? user.Username : "");
             }
         }
@@ -347,6 +338,13 @@ namespace Oqtane.Controllers
             return user;
         }
 
+        // GET api/<controller>/validate/x
+        [HttpGet("validateuser")]
+        public async Task<UserValidateResult> ValidateUser(string username, string email, string password)
+        {
+            return await _userManager.ValidateUser(username, email, password);
+        }
+
         // GET api/<controller>/validate/x
         [HttpGet("validate/{password}")]
         public async Task<bool> Validate(string password)

Oqtane.Server/Controllers/UserRoleController.cs

@@ -10,7 +10,6 @@ using System.Linq;
 using System.Net;
 using Oqtane.Security;
 using System;
-using Oqtane.Modules.Admin.Roles;
 
 namespace Oqtane.Controllers
 {
@@ -40,24 +39,34 @@ namespace Oqtane.Controllers
         public IEnumerable<UserRole> Get(string siteid, string userid = null, string rolename = null)
         {
             int SiteId;
-            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId && (userid != null || rolename != null))
+            int UserId = -1;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId && (userid != null && int.TryParse(userid, out UserId) || rolename != null))
             {
-                var userroles = _userRoles.GetUserRoles(SiteId).ToList();
-                if (userid != null)
+                if (IsAuthorized(UserId, rolename))
                 {
-                    int UserId = int.TryParse(userid, out UserId) ? UserId : -1;
-                    userroles = userroles.Where(item => item.UserId == UserId).ToList();
+                    var userroles = _userRoles.GetUserRoles(SiteId).ToList();
+                    if (UserId != -1)
+                    {
+                        userroles = userroles.Where(item => item.UserId == UserId).ToList();
+                    }
+                    if (rolename != null)
+                    {
+                        userroles = userroles.Where(item => item.Role.Name == rolename).ToList();
+                    }
+                    var user = _userPermissions.GetUser();
+                    for (int i = 0; i < userroles.Count(); i++)
+                    {
+                        userroles[i] = Filter(userroles[i], user.UserId);
+                    }
+                    return userroles.OrderBy(u => u.User.DisplayName);
+
                 }
-                if (rolename != null)
+                else
                 {
-                    userroles = userroles.Where(item => item.Role.Name == rolename).ToList();
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UserRole Get Attempt For Site {SiteId} User {UserId} Role {RoleName}", siteid, userid, rolename);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    return null;
                 }
-                var user = _userPermissions.GetUser();
-                for (int i = 0; i < userroles.Count(); i++)
-                {
-                    userroles[i] = Filter(userroles[i], user.UserId);
-                }
-                return userroles.OrderBy(u => u.User.DisplayName);
             }
             else
             {
@@ -73,7 +82,7 @@ namespace Oqtane.Controllers
         public UserRole Get(int id)
         {
             var userrole = _userRoles.GetUserRole(id);
-            if (userrole != null && SiteValid(userrole.Role.SiteId))
+            if (userrole != null && SiteValid(userrole.Role.SiteId) && IsAuthorized(userrole.UserId, userrole.Role.Name))
             {
                 return Filter(userrole, _userPermissions.GetUser().UserId);
             }
@@ -92,33 +101,57 @@ namespace Oqtane.Controllers
             }
         }
 
+        private bool IsAuthorized(int userId, string roleName)
+        {
+            bool authorized = true;
+            if (userId != -1)
+            {
+                authorized = _userPermissions.GetUser(User).UserId == userId;
+            }
+            if (authorized && !string.IsNullOrEmpty(roleName))
+            {
+                authorized = User.IsInRole(roleName);
+            }
+            return authorized;
+        }
+
         private UserRole Filter(UserRole userrole, int userid)
         {
+            // clone object to avoid mutating cache 
+            UserRole filtered = null;
+
             if (userrole != null)
             {
-                userrole.User.Password = "";
-                userrole.User.IsAuthenticated = false;
-                userrole.User.TwoFactorCode = "";
-                userrole.User.TwoFactorExpiry = null;
+                filtered = new UserRole();
 
-                if (!_userPermissions.IsAuthorized(User, userrole.User.SiteId, EntityNames.User, -1, PermissionNames.Write, RoleNames.Admin) && userid != userrole.User.UserId)
+                // public properties
+                filtered.UserRoleId = userrole.UserRoleId;
+                filtered.UserId = userrole.UserId;
+                filtered.RoleId = userrole.RoleId;
+
+                filtered.User = new User();
+                filtered.User.SiteId = userrole.User.SiteId;
+                filtered.User.UserId = userrole.User.UserId;
+                filtered.User.Username = userrole.User.Username;
+                filtered.User.DisplayName = userrole.User.DisplayName;
+
+                filtered.Role = new Role();
+                filtered.Role.SiteId = userrole.Role.SiteId;
+                filtered.Role.RoleId = userrole.Role.RoleId;
+                filtered.Role.Name = userrole.Role.Name;
+
+                // include private properties if administrator
+                if (_userPermissions.IsAuthorized(User, filtered.User.SiteId, EntityNames.UserRole, -1, PermissionNames.Write, RoleNames.Admin))
                 {
-                    userrole.User.Email = "";
-                    userrole.User.PhotoFileId = null;
-                    userrole.User.LastLoginOn = DateTime.MinValue;
-                    userrole.User.LastIPAddress = "";
-                    userrole.User.Roles = "";
-                    userrole.User.CreatedBy = "";
-                    userrole.User.CreatedOn = DateTime.MinValue;
-                    userrole.User.ModifiedBy = "";
-                    userrole.User.ModifiedOn = DateTime.MinValue;
-                    userrole.User.DeletedBy = "";
-                    userrole.User.DeletedOn = DateTime.MinValue;
-                    userrole.User.IsDeleted = false;
-                    userrole.User.TwoFactorRequired = false;
+                    filtered.User.Email = userrole.User.Email;
+                    filtered.User.PhotoFileId = userrole.User.PhotoFileId;
+                    filtered.User.LastLoginOn = userrole.User.LastLoginOn;
+                    filtered.User.LastIPAddress = userrole.User.LastIPAddress;
+                    filtered.User.CreatedOn = userrole.User.CreatedOn;
                 }
             }
-            return userrole;
+
+            return filtered;
         }
 
         // POST api/<controller>

Oqtane.Server/Extensions/DbContextOptionsBuilderExtensions.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Oqtane.Databases.Interfaces;
 // ReSharper disable ConvertToUsingDeclaration
 
@@ -9,7 +10,8 @@ namespace Oqtane.Extensions
     {
         public static DbContextOptionsBuilder UseOqtaneDatabase([NotNull] this DbContextOptionsBuilder optionsBuilder, IDatabase database, string connectionString)
         {
-            database.UseDatabase(optionsBuilder, connectionString);
+            database.UseDatabase(optionsBuilder, connectionString)
+                .ConfigureWarnings(warnings => warnings.Log(RelationalEventId.PendingModelChangesWarning));
 
             return optionsBuilder;
         }

Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -113,8 +113,11 @@ namespace Microsoft.Extensions.DependencyInjection
 
         internal static IServiceCollection AddOqtaneTransientServices(this IServiceCollection services)
         {
-            // repositories
+            // services
             services.AddTransient<ISiteService, ServerSiteService>();
+            services.AddTransient<ILocalizationCookieService, ServerLocalizationCookieService>();
+
+            // repositories
             services.AddTransient<IModuleDefinitionRepository, ModuleDefinitionRepository>();
             services.AddTransient<IThemeRepository, ThemeRepository>();
             services.AddTransient<IAliasRepository, AliasRepository>();
@@ -130,7 +133,6 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddTransient<IPermissionRepository, PermissionRepository>();
             services.AddTransient<ISettingRepository, SettingRepository>();
             services.AddTransient<ILogRepository, LogRepository>();
-            services.AddTransient<ILocalizationManager, LocalizationManager>();
             services.AddTransient<IJobRepository, JobRepository>();
             services.AddTransient<IJobLogRepository, JobLogRepository>();
             services.AddTransient<INotificationRepository, NotificationRepository>();
@@ -153,12 +155,12 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddTransient<ILogManager, LogManager>();
             services.AddTransient<IUpgradeManager, UpgradeManager>();
             services.AddTransient<IUserManager, UserManager>();
-
-            // obsolete - replaced by ITenantManager
-            services.AddTransient<ITenantResolver, TenantResolver>();
-
+            services.AddTransient<ILocalizationManager, LocalizationManager>();
             services.AddTransient<ITokenReplace, TokenReplace>();
 
+            // obsolete
+            services.AddTransient<ITenantResolver, TenantResolver>(); // replaced by ITenantManager
+
             return services;
         }
 

Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs

@@ -645,6 +645,9 @@ namespace Oqtane.Extensions
                         }
                     }
 
+                    var _syncManager = httpContext.RequestServices.GetRequiredService<ISyncManager>();
+                    _syncManager.AddSyncEvent(alias, EntityNames.User, user.UserId, "Login");
+
                     _logger.Log(LogLevel.Information, "ExternalLogin", Enums.LogFunction.Security, "External User Login Successful For {Username} From IP Address {IPAddress} Using Provider {Provider}", user.Username, httpContext.Connection.RemoteIpAddress.ToString(), providerName);
                 }
             }

Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs

@@ -59,8 +59,15 @@ namespace Oqtane.Infrastructure
                 var currentTime = DateTime.UtcNow;
                 var lastIndexedOn = Convert.ToDateTime(siteSettings.GetValue(SearchLastIndexedOnSetting, DateTime.MinValue.ToString()));
 
+                if (lastIndexedOn == DateTime.MinValue)
+                {
+                    // reset index
+                    log += $"*Site Index Reset*<br />";
+                    await searchService.DeleteSearchContentsAsync(site.SiteId);
+                }
+
                 var ignorePages = siteSettings.GetValue(SearchIgnorePagesSetting, "").Split(',');
-                var ignoreEntities = siteSettings.GetValue(SearchIgnoreEntitiesSetting, "").Split(',');
+                var ignoreEntities = siteSettings.GetValue(SearchIgnoreEntitiesSetting, "File").Split(',');
 
                 var pages = pageRepository.GetPages(site.SiteId);
                 var pageModules = pageModuleRepository.GetPageModules(site.SiteId);

Oqtane.Server/Infrastructure/Middleware/JwtMiddleware.cs

@@ -59,7 +59,7 @@ namespace Oqtane.Infrastructure
                             if (userid != null && username != null)
                             {
                                 var _users = context.RequestServices.GetService(typeof(IUserManager)) as IUserManager;
-                                var user = _users.GetUser(userid, alias.SiteId); // cached
+                                var user = _users.GetUser(int.Parse(userid), alias.SiteId); // cached
                                 if (user != null && !user.IsDeleted)
                                 {
                                     var claimsidentity = UserSecurity.CreateClaimsIdentity(alias, user);

Oqtane.Server/Infrastructure/UpgradeManager.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Oqtane.Models;
 using Oqtane.Repository;
 using Oqtane.Shared;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -17,12 +17,14 @@ namespace Oqtane.Infrastructure
         private readonly IServiceScopeFactory _serviceScopeFactory;
         private readonly IWebHostEnvironment _environment;
         private readonly IConfigManager _configManager;
+        private readonly ILogger<UpgradeManager> _filelogger;
 
-        public UpgradeManager(IServiceScopeFactory serviceScopeFactory, IWebHostEnvironment environment, IConfigManager configManager)
+        public UpgradeManager(IServiceScopeFactory serviceScopeFactory, IWebHostEnvironment environment, IConfigManager configManager, ILogger<UpgradeManager> filelogger)
         {
             _serviceScopeFactory = serviceScopeFactory;
             _environment = environment;
             _configManager = configManager;
+            _filelogger = filelogger;
         }
 
         public void Upgrade(Tenant tenant, string version)
@@ -69,6 +71,9 @@ namespace Oqtane.Infrastructure
                     case "5.2.1":
                         Upgrade_5_2_1(tenant, scope);
                         break;
+                    case "6.0.1":
+                        Upgrade_6_0_1(tenant, scope);
+                        break;
                 }
             }
         }
@@ -88,7 +93,7 @@ namespace Oqtane.Infrastructure
                     catch (Exception ex)
                     {
                         // error deleting directory
-                        Debug.WriteLine($"Oqtane Error: Error In 2.0.2 Upgrade Logic - {ex}");
+                        _filelogger.LogError(Utilities.LogMessage(this, $"Oqtane Error: Error In 2.0.2 Upgrade Logic - {ex}"));
                     }
                 }
             }
@@ -106,7 +111,7 @@ namespace Oqtane.Infrastructure
             catch (Exception ex)
             {
                 // error populating guid
-                Debug.WriteLine($"Oqtane Error: Error In 2.0.2 Upgrade Logic - {ex}");
+                _filelogger.LogError(Utilities.LogMessage(this, $"Oqtane Error: Error In 2.0.2 Upgrade Logic - {ex}"));
             }
         }
 
@@ -274,7 +279,7 @@ namespace Oqtane.Infrastructure
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"Oqtane Error: Error In 3.2.0 Upgrade Logic - {ex}");
+                _filelogger.LogError(Utilities.LogMessage(this, $"Oqtane Error: Error In 3.2.0 Upgrade Logic - {ex}"));
             }
         }
 
@@ -310,7 +315,7 @@ namespace Oqtane.Infrastructure
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"Oqtane Error: Error In 3.2.1 Upgrade Logic - {ex}");
+                _filelogger.LogError(Utilities.LogMessage(this, $"Oqtane Error: Error In 3.2.1 Upgrade Logic - {ex}"));
             }
         }
 
@@ -354,7 +359,7 @@ namespace Oqtane.Infrastructure
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"Oqtane Error: Error In 3.3.0 Upgrade Logic - {ex}");
+                _filelogger.LogError(Utilities.LogMessage(this, $"Oqtane Error: Error In 3.3.0 Upgrade Logic - {ex}"));
             }
         }
 
@@ -371,7 +376,7 @@ namespace Oqtane.Infrastructure
                 try
                 {
                     // delete legacy Views assemblies which will cause startup errors due to missing HostModel
-                    // note that the following files will be deleted however the framework has already started up so a restart will be required
+                    // note that the following files will be deleted however the framework has already started up so another restart will be required
                     var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
                     var filepath = Path.Combine(binFolder, "Oqtane.Server.Views.dll");
                     if (System.IO.File.Exists(filepath)) System.IO.File.Delete(filepath);
@@ -381,7 +386,7 @@ namespace Oqtane.Infrastructure
                 catch (Exception ex)
                 {
                     // error deleting file
-                    Debug.WriteLine($"Oqtane Error: Error In 5.1.0 Upgrade Logic - {ex}");
+                    _filelogger.LogError(Utilities.LogMessage(this, $"Oqtane Error: Error In 5.1.0 Upgrade Logic - {ex}"));
                 }
             }
         }
@@ -441,6 +446,54 @@ namespace Oqtane.Infrastructure
             AddPagesToSites(scope, tenant, pageTemplates);
         }
 
+        private void Upgrade_6_0_1(Tenant tenant, IServiceScope scope)
+        {
+            // assemblies which have been relocated to the bin/refs folder in .NET 9
+            string[] assemblies = {
+                "Microsoft.AspNetCore.Authorization.dll",
+                "Microsoft.AspNetCore.Components.Authorization.dll",
+                "Microsoft.AspNetCore.Components.dll",
+                "Microsoft.AspNetCore.Components.Forms.dll",
+                "Microsoft.AspNetCore.Components.Web.dll",
+                "Microsoft.AspNetCore.Cryptography.Internal.dll",
+                "Microsoft.AspNetCore.Cryptography.KeyDerivation.dll",
+                "Microsoft.AspNetCore.Metadata.dll",
+                "Microsoft.Extensions.Caching.Memory.dll",
+                "Microsoft.Extensions.Configuration.Binder.dll",
+                "Microsoft.Extensions.Configuration.FileExtensions.dll",
+                "Microsoft.Extensions.Configuration.Json.dll",
+                "Microsoft.Extensions.DependencyInjection.Abstractions.dll",
+                "Microsoft.Extensions.DependencyInjection.dll",
+                "Microsoft.Extensions.Diagnostics.Abstractions.dll",
+                "Microsoft.Extensions.Diagnostics.dll",
+                "Microsoft.Extensions.Http.dll",
+                "Microsoft.Extensions.Identity.Core.dll",
+                "Microsoft.Extensions.Identity.Stores.dll",
+                "Microsoft.Extensions.Localization.Abstractions.dll",
+                "Microsoft.Extensions.Localization.dll",
+                "Microsoft.Extensions.Logging.Abstractions.dll",
+                "Microsoft.Extensions.Logging.dll",
+                "Microsoft.Extensions.Options.dll",
+                "Microsoft.JSInterop.dll",
+                "System.Text.Json.dll"
+            };
+
+            foreach (var assembly in assemblies)
+            {
+                try
+                {
+                    var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+                    var filepath = Path.Combine(binFolder, assembly);
+                    if (System.IO.File.Exists(filepath)) System.IO.File.Delete(filepath);
+                }
+                catch (Exception ex)
+                {
+                    // error deleting asesmbly
+                    _filelogger.LogError(Utilities.LogMessage(this, $"Oqtane Error: 6.0.1 Upgrade Error Removing {assembly} - {ex}"));
+                }
+            }
+        }
+
         private void AddPagesToSites(IServiceScope scope, Tenant tenant, List<PageTemplate> pageTemplates)
         {
             var tenants = scope.ServiceProvider.GetRequiredService<ITenantManager>();

Oqtane.Server/Managers/Interfaces/IUserManager.cs

@@ -19,6 +19,7 @@ namespace Oqtane.Managers
         Task<User> ResetPassword(User user, string token);
         User VerifyTwoFactor(User user, string token);
         Task<User> LinkExternalAccount(User user, string token, string type, string key, string name);
+        Task<UserValidateResult> ValidateUser(string username, string email, string password);
         Task<bool> ValidatePassword(string password);
         Task<Dictionary<string, string>> ImportUsers(int siteId, string filePath, bool notify);
     }

Oqtane.Server/Managers/UserManager.cs

@@ -339,20 +339,20 @@ namespace Oqtane.Managers
                     user = _users.GetUser(user.Username);
                     if (!user.IsDeleted)
                     {
-                        if (user.TwoFactorRequired)
+                        var alias = _tenantManager.GetAlias();
+                        var twoFactorSetting = _settings.GetSetting(EntityNames.Site, alias.SiteId, "LoginOptions:TwoFactor")?.SettingValue ?? "false";
+                        var twoFactorRequired = twoFactorSetting == "required" || user.TwoFactorRequired;
+                        if (twoFactorRequired)
                         {
                             var token = await _identityUserManager.GenerateTwoFactorTokenAsync(identityuser, "Email");
                             user.TwoFactorCode = token;
                             user.TwoFactorExpiry = DateTime.UtcNow.AddMinutes(10);
                             _users.UpdateUser(user);
-                            var alias = _tenantManager.GetAlias();
-                            string url = alias.Protocol + alias.Name;
                             string siteName = _sites.GetSite(alias.SiteId).Name;
                             string subject = _localizer["TwoFactorEmailSubject"];
                             subject = subject.Replace("[SiteName]", siteName);
                             string body = _localizer["TwoFactorEmailBody"].Value;
                             body = body.Replace("[UserDisplayName]", user.DisplayName);
-                            body = body.Replace("[URL]", url);
                             body = body.Replace("[SiteName]", siteName);
                             body = body.Replace("[Token]", token);
                             var notification = new Notification(alias.SiteId, user, subject, body);
@@ -374,6 +374,8 @@ namespace Oqtane.Managers
                                     _users.UpdateUser(user);
                                     _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful For {Username} From IP Address {IPAddress}", user.Username, LastIPAddress);
 
+                                    _syncManager.AddSyncEvent(alias, EntityNames.User, user.UserId, "Login");
+
                                     if (setCookie)
                                     {
                                         await _identitySignInManager.SignInAsync(identityuser, isPersistent);
@@ -540,6 +542,30 @@ namespace Oqtane.Managers
             return user;
         }
 
+        public async Task<UserValidateResult> ValidateUser(string username, string email, string password)
+        {
+            var validateResult = new UserValidateResult { Succeeded = true };
+
+            //validate username
+            var allowedChars = _identityUserManager.Options.User.AllowedUserNameCharacters;
+            if (string.IsNullOrWhiteSpace(username) || (!string.IsNullOrEmpty(allowedChars) && username.Any(c => !allowedChars.Contains(c))))
+            {
+                validateResult.Succeeded = false;
+                validateResult.Errors.Add("Message.Username.Invalid", string.Empty);
+            }
+
+            //validate password
+            var passwordValidator = new PasswordValidator<IdentityUser>();
+            var passwordResult = await passwordValidator.ValidateAsync(_identityUserManager, null, password);
+            if (!passwordResult.Succeeded)
+            {
+                validateResult.Succeeded = false;
+                validateResult.Errors.Add("Message.Password.Invalid", string.Empty);
+            }
+
+            return validateResult;
+        }
+
         public async Task<bool> ValidatePassword(string password)
         {
             var validator = new PasswordValidator<IdentityUser>();

Oqtane.Server/Migrations/Framework/ForeignKey.cs

@@ -44,7 +44,7 @@ namespace Oqtane.Migrations
 
         public string PrincipalColumn { get; }
 
-        public string PrincipalSchema { get; }
+        public string PrincipalSchema { get; } = "";
 
 
     }

Oqtane.Server/Migrations/Tenant/06000101_AddLanguageName.cs

@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+
+namespace Oqtane.Migrations.Tenant
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.06.00.01.01")]
+    public class AddLanguageName : MultiDatabaseMigration
+    {
+        public AddLanguageName(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Name column was removed in 5.2.4 however SQLite does not support column removal so it had to be restored
+            if (ActiveDatabase.Name != "Sqlite")
+            {
+                var languageEntityBuilder = new LanguageEntityBuilder(migrationBuilder, ActiveDatabase);
+                languageEntityBuilder.AddStringColumn("Name", 100, true);
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // not implemented
+        }
+    }
+}

Oqtane.Server/Modules/Admin/Files/Manager/FileManager.cs

@@ -45,10 +45,25 @@ namespace Oqtane.Modules.Admin.Files.Manager
                         var path = folder.Path + file.Name;
 
                         var body = "";
-                        if (DocumentExtensions.Contains(Path.GetExtension(file.Name)))
+                        if (System.IO.File.Exists(_fileRepository.GetFilePath(file)))
                         {
-                            // get the contents of the file
-                            body = System.IO.File.ReadAllText(_fileRepository.GetFilePath(file));
+                            // only non-binary files can be indexed
+                            if (DocumentExtensions.Contains(Path.GetExtension(file.Name)))
+                            {
+                                // get the contents of the file
+                                try
+                                {
+                                    body = System.IO.File.ReadAllText(_fileRepository.GetFilePath(file));
+                                }
+                                catch
+                                {
+                                    // could not read the file
+                                }
+                            }
+                        }
+                        else
+                        {
+                            removed = true; // file does not exist on disk
                         }
 
                         var searchContent = new SearchContent

Oqtane.Server/Oqtane.Server.csproj

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>5.2.4</Version>
+    <Version>6.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,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/v5.2.4</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -19,6 +19,7 @@
     <DefineConstants>$(DefineConstants);OQTANE;OQTANE3</DefineConstants>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <SatelliteResourceLanguages>none</SatelliteResourceLanguages>
+    <CompressionEnabled>false</CompressionEnabled>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="wwwroot\Modules\Templates\**" />
@@ -33,21 +34,21 @@
     <EmbeddedResource Include="Scripts\MigrateTenant.sql" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.67" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.10" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.0-preview2.24304.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.10" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.10" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.71" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Oqtane.Client\Oqtane.Client.csproj" />

Oqtane.Server/Pages/Logout.cshtml.cs

@@ -35,6 +35,7 @@ namespace Oqtane.Pages
                     {
                         await _userManager.LogoutUserEverywhere(user);
                     }
+                    _syncManager.AddSyncEvent(alias, EntityNames.User, user.UserId, "Logout");
                     _syncManager.AddSyncEvent(alias, EntityNames.User, user.UserId, SyncEventActions.Reload);
                 }
 

Oqtane.Server/Providers/DatabaseSearchProvider.cs

@@ -235,9 +235,9 @@ namespace Oqtane.Providers
             return text;
         }
 
-        public Task ResetIndex()
+        public Task DeleteSearchContent(int siteId)
         {
-            _searchContentRepository.DeleteAllSearchContent();
+            _searchContentRepository.DeleteAllSearchContent(siteId);
             return Task.CompletedTask;
         }
     }

Oqtane.Server/Repository/Interfaces/ISearchContentRepository.cs

@@ -12,7 +12,7 @@ namespace Oqtane.Repository
         void DeleteSearchContent(int searchContentId);
         void DeleteSearchContent(string entityName, string entryId);
         void DeleteSearchContent(string uniqueKey);
-        void DeleteAllSearchContent();
+        void DeleteAllSearchContent(int siteId);
 
         SearchWord GetSearchWord(string word);
         SearchWord AddSearchWord(SearchWord searchWord);

Oqtane.Server/Repository/LanguageRepository.cs

@@ -31,7 +31,7 @@ namespace Oqtane.Repository
                     .ToList()
                     .ForEach(l => l.IsDefault = false);
             }
-
+            language.Name = ""; // stored in database but not used (SQLite limitation)
             db.Language.Add(language);
             db.SaveChanges();
 
@@ -55,6 +55,7 @@ namespace Oqtane.Repository
                     .ForEach(l => l.IsDefault = false);
             }
 
+            language.Name = ""; // stored in database but not used (SQLite limitation)
             db.SaveChanges();
         }
 

Oqtane.Server/Repository/PageRepository.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
@@ -31,7 +32,47 @@ namespace Oqtane.Repository
             {
                 page.PermissionList = permissions.Where(item => item.EntityId == page.PageId).ToList();
             }
-            return pages;
+            return GetPagesHierarchy(pages);
+        }
+
+        private static List<Page> GetPagesHierarchy(List<Page> pages)
+        {
+            List<Page> hierarchy = new List<Page>();
+            Action<List<Page>, Page> getPath = null;
+            getPath = (pageList, page) =>
+            {
+                IEnumerable<Page> children;
+                int level;
+                if (page == null)
+                {
+                    level = -1;
+                    children = pages.Where(item => item.ParentId == null);
+                }
+                else
+                {
+                    level = page.Level;
+                    children = pages.Where(item => item.ParentId == page.PageId);
+                }
+                foreach (Page child in children)
+                {
+                    child.Level = level + 1;
+                    child.HasChildren = pages.Any(item => item.ParentId == child.PageId && !item.IsDeleted && item.IsNavigation);
+                    hierarchy.Add(child);
+                    getPath(pageList, child);
+                }
+            };
+            pages = pages.OrderBy(item => item.Order).ToList();
+            getPath(pages, null);
+
+            // add any non-hierarchical items to the end of the list
+            foreach (Page page in pages)
+            {
+                if (hierarchy.Find(item => item.PageId == page.PageId) == null)
+                {
+                    hierarchy.Add(page);
+                }
+            }
+            return hierarchy;
         }
 
         public Page AddPage(Page page)

Oqtane.Server/Repository/SearchContentRepository.cs

@@ -152,11 +152,17 @@ namespace Oqtane.Repository
             }
         }
 
-        public void DeleteAllSearchContent()
+        public void DeleteAllSearchContent(int siteId)
         {
             using var db = _dbContextFactory.CreateDbContext();
-            db.SearchContent.RemoveRange(db.SearchContent);
-            db.SaveChanges();
+            // delete in batches of 100 records
+            var searchContents = db.SearchContent.Where(item => item.SiteId == siteId).Take(100).ToList();
+            while (searchContents.Count > 0)
+            {
+                db.SearchContent.RemoveRange(searchContents);
+                db.SaveChanges();
+                searchContents = db.SearchContent.Where(item => item.SiteId == siteId).Take(100).ToList();
+            }
         }
 
         public SearchWord GetSearchWord(string word)

Oqtane.Server/Resources/Managers/UserManager.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ForgotPasswordEmailBody" xml:space="preserve">
-    <value>Dear [UserDisplayName]&lt;br&gt;&lt;br&gt;You recently requested to reset your password. Please use the link below to complete the process: &lt;b&gt;&lt;a href="[URL]"&gt;&lt;br&gt;&lt;br&gt;Click here to Reset Password&lt;/a&gt;&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please note that the link is only valid for 24 hours so if you are unable to take action within that time period, you should initiate another password reset on the site.&lt;br&gt;&lt;br&gt;If you did not request to reset your password you can safely ignore this message.&lt;br&gt;&lt;br&gt;Thank You!&lt;br&gt;[SiteName] team</value>
+    <value>Dear [UserDisplayName]&lt;br&gt;&lt;br&gt;You recently requested to reset your password. Please use the link below to complete the process: &lt;b&gt;&lt;a href="[URL]"&gt;&lt;br&gt;&lt;br&gt;Click here to Reset Password&lt;/a&gt;&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please note that the link is only valid for 24 hours so if you are unable to take action within that time period, you should initiate another password reset on the site.&lt;br&gt;&lt;br&gt;If you did not request to reset your password you can safely ignore this message.&lt;br&gt;&lt;br&gt;Thank You!&lt;br&gt;[SiteName] Team</value>
   </data>
   <data name="ForgotPasswordEmailSubject" xml:space="preserve">
     <value>Password Reset Notification Sent For [SiteName]</value>
@@ -130,7 +130,7 @@
     <value>User Account Notification for [SiteName]</value>
   </data>
   <data name="TwoFactorEmailBody" xml:space="preserve">
-    <value>Dear [UserDisplayName] + ",&lt;br&gt;&lt;br&gt;You requested a secure verification code to log in to your account. Please enter the secure verification code on the site:&lt;br&gt;&lt;br&gt;&lt;b&gt;[Token] &lt;/b&gt;&lt;br&gt;&lt;br&gt;Please note that the code is only valid for 10 minutes so if you are unable to take action within that time period, you should initiate a new login on the [Alias].&lt;br&gt;&lt;br&gt;Thank You!&lt;br&gt;[SiteName] Team"</value>
+    <value>Dear [UserDisplayName],&lt;br&gt;&lt;br&gt;You requested a secure verification code to log in to your account. Please enter the secure verification code on the site:&lt;br&gt;&lt;br&gt;&lt;b&gt;[Token] &lt;/b&gt;&lt;br&gt;&lt;br&gt;Please note that the code is only valid for 10 minutes so if you are unable to take action within that time period, you should initiate a new login on the site.&lt;br&gt;&lt;br&gt;Thank You!&lt;br&gt;[SiteName] Team</value>
   </data>
   <data name="TwoFactorEmailSubject" xml:space="preserve">
     <value>User Verification Code for [SiteName]</value>

Oqtane.Server/Services/LocalizationCookieService.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Localization;
+using Oqtane.Documentation;
+
+namespace Oqtane.Services
+{
+    [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
+    public class ServerLocalizationCookieService : ILocalizationCookieService
+    {
+        private readonly IHttpContextAccessor _accessor;
+
+        public ServerLocalizationCookieService(IHttpContextAccessor accessor)
+        {
+            _accessor = accessor;
+        }
+
+        public Task SetLocalizationCookieAsync(string culture)
+        {
+            var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
+
+            _accessor.HttpContext.Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, new CookieOptions
+            {
+                Path = "/",
+                Expires = DateTimeOffset.UtcNow.AddYears(365),
+                SameSite = SameSiteMode.Lax,
+                Secure = true, // Ensure the cookie is only sent over HTTPS
+                HttpOnly = false // cookie is updated using JS Interop in Interactive render mode
+            });
+
+            return Task.CompletedTask;
+        }
+    }
+}

Oqtane.Server/Services/SearchService.cs

@@ -149,6 +149,12 @@ namespace Oqtane.Services
             return result;
         }
 
+        public async Task DeleteSearchContentsAsync(int siteId)
+        {
+            var searchProvider = GetSearchProvider(siteId);
+            await searchProvider.DeleteSearchContent(siteId);
+        }
+
         private ISearchProvider GetSearchProvider(int siteId)
         {
             var providerName = GetSearchProviderSetting(siteId);

Oqtane.Server/Services/SiteService.cs

@@ -127,7 +127,6 @@ namespace Oqtane.Services
                         .ToDictionary(setting => setting.SettingName, setting => (setting.IsPrivate ? _private : "") + setting.SettingValue);
                     site.Pages.Add(page);
                 }
-                site.Pages = GetPagesHierarchy(site.Pages);
 
                 // framework modules
                 var modules = GetPageModules(site.SiteId);

Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs

@@ -9,7 +9,7 @@ namespace [Owner].Module.[Module].Services
 {
     public class [Module]Service : ServiceBase, I[Module]Service
     {
-        public [Module]Service(IHttpClientFactory http, SiteState siteState) : base(http, siteState) { }
+        public [Module]Service(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
         private string Apiurl => CreateApiUrl("[Module]");
 

Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Version>1.0.0</Version>
     <Authors>[Owner]</Authors>
     <Company>[Owner]</Company>
@@ -13,12 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.10" />
-    <PackageReference Include="System.Net.Http.Json" Version="8.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].Module.[Module].Package.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
   </PropertyGroup>
@@ -20,10 +20,10 @@
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Condition="'$(OS)' == 'Windows_NT' And '$(Configuration)' == 'Debug'" Command="debug.cmd" />
-    <Exec Condition="'$(OS)' != 'Windows_NT' And '$(Configuration)' == 'Debug'" Command="bash $(ProjectDir)debug.sh" />
-    <Exec Condition="'$(OS)' == 'Windows_NT' And '$(Configuration)' == 'Release'" Command="release.cmd" />
-    <Exec Condition="'$(OS)' != 'Windows_NT' And '$(Configuration)' == 'Release'" Command="bash $(ProjectDir)release.sh" />
+    <Exec Condition="'$(OS)' == 'Windows_NT' And '$(Configuration)' == 'Debug'" Command="debug.cmd $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Package',''))"  />
+    <Exec Condition="'$(OS)' != 'Windows_NT' And '$(Configuration)' == 'Debug'" Command="bash $(ProjectDir)debug.sh $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Package',''))" />
+    <Exec Condition="'$(OS)' == 'Windows_NT' And '$(Configuration)' == 'Release'" Command="release.cmd $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Package',''))" />
+    <Exec Condition="'$(OS)' != 'Windows_NT' And '$(Configuration)' == 'Release'" Command="bash $(ProjectDir)release.sh $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Package',''))" />
   </Target>
 
-</Project>
+</Project>

Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].Module.[Module].nuspec

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>[Owner].Module.[Module]</id>
-    <version>1.0.0</version>
-    <authors>[Owner]</authors>
-    <owners>[Owner]</owners>
-    <title>[Module]</title>
-    <description>[Description]</description>
-    <copyright>[Owner]</copyright>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="expression">MIT</license>
-    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <icon>icon.png</icon>
-    <tags>oqtane module</tags>
-    <releaseNotes></releaseNotes>
-    <summary></summary>
-    <dependencies>
-      <dependency id="Oqtane.Framework" version="[FrameworkVersion]" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="..\Client\bin\Release\net8.0\[Owner].Module.[Module].Client.Oqtane.dll" target="lib\net8.0" /> 
-    <file src="..\Client\bin\Release\net8.0\[Owner].Module.[Module].Client.Oqtane.pdb" target="lib\net8.0" /> 
-    <file src="..\Server\bin\Release\net8.0\[Owner].Module.[Module].Server.Oqtane.dll" target="lib\net8.0" /> 
-    <file src="..\Server\bin\Release\net8.0\[Owner].Module.[Module].Server.Oqtane.pdb" target="lib\net8.0" /> 
-    <file src="..\Shared\bin\Release\net8.0\[Owner].Module.[Module].Shared.Oqtane.dll" target="lib\net8.0" /> 
-    <file src="..\Shared\bin\Release\net8.0\[Owner].Module.[Module].Shared.Oqtane.pdb" target="lib\net8.0" /> 
-    <file src="..\Server\wwwroot\**\*.*" target="wwwroot" /> 
-    <file src="icon.png" target="" />
-  </files>
-</package>
+    <metadata>
+        <id>$projectname$</id>
+        <version>1.0.0</version>
+        <authors>[Owner]</authors>
+        <owners>[Owner]</owners>
+        <title>[Module]</title>
+        <description>[Description]</description>
+        <copyright>[Owner]</copyright>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <license type="expression">MIT</license>
+        <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
+        <icon>icon.png</icon>
+        <tags>oqtane module</tags>
+        <releaseNotes></releaseNotes>
+        <summary></summary>
+        <dependencies>
+            <dependency id="Oqtane.Framework" version="[FrameworkVersion]" />
+        </dependencies>
+    </metadata>
+    <files>
+        <file src="..\Client\bin\Release\$targetframework$\$ProjectName$.Client.Oqtane.dll" target="lib\$targetframework$" />
+        <file src="..\Client\bin\Release\$targetframework$\$ProjectName$.Client.Oqtane.pdb" target="lib\$targetframework$" />
+        <file src="..\Server\bin\Release\$targetframework$\$ProjectName$.Server.Oqtane.dll" target="lib\$targetframework$" />
+        <file src="..\Server\bin\Release\$targetframework$\$ProjectName$.Server.Oqtane.pdb" target="lib\$targetframework$" />
+        <file src="..\Shared\bin\Release\$targetframework$\$ProjectName$.Shared.Oqtane.dll" target="lib\$targetframework$" />
+        <file src="..\Shared\bin\Release\$targetframework$\$ProjectName$.Shared.Oqtane.pdb" target="lib\$targetframework$" />
+        <file src="..\Server\wwwroot\**\*.*" target="wwwroot" />
+        <file src="icon.png" target="" />
+    </files>
+</package>

Oqtane.Server/wwwroot/Modules/Templates/External/Package/debug.cmd

@@ -1,7 +1,11 @@
-XCOPY "..\Client\bin\Debug\net8.0\[Owner].Module.[Module].Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net8.0\" /Y
-XCOPY "..\Client\bin\Debug\net8.0\[Owner].Module.[Module].Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net8.0\" /Y
-XCOPY "..\Server\bin\Debug\net8.0\[Owner].Module.[Module].Server.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net8.0\" /Y
-XCOPY "..\Server\bin\Debug\net8.0\[Owner].Module.[Module].Server.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net8.0\" /Y
-XCOPY "..\Shared\bin\Debug\net8.0\[Owner].Module.[Module].Shared.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net8.0\" /Y
-XCOPY "..\Shared\bin\Debug\net8.0\[Owner].Module.[Module].Shared.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net8.0\" /Y
-XCOPY "..\Server\wwwroot\*" "..\..\[RootFolder]\Oqtane.Server\wwwroot\" /Y /S /I
+@echo off
+set TargetFramework=%1
+set ProjectName=%2
+
+XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Server\bin\Debug\%TargetFramework%\%ProjectName%.Server.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Server\bin\Debug\%TargetFramework%\%ProjectName%.Server.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Shared\bin\Debug\%TargetFramework%\%ProjectName%.Shared.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Shared\bin\Debug\%TargetFramework%\%ProjectName%.Shared.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y
+XCOPY "..\Server\wwwroot\*" "..\..\[RootFolder]\Oqtane.Server\wwwroot\" /Y /S /I