Merge pull request #3483 from oqtane/master

Merge pull request #3482 from oqtane/dev

Oqtane.Client/App.razor

@@ -2,7 +2,6 @@
 @inject IInstallationService InstallationService
 @inject IJSRuntime JSRuntime
 @inject SiteState SiteState
-@inject IServiceProvider ServiceProvider
 
 @if (_initialized)
 {
@@ -50,29 +49,21 @@
     [Parameter]
     public string AuthorizationToken { get; set; }
 
+    [CascadingParameter]
+    HttpContext HttpContext { get; set; }
+
     private bool _initialized = false;
     private string _display = "display: none;";
     private Installation _installation = new Installation { Success = false, Message = "" };
 
     private PageState PageState { get; set; }
 
-    private IHttpContextAccessor accessor;
-
     protected override async Task OnParametersSetAsync()
     {
         SiteState.RemoteIPAddress = RemoteIPAddress;
         SiteState.AntiForgeryToken = AntiForgeryToken;
         SiteState.AuthorizationToken = AuthorizationToken;
-
-        accessor = (IHttpContextAccessor)ServiceProvider.GetService(typeof(IHttpContextAccessor));
-        if (accessor != null)
-        {
-            SiteState.IsPrerendering = !accessor.HttpContext.Response.HasStarted;
-        }
-        else
-        {
-            SiteState.IsPrerendering = true;
-        }
+        SiteState.IsPrerendering = (HttpContext != null) ? true : false;
 
         _installation = await InstallationService.IsInstalled();
         if (_installation.Alias != null)

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 7)</div>
+            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version (.NET 8)</div>
         </div>
     </div>
     <hr class="app-rule" />

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

@@ -12,11 +12,12 @@
             if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
             {
                 string url = NavigateUrl(p.Path);
-                <div class="col-md-2 mx-auto text-center mb-3">
+                <p class="col-md-2 mx-auto text-center mb-3">
                     <NavLink class="nav-link text-primary" href="@url" Match="NavLinkMatch.All">
-                        <h2><span class="@p.Icon" aria-hidden="true"></span></h2>@SharedLocalizer[p.Name]
+                        <h2><span class="@p.Icon" aria-hidden="true"></span></h2>
+                        <p class="lead">@((MarkupString)SharedLocalizer[p.Name].ToString().Replace(" ", "<br />"))</p>
                     </NavLink>
-                </div>
+                </p>
             }
         }
     </div>

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

@@ -67,6 +67,7 @@
             </div>
         </div>
     </form>
+    <br /><br />
 
     @if (!_isSystem)
     {
@@ -79,8 +80,7 @@
         @((MarkupString)"&nbsp;")
         <ActionDialog Header="Delete Folder" Message="Are You Sure You Wish To Delete This Folder?" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" ResourceKey="DeleteFolder" />
     }
-    <br />
-    <br />
+    <br /><br />
     @if (PageState.QueryString.ContainsKey("id"))
     {
         <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>

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

@@ -8,27 +8,28 @@
 
 @if (_files != null)
 {
-    <div class="container">
-        <div class="row mb-1 align-items-center">
-            <div class="col-sm-2">
-                <label class="control-label">@Localizer["Folder"] </label>
-            </div>            
-            <div class="col-sm-6">
+    <div class="row">
+        <div class="col-md mb-1">
+            <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" ResourceKey="AddFolder" />
+        </div>
+        <div class="col-md-8 mb-1">
+            <div class="input-group">
+                <span class="input-group-text">@Localizer["Folder"]:</span>
                 <select class="form-select" @onchange="(e => FolderChanged(e))">
                     @foreach (Folder folder in _folders)
                     {
                         <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
                     }
                 </select>
-            </div>            
-            <div class="col-sm-4">
                 <ActionLink Action="Edit" Text="Edit Folder" Class="btn btn-secondary" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="EditFolder" />&nbsp;
-                <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" ResourceKey="AddFolder" />&nbsp;
-                <ActionLink Action="Add" Text="Upload Files" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="UploadFiles" />
             </div>
         </div>
+        <div class="col-md mb-1 text-end">
+            <ActionLink Action="Add" Text="Upload Files" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="UploadFiles" />
+        </div>
     </div>
-    <Pager Items="@_files">
+
+    <Pager Items="@_files" SearchProperties="Name">
         <Header>
         <th style="width: 1px;">&nbsp;</th>
         <th style="width: 1px;">&nbsp;</th>

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

@@ -15,7 +15,7 @@ else
     <br />
     <br />
 
-    <Pager Items="@_jobs">
+    <Pager Items="@_jobs" SearchProperties="Name">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>

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

@@ -14,7 +14,7 @@ else
 {
     <ActionLink Action="Add" Text="Add Language" ResourceKey="AddLanguage" />
 
-    <Pager Items="@_languages">
+    <Pager Items="@_languages" SearchProperties="Name,Code">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>

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

@@ -36,10 +36,13 @@
 						</div>
 					</div>
 					<div class="form-group mt-2">
+						@if (!_alwaysremember)
+						{
 						<div class="form-check">
 							<input id="remember" type="checkbox" class="form-check-input" @bind="@_remember" />
 							<Label Class="control-label" For="remember" HelpText="Specify if you would like to be signed back in automatically the next time you visit this site" ResourceKey="Remember">Remember Me?</Label>
 						</div>
+						}
 					</div>
 					<button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
 					<button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
@@ -78,6 +81,7 @@
     private string _passwordtype = "password";
     private string _togglepassword = string.Empty;
     private bool _remember = false;
+    private bool _alwaysremember = false;
     private string _code = string.Empty;
 
     private string _returnUrl = string.Empty;
@@ -93,23 +97,16 @@
     {
         try
         {
+            _allowexternallogin = (SettingService.GetSetting(PageState.Site.Settings, "ExternalLogin:ProviderType", "") != "") ? true : false;
+            _allowsitelogin = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowSiteLogin", "true"));
+
+            _togglepassword = SharedLocalizer["ShowPassword"];
+
             if (PageState.QueryString.ContainsKey("returnurl"))
             {
                 _returnUrl = PageState.QueryString["returnurl"];
             }
 
-            _allowexternallogin = (SettingService.GetSetting(PageState.Site.Settings, "ExternalLogin:ProviderType", "") != "") ? true : false;
-            _allowsitelogin = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowSiteLogin", "true"));
-
-            if (_allowexternallogin && !_allowsitelogin)
-            {
-                // redirect to external login
-                NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + _returnUrl), true);
-                return;
-            }
-
-            _togglepassword = SharedLocalizer["ShowPassword"];
-
             if (PageState.QueryString.ContainsKey("name"))
             {
                 _username = PageState.QueryString["name"];
@@ -158,6 +155,10 @@
                     AddModuleMessage(Localizer["ExternalLoginStatus." + PageState.QueryString["status"]], MessageType.Info);
                 }
             }
+            if (PageState.Site.Settings.TryGetValue("LoginOptions:AlwaysRemember", out string alwaysRememberStr))
+            {
+                _alwaysremember = Convert.ToBoolean(alwaysRememberStr);
+            }
         }
         catch (Exception ex)
         {
@@ -192,7 +193,14 @@
                 var user = new User { SiteId = PageState.Site.SiteId, Username = _username, Password = _password, LastIPAddress = SiteState.RemoteIPAddress};
 
                 if (!twofactor)
-                {
+                { 
+                    bool alwaysRemember = false;
+                    if (PageState.Site.Settings.TryGetValue("LoginOptions:AlwaysRemember", out string alwaysRememberStr))
+                    {
+                        alwaysRemember = Convert.ToBoolean(alwaysRememberStr);
+                    }
+                    bool remember = alwaysRemember || _remember;
+                    _remember = remember;
                     user = await UserService.LoginUserAsync(user, hybrid, _remember);
                 }
                 else

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

@@ -66,6 +66,7 @@
                                 <div class="container-fluid px-0">
                                     <div class="row g-0 mb-2">
                                         <div class="col-4">
+                                            <a href="@context.ProductUrl" target="_blank">
                                             @if (context.LogoUrl != null)
                                             {
                                                 <img src="@context.LogoUrl" class="img-fluid" alt="@context.Name" />
@@ -74,6 +75,7 @@
                                             {
                                                 <img src="/package.png" class="img-fluid" alt="@context.Name" />
                                             }
+                                            </a>
                                         </div>
                                         <div class="col-8 text-end">
                                             <small>@SharedLocalizer["Search.Version"]:</small> <strong>@context.Version</strong>

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

@@ -156,7 +156,7 @@
     private bool IsValidXML(string description)
     {
         // must contain letters, digits, or spaces
-        return Regex.IsMatch(description, "^[A-Za-z0-9 ]+$");
+        return Regex.IsMatch(description, "^[A-Za-z0-9 .,!?]+$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)

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

@@ -26,6 +26,17 @@
                             <input id="title" type="text" class="form-control" @bind="@_title" required />
                         </div>
                     </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="pane" HelpText="The pane where the module will be displayed" ResourceKey="Pane">Pane: </Label>
+                        <div class="col-sm-9">
+                            <select class="form-select" @bind="@_pane">
+                                @foreach (string pane in PageState.Page.Panes)
+                                {
+                                    <option value="@pane">@pane Pane</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="container" HelpText="Select the module's container" ResourceKey="Container">Container: </Label>
                         <div class="col-sm-9">
@@ -112,6 +123,7 @@
     private List<ThemeControl> _containers = new List<ThemeControl>();
     private string _module;
     private string _title;
+    private string _pane;
     private string _containerType;
     private string _allPages = "false";
     private string _permissionNames = "";
@@ -134,80 +146,82 @@
     {
         _module = ModuleState.ModuleDefinition.Name;
         _title = ModuleState.Title;
+        _pane = ModuleState.Pane;
         _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
-		_containerType = ModuleState.ContainerType;
-		_allPages = ModuleState.AllPages.ToString();
-		_permissions = ModuleState.PermissionList;
-		_pageId = ModuleState.PageId.ToString();
-		createdby = ModuleState.CreatedBy;
-		createdon = ModuleState.CreatedOn;
-		modifiedby = ModuleState.ModifiedBy;
-		modifiedon = ModuleState.ModifiedOn;
+        _containerType = ModuleState.ContainerType;
+        _allPages = ModuleState.AllPages.ToString();
+        _permissions = ModuleState.PermissionList;
+        _pageId = ModuleState.PageId.ToString();
+        createdby = ModuleState.CreatedBy;
+        createdon = ModuleState.CreatedOn;
+        modifiedby = ModuleState.ModifiedBy;
+        modifiedon = ModuleState.ModifiedOn;
 
-		if (ModuleState.ModuleDefinition != null)
-		{
-			_permissionNames = ModuleState.ModuleDefinition?.PermissionNames;
+        if (ModuleState.ModuleDefinition != null)
+        {
+            _permissionNames = ModuleState.ModuleDefinition?.PermissionNames;
 
-			if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
-			{
-				// module settings type explicitly declared in IModule interface
-				_moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.SettingsType);
-			}
-			else
-			{
-				// legacy support - module settings type determined by convention ( ie. existence of a "Settings.razor" component in module )
-				_moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
-			}
-			if (_moduleSettingsType != null)
-			{
-				var moduleobject = Activator.CreateInstance(_moduleSettingsType) as IModuleControl;
-				if (!string.IsNullOrEmpty(moduleobject.Title))
-				{
-					_moduleSettingsTitle = moduleobject.Title;
-				}
+            if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
+            {
+                // module settings type explicitly declared in IModule interface
+                _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.SettingsType);
+            }
+            else
+            {
+                // legacy support - module settings type determined by convention ( ie. existence of a "Settings.razor" component in module )
+                _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
+            }
+            if (_moduleSettingsType != null)
+            {
+                var moduleobject = Activator.CreateInstance(_moduleSettingsType) as IModuleControl;
+                if (!string.IsNullOrEmpty(moduleobject.Title))
+                {
+                    _moduleSettingsTitle = moduleobject.Title;
+                }
 
-				ModuleSettingsComponent = builder =>
-				{
-					builder.OpenComponent(0, _moduleSettingsType);
-					builder.AddComponentReferenceCapture(1, inst => { _moduleSettings = Convert.ChangeType(inst, _moduleSettingsType); });
-					builder.CloseComponent();
-				};
-			}
-		}
-		else
-		{
-			AddModuleMessage(string.Format(Localizer["Error.Module.Load"], ModuleState.ModuleDefinitionName), MessageType.Error);
-		}
+                ModuleSettingsComponent = builder =>
+                {
+                    builder.OpenComponent(0, _moduleSettingsType);
+                    builder.AddComponentReferenceCapture(1, inst => { _moduleSettings = Convert.ChangeType(inst, _moduleSettingsType); });
+                    builder.CloseComponent();
+                };
+            }
+        }
+        else
+        {
+            AddModuleMessage(string.Format(Localizer["Error.Module.Load"], ModuleState.ModuleDefinitionName), MessageType.Error);
+        }
 
         var theme = PageState.Site.Themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
-		if (theme != null && !string.IsNullOrEmpty(theme.ContainerSettingsType))
-		{
-			_containerSettingsType = Type.GetType(theme.ContainerSettingsType);
-			if (_containerSettingsType != null)
-			{
-				ContainerSettingsComponent = builder =>
-				{
-					builder.OpenComponent(0, _containerSettingsType);
-					builder.AddComponentReferenceCapture(1, inst => { _containerSettings = Convert.ChangeType(inst, _containerSettingsType); });
-					builder.CloseComponent();
-				};
-			}
-		}
-	}
+        if (theme != null && !string.IsNullOrEmpty(theme.ContainerSettingsType))
+        {
+            _containerSettingsType = Type.GetType(theme.ContainerSettingsType);
+            if (_containerSettingsType != null)
+            {
+                ContainerSettingsComponent = builder =>
+                {
+                    builder.OpenComponent(0, _containerSettingsType);
+                    builder.AddComponentReferenceCapture(1, inst => { _containerSettings = Convert.ChangeType(inst, _containerSettingsType); });
+                    builder.CloseComponent();
+                };
+            }
+        }
+    }
 
-	private async Task SaveModule()
-	{
-		validated = true;
-		var interop = new Interop(JSRuntime);
-		if (await interop.FormValid(form))
-		{
-			if (!string.IsNullOrEmpty(_title))
-			{
-				var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
-				pagemodule.PageId = int.Parse(_pageId);
-				pagemodule.Title = _title;
-				pagemodule.ContainerType = (_containerType != "-") ? _containerType : string.Empty;
-				if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Page.DefaultContainerType)
+    private async Task SaveModule()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            if (!string.IsNullOrEmpty(_title))
+            {
+                var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
+                pagemodule.PageId = int.Parse(_pageId);
+                pagemodule.Title = _title;
+                pagemodule.Pane = _pane;
+                pagemodule.ContainerType = (_containerType != "-") ? _containerType : string.Empty;
+                if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Page.DefaultContainerType)
 				{
 					pagemodule.ContainerType = string.Empty;
 				}

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

@@ -9,7 +9,7 @@
 {
     <ActionLink Action="Add" Text="Add Page" ResourceKey="AddPage" />
 
-    <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)">
+    <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)" SearchProperties="Name">
         <Header>
         <th style="width: 1px;">&nbsp;</th>
         <th style="width: 1px;">&nbsp;</th>

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

@@ -22,7 +22,7 @@
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="description" HelpText="The help text displayed to the user for this profile item" ResourceKey="Description">Description: </Label>
             <div class="col-sm-9">
-                <textarea id="description" class="form-control" @bind="@_description" rows="5" maxlength="256" required ></textarea>
+                <textarea id="description" class="form-control" @bind="@_description" rows="3" maxlength="256" required></textarea>
             </div>
         </div>
         <div class="row mb-1 align-items-center">
@@ -34,19 +34,25 @@
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="order" HelpText="The index order of where this profile item should be displayed" ResourceKey="Order">Order: </Label>
             <div class="col-sm-9">
-                <input id="order" class="form-control" @bind="@_vieworder" maxlength="4" required />
+                <input id="order" class="form-control" @bind="@_vieworder" min="0" max="99" type="number" required />
             </div>
         </div>
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="length" HelpText="The max number of characters this profile item should accept (enter zero for unlimited)" ResourceKey="Length">Length: </Label>
             <div class="col-sm-9">
-                <input id="length" class="form-control" @bind="@_maxlength" maxlength="4" required />
+                <input id="length" class="form-control" @bind="@_maxlength" min="0" max="524288" type="number" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="rows" HelpText="The number of rows for text entry (one is the default)" ResourceKey="Rows">Rows: </Label>
+            <div class="col-sm-9">
+                <input id="rows" class="form-control" @bind="@_rows" min="1" max="10" type="number" required />
             </div>
         </div>
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="defaultVal" HelpText="The default value for this profile item" ResourceKey="DefaultValue">Default Value: </Label>
             <div class="col-sm-9">
-                <input id="defaultVal" class="form-control" @bind="@_defaultvalue" maxlength="2000"/>
+                <input id="defaultVal" class="form-control" @bind="@_defaultvalue" maxlength="2000" />
             </div>
         </div>
         <div class="row mb-1 align-items-center">
@@ -101,6 +107,7 @@
     private string _category = string.Empty;
     private string _vieworder = "0";
     private string _maxlength = "0";
+    private string _rows = "1";
     private string _defaultvalue = string.Empty;
     private string _options = string.Empty;
     private string _validation = string.Empty;
@@ -131,6 +138,7 @@
                     _category = profile.Category;
                     _vieworder = profile.ViewOrder.ToString();
                     _maxlength = profile.MaxLength.ToString();
+                    _rows = profile.Rows.ToString();
                     _defaultvalue = profile.DefaultValue;
                     _options = profile.Options;
                     _validation = profile.Validation;
@@ -175,6 +183,7 @@
                 profile.Category = _category;
                 profile.ViewOrder = int.Parse(_vieworder);
                 profile.MaxLength = int.Parse(_maxlength);
+                profile.Rows = int.Parse(_rows);
                 profile.DefaultValue = _defaultvalue;
                 profile.Options = _options;
                 profile.Validation = _validation;

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

@@ -12,7 +12,7 @@ else
 {
 	<ActionLink Action="Add" Text="Add Profile" Security="SecurityAccessLevel.Edit" ResourceKey="AddProfile" />
 
-    <Pager Items="@_profiles">
+    <Pager Items="@_profiles" SearchProperties="Title,Category">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>

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

@@ -12,7 +12,7 @@ else
 {
 	<ActionLink Action="Add" Text="Add Role" Security="SecurityAccessLevel.Edit" ResourceKey="AddRole" />
 
-    <Pager Items="@_roles">
+    <Pager Items="@_roles" SearchProperties="Name">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>

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

@@ -37,7 +37,7 @@ else
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label>
                 <div class="col-sm-9">
-                    <select id="defaultTheme" class="form-select" @onchange="(e => ThemeChanged(e))" required>
+                    <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
                         <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
                         @foreach (var theme in _themes)
                         {
@@ -58,19 +58,6 @@ else
                     </select>
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="adminContainer" HelpText="Select the admin container for the site" ResourceKey="AdminContainer">Admin Container: </Label>
-                <div class="col-sm-9">
-                    <select id="adminContainer" class="form-select" @bind="@_admincontainertype" required>
-                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                        <option value="">&lt;@Localizer["DefaultContainer.Admin"]&gt;</option>
-                        @foreach (var container in _containers)
-                        {
-                            <option value="@container.TypeName">@container.Name</option>
-                        }
-                    </select>
-                </div>
-            </div>
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="siteTemplate" HelpText="Select the site template" ResourceKey="SiteTemplate">Site Template: </Label>
                 <div class="col-sm-9">
@@ -105,7 +92,7 @@ else
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="tenant" HelpText="Select the database for the site" ResourceKey="Tenant">Database: </Label>
                 <div class="col-sm-9">
-                    <select id="tenant" class="form-select" @onchange="(e => TenantChanged(e))" required>
+                    <select id="tenant" class="form-select" value="@_tenantid" @onchange="(e => TenantChanged(e))" required>
                         <option value="-">&lt;@Localizer["Tenant.Select"]&gt;</option>
                         <option value="+">&lt;@Localizer["Tenant.Add"]&gt;</option>
                         @foreach (Tenant tenant in _tenants)
@@ -188,46 +175,59 @@ else
 }
 
 @code {
-	private List<Database> _databases;
-	private ElementReference form;
-	private bool validated = false;
-	private string _databaseName;
-	private Type _databaseConfigType;
-	private object _databaseConfig;
-	private RenderFragment DatabaseConfigComponent { get; set; }
-	private bool _showConnectionString = false;
-	private string _connectionString = string.Empty;
+    private List<Database> _databases;
+    private ElementReference form;
+    private bool validated = false;
+    private string _databaseName;
+    private Type _databaseConfigType;
+    private object _databaseConfig;
+    private RenderFragment DatabaseConfigComponent { get; set; }
+    private bool _showConnectionString = false;
+    private string _connectionString = string.Empty;
 
-	private List<Theme> _themeList;
-	private List<ThemeControl> _themes = new List<ThemeControl>();
-	private List<ThemeControl> _containers = new List<ThemeControl>();
-	private List<SiteTemplate> _siteTemplates;
-	private List<Tenant> _tenants;
-	private string _tenantid = "-";
+    private List<Theme> _themeList;
+    private List<ThemeControl> _themes = new List<ThemeControl>();
+    private List<ThemeControl> _containers = new List<ThemeControl>();
+    private List<SiteTemplate> _siteTemplates;
+    private List<Tenant> _tenants;
+    private string _tenantid = "-";
 
-	private string _tenantName = string.Empty;
+    private string _tenantName = string.Empty;
 
-	private string _hostusername = string.Empty;
-	private string _hostpassword = string.Empty;
+    private string _hostusername = string.Empty;
+    private string _hostpassword = string.Empty;
 
-	private string _name = string.Empty;
-	private string _urls = string.Empty;
-	private string _themetype = "-";
-	private string _containertype = "-";
-	private string _admincontainertype = "";
-	private string _sitetemplatetype = "-";
-	private string _runtime = "Server";
-	private string _prerender = "Prerendered";
+    private string _name = string.Empty;
+    private string _urls = string.Empty;
+    private string _themetype = "-";
+    private string _containertype = "-";
+    private string _sitetemplatetype = "-";
+    private string _runtime = "Server";
+    private string _prerender = "Prerendered";
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-	protected override async Task OnInitializedAsync()
-	{
-		_tenants = await TenantService.GetTenantsAsync();
-		_urls = PageState.Alias.Name;
-		_themeList = await ThemeService.GetThemesAsync();
-		_themes = ThemeService.GetThemeControls(_themeList);
-		_siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
+    protected override async Task OnInitializedAsync()
+    {
+        _tenants = await TenantService.GetTenantsAsync();
+        if (_tenants.Any(item => item.Name == TenantNames.Master))
+        {
+            _tenantid = _tenants.First(item => item.Name == TenantNames.Master).TenantId.ToString();
+        }
+        _urls = PageState.Alias.Name;
+        _themeList = await ThemeService.GetThemesAsync();
+        _themes = ThemeService.GetThemeControls(_themeList);
+        if (_themes.Any(item => item.TypeName == Constants.DefaultTheme))
+        {
+            _themetype = Constants.DefaultTheme;
+            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
+            _containertype = _containers.First().TypeName;
+        }
+        _siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
+        if (_siteTemplates.Any(item => item.TypeName == Constants.DefaultSiteTemplate))
+        {
+            _sitetemplatetype = Constants.DefaultSiteTemplate;
+        }
 
 		_databases = await DatabaseService.GetDatabasesAsync();
 		if (_databases.Exists(item => item.IsDefault))
@@ -295,7 +295,6 @@ else
 				_containers = new List<ThemeControl>();
                 _containertype = "-";
             }
-			_admincontainertype = "";
 			StateHasChanged();
 		}
 		catch (Exception ex)
@@ -399,7 +398,7 @@ else
                         config.Aliases = _urls;
                         config.DefaultTheme = _themetype;
                         config.DefaultContainer = _containertype;
-                        config.DefaultAdminContainer = _admincontainertype;
+                        config.DefaultAdminContainer = "";
                         config.SiteTemplate = _sitetemplatetype;
                         config.Runtime = _runtime;
                         config.RenderMode = _runtime + _prerender;

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

@@ -14,7 +14,7 @@ else
 {
     <ActionLink Action="Add" Text="Add Site" ResourceKey="AddSite" />
 
-    <Pager Items="@_sites">
+    <Pager Items="@_sites" SearchProperties="Name">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>

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

@@ -66,6 +66,7 @@
                                 <div class="container-fluid px-0">
                                     <div class="row g-0 mb-2">
                                         <div class="col-4">
+                                            <a href="@context.ProductUrl" target="_blank">
                                             @if (context.LogoUrl != null)
                                             {
                                                 <img src="@context.LogoUrl" class="img-fluid" alt="@context.Name" />
@@ -74,6 +75,7 @@
                                             {
                                                 <img src="/package.png" class="img-fluid" alt="@context.Name" />
                                             }
+                                            </a>
                                         </div>
                                         <div class="col-8 text-end">
                                             <small>@SharedLocalizer["Search.Version"]:</small> <strong>@context.Version</strong>

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

@@ -28,7 +28,7 @@ else
 				</div>
 			</div>
 			<br/>
-			<Pager Items="@_urlMappings">
+            <Pager Items="@_urlMappings" SearchProperties="Url">
 				<Header>
 					<th style="width: 1px;">&nbsp;</th>
 					<th style="width: 1px;">&nbsp;</th>

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

@@ -2,6 +2,7 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
+@inject IUserRoleService UserRoleService
 @inject INotificationService NotificationService
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
@@ -10,10 +11,10 @@
 {
 <div class="container">
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="to" HelpText="Enter the username you wish to send a message to" ResourceKey="To">To: </Label>
+        <Label Class="col-sm-3" For="to" HelpText="Enter the user you wish to send a message to" ResourceKey="To">To: </Label>
         <div class="col-sm-9">
-            <input id="to" class="form-control" @bind="@username" />
-        </div> 
+            <AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["Username.Enter"]" @ref="username" />
+        </div>
     </div>
     <div class="row mb-1 align-items-center">
         <Label Class="col-sm-3" For="subject" HelpText="Enter the subject of the message" ResourceKey="Subject">Subject: </Label>
@@ -30,11 +31,11 @@
 </div>
 <br/>
     <button type="button" class="btn btn-primary" @onclick="Send">@SharedLocalizer["Send"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
 }
 
 @code {
-    private string username = "";
+    private AutoComplete username;
     private string subject = "";
     private string body = "";
 
@@ -42,21 +43,35 @@
 
     public override string Title => "Send Notification";
 
+    private async Task<Dictionary<string, string>> GetUsers(string filter)
+    {
+        var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+        return users.Where(item => item.User.Username.Contains(filter, StringComparison.OrdinalIgnoreCase))
+            .ToDictionary(item => item.UserId.ToString(), item => item.User.Username);
+    }
+
     private async Task Send()
     {
         try
         {
-            var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
-            if (user != null)
+            if (!string.IsNullOrEmpty(username.Key) && !string.IsNullOrEmpty(subject))
             {
-                var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body);
-                notification = await NotificationService.AddNotificationAsync(notification);
-                await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
-                NavigationManager.NavigateTo(NavigateUrl());
+                var user = await UserService.GetUserAsync(int.Parse(username.Key), ModuleState.SiteId);
+                if (user != null)
+                {
+                    var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body);
+                    notification = await NotificationService.AddNotificationAsync(notification);
+                    await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
+                    NavigationManager.NavigateTo(PageState.ReturnUrl);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.User.Invalid"], MessageType.Warning);
+                }
             }
             else
             {
-                AddModuleMessage(Localizer["Message.User.Invalid"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required"], MessageType.Warning);
             }
         }
         catch (Exception ex)

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

@@ -11,18 +11,18 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (PageState.User != null && photo != null)
+@if (_initialized)
 {
-    <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
-}
-else
-{
-    <br />
-}
-<TabStrip>
-    <TabPanel Name="Identity" ResourceKey="Identity">
-        @if (profiles != null && settings != null)
-        {
+    @if (PageState.User != null && photo != null)
+    {
+        <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
+    }
+    else
+    {
+        <br />
+    }
+    <TabStrip>
+        <TabPanel Name="Identity" ResourceKey="Identity">
             <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
             <div class="container">
                 <div class="row mb-1 align-items-center">
@@ -33,34 +33,34 @@ else
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
-					<div class="col-sm-9">
+                    <div class="col-sm-9">
                         <div class="input-group">
-						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
+                            <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
-					    </div>
+                        </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
                     <div class="col-sm-9">
                         <div class="input-group">
-							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
+                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
-					    </div>
+                        </div>
                     </div>
                 </div>
-				@if (allowtwofactor)
-				{
-					<div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="twofactor" HelpText="Indicates if you are using two factor authentication. Two factor authentication requires you to enter a verification code sent via email after you sign in." ResourceKey="TwoFactor"></Label>
-						<div class="col-sm-9">
-							<select id="twofactor" class="form-select" @bind="@twofactor" required>
-								<option value="True">@SharedLocalizer["Yes"]</option>
-								<option value="False">@SharedLocalizer["No"]</option>
-							</select>
-						</div>
-					</div>
-				}
+                @if (allowtwofactor)
+                {
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="twofactor" HelpText="Indicates if you are using two factor authentication. Two factor authentication requires you to enter a verification code sent via email after you sign in." ResourceKey="TwoFactor"></Label>
+                        <div class="col-sm-9">
+                            <select id="twofactor" class="form-select" @bind="@twofactor" 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="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
                     <div class="col-sm-9">
@@ -83,11 +83,8 @@ else
             <br />
             <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
             <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-        }
-    </TabPanel>
-    <TabPanel Name="Profile" ResourceKey="Profile">
-        @if (profiles != null && settings != null)
-        {
+        </TabPanel>
+        <TabPanel Name="Profile" ResourceKey="Profile">
             <div class="container">
                 <div class="row mb-1 align-items-center">
                     @foreach (Profile profile in profiles)
@@ -104,8 +101,8 @@ else
                             }
                             <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))
@@ -123,13 +120,27 @@ else
                                     }
                                     else
                                     {
-                                        @if (p.IsRequired)
+                                        @if (p.Rows == 1)
                                         {
-                                            <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                            @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))" />
+                                            }
+                                            else
+                                            {
+                                                <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                            }
                                         }
                                         else
                                         {
-                                            <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                            @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>
+                                            }
+                                            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>
+                                            }
                                         }
                                     }
                                 </div>
@@ -140,134 +151,151 @@ else
             </div>
             <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
             <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-        }
-    </TabPanel>
-    <TabPanel Name="Notifications" ResourceKey="Notifications">
-        @if (notifications != null)
-        {
+        </TabPanel>
+        <TabPanel Name="Notifications" ResourceKey="Notifications">
+            <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" ReturnUrl="@NavigateUrl(PageState.Page.Path, "tab=Notifications")" />
+            <br />
+            <br />
             <select class="form-select" @onchange="(e => FilterChanged(e))">
                 <option value="to">@Localizer["Inbox"]</option>
                 <option value="from">@Localizer["Items.Sent"]</option>
             </select>
             <br />
-            <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" />
-            <br /><br />
             @if (filter == "to")
             {
-                <Pager Items="@notifications">
-                    <Header>
+                @if (notifications.Any())
+                {
+                    <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>
-                    </Header>
-                    <Row>
-                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
-                        <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
-                        
-                        @if (context.IsRead)
-                        {
-                            <td>@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>@context.Subject</b></td>
-                            <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
-                        }
-                    </Row>
-                    <Detail>
-                        <td colspan="2"></td>
-                        <td colspan="3">
-                            @{
-                                string input = "___";
-                                if (context.Body.Contains(input))
-                                {
-                                    context.Body = context.Body.Split(input)[0];
-                                    context.Body = context.Body.Replace("\n", "");
-                                    context.Body = context.Body.Replace("\r", "");
-                                }
-                                notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
-                            }
+                        </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>
+                            <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
+
                             @if (context.IsRead)
                             {
-                                @notificationSummary
+                                <td>@context.FromDisplayName</td>
+                                <td>@context.Subject</td>
+                                <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
                             }
                             else
                             {
-                                <b>@notificationSummary</b>
+                                <td><b>@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>
                             }
-                        </td>
-                    </Detail>
-                </Pager>
+                        </Row>
+                        <Detail>
+                            <td colspan="2"></td>
+                            <td colspan="3">
+                                @{
+                                    string input = "___";
+                                    if (context.Body.Contains(input))
+                                    {
+                                        context.Body = context.Body.Split(input)[0];
+                                        context.Body = context.Body.Replace("\n", "");
+                                        context.Body = context.Body.Replace("\r", "");
+                                    }
+                                    notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                }
+                                @if (context.IsRead)
+                                {
+                                    @notificationSummary
+                                }
+                                else
+                                {
+                                    <b>@notificationSummary</b>
+                                }
+                            </td>
+                        </Detail>
+                    </Pager>
+                    <br />
+                    <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
+                }
+                else
+                {
+                    <div class="no-notifications-text">
+                        @Localizer["NoNotificationsReceived.Text"]
+                    </div>
+                }
             }
             else
             {
-                <Pager Items="@notifications">
-                    <Header>
-                        <th>&nbsp;</th>
-                        <th>&nbsp;</th>
+                @if (notifications.Any())
+                {
+                    <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>
-                    </Header>
-                    <Row>
-                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
-                        <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
+                        </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>
+                            <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
 
-                        @if (context.IsRead)
-                        {
-                            <td>@context.ToDisplayName</td>
-                            <td>@context.Subject</td>
-                            <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
-                        } 
-                        else
-                        {
-                            <td><b>@context.ToDisplayName</b></td>
-                            <td><b>@context.Subject</b></td>
-                            <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
-                        }
-
-                    </Row>
-                    <Detail>
-                        <td colspan="2"></td>
-                        <td colspan="3">
-                            @{
-                                string input = "___";
-                                if (context.Body.Contains(input))
-                                {
-                                    context.Body = context.Body.Split(input)[0];
-                                    context.Body = context.Body.Replace("\n", "");
-                                    context.Body = context.Body.Replace("\r", "");
-                                }
-                                notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
-                            }
                             @if (context.IsRead)
                             {
-                                @notificationSummary
+                                <td>@context.ToDisplayName</td>
+                                <td>@context.Subject</td>
+                                <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
                             }
-                            else 
+                            else
                             {
-                                <b>@notificationSummary</b>
-                            } 
-                        </td>
-                    </Detail>
-                </Pager>
+                                <td><b>@context.ToDisplayName</b></td>
+                                <td><b>@context.Subject</b></td>
+                                <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
+                            }
+
+                        </Row>
+                        <Detail>
+                            <td colspan="2"></td>
+                            <td colspan="3">
+                                @{
+                                    string input = "___";
+                                    if (context.Body.Contains(input))
+                                    {
+                                        context.Body = context.Body.Split(input)[0];
+                                        context.Body = context.Body.Replace("\n", "");
+                                        context.Body = context.Body.Replace("\r", "");
+                                    }
+                                    notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                }
+                                @if (context.IsRead)
+                                {
+                                    @notificationSummary
+                                }
+                                else
+                                {
+                                    <b>@notificationSummary</b>
+                                }
+                            </td>
+                        </Detail>
+                    </Pager>
+                    <br />
+                    <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
+                }
+                else
+                {
+                    <div class="no-notifications-text">
+                        @Localizer["NoNotificationsSent.Text"]
+                    </div>
+                }
             }
-            @if (notifications.Any())
-            {
-                <br />
-                <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
-            }
-        }
-    </TabPanel>
-</TabStrip>
-<br /><br />
+        </TabPanel>
+    </TabStrip>
+    <br />
+    <br />
+}
 
 @code {
+    private bool _initialized = false;
     private string _passwordrequirements;
     private string username = string.Empty;
     private string _password = string.Empty;
@@ -282,24 +310,25 @@ else
     private int folderid = -1;
     private int photofileid = -1;
     private File photo = null;
+
     private List<Profile> profiles;
     private Dictionary<string, string> settings;
     private string category = string.Empty;
+
     private string filter = "to";
     private List<Notification> notifications;
     private string notificationSummary = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
-    protected override async Task OnParametersSetAsync()
+    protected override async Task OnInitializedAsync()
     {
         try
         {
             _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
-
             _togglepassword = SharedLocalizer["ShowPassword"];
-
             allowtwofactor = (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "true");
+            profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
 
             if (PageState.User != null)
             {
@@ -326,10 +355,11 @@ else
                     photo = null;
                 }
 
-                profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
                 settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
 
                 await LoadNotificationsAsync();
+
+                _initialized = true;
             }
             else
             {
@@ -363,44 +393,47 @@ else
     {
         try
         {
-            if (username != string.Empty && email != string.Empty && ValidateProfiles())
+            if (username != string.Empty && email != string.Empty)
             {
                 if (_password == confirm)
                 {
-                    var user = PageState.User;
-                    user.Username = username;
-                    user.Password = _password;
-                    user.TwoFactorRequired = bool.Parse(twofactor);
-                    user.Email = email;
-                    user.DisplayName = (displayname == string.Empty ? username : displayname);
-                    user.PhotoFileId = filemanager.GetFileId();
-                    if (user.PhotoFileId == -1)
+                    if (ValidateProfiles())
                     {
-                        user.PhotoFileId = null;
-                    }
-                    if (user.PhotoFileId != null)
-                    {
-                        photofileid = user.PhotoFileId.Value;
-                        photo = await FileService.GetFileAsync(photofileid);
-                    }
-                    else
-                    {
-                        photofileid = -1;
-                        photo = null;
-                    }
+                        var user = PageState.User;
+                        user.Username = username;
+                        user.Password = _password;
+                        user.TwoFactorRequired = bool.Parse(twofactor);
+                        user.Email = email;
+                        user.DisplayName = (displayname == string.Empty ? username : displayname);
+                        user.PhotoFileId = filemanager.GetFileId();
+                        if (user.PhotoFileId == -1)
+                        {
+                            user.PhotoFileId = null;
+                        }
+                        if (user.PhotoFileId != null)
+                        {
+                            photofileid = user.PhotoFileId.Value;
+                            photo = await FileService.GetFileAsync(photofileid);
+                        }
+                        else
+                        {
+                            photofileid = -1;
+                            photo = null;
+                        }
 
-                    user = await UserService.UpdateUserAsync(user);
-                    if (user != null)
-                    {
-                        await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
-                        await logger.LogInformation("User Profile Saved");
+                        user = await UserService.UpdateUserAsync(user);
+                        if (user != null)
+                        {
+                            await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
+                            await logger.LogInformation("User Profile Saved");
 
-                        AddModuleMessage(Localizer["Success.Profile.Update"], MessageType.Success);
-                        StateHasChanged();
-                    }
-                    else
-                    {
-                        AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);						
+                            AddModuleMessage(Localizer["Success.Profile.Update"], MessageType.Success);
+                            StateHasChanged();
+                        }
+                        else
+                        {
+                            AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);
+                        }
                     }
                 }
                 else
@@ -424,27 +457,33 @@ else
 
     private bool ValidateProfiles()
     {
-        bool valid = true;
         foreach (Profile profile in profiles)
         {
-            if (string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)) && !string.IsNullOrEmpty(profile.DefaultValue))
+            var value = GetProfileValue(profile.Name, string.Empty);
+            if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
                 settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                if (valid == true && profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+                if (profile.IsRequired && string.IsNullOrEmpty(value))
                 {
-                    valid = false;
+                    AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], profile.Title), MessageType.Warning);
+                    return false;
                 }
-                if (valid == true && !string.IsNullOrEmpty(profile.Validation))
+                if (!string.IsNullOrEmpty(profile.Validation))
                 {
                     Regex regex = new Regex(profile.Validation);
-                    valid = regex.Match(SettingService.GetSetting(settings, profile.Name, string.Empty)).Success;
+                    bool valid = regex.Match(value).Success;
+                    if (!valid)
+                    {
+                        AddModuleMessage(string.Format(SharedLocalizer["ProfileInvalid"], profile.Title), MessageType.Warning);
+                        return false;
+                    }
                 }
             }
         }
-        return valid;
+        return true;
     }
 
     private void Cancel()
@@ -486,7 +525,6 @@ else
     private async void FilterChanged(ChangeEventArgs e)
     {
         filter = (string)e.Value;
-
         await LoadNotificationsAsync();
         StateHasChanged();
     }

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

@@ -8,94 +8,71 @@
 
 @if (PageState.User != null)
 {
-    <div class="container">
-        <div class="row mb-1 align-items-center">
-            <label Class="col-sm-3">@Localizer["Title"] </label>
-            @if (title == "From")
-            {
-                <div class="col-sm-3">
-                    <input class="form-control" @bind="@username" readonly />
-                </div>
-            }
-            @if (title == "To")
-            {
-                <div class="col-sm-3">
-                    <input class="form-control" @bind="@username" />
-                </div>
-            }
-        </div>
-        <div class="row mb-1 align-items-center">
-            <label Class="col-sm-3">@Localizer["Subject"] </label>
-            @if (title == "From")
-            {
-                <div class="col-sm-3">
-                    <input class="form-control" @bind="@subject" readonly />
-                </div>
-            }
-            @if (title == "To")
-            {
-                <div class="col-sm-3">
-                    <input class="form-control" @bind="@subject" />
-                </div>
-            }
-        </div>
-    </div>
-    <div class="container">
-        @if (title == "From")
-        {
+    @if (title == "From")
+    {
+        <div class="container">
             <div class="row mb-1 align-items-center">
-                <label class="col-sm-3">@Localizer["Date"] </label>
+                <Label Class="col-sm-3" For="username" HelpText="The user who sent the message" ResourceKey="From">From:</Label>
                 <div class="col-sm-9">
-                    <input class="form-control" @bind="@createdon" readonly />
+                    <input id="username" class="form-control" @bind="@username" readonly />
                 </div>
             </div>
-        }
-        @if (title == "From")
-        {
-                <div class="row mb-1 align-items-center">
-                    <label class="col-sm-3">@Localizer["Message"] </label>
-                    <div class="col-sm-9">
-                        <textarea id="txtFrom" class="form-control" @bind="@body" rows="5" readonly />
-                    </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="subject" HelpText="The subject of the message" ResourceKey="Subject">Subject:</Label>
+                <div class="col-sm-9">
+                    <input id="subject" class="form-control" @bind="@subject" readonly />
                 </div>
-
-        }
-        @if (title == "To")
-        {
-
-                <div class="row mb-1 align-items-center">
-                    <label class="col-sm-3">@Localizer["Message"] </label>
-                    <div class="col-sm-9">
-                    <textarea id="txtTo" class="form-control" @bind="@body" rows="5" />
-                    </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label class="col-sm-3" For="date" HelpText="The date the message was sent" ResourceKey="Date">Sent:</Label>
+                <div class="col-sm-9">
+                    <input id="date" class="form-control" @bind="@createdon" readonly />
                 </div>
-
-        }
-
-    </div>
-
-
-    @if (reply != string.Empty)
-    {
-        <button type="button" class="btn btn-primary" @onclick="Send">@SharedLocalizer["Send"]</button>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label class="col-sm-3" For="message" HelpText="The contents of the message" ResourceKey="Message">Message:</Label>
+                <div class="col-sm-9">
+                    <textarea id="message" class="form-control" @bind="@body" rows="5" readonly />
+                </div>
+            </div>
+        </div>
     }
     else
     {
-        if (title == "From")
-        {
-            <button type="button" class="btn btn-primary" @onclick="Reply">@Localizer["Reply"]</button>
-        }
-    }
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-    <br />
-    <br />
-    @if (title == "To")
-    {
-        <div class="control-group">
-            <label class="control-label">@Localizer["OriginalMessage"] </label>
-            <textarea id="txtReply" class="form-control" @bind="@reply" rows="5" readonly />
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="username" HelpText="The user who will be the recipient of the message" ResourceKey="To">To:</Label>
+                <div class="col-sm-9">
+                    <input id="username" class="form-control" @bind="@username" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="subject" HelpText="The subject of the message" ResourceKey="Subject">Subject:</Label>
+                <div class="col-sm-9">
+                    <input id="subject" class="form-control" @bind="@subject" readonly="@(!reply)" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label class="col-sm-3" For="message" HelpText="The content of the message" ResourceKey="Message">Message:</Label>
+                <div class="col-sm-9">
+                    <textarea id="message" class="form-control" @bind="@body" rows="5" readonly="@(!reply)" />
+                </div>
+            </div>
         </div>
     }
+
+    @if (reply)
+    {
+        <button type="button" class="btn btn-primary me-2" @onclick="Send">@SharedLocalizer["Send"]</button>
+    }
+    else
+    {
+        if (title == "From" && username != Localizer["System"])
+        {
+            <button type="button" class="btn btn-primary me-2" @onclick="Reply">@Localizer["Reply"]</button>
+        }
+    }
+    <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
 }
 
 @code {
@@ -105,7 +82,7 @@
     private string subject = string.Empty;
     private string createdon = string.Empty;
     private string body = string.Empty;
-    private string reply = string.Empty;
+    private bool reply = false;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
     public override string Title => "View Notification";
@@ -118,9 +95,6 @@
             Notification notification = await NotificationService.GetNotificationAsync(notificationid);
             if (notification != null)
             {
-                notification.IsRead = true;
-                notification = await NotificationService.UpdateNotificationAsync(notification);
-
                 int userid = -1;
                 if (notification.ToUserId == PageState.User.UserId)
                 {
@@ -148,11 +122,17 @@
                 }
                 if (username == "")
                 {
-                    username = "System";
+                    username = Localizer["System"];
                 }
                 subject = notification.Subject;
                 createdon = notification.CreatedOn.ToString();
                 body = notification.Body;
+
+                if (title == "From")
+                {
+                    notification.IsRead = true;
+                    notification = await NotificationService.UpdateNotificationAsync(notification);
+                }
             }
         }
         catch (Exception ex)
@@ -165,12 +145,16 @@
     private void Reply()
     {
         title = "To";
-        if (!subject.Contains("RE:"))
+        if (!subject.Contains(Localizer["RE:"]))
         {
-            subject = "RE: " + subject;
+            subject = Localizer["RE"] + " " + subject;
         }
-        reply = body;
-        body = "\n\n____________________________________________\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
+        body = $"\n\n____________________________________________\n" +
+            $"{Localizer["From.Text"]} {username}\n" +
+            $"{Localizer["Date.Text"]} {createdon}\n" +
+            $"{Localizer["Subject.Text"]} {subject}\n\n" +
+            body;
+        reply = true;
         StateHasChanged();
     }
 
@@ -184,7 +168,7 @@
                 var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body, notificationid);
                 notification = await NotificationService.AddNotificationAsync(notification);
                 await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
-                NavigationManager.NavigateTo(NavigateUrl());
+                NavigationManager.NavigateTo(PageState.ReturnUrl);
             }
             else
             {

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

@@ -8,63 +8,63 @@
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Identity" ResourceKey="Identity">
-        @if (profiles != null)
-        {
-            <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
-            <div class="container">
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="username" HelpText="A unique username for a user. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
-                    <div class="col-sm-9">
-                        <input id="username" class="form-control" @bind="@_username" />
+@if (_initialized)
+{
+    <TabStrip>
+        <TabPanel Name="Identity" ResourceKey="Identity">
+            @if (profiles != null)
+            {
+                <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="username" HelpText="A unique username for a user. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
+                        <div class="col-sm-9">
+                            <input id="username" class="form-control" @bind="@_username" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
+                        <div class="col-sm-9">
+                            <div class="input-group">
+                                <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
+                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
+                        <div class="col-sm-9">
+                            <div class="input-group">
+                                <input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
+                        <div class="col-sm-9">
+                            <input id="email" class="form-control" @bind="@_email" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
+                        <div class="col-sm-9">
+                            <input id="displayname" class="form-control" @bind="@_displayname" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="notify" HelpText="Indicate if new users should receive an email notification" ResourceKey="Notify">Notify? </Label>
+                        <div class="col-sm-9">
+                            <select id="notify" class="form-select" @bind="@_notify" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
                     </div>
                 </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
-					<div class="col-sm-9">
-                        <div class="input-group">
-						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
-                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
-					    </div>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
-                    <div class="col-sm-9">
-                        <div class="input-group">
-							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
-                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
-					    </div>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
-                    <div class="col-sm-9">
-                        <input id="email" class="form-control" @bind="@_email" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
-                    <div class="col-sm-9">
-                        <input id="displayname" class="form-control" @bind="@_displayname" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="notify" HelpText="Indicate if new users should receive an email notification" ResourceKey="Notify">Notify? </Label>
-                    <div class="col-sm-9">
-                        <select id="notify" class="form-select" @bind="@_notify" required>
-                            <option value="True">@SharedLocalizer["Yes"]</option>
-                            <option value="False">@SharedLocalizer["No"]</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-        }
-    </TabPanel>
-    <TabPanel Name="Profile" ResourceKey="Profile">
-        @if (profiles != null)
-        {
+            }
+        </TabPanel>
+        <TabPanel Name="Profile" ResourceKey="Profile">
             <div class="container">
                 <div class="row mb-1 align-items-center">
                     @foreach (Profile profile in profiles)
@@ -79,30 +79,50 @@
                         }
                         <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 (p.IsRequired)
+                                <div class="col-sm-9">
+                                    @if (!string.IsNullOrEmpty(p.Options))
                                 {
-                                    <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                    <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
+                                        @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                                        {
+                                            @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                            {
+                                                <option value="@option" selected>@option</option>
+                                            }
+                                            else
+                                            {
+                                                <option value="@option">@option</option>
+                                            }
+                                        }
+                                    </select>
                                 }
                                 else
                                 {
-                                    <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                    @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))" />
+                                    }
+                                    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>
+                                    }
                                 }
                             </div>
                         </div>
                     }
-
                 </div>
             </div>
-        }
-    </TabPanel>
-</TabStrip>
-<br />
-<br />
-<button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+        </TabPanel>
+    </TabStrip>
+    <br />
+    <br />
+    <button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+}
+
 
 @code {
+    private bool _initialized = false;
     private string _passwordrequirements;
     private string _username = string.Empty;
     private string _password = string.Empty;
@@ -126,6 +146,7 @@
             _togglepassword = SharedLocalizer["ShowPassword"];
             profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
             settings = new Dictionary<string, string>();
+            _initialized = true;
         }
         catch (Exception ex)
         {
@@ -148,31 +169,34 @@
     {
         try
         {
-            if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty && _email != string.Empty && ValidateProfiles())
+            if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty && _email != string.Empty)
             {
                 if (_password == _confirm)
                 {
-                    var user = new User();
-                    user.SiteId = PageState.Site.SiteId;
-                    user.Username = _username;
-                    user.Password = _password;
-                    user.Email = _email;
-                    user.DisplayName = string.IsNullOrWhiteSpace(_displayname) ? _username : _displayname;
-                    user.PhotoFileId = null;
-                    user.SuppressNotification = !bool.Parse(_notify);
-
-                    user = await UserService.AddUserAsync(user);
-
-                    if (user != null)
+                    if (ValidateProfiles())
                     {
-                        await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
-                        await logger.LogInformation("User Created {User}", user);
-                        NavigationManager.NavigateTo(NavigateUrl());
-                    }
-                    else
-                    {
-                        await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
-                        AddModuleMessage(Localizer["Error.User.AddCheckPass"], MessageType.Error);
+                        var user = new User();
+                        user.SiteId = PageState.Site.SiteId;
+                        user.Username = _username;
+                        user.Password = _password;
+                        user.Email = _email;
+                        user.DisplayName = string.IsNullOrWhiteSpace(_displayname) ? _username : _displayname;
+                        user.PhotoFileId = null;
+                        user.SuppressNotification = !bool.Parse(_notify);
+
+                        user = await UserService.AddUserAsync(user);
+
+                        if (user != null)
+                        {
+                            await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
+                            await logger.LogInformation("User Created {User}", user);
+                            NavigationManager.NavigateTo(NavigateUrl());
+                        }
+                        else
+                        {
+                            await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
+                            AddModuleMessage(Localizer["Error.User.AddCheckPass"], MessageType.Error);
+                        }
                     }
                 }
                 else
@@ -194,27 +218,33 @@
 
     private bool ValidateProfiles()
     {
-        bool valid = true;
         foreach (Profile profile in profiles)
         {
-            if (string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)) && !string.IsNullOrEmpty(profile.DefaultValue))
+            var value = GetProfileValue(profile.Name, string.Empty);
+            if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
                 settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                if (valid == true && profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+                if (profile.IsRequired && string.IsNullOrEmpty(value))
                 {
-                    valid = false;
+                    AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], profile.Title), MessageType.Warning);
+                    return false;
                 }
-                if (valid == true && !string.IsNullOrEmpty(profile.Validation))
+                if (!string.IsNullOrEmpty(profile.Validation))
                 {
                     Regex regex = new Regex(profile.Validation);
-                    valid = regex.Match(SettingService.GetSetting(settings, profile.Name, string.Empty)).Success;
+                    bool valid = regex.Match(value).Success;
+                    if (!valid)
+                    {
+                        AddModuleMessage(string.Format(SharedLocalizer["ProfileInvalid"], profile.Title), MessageType.Warning);
+                        return false;
+                    }
                 }
             }
         }
-        return valid;
+        return true;
     }
 
     private void ProfileChanged(ChangeEventArgs e, string SettingName)

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

@@ -9,18 +9,10 @@
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (PageState.User != null && photo != null)
+@if (_initialized)
 {
-    <img src="@photo.Url" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
-}
-else
-{
-    <br />
-}
-<TabStrip>
-    <TabPanel Name="Identity" ResourceKey="Identity">
-        @if (profiles != null)
-        {
+    <TabStrip>
+        <TabPanel Name="Identity" ResourceKey="Identity">
             <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
             <div class="container">
                 <div class="row mb-1 align-items-center">
@@ -31,20 +23,20 @@ else
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
-					<div class="col-sm-9">
+                    <div class="col-sm-9">
                         <div class="input-group">
-						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
+                            <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
-					    </div>
+                        </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
                     <div class="col-sm-9">
                         <div class="input-group">
-							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
+                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
-					    </div>
+                        </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -59,12 +51,6 @@ else
                         <input id="displayname" class="form-control" @bind="@displayname" />
                     </div>
                 </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="@photofileid.ToString()" HelpText="A photo of the user" ResourceKey="Photo"></Label>
-                    <div class="col-sm-9">
-                        <FileManager FileId="@photofileid" @ref="filemanager" />
-                    </div>
-                </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="isdeleted" HelpText="Indicate if the user is active" ResourceKey="IsDeleted"></Label>
                     <div class="col-sm-9">
@@ -87,11 +73,8 @@ else
                     </div>
                 </div>
             </div>
-        }
-    </TabPanel>
-    <TabPanel Name="Profile" ResourceKey="Profile">
-        @if (profiles != null)
-        {
+        </TabPanel>
+        <TabPanel Name="Profile" ResourceKey="Profile">
             <div class="container">
                 <div class="row mb-1 align-items-center">
                     @foreach (Profile profile in profiles)
@@ -106,8 +89,8 @@ else
                         }
                         <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))
@@ -125,13 +108,13 @@ else
                                 }
                                 else
                                 {
-                                    @if (p.IsRequired)
+                                    @if (p.Rows == 1)
                                     {
-                                        <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" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
                                     }
                                     else
                                     {
-                                        <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                        <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>
                                     }
                                 }
                             </div>
@@ -139,17 +122,18 @@ else
                     }
                 </div>
             </div>
-        }
-    </TabPanel>
-</TabStrip>
+        </TabPanel>
+    </TabStrip>
 
-<button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-<br />
-<br />
-<AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
+    <button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    <br />
+    <br />
+    <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;
     private string username = string.Empty;
@@ -159,9 +143,6 @@ else
     private string confirm = string.Empty;
     private string email = string.Empty;
     private string displayname = string.Empty;
-    private FileManager filemanager;
-    private int photofileid = -1;
-    private File photo = null;
     private string isdeleted;
     private string lastlogin;
     private string lastipaddress;
@@ -179,32 +160,23 @@ else
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
-    protected override async Task OnParametersSetAsync()
+    protected override async Task OnInitializedAsync()
     {
         try
         {
-            if (PageState.QueryString.ContainsKey("id"))
+            _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
+            _togglepassword = SharedLocalizer["ShowPassword"];
+            profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+
+            if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int UserId))
             {
-                _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
-                _togglepassword = SharedLocalizer["ShowPassword"];
-                profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
-                userid = Int32.Parse(PageState.QueryString["id"]);
+                userid = UserId;
                 var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
                 if (user != null)
                 {
                     username = user.Username;
                     email = user.Email;
                     displayname = user.DisplayName;
-                    if (user.PhotoFileId != null)
-                    {
-                        photofileid = user.PhotoFileId.Value;
-                        photo = await FileService.GetFileAsync(photofileid);
-                    }
-                    else
-                    {
-                        photofileid = -1;
-                        photo = null;
-                    }
                     isdeleted = user.IsDeleted.ToString();
                     lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn);
                     lastipaddress = user.LastIPAddress;
@@ -218,6 +190,8 @@ else
                     deletedon = user.DeletedOn;
                 }
             }
+
+            _initialized = true;
         }
         catch (Exception ex)
         {
@@ -240,35 +214,37 @@ else
     {
         try
         {
-            if (username != string.Empty && email != string.Empty && ValidateProfiles())
+            if (username != string.Empty && email != string.Empty)
             {
                 if (_password == confirm)
                 {
-                    var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
-                    user.SiteId = PageState.Site.SiteId;
-                    user.Username = username;
-                    user.Password = _password;
-                    user.Email = email;
-                    user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
-                    user.PhotoFileId = null;
-                    user.PhotoFileId = filemanager.GetFileId();
-                    if (user.PhotoFileId == -1)
+                    if (ValidateProfiles())
                     {
+                        var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                        user.SiteId = PageState.Site.SiteId;
+                        user.Username = username;
+                        user.Password = _password;
+                        user.Email = email;
+                        user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
                         user.PhotoFileId = null;
-                    }
+                        if (user.PhotoFileId == -1)
+                        {
+                            user.PhotoFileId = null;
+                        }
 
-                    user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
+                        user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
 
-                    user = await UserService.UpdateUserAsync(user);
-                    if (user != null)
-                    {
-                        await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
-                        await logger.LogInformation("User Saved {User}", user);
-                        NavigationManager.NavigateTo(NavigateUrl());
-                    }
-                    else
-                    {
-                        AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);
+                        user = await UserService.UpdateUserAsync(user);
+                        if (user != null)
+                        {
+                            await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
+                            await logger.LogInformation("User Saved {User}", user);
+                            NavigationManager.NavigateTo(NavigateUrl());
+                        }
+                        else
+                        {
+                            AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);
+                        }
                     }
                 }
                 else
@@ -290,27 +266,33 @@ else
 
     private bool ValidateProfiles()
     {
-        bool valid = true;
         foreach (Profile profile in profiles)
         {
-            if (string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)) && !string.IsNullOrEmpty(profile.DefaultValue))
+            var value = GetProfileValue(profile.Name, string.Empty);
+            if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
                 settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                if (valid == true && profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+                if (profile.IsRequired && string.IsNullOrEmpty(value))
                 {
-                    valid = false;
+                    AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], profile.Title), MessageType.Warning);
+                    return false;
                 }
-                if (valid == true && !string.IsNullOrEmpty(profile.Validation))
+                if (!string.IsNullOrEmpty(profile.Validation))
                 {
                     Regex regex = new Regex(profile.Validation);
-                    valid = regex.Match(SettingService.GetSetting(settings, profile.Name, string.Empty)).Success;
+                    bool valid = regex.Match(value).Success;
+                    if (!valid)
+                    {
+                        AddModuleMessage(string.Format(SharedLocalizer["ProfileInvalid"], profile.Title), MessageType.Warning);
+                        return false;
+                    }
                 }
             }
         }
-        return valid;
+        return true;
     }
 
     private void ProfileChanged(ChangeEventArgs e, string SettingName)

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

@@ -17,21 +17,10 @@ else
 {
     <TabStrip>
         <TabPanel Name="Users" Heading="Users" ResourceKey="Users">
-			<div class="container">
-				<div class="row mb-1 align-items-center">
-					<div class="col-sm-4">
-						<ActionLink Action="Add" Text="Add User" Security="SecurityAccessLevel.Edit" ResourceKey="AddUser" />&nbsp;
-                        <ActionLink Text="Import Users" Class="btn btn-secondary" Action="Users" Security="SecurityAccessLevel.Admin" ResourceKey="ImportUsers"/>                    
-                    </div>
-					<div class="col-sm-4">
-						<input class="form-control" @bind="@_search" />
-					</div>
-					<div class="col-sm-4">
-						<button type="button" class="btn btn-secondary" @onclick="OnSearch">@SharedLocalizer["Search"]</button>
-					</div>
-				</div>
-			</div>
-			<Pager Items="@users" RowClass="align-middle">
+			<ActionLink Action="Add" Text="Add User" Security="SecurityAccessLevel.Edit" ResourceKey="AddUser" />&nbsp;
+            <ActionLink Text="Import Users" Class="btn btn-secondary ms-2" Action="Users" Security="SecurityAccessLevel.Admin" ResourceKey="ImportUsers"/>
+
+            <Pager Items="@users" RowClass="align-middle" SearchProperties="User.Username,User.Email,User.DisplayName">
 				<Header>
 					<th style="width: 1px;">&nbsp;</th>
 					<th style="width: 1px;">&nbsp;</th>
@@ -109,6 +98,21 @@ else
 								<input id="cookiename" class="form-control" @bind="@_cookiename" />
 							</div>
 						</div>
+						<div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="cookieexpiration" HelpText="You can choose to use a custom authentication cookie expiration timespan for each site (e.g. '08:00:00' for 8 hours). The default is 14 days if not specified." ResourceKey="CookieExpiration">Cookie Expiration Timespan:</Label>
+							<div class="col-sm-9">
+								<input id="cookieexpiration" class="form-control" @bind="@_cookieexpiration" />
+							</div>
+						</div>
+						<div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="alwaysremember" HelpText="Enabling this option will set a permanent cookie in conjunction with the Cookie Expiration Timespan, which will automatically sign in users the next time they visit the site. By default the site will use session cookies." ResourceKey="AlwaysRemember">Always Remember User?</Label>
+							<div class="col-sm-9">
+                                <select id="alwaysremember" class="form-select" @bind="@_alwaysremember">
+									<option value="true">@SharedLocalizer["Yes"]</option>
+									<option value="false">@SharedLocalizer["No"]</option>
+								</select>
+							</div>
+						</div>
 					}
 				</Section>
 				@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
@@ -262,7 +266,22 @@ else
 									<input id="parameters" class="form-control" @bind="@_parameters" />
 								</div>
 							</div>
-							<div class="row mb-1 align-items-center">
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="authresponsetype" HelpText="Specify the authorization response type" ResourceKey="AuthResponseType">Authorization Response Type</Label>
+                                <div class="col-sm-9">
+                                    <select id="authresponsetype" class="form-select" @bind="@_authresponsetype" required>
+                                        <option value="code">@Localizer["AuthFlow.Code"]</option>
+                                        <option value="code id_token">@Localizer["AuthFlow.CodeIdToken"]</option>
+                                        <option value="code id_token token">@Localizer["AuthFlow.CodeIdTokenToken"]</option>
+                                        <option value="code token">@Localizer["AuthFlow.CodeToken"]</option>
+                                        <option value="id_token">@Localizer["AuthFlow.IdToken"]</option>
+                                        <option value="id_token token">@Localizer["AuthFlow.IdTokenToken"]</option>
+                                        <option value="token">@Localizer["AuthFlow.Token"]</option>
+                                        <option value="none">@Localizer["AuthFlow.None"]</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
 								<Label Class="col-sm-3" For="pkce" HelpText="Indicate if the provider supports Proof Key for Code Exchange (PKCE)" ResourceKey="PKCE">Use PKCE?</Label>
 								<div class="col-sm-9">
 									<select id="pkce" class="form-select" @bind="@_pkce" required>
@@ -319,7 +338,16 @@ else
 									</select>
 								</div>
 							</div>
-						}
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="verifyusers" HelpText="Do you want existing users to perform an additional email verification step to link their external login? If you disable this option, existing users will be linked automatically." ResourceKey="VerifyUsers">Verify Existing Users?</Label>
+                                <div class="col-sm-9">
+                                    <select id="verifyusers" class="form-select" @bind="@_verifyusers">
+                                        <option value="true">@SharedLocalizer["Yes"]</option>
+                                        <option value="false">@SharedLocalizer["No"]</option>
+                                    </select>
+                                </div>
+                            </div>
+                        }
 					</Section>
 					<Section Name="Token" Heading="Token Settings" ResourceKey="TokenSettings">
 						<div class="row mb-1 align-items-center">
@@ -368,14 +396,14 @@ else
 }
 
 @code {
-    private List<UserRole> allusers;
     private List<UserRole> users;
-    private string _search = "";
 
     private string _allowregistration;
     private string _allowsitelogin;
     private string _twofactor;
     private string _cookiename;
+    private string _cookieexpiration;
+    private string _alwaysremember;
 
     private string _minimumlength;
     private string _uniquecharacters;
@@ -400,6 +428,7 @@ else
     private string _scopes;
     private string _parameters;
     private string _pkce;
+    private string _authresponsetype;
     private string _redirecturl;
     private string _identifierclaimtype;
     private string _emailclaimtype;
@@ -407,6 +436,7 @@ else
     private string _profileclaimtypes;
     private string _domainfilter;
     private string _createusers;
+    private string _verifyusers;
 
     private string _secret;
     private string _secrettype = "password";
@@ -423,7 +453,6 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        await LoadUserSettingsAsync();
         await LoadUsersAsync(true);
 
         var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
@@ -434,6 +463,8 @@ else
         {
             _twofactor = SettingService.GetSetting(settings, "LoginOptions:TwoFactor", "false");
             _cookiename = SettingService.GetSetting(settings, "LoginOptions:CookieName", ".AspNetCore.Identity.Application");
+            _cookieexpiration = SettingService.GetSetting(settings, "LoginOptions:CookieExpiration", "");
+            _alwaysremember = SettingService.GetSetting(settings, "LoginOptions:AlwaysRemember", "false");
 
             _minimumlength = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredLength", "6");
             _uniquecharacters = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", "1");
@@ -458,6 +489,7 @@ else
             _scopes = SettingService.GetSetting(settings, "ExternalLogin:Scopes", "");
             _parameters = SettingService.GetSetting(settings, "ExternalLogin:Parameters", "");
             _pkce = SettingService.GetSetting(settings, "ExternalLogin:PKCE", "false");
+            _authresponsetype = SettingService.GetSetting(settings, "ExternalLogin:AuthResponseType", "code");
             _redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
             _identifierclaimtype = SettingService.GetSetting(settings, "ExternalLogin:IdentifierClaimType", "sub");
             _emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "email");
@@ -465,6 +497,7 @@ else
             _profileclaimtypes = SettingService.GetSetting(settings, "ExternalLogin:ProfileClaimTypes", "");
             _domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
             _createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
+            _verifyusers = SettingService.GetSetting(settings, "ExternalLogin:VerifyUsers", "true");
 
             _secret = SettingService.GetSetting(settings, "JwtOptions:Secret", "");
             _togglesecret = SharedLocalizer["ShowPassword"];
@@ -478,32 +511,14 @@ else
     {
         if (load)
         {
-            allusers = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
                 var hosts = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Host);
-                allusers.AddRange(hosts);
-                allusers = allusers.OrderBy(u => u.User.DisplayName).ToList();
+                users.AddRange(hosts);
+                users = users.OrderBy(u => u.User.DisplayName).ToList();
             }           
         }
-
-		users = allusers;
-		if (!string.IsNullOrEmpty(_search))
-		{
-			users = users.Where(item =>
-				(
-					item.User.Username.Contains(_search, StringComparison.OrdinalIgnoreCase) ||
-					item.User.Email.Contains(_search, StringComparison.OrdinalIgnoreCase) ||
-					item.User.DisplayName.Contains(_search, StringComparison.OrdinalIgnoreCase)
-				)
-			).ToList();
-		}
-	}
-
-	private async Task OnSearch()
-	{
-		await UpdateUserSettingsAsync();
-		await LoadUsersAsync(false);
 	}
 
 	private async Task DeleteUser(UserRole UserRole)
@@ -526,21 +541,6 @@ else
 		}
 	}
 
-	private string settingSearch = "AU-search";
-
-	private async Task LoadUserSettingsAsync()
-	{
-		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-		_search = SettingService.GetSetting(settings, settingSearch, "");
-	}
-
-	private async Task UpdateUserSettingsAsync()
-	{
-		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-		settings = SettingService.SetSetting(settings, settingSearch, _search);
-		await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
-	}
-
 	private async Task SaveSiteSettings()
 	{
 		try
@@ -556,6 +556,8 @@ else
 			{
 				settings = SettingService.SetSetting(settings, "LoginOptions:TwoFactor", _twofactor, false);
 				settings = SettingService.SetSetting(settings, "LoginOptions:CookieName", _cookiename, true);
+				settings = SettingService.SetSetting(settings, "LoginOptions:CookieExpiration", _cookieexpiration, true);
+				settings = SettingService.SetSetting(settings, "LoginOptions:AlwaysRemember", _alwaysremember, false);
 
 				settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequiredLength", _minimumlength, true);
 				settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", _uniquecharacters, true);
@@ -579,12 +581,14 @@ else
 				settings = SettingService.SetSetting(settings, "ExternalLogin:Scopes", _scopes, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:Parameters", _parameters, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:PKCE", _pkce, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:AuthResponseType", _authresponsetype, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:IdentifierClaimType", _identifierclaimtype, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:EmailClaimType", _emailclaimtype, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:RoleClaimType", _roleclaimtype, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:ProfileClaimTypes", _profileclaimtypes, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:DomainFilter", _domainfilter, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:VerifyUsers", _verifyusers, true);
 
 				if (!string.IsNullOrEmpty(_secret) && _secret.Length < 16) _secret = (_secret + "????????????????").Substring(0, 16);
 				settings = SettingService.SetSetting(settings, "JwtOptions:Secret", _secret, true);

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -40,10 +40,17 @@
                             </div>
                         </div>
                     }
+                    else
+                    {
+                        if (FileId != -1 && _file != null && !UploadMultiple)
+                        {
+                            <input class="form-control" @bind="@_file.Name" disabled />
+                        }
+                    }
                     @if (ShowUpload && _haseditpermission)
                     {
-                        <div class="row">
-                            <div class="col mt-2">
+                        <div class="row mt-2">
+                            <div class="col">
                                 @if (UploadMultiple)
                                 {
                                     <input type="file" id="@_fileinputid" name="file" accept="@_filter" multiple />
@@ -53,9 +60,9 @@
                                     <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
                                 }
                             </div>
-                            <div class="col mt-2 text-end">
+                            <div class="col-auto">
                                 <button type="button" class="btn btn-success" @onclick="UploadFiles">@SharedLocalizer["Upload"]</button>
-                                @if (GetFileId() != -1)
+                                @if (FileId != -1 && !UploadMultiple)
                                 {
                                     <button type="button" class="btn btn-danger mx-1" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button>
                                 }
@@ -370,14 +377,19 @@
                     {
                         success = false;
                         var filename = uploads[upload].Split(':')[0];
-                        var size = Int64.Parse(uploads[upload].Split(':')[1]);
-                        var maxattempts = (int)Math.Ceiling(size / 500000.0) + 1; // 30 MB takes 1 minute at 5 Mbps
+
+                        var size = Int64.Parse(uploads[upload].Split(':')[1]); // bytes
+                        var megabits = (size / 1048576.0) * 8; // binary conversion
+                        var uploadspeed = 2; // 2 Mbps (3G ranges from 300Kbps to 3Mbps)
+                        var uploadtime = (megabits / uploadspeed); // seconds
+                        var maxattempts = 5; // polling (minimum timeout duration will be 5 seconds)
+                        var sleep = (int)Math.Ceiling(uploadtime / maxattempts) * 1000; // milliseconds
 
                         int attempts = 0;
                         while (attempts < maxattempts && !success)
                         {
                             attempts += 1;
-                            Thread.Sleep(1000);
+                            Thread.Sleep(sleep);
 
                             if (Folder == Constants.PackagesFolder)
                             {

Oqtane.Client/Modules/Controls/Pager.razor

@@ -1,10 +1,20 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
 @inject IStringLocalizerFactory LocalizerFactory
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 @typeparam TableItem
 
 @if (ItemList != null)
 {
+    @if (!string.IsNullOrEmpty(SearchProperties))
+    {
+        <div class="input-group my-3">
+            <input id="search" class="form-control" placeholder=@string.Format(Localizer["SearchPlaceholder"], FormatSearchProperties()) @bind="@_search" />
+            <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>
+            <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
+        </div>
+    }
+
     @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
     {
         <ul class="pagination justify-content-center my-2">
@@ -175,6 +185,9 @@
     private int _startPage = 0;
     private int _endPage = 0;
     private int _columns = 0;
+    private string _search = "";
+
+    private IEnumerable<TableItem> AllItems;
 
     [Parameter]
     public string Format { get; set; } // Table or Grid
@@ -221,6 +234,9 @@
     [Parameter]
     public Action<int> OnPageChange { get; set; } // a method to be executed in the calling component when the page changes
 
+    [Parameter]
+    public string SearchProperties { get; set; } // comma delimited list of property names to include in search
+
     private IEnumerable<TableItem> ItemList { get; set; }
 
     protected override void OnInitialized()
@@ -276,6 +292,15 @@
             }
         }
 
+        if (!string.IsNullOrEmpty(SearchProperties))
+        {
+            AllItems = Items; // only used in search
+            if (!string.IsNullOrEmpty(_search))
+            {
+                Search();
+            }
+        }
+
         if (!string.IsNullOrEmpty(PageSize))
         {
             _maxItems = int.Parse(PageSize);
@@ -323,10 +348,10 @@
         {
             _endPage = _pages;
         }
-		ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
-		StateHasChanged();
-		OnPageChange?.Invoke(_page);
-	}
+        ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
+        StateHasChanged();
+        OnPageChange?.Invoke(_page);
+    }
 
     public void UpdateList(int page)
     {
@@ -369,4 +394,75 @@
 
         UpdateList(_page);
     }
+
+    public void Search()
+    {
+        if (!string.IsNullOrEmpty(_search))
+        {
+            Items = AllItems.Where(item =>
+            {
+                var values = SearchProperties.Split(',')
+                    .Select(itemType => GetPropertyValue(item, itemType))
+                    .Where(value => value != null)
+                    .Select(value => value.ToString().ToLower());
+
+                return values.Any(value => value.Contains(_search.ToLower()));
+            }).ToList();
+        }
+        else
+        {
+            Items = AllItems;
+        }
+        _pages = (int)Math.Ceiling(Items.Count() / (decimal)_maxItems);
+        UpdateList(1);
+    }
+
+    private object GetPropertyValue(object obj, string propertyName)
+    {
+        var index = propertyName.IndexOf(".");
+        if (index != -1)
+        {
+            var propertyInfo = obj.GetType().GetProperty(propertyName.Substring(0, index));
+            if (propertyInfo != null)
+            {
+                return GetPropertyValue(propertyInfo.GetValue(obj), propertyName.Substring(index + 1));
+            }
+            return null;
+        }
+        else
+        {
+            var propertyInfo = obj.GetType().GetProperty(propertyName);
+            if (propertyInfo != null)
+            {
+                return propertyInfo.GetValue(obj);
+            }
+            return null;
+        }
+    }
+
+    public void Reset()
+    {
+        _search = "";
+        Items = AllItems;
+        _pages = (int)Math.Ceiling(Items.Count() / (decimal)_maxItems);
+        UpdateList(1);
+    }
+
+    private string FormatSearchProperties()
+    {
+        var properties = new List<string>();
+        foreach (var property in SearchProperties.Split(',', StringSplitOptions.RemoveEmptyEntries))
+        {
+            var index = property.LastIndexOf(".");
+            if (index != -1)
+            {
+                properties.Add(property.Substring(index + 1));
+            }
+            else
+            {
+                properties.Add(property);
+            }
+        }
+        return string.Join(",", properties);
+    }
 }

Oqtane.Client/Oqtane.Client.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <Configurations>Debug;Release</Configurations>
-    <Version>4.0.5</Version>
+    <Version>5.0.0</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/v4.0.5</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -21,12 +21,12 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
   </ItemGroup>
 

Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx

@@ -159,4 +159,10 @@
   <data name="Module Settings" xml:space="preserve">
     <value>Module Settings</value>
   </data>
+  <data name="Pane.HelpText" xml:space="preserve">
+    <value>The pane where the module will be displayed</value>
+  </data>
+  <data name="Pane.Text" xml:space="preserve">
+    <value>Pane:</value>
+  </data>
 </root>

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

@@ -187,6 +187,12 @@
     <value>Optionally provide a regular expression (RegExp) for validating the value entered</value>
   </data>
   <data name="Validation.Text" xml:space="preserve">
-    <value>Validation:</value>
+    <value>Validation: </value>
   </data>
-</root>
+  <data name="Rows.HelpText" xml:space="preserve">
+    <value>The number of rows for text entry (one is the default)</value>
+  </data>
+  <data name="Rows.Text" xml:space="preserve">
+    <value>Rows: </value>
+  </data>
+</root>

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

@@ -132,9 +132,6 @@
   <data name="Theme.Select" xml:space="preserve">
     <value>Select Theme</value>
   </data>
-  <data name="DefaultContainer.Admin" xml:space="preserve">
-    <value>Default Admin Container</value>
-  </data>
   <data name="Aliases.HelpText" xml:space="preserve">
     <value>The urls for the site (comman delimited). This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or a virtual folder (ie. domain.com/folder).</value>
   </data>
@@ -183,9 +180,6 @@
   <data name="DefaultTheme.HelpText" xml:space="preserve">
     <value>Select the default theme for the site</value>
   </data>
-  <data name="AdminContainer.HelpText" xml:space="preserve">
-    <value>Select the admin container for the site</value>
-  </data>
   <data name="SiteTemplate.HelpText" xml:space="preserve">
     <value>Select the site template</value>
   </data>
@@ -207,9 +201,6 @@
   <data name="Name.Text" xml:space="preserve">
     <value>Site Name: </value>
   </data>
-  <data name="AdminContainer.Text" xml:space="preserve">
-    <value>Admin Container: </value>
-  </data>
   <data name="SiteTemplate.Text" xml:space="preserve">
     <value>Site Template: </value>
   </data>

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

@@ -121,7 +121,7 @@
     <value>Message: </value>
   </data>
   <data name="Message.User.Invalid" xml:space="preserve">
-    <value>User Does Not Exist. Please Verify That The Username Provided Is Correct.</value>
+    <value>The User Specified Does Not Exist</value>
   </data>
   <data name="Error.Notification.Add" xml:space="preserve">
     <value>Error Adding Notification</value>
@@ -133,7 +133,7 @@
     <value>Enter the subject of the message</value>
   </data>
   <data name="Message.HelpText" xml:space="preserve">
-    <value>Enter the message</value>
+    <value>Enter the message content</value>
   </data>
   <data name="To.Text" xml:space="preserve">
     <value>To: </value>
@@ -144,4 +144,10 @@
   <data name="Send Notification" xml:space="preserve">
     <value>Send Notification</value>
   </data>
+  <data name="Message.Required" xml:space="preserve">
+    <value>You Must Enter All Required Information</value>
+  </data>
+  <data name="Username.Enter" xml:space="preserve">
+    <value>Enter Username</value>
+  </data>
 </root>

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

@@ -233,5 +233,11 @@
   </data>
   <data name="DeleteNotification.Text" xml:space="preserve">
     <value>Delete</value>
-  </data>    
+  </data>
+  <data name="NoNotificationsReceived.Text" xml:space="preserve">
+    <value>No notifications have been received</value>
+  </data>
+  <data name="NoNotificationsSent.Text" xml:space="preserve">
+    <value>No notifications have been sent</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/UserProfile/View.resx

@@ -126,25 +126,43 @@
   <data name="Error.Notification.Add" xml:space="preserve">
     <value>Error Adding Notification</value>
   </data>
-  <data name="Title" xml:space="preserve">
-    <value>Title:</value>
-  </data>
-  <data name="Subject" xml:space="preserve">
-    <value>Subject:</value>
-  </data>
-  <data name="Date" xml:space="preserve">
-    <value>Date:</value>
-  </data>
-  <data name="Message" xml:space="preserve">
-    <value>Message:</value>
-  </data>
-  <data name="Reply" xml:space="preserve">
-    <value>Reply</value>
-  </data>
-  <data name="OriginalMessage" xml:space="preserve">
-    <value>Original Message</value>
-  </data>
   <data name="View Notification" xml:space="preserve">
     <value>View Notification</value>
   </data>
+  <data name="Date.HelpText" xml:space="preserve">
+    <value>The date the message was sent</value>
+  </data>
+  <data name="Date.Text" xml:space="preserve">
+    <value>Sent:</value>
+  </data>
+  <data name="From.HelpText" xml:space="preserve">
+    <value>The user who sent the message</value>
+  </data>
+  <data name="From.Text" xml:space="preserve">
+    <value>From:</value>
+  </data>
+  <data name="Message.HelpText" xml:space="preserve">
+    <value>The content of the message</value>
+  </data>
+  <data name="Message.Text" xml:space="preserve">
+    <value>Message:</value>
+  </data>
+  <data name="RE" xml:space="preserve">
+    <value>RE:</value>
+  </data>
+  <data name="Subject.HelpText" xml:space="preserve">
+    <value>The subject of the message</value>
+  </data>
+  <data name="Subject.Text" xml:space="preserve">
+    <value>Subject:</value>
+  </data>
+  <data name="System" xml:space="preserve">
+    <value>System</value>
+  </data>
+  <data name="To.HelpText" xml:space="preserve">
+    <value>The user who will be the recipient of the message</value>
+  </data>
+  <data name="To.Text" xml:space="preserve">
+    <value>To:</value>
+  </data>
 </root>

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

@@ -168,12 +168,6 @@
   <data name="Password.Text" xml:space="preserve">
     <value>Password:</value>
   </data>
-  <data name="Photo.HelpText" xml:space="preserve">
-    <value>A photo of the user</value>
-  </data>
-  <data name="Photo.Text" xml:space="preserve">
-    <value>Photo:</value>
-  </data>
   <data name="Username.HelpText" xml:space="preserve">
     <value>The unique username for a user. Note that this field can not be modified.</value>
   </data>

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

@@ -408,4 +408,49 @@
   <data name="ImportUsers.Text" xml:space="preserve">
     <value>Import Users</value>
   </data>
+  <data name="AuthFlow.Code" xml:space="preserve">
+    <value>code</value>
+  </data>
+  <data name="AuthFlow.CodeIdToken" xml:space="preserve">
+    <value>code id_token</value>
+  </data>
+  <data name="AuthFlow.CodeIdTokenToken" xml:space="preserve">
+    <value>code id_token token</value>
+  </data>
+  <data name="AuthFlow.CodeToken" xml:space="preserve">
+    <value>code token</value>
+  </data>
+  <data name="AuthFlow.IdToken" xml:space="preserve">
+    <value>id_token</value>
+  </data>
+  <data name="AuthFlow.IdTokenToken" xml:space="preserve">
+    <value>id_token token</value>
+  </data>
+  <data name="AuthFlow.None" xml:space="preserve">
+    <value>none</value>
+  </data>
+  <data name="AuthFlow.Token" xml:space="preserve">
+    <value>token</value>
+  </data>
+  <data name="AuthResponseType" xml:space="preserve">
+    <value>Authorization Response Type</value>
+  </data>
+  <data name="VerifyUsers.HelpText" xml:space="preserve">
+    <value>Do you want existing users to perform an additional email verification step to link their external login? If you disable this option, existing users will be linked automatically.</value>
+  </data>
+  <data name="VerifyUsers.Text" xml:space="preserve">
+    <value>Verify Existing Users?</value>
+  </data>
+  <data name="AlwaysRemember.HelpText" xml:space="preserve">
+    <value>Enabling this option will set a permanent cookie in conjunction with the Cookie Expiration Timespan, which will automatically sign in users the next time they visit the site. By default the site will use session cookies.</value>
+  </data>
+  <data name="AlwaysRemember.Text" xml:space="preserve">
+    <value>Always Remember User?</value>
+  </data>
+  <data name="CookieExpiration.HelpText" xml:space="preserve">
+    <value>You can choose to use a custom authentication cookie expiration timespan for each site (e.g. '08:00:00' for 8 hours). The default is 14 days if not specified.</value>
+  </data>
+  <data name="CookieExpiration.Text" xml:space="preserve">
+    <value>Cookie Expiration Timespan:</value>
+  </data>
 </root>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -120,4 +120,7 @@
   <data name="PageOfPages" xml:space="preserve">
     <value>Page {0} of {1}</value>
   </data>
+  <data name="SearchPlaceholder" xml:space="preserve">
+    <value>Search: {0}</value>
+  </data>
 </root>

Oqtane.Client/Resources/SharedResources.resx

@@ -426,4 +426,10 @@
   <data name="Password.ValidationCriteria" xml:space="preserve">
     <value>Passwords Must Have A Minimum Length Of {0} Characters, Including At Least {1} Unique Character(s), {2}{3}{4}{5} To Satisfy Password Compexity Requirements For This Site.</value>
   </data>
+  <data name="ProfileInvalid" xml:space="preserve">
+    <value>{0} Is Not Valid</value>
+  </data>
+  <data name="ProfileRequired" xml:space="preserve">
+    <value>{0} Is Required</value>
+  </data>
 </root>

Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx

@@ -189,4 +189,13 @@
   <data name="Confirm.Page.Delete" xml:space="preserve">
     <value>Are You Sure You Want To Delete This Page?</value>
   </data>
+  <data name="Location" xml:space="preserve">
+    <value>Location:</value>
+  </data>
+  <data name="LocationBottom" xml:space="preserve">
+    <value>Bottom</value>
+  </data>
+  <data name="LocationTop" xml:space="preserve">
+    <value>Top</value>
+  </data>
 </root>

Oqtane.Client/Services/SyncService.cs

@@ -4,6 +4,7 @@ using System.Net.Http;
 using System;
 using Oqtane.Documentation;
 using Oqtane.Shared;
+using System.Globalization;
 
 namespace Oqtane.Services
 {
@@ -18,7 +19,7 @@ namespace Oqtane.Services
         /// <inheritdoc />
         public async Task<Sync> GetSyncEventsAsync(DateTime lastSyncDate)
         {
-            return await GetJsonAsync<Sync>($"{ApiUrl}/{lastSyncDate.ToString("yyyyMMddHHmmssfff")}");
+            return await GetJsonAsync<Sync>($"{ApiUrl}/{lastSyncDate.ToString("yyyyMMddHHmmssfff", CultureInfo.InvariantCulture)}");
         }
     }
 }

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

@@ -15,7 +15,7 @@
 
     <div class="main g-0">
         <div class="top-row px-4">
-            <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
+            <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel LanguageDropdownAlignment="right" /></div>
         </div>
         <div class="container">
             <div class="row px-4">

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

@@ -17,7 +17,7 @@
 
 @if (ShowLanguageSwitcher)
 {
-    <LanguageSwitcher />
+    <LanguageSwitcher DropdownAlignment="@LanguageDropdownAlignment" />
 }
 
 @if (_showEditMode || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)))
@@ -114,7 +114,7 @@
 
 					<div class="row">
 						<div class="col text-center">
-							<label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
+							<label for="Module" class="control-label">@Localizer["Module.Manage"]</label>
 							<select class="form-select" @bind="@ModuleType">
 								<option value="new">@Localizer["Module.AddNew"]</option>
 								<option value="existing">@Localizer["Module.AddExisting"]</option>
@@ -179,27 +179,33 @@
 					</div>
 					<div class="row">
 						<div class="col text-center">
-							<label for="Title" class="control-label">@Localizer["Title"] </label>
+							<label for="Title" class="control-label">@Localizer["Title"]</label>
 							<input type="text" name="Title" class="form-control" @bind="@Title" />
 						</div>
 					</div>
-					@if (_pane.Length > 1)
-					{
-						<div class="row">
-							<div class="col text-center">
-								<label for="Pane" class="control-label">@Localizer["Pane"] </label>
-								<select class="form-select" @bind="@Pane">
-									@foreach (string pane in PageState.Page.Panes)
-									{
-										<option value="@pane">@pane Pane</option>
-									}
-								</select>
-							</div>
-						</div>
-					}
 					<div class="row">
 						<div class="col text-center">
-							<label for="Container" class="control-label">@Localizer["Container"] </label>
+							<label for="Pane" class="control-label">@Localizer["Pane"]</label>
+							<select class="form-select" @bind="@Pane">
+								@foreach (string pane in PageState.Page.Panes)
+								{
+									<option value="@pane">@pane Pane</option>
+								}
+							</select>
+						</div>
+					</div>
+                    <div class="row">
+                        <div class="col text-center">
+                            <label for="Insert" class="control-label">@Localizer["Location"]</label>
+                            <select class="form-select" @bind="@Location">
+                                <option value="@int.MinValue">@Localizer["LocationTop"]</option>
+                                <option value="@int.MaxValue">@Localizer["LocationBottom"]</option>
+                            </select>
+                        </div>
+                    </div>
+					<div class="row">
+						<div class="col text-center">
+							<label for="Container" class="control-label">@Localizer["Container"]</label>
 							<select class="form-select" @bind="@ContainerType">
 								@foreach (var container in _containers)
 								{
@@ -233,6 +239,24 @@
 }
 
 @code{
+    [Parameter]
+    public string ButtonClass { get; set; } = "btn-outline-secondary";
+
+    [Parameter]
+    public string ContainerClass { get; set; } = "offcanvas offcanvas-end";
+
+    [Parameter]
+    public string HeaderClass { get; set; } = "offcanvas-header";
+
+    [Parameter]
+    public string BodyClass { get; set; } = "offcanvas-body overflow-auto";
+
+    [Parameter]
+    public bool ShowLanguageSwitcher { get; set; } = true;
+
+    [Parameter]
+    public string LanguageDropdownAlignment { get; set; } = string.Empty; // Empty or Left or Right
+
     private bool _canViewAdminDashboard = false;
     private bool _showEditMode = false;
     private bool _deleteConfirmation = false;
@@ -243,6 +267,7 @@
     private List<Module> _modules = new List<Module>();
     private List<ThemeControl> _containers = new List<ThemeControl>();
     private string _category = "Common";
+    private string _pane = "";
 
     protected string PageId { get; private set; } = "-";
     protected string ModuleId { get; private set; } = "-";
@@ -251,12 +276,12 @@
 
     protected string Title { get; private set; } = "";
     protected string ContainerType { get; private set; } = "";
+    protected int Location { get; private set; } = int.MaxValue;
     protected string Visibility { get; private set; } = "view";
     protected string Message { get; private set; } = "";
 
     private string settingCategory = "CP-category";
     private string settingPane = "CP-pane";
-    private string _pane = "";
 
     protected string Category
     {
@@ -288,21 +313,6 @@
         }
     }
 
-    [Parameter]
-    public string ButtonClass { get; set; } = "btn-outline-secondary";
-
-    [Parameter]
-    public string ContainerClass { get; set; } = "offcanvas offcanvas-end";
-
-    [Parameter]
-    public string HeaderClass { get; set; } = "offcanvas-header";
-
-    [Parameter]
-    public string BodyClass { get; set; } = "offcanvas-body overflow-auto";
-
-    [Parameter]
-    public bool ShowLanguageSwitcher { get; set; } = true;
-
     protected override async Task OnParametersSetAsync()
     {
         _canViewAdminDashboard = CanViewAdminDashboard();
@@ -310,8 +320,9 @@
         if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
         {
             _showEditMode = true;
-            _pages?.Clear();
+            LoadSettingsAsync();
 
+            _pages?.Clear();
             foreach (Page p in PageState.Pages)
             {
                 if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
@@ -319,7 +330,6 @@
                     _pages.Add(p);
                 }
             }
-            await LoadSettingsAsync();
 
             var themes = await ThemeService.GetThemesAsync();
             _containers = ThemeService.GetContainerControls(themes, PageState.Page.ThemeType);
@@ -443,7 +453,7 @@
                 }
 
                 pageModule.Pane = Pane;
-                pageModule.Order = int.MaxValue;
+                pageModule.Order = Location;
                 pageModule.ContainerType = ContainerType;
 
                 if (pageModule.ContainerType == PageState.Site.DefaultContainerType)
@@ -653,11 +663,10 @@
         }
     }
 
-	private async Task LoadSettingsAsync()
+	private void LoadSettingsAsync()
 	{
-		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-		_category = SettingService.GetSetting(settings, settingCategory, "Common");
-		var pane = SettingService.GetSetting(settings, settingPane, "");
+        _category = SettingService.GetSetting(PageState.User.Settings, settingCategory, "Common");
+        var pane = SettingService.GetSetting(PageState.User.Settings, settingPane, "");
 		if (PageState.Page.Panes.Contains(pane))
 		{
 			_pane = pane;

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

@@ -12,7 +12,7 @@
         <button id="btnCultures" type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <span class="oi oi-globe"></span>
         </button>
-        <div class="dropdown-menu" aria-labelledby="btnCultures">
+        <div class="dropdown-menu @MenuAlignment" aria-labelledby="btnCultures">
             @foreach (var culture in _supportedCultures)
             {
                 <a class="dropdown-item @(CultureInfo.CurrentUICulture.Name == culture.Name ? "active" : String.Empty)" href="#" @onclick="@(async e => await SetCultureAsync(culture.Name))">@culture.DisplayName</a>
@@ -23,10 +23,15 @@
 
 @code{
     private IEnumerable<Culture> _supportedCultures;
+    [Parameter]
+    public string DropdownAlignment { get; set; } = string.Empty; // Empty or Left or Right
+    private string MenuAlignment = string.Empty;
 
     protected override void OnParametersSet()
     {
-		var languages = PageState.Languages;
+        MenuAlignment = DropdownAlignment.ToLower() == "right" ? "dropdown-menu-end" : string.Empty;
+
+        var languages = PageState.Languages;
         _supportedCultures = languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name });
     }
 

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

@@ -23,8 +23,23 @@ namespace Oqtane.Themes.Controls
 
         protected void LoginUser()
         {
+            var allowexternallogin = (SettingService.GetSetting(PageState.Site.Settings, "ExternalLogin:ProviderType", "") != "") ? true : false;
+            var allowsitelogin = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowSiteLogin", "true"));
+
             Route route = new Route(PageState.Uri.AbsoluteUri, PageState.Alias.Path);
-            NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + WebUtility.UrlEncode(route.PathAndQuery)));
+            var returnurl = WebUtility.UrlEncode(route.PathAndQuery);
+
+            if (allowexternallogin && !allowsitelogin)
+            {
+                // external login
+                NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + returnurl), true);
+            }
+            else
+            {
+                // local login
+                NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + returnurl));
+            }
+
         }
 
         protected async Task LogoutUser()

Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor

@@ -6,7 +6,7 @@
     <nav class="navbar navbar-dark bg-primary fixed-top">
         <Logo /><Menu Orientation="Horizontal" />
         <div class="controls ms-auto">
-            <div class="controls-group"><UserProfile ShowRegister="@_register" /> <Login ShowLogin="@_login" /> <ControlPanel /></div>
+            <div class="controls-group"><UserProfile ShowRegister="@_register" /> <Login ShowLogin="@_login" /> <ControlPanel LanguageDropdownAlignment="right" /></div>
         </div>
     </nav>
     <div class="content">

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

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Version>4.0.5</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>5.0.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.5</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -29,7 +29,8 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MySql.EntityFrameworkCore" Version="7.0.2" />
+    <PackageReference Include="MySql.EntityFrameworkCore" Version="8.0.0-preview" />
+    <PackageReference Include="MySql.Data" Version="8.2.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.MySQL</id>
-        <version>4.0.5</version>
+        <version>5.0.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane MySQL Provider</title>
@@ -12,15 +12,15 @@
         <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/v4.0.5</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
     <files>
-        <file src="bin\net7.0\Oqtane.Database.MySQL.dll" target="lib\net7.0" />
-        <file src="bin\net7.0\Oqtane.Database.MySQL.pdb" target="lib\net7.0" />
-        <file src="bin\net7.0\Mysql.EntityFrameworkCore.dll" target="lib\net7.0" />
-        <file src="bin\net7.0\Mysql.Data.dll" target="lib\net7.0" />
+        <file src="bin\net8.0\Oqtane.Database.MySQL.dll" target="lib\net8.0" />
+        <file src="bin\net8.0\Oqtane.Database.MySQL.pdb" target="lib\net8.0" />
+        <file src="bin\net8.0\MySql.EntityFrameworkCore.dll" target="lib\net8.0" />
+        <file src="bin\net8.0\MySql.Data.dll" target="lib\net8.0" />
         <file src="icon.png" target="" />
     </files>
 </package>

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

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Version>4.0.5</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>5.0.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.5</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -29,9 +29,9 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="EFCore.NamingConventions" Version="7.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
+    <PackageReference Include="EFCore.NamingConventions" Version="8.0.0-rc.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.2" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.PostgreSQL</id>
-        <version>4.0.5</version>
+        <version>5.0.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane PostgreSQL Provider</title>
@@ -12,16 +12,16 @@
         <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/v4.0.5</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
     <files>
-        <file src="bin\net7.0\Oqtane.Database.PostgreSQL.dll" target="lib\net7.0" />
-        <file src="bin\net7.0\Oqtane.Database.PostgreSQL.pdb" target="lib\net7.0" />
-        <file src="bin\net7.0\EFCore.NamingConventions.dll" target="lib\net7.0" />
-        <file src="bin\net7.0\Npgsql.EntityFrameworkCore.PostgreSQL.dll" target="lib\net7.0" />
-        <file src="bin\net7.0\Npgsql.dll" target="lib\net7.0" />
+        <file src="bin\net8.0\Oqtane.Database.PostgreSQL.dll" target="lib\net8.0" />
+        <file src="bin\net8.0\Oqtane.Database.PostgreSQL.pdb" target="lib\net8.0" />
+        <file src="bin\net8.0\EFCore.NamingConventions.dll" target="lib\net8.0" />
+        <file src="bin\net8.0\Npgsql.EntityFrameworkCore.PostgreSQL.dll" target="lib\net8.0" />
+        <file src="bin\net8.0\Npgsql.dll" target="lib\net8.0" />
         <file src="icon.png" target="" />
     </files>
 </package>

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

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Version>4.0.5</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>5.0.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.5</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.SqlServer</id>
-        <version>4.0.5</version>
+        <version>5.0.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQL Server Provider</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/v4.0.5</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
     <files>
-        <file src="bin\net7.0\Oqtane.Database.SqlServer.dll" target="lib\net7.0" />
-        <file src="bin\net7.0\Oqtane.Database.SqlServer.pdb" target="lib\net7.0" />
-        <file src="bin\net7.0\Microsoft.EntityFrameworkCore.SqlServer.dll" target="lib\net7.0" />
+        <file src="bin\net8.0\Oqtane.Database.SqlServer.dll" target="lib\net8.0" />
+        <file src="bin\net8.0\Oqtane.Database.SqlServer.pdb" target="lib\net8.0" />
+        <file src="bin\net8.0\Microsoft.EntityFrameworkCore.SqlServer.dll" target="lib\net8.0" />
         <file src="icon.png" target="" />
     </files>
 </package>

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

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Version>4.0.5</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>5.0.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.5</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.Sqlite</id>
-        <version>4.0.5</version>
+        <version>5.0.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQLite Provider</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/v4.0.5</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
     <files>
-        <file src="bin\net7.0\Oqtane.Database.Sqlite.dll" target="lib\net7.0" />
-        <file src="bin\net7.0\Oqtane.Database.Sqlite.pdb" target="lib\net7.0" />
-        <file src="bin\net7.0\Microsoft.EntityFrameworkCore.Sqlite.dll" target="lib\net7.0" />
+        <file src="bin\net8.0\Oqtane.Database.Sqlite.dll" target="lib\net8.0" />
+        <file src="bin\net8.0\Oqtane.Database.Sqlite.pdb" target="lib\net8.0" />
+        <file src="bin\net8.0\Microsoft.EntityFrameworkCore.Sqlite.dll" target="lib\net8.0" />
         <file src="icon.png" target="" />
     </files>
 </package>

Oqtane.Maui/Oqtane.Maui.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.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>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks> -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
+    <!-- <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
-    <Version>4.0.5</Version>
+    <Version>5.0.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -14,7 +14,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.5</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane.Maui</RootNamespace>
@@ -31,7 +31,7 @@
 		<ApplicationIdGuid>0E29FC31-1B83-48ED-B6E0-9F3C67B775D4</ApplicationIdGuid>
     
 		<!-- Versions -->
-		<ApplicationDisplayVersion>4.0.5</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>5.0.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
@@ -65,20 +65,22 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.5" />
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="Oqtane.Client">
-      <HintPath>..\Oqtane.Server\bin\Debug\net7.0\Oqtane.Client.dll</HintPath>
+      <HintPath>..\Oqtane.Server\bin\Debug\net8.0\Oqtane.Client.dll</HintPath>
     </Reference>
     <Reference Include="Oqtane.Shared">
-      <HintPath>..\Oqtane.Server\bin\Debug\net7.0\Oqtane.Shared.dll</HintPath>
+      <HintPath>..\Oqtane.Server\bin\Debug\net8.0\Oqtane.Shared.dll</HintPath>
     </Reference>
   </ItemGroup>
 

Oqtane.Package/Oqtane.Client.nuspec

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Client</id>
-    <version>4.0.5</version>
+    <version>5.0.0</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,13 +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/v4.0.5</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
   <files>
-    <file src="..\Oqtane.Client\bin\Release\net7.0\Oqtane.Client.dll" target="lib\net7.0" /> 
-    <file src="..\Oqtane.Client\bin\Release\net7.0\Oqtane.Client.pdb" target="lib\net7.0" /> 
+    <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.Server\bin\Release\net8.0\Oqtane.Licensing.Client.Oqtane.dll" target="lib\net8.0" /> 
     <file src="icon.png" target="" />
   </files>
 </package>

Oqtane.Package/Oqtane.Framework.nuspec

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

Oqtane.Package/Oqtane.Server.nuspec

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Server</id>
-    <version>4.0.5</version>
+    <version>5.0.0</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/v4.0.5</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
   <files>
-    <file src="..\Oqtane.Server\bin\Release\net7.0\Oqtane.Server.dll" target="lib\net7.0" /> 
-    <file src="..\Oqtane.Server\bin\Release\net7.0\Oqtane.Server.pdb" target="lib\net7.0" /> 
+    <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="icon.png" target="" />
   </files>
 </package>

Oqtane.Package/Oqtane.Shared.nuspec

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Shared</id>
-    <version>4.0.5</version>
+    <version>5.0.0</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,13 +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/v4.0.5</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
   <files>
-    <file src="..\Oqtane.Shared\bin\Release\net7.0\Oqtane.Shared.dll" target="lib\net7.0" /> 
-    <file src="..\Oqtane.Shared\bin\Release\net7.0\Oqtane.Shared.pdb" target="lib\net7.0" /> 
+    <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.Server\bin\Release\net8.0\Oqtane.Licensing.Shared.Oqtane.dll" target="lib\net8.0" /> 
     <file src="icon.png" target="" />
   </files>
 </package>

Oqtane.Package/Oqtane.Updater.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Updater</id>
-    <version>4.0.5</version>
+    <version>5.0.0</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,12 +12,12 @@
     <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/v4.0.5</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
   <files>
-    <file src="..\Oqtane.Updater\bin\Release\net7.0\publish\*.*" target="lib\net7.0" /> 
+    <file src="..\Oqtane.Updater\bin\Release\net8.0\publish\*.*" target="lib\net8.0" /> 
     <file src="icon.png" target="" />
   </files>
 </package>

Oqtane.Package/install.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.5.Install.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net8.0\publish\*" -DestinationPath "Oqtane.Framework.5.0.0.Install.zip" -Force 

Oqtane.Package/release.cmd

@@ -8,14 +8,14 @@ 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\net7.0\publish" > NUL
-rmdir /Q/S "..\Oqtane.Server\bin\Release\net7.0\publish"
+del /F/Q/S "..\Oqtane.Server\bin\Release\net8.0\publish" > NUL
+rmdir /Q/S "..\Oqtane.Server\bin\Release\net8.0\publish"
 dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
-del /F/Q/S "..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Content" > NUL
-rmdir /Q/S "..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Content"
+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"
 setlocal ENABLEDELAYEDEXPANSION
 set retain=Oqtane.Modules.Admin.Login,Oqtane.Modules.HtmlText
-for /D %%i in ("..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Modules\*") do (
+for /D %%i in ("..\Oqtane.Server\bin\Release\net8.0\publish\wwwroot\Modules\*") do (
 set /A found=0
 for %%j in (%retain%) do (
 if "%%~nxi" == "%%j" set /A found=1
@@ -23,18 +23,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\net7.0\publish\wwwroot\Themes\*") do (
+for /D %%i in ("..\Oqtane.Server\bin\Release\net8.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\net7.0\publish\appsettings.json"
-ren "..\Oqtane.Server\bin\Release\net7.0\publish\appsettings.release.json" "appsettings.json"
+del "..\Oqtane.Server\bin\Release\net8.0\publish\appsettings.json"
+ren "..\Oqtane.Server\bin\Release\net8.0\publish\appsettings.release.json" "appsettings.json"
 C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\install.ps1"
-del "..\Oqtane.Server\bin\Release\net7.0\publish\appsettings.json"
-del "..\Oqtane.Server\bin\Release\net7.0\publish\web.config"
+del "..\Oqtane.Server\bin\Release\net8.0\publish\appsettings.json"
+del "..\Oqtane.Server\bin\Release\net8.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\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.5.Upgrade.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net8.0\publish\*" -DestinationPath "Oqtane.Framework.5.0.0.Upgrade.zip" -Force 

Oqtane.Server/Controllers/FolderController.cs

@@ -95,6 +95,33 @@ namespace Oqtane.Controllers
                 folderPath += "/";
             }
             Folder folder = _folders.GetFolder(siteId, folderPath);
+            if (folder == null && User.IsInRole(RoleNames.Host) && path.StartsWith("Users/"))
+            {
+                // create the user folder on this site for the host user
+                var userId = int.Parse(path.ReplaceMultiple(new string[] { "Users", "/" }, ""));
+                folder = _folders.GetFolder(siteId, "Users/");
+                if (folder != null)
+                {
+                    folder = _folders.AddFolder(new Folder
+                    {
+                        SiteId = folder.SiteId,
+                        ParentId = folder.FolderId,
+                        Name = "My Folder",
+                        Type = FolderTypes.Private,
+                        Path = path,
+                        Order = 1,
+                        ImageSizes = "",
+                        Capacity = Constants.UserFolderCapacity,
+                        IsSystem = true,
+                        PermissionList = new List<Permission>
+                        {
+                            new Permission(PermissionNames.Browse, userId, true),
+                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                            new Permission(PermissionNames.Edit, userId, true)
+                        }
+                    });
+                }
+            }
             if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, folder.PermissionList))
             {
                 return folder;

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -350,9 +350,9 @@ namespace Oqtane.Controllers
                     if (moduleDefinition.Version == "local")
                     {
                         text = text.Replace("[FrameworkVersion]", Constants.Version);
-                        text = text.Replace("[ClientReference]", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net7.0\\Oqtane.Client.dll</HintPath></Reference>");
-                        text = text.Replace("[ServerReference]", $"<Reference Include=\"Oqtane.Server\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net7.0\\Oqtane.Server.dll</HintPath></Reference>");
-                        text = text.Replace("[SharedReference]", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net7.0\\Oqtane.Shared.dll</HintPath></Reference>");
+                        text = text.Replace("[ClientReference]", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Client.dll</HintPath></Reference>");
+                        text = text.Replace("[ServerReference]", $"<Reference Include=\"Oqtane.Server\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Server.dll</HintPath></Reference>");
+                        text = text.Replace("[SharedReference]", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Shared.dll</HintPath></Reference>");
                     }
                     else
                     {

Oqtane.Server/Controllers/NotificationController.cs

@@ -179,7 +179,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Notification Put(int id, [FromBody] Notification notification)
         {
-            if (ModelState.IsValid && notification.SiteId == _alias.SiteId && _notifications.GetNotification(notification.NotificationId, false) != null && IsAuthorized(notification.FromUserId))
+            if (ModelState.IsValid && notification.SiteId == _alias.SiteId && _notifications.GetNotification(notification.NotificationId, false) != null && (IsAuthorized(notification.FromUserId) || IsAuthorized(notification.ToUserId)))
             {
                 notification = _notifications.UpdateNotification(notification);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Notification, notification.NotificationId, SyncEventActions.Update);

Oqtane.Server/Controllers/ThemeController.cs

@@ -237,8 +237,8 @@ namespace Oqtane.Controllers
                     if (theme.Version == "local")
                     {
                         text = text.Replace("[FrameworkVersion]", Constants.Version);
-                        text = text.Replace("[ClientReference]", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net7.0\\Oqtane.Client.dll</HintPath></Reference>");
-                        text = text.Replace("[SharedReference]", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net7.0\\Oqtane.Shared.dll</HintPath></Reference>");
+                        text = text.Replace("[ClientReference]", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Client.dll</HintPath></Reference>");
+                        text = text.Replace("[SharedReference]", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net8.0\\Oqtane.Shared.dll</HintPath></Reference>");
                     }
                     else
                     {

Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs

@@ -31,6 +31,12 @@ namespace Oqtane.Extensions
             builder.AddSiteNamedOptions<CookieAuthenticationOptions>(Constants.AuthenticationScheme, (options, alias, sitesettings) =>
             {
                 options.Cookie.Name = sitesettings.GetValue("LoginOptions:CookieName", ".AspNetCore.Identity.Application");
+                string cookieExpStr = sitesettings.GetValue("LoginOptions:CookieExpiration", "");
+                if (!string.IsNullOrEmpty(cookieExpStr) && TimeSpan.TryParse(cookieExpStr, out TimeSpan cookieExpTS))
+                {
+                    options.Cookie.Expiration = cookieExpTS;
+                    options.ExpireTimeSpan = cookieExpTS;
+                }
             });
 
             // site OpenId Connect options
@@ -44,7 +50,7 @@ namespace Oqtane.Extensions
                     options.SaveTokens = false;
                     options.GetClaimsFromUserInfoEndpoint = true;
                     options.CallbackPath = string.IsNullOrEmpty(alias.Path) ? "/signin-" + AuthenticationProviderTypes.OpenIDConnect : "/" + alias.Path + "/signin-" + AuthenticationProviderTypes.OpenIDConnect;
-                    options.ResponseType = OpenIdConnectResponseType.Code; // authorization code flow
+                    options.ResponseType = sitesettings.GetValue("ExternalLogin:AuthResponseType", "code"); // authorization code flow
                     options.ResponseMode = OpenIdConnectResponseMode.FormPost; // recommended as most secure
 
                     // cookie config is required to avoid Correlation Failed errors
@@ -298,6 +304,7 @@ namespace Oqtane.Extensions
                 if (identityuser != null)
                 {
                     user = _users.GetUser(identityuser.UserName);
+                    user.SiteId = alias.SiteId;
                 }
                 else
                 {
@@ -351,7 +358,7 @@ namespace Oqtane.Extensions
                                             _notifications.AddNotification(notification);
 
                                             // add user login
-                                            await _identityUserManager.AddLoginAsync(identityuser, new UserLoginInfo(providerType + ":" + alias.SiteId.ToString(), id, providerName));
+                                            await _identityUserManager.AddLoginAsync(identityuser, new UserLoginInfo(providerType + ":" + user.SiteId.ToString(), id, providerName));
 
                                             _logger.Log(user.SiteId, LogLevel.Information, "ExternalLogin", Enums.LogFunction.Create, "User Added {User}", user);
                                         }
@@ -380,18 +387,38 @@ namespace Oqtane.Extensions
                             var login = logins.FirstOrDefault(item => item.LoginProvider == (providerType + ":" + alias.SiteId.ToString()));
                             if (login == null)
                             {
-                                // new external login using existing user account - verification required
-                                var _notifications = httpContext.RequestServices.GetRequiredService<INotificationRepository>();
-                                string token = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
-                                string url = httpContext.Request.Scheme + "://" + alias.Name;
-                                url += $"/login?name={identityuser.UserName}&token={WebUtility.UrlEncode(token)}&key={WebUtility.UrlEncode(id)}";
-                                string body = $"You Recently Signed In To Our Site With {providerName} Using The Email Address {email}. ";
-                                body += "In Order To Complete The Linkage Of Your User Account Please Click The Link Displayed Below:\n\n" + url + "\n\nThank You!";
-                                var notification = new Notification(alias.SiteId, email, email, "External Login Linkage", body);
-                                _notifications.AddNotification(notification);
+                                if (bool.Parse(httpContext.GetSiteSettings().GetValue("ExternalLogin:VerifyUsers", "true")))
+                                {
+                                    // external login using existing user account - verification required
+                                    var _notifications = httpContext.RequestServices.GetRequiredService<INotificationRepository>();
+                                    string token = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
+                                    string url = httpContext.Request.Scheme + "://" + alias.Name;
+                                    url += $"/login?name={identityuser.UserName}&token={WebUtility.UrlEncode(token)}&key={WebUtility.UrlEncode(id)}";
+                                    string body = $"You Recently Signed In To Our Site With {providerName} Using The Email Address {email}. ";
+                                    body += "In Order To Complete The Linkage Of Your User Account Please Click The Link Displayed Below:\n\n" + url + "\n\nThank You!";
+                                    var notification = new Notification(alias.SiteId, email, email, "External Login Linkage", body);
+                                    _notifications.AddNotification(notification);
 
-                                identity.Label = ExternalLoginStatus.VerificationRequired;
-                                _logger.Log(alias.SiteId, LogLevel.Information, "ExternalLogin", Enums.LogFunction.Create, "External Login Linkage Verification For Provider {Provider} Sent To {Email}", providerName, email);
+                                    identity.Label = ExternalLoginStatus.VerificationRequired;
+                                    _logger.Log(alias.SiteId, LogLevel.Information, "ExternalLogin", Enums.LogFunction.Create, "External Login Linkage Verification For Provider {Provider} Sent To {Email}", providerName, email);
+                                }
+                                else
+                                {
+                                    // external login using existing user account - link automatically
+                                    user = _users.GetUser(identityuser.UserName);
+                                    user.SiteId = alias.SiteId;
+
+                                    var _notifications = httpContext.RequestServices.GetRequiredService<INotificationRepository>();
+                                    string url = httpContext.Request.Scheme + "://" + alias.Name;
+                                    string body = "You Recently Used An External Account To Sign In To Our Site.\n\n" + url + "\n\nThank You!";
+                                    var notification = new Notification(user.SiteId, user, "User Account Notification", body);
+                                    _notifications.AddNotification(notification);
+
+                                    // add user login
+                                    await _identityUserManager.AddLoginAsync(identityuser, new UserLoginInfo(providerType + ":" + user.SiteId.ToString(), id, providerName));
+
+                                    _logger.Log(user.SiteId, LogLevel.Information, "ExternalLogin", Enums.LogFunction.Create, "External Login Linkage Created For User {Username} And Provider {Provider}", user.Username, providerName);
+                                }
                             }
                             else
                             {

Oqtane.Server/Infrastructure/InstallationManager.cs

@@ -251,10 +251,14 @@ namespace Oqtane.Infrastructure
                         string filepath = asset.StartsWith("\\") ? Path.Combine(_environment.ContentRootPath, asset.Substring(1)) : asset;
                         if (File.Exists(filepath))
                         {
-                            File.Delete(filepath);
-                            if (!Directory.EnumerateFiles(Path.GetDirectoryName(filepath)).Any())
+                            // do not remove licensing assemblies - this is a temporary fix until a more robust dependency management solution is available
+                            if (!filepath.Contains("Oqtane.Licensing."))
                             {
-                                Directory.Delete(Path.GetDirectoryName(filepath), true);
+                                File.Delete(filepath);
+                                if (!Directory.EnumerateFiles(Path.GetDirectoryName(filepath)).Any())
+                                {
+                                    Directory.Delete(Path.GetDirectoryName(filepath), true);
+                                }
                             }
                         }
                     }

Oqtane.Server/Managers/UserManager.cs

@@ -184,7 +184,6 @@ namespace Oqtane.Managers
             IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
             if (identityuser != null)
             {
-                identityuser.Email = user.Email;
                 var valid = true;
                 if (!string.IsNullOrEmpty(user.Password))
                 {
@@ -203,6 +202,13 @@ namespace Oqtane.Managers
                         await _identityUserManager.UpdateAsync(identityuser); // requires password to be provided
                     }
 
+                    if (user.Email != identityuser.Email)
+                    {
+                        await _identityUserManager.SetEmailAsync(identityuser, user.Email);
+                        var emailConfirmationToken = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
+                        await _identityUserManager.ConfirmEmailAsync(identityuser, emailConfirmationToken);
+                    }
+
                     user = _users.UpdateUser(user);
                     _syncManager.AddSyncEvent(_tenantManager.GetAlias().TenantId, EntityNames.User, user.UserId, SyncEventActions.Update);
                     _syncManager.AddSyncEvent(_tenantManager.GetAlias().TenantId, EntityNames.User, user.UserId, SyncEventActions.Reload);

Oqtane.Server/Migrations/Tenant/04000601_AddProfileRows.cs

@@ -0,0 +1,29 @@
+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.04.00.06.01")]
+    public class AddProfileRows : MultiDatabaseMigration
+    {
+        public AddProfileRows(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var profileEntityBuilder = new ProfileEntityBuilder(migrationBuilder, ActiveDatabase);
+            profileEntityBuilder.AddIntegerColumn("Rows", true);
+            profileEntityBuilder.UpdateColumn("Rows", "1");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // not implemented
+        }
+    }
+}

Oqtane.Server/Oqtane.Server.csproj

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>4.0.5</Version>
+    <Version>5.0.0</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/v4.0.5</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -32,20 +32,21 @@
     <EmbeddedResource Include="Scripts\MigrateTenant.sql" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0-preview3.23201.1" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.0" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.4" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.7-pre20231110210158" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
+    <PackageReference Include="Oqtane.Licensing" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Oqtane.Client\Oqtane.Client.csproj" />

Oqtane.Server/Pages/Files.cshtml.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Net;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
@@ -96,7 +97,7 @@ namespace Oqtane.Pages
                             }
                             else
                             {
-                                HttpContext.Response.Headers.Add(HeaderNames.ETag, etag);
+                                HttpContext.Response.Headers.Append(HeaderNames.ETag, etag);
                                 return PhysicalFile(filepath, file.GetMimeType());
                             }
                         }

Oqtane.Server/Pages/_Host.cshtml.cs

@@ -128,11 +128,6 @@ namespace Oqtane.Pages
                             RenderMode = site.RenderMode;
                         }
  
-                        if (site.VisitorTracking)
-                        {
-                            TrackVisitor(site.SiteId);
-                        }
-
                         var page = _pages.GetPage(route.PagePath, site.SiteId);
                         if (page == null && route.PagePath == "" && site.HomePageId != null)
                         {
@@ -156,6 +151,11 @@ namespace Oqtane.Pages
                             }
                         }
 
+                        if (site.VisitorTracking)
+                        {
+                            TrackVisitor(site.SiteId);
+                        }
+
                         // get jwt token for downstream APIs
                         if (User.Identity.IsAuthenticated)
                         {

Oqtane.Server/Repository/FileRepository.cs

@@ -32,8 +32,9 @@ namespace Oqtane.Repository
 
         public IEnumerable<File> GetFiles(int folderId, bool tracking)
         {
-            var alias = _tenants.GetAlias();
-            IEnumerable<Permission> permissions = _permissions.GetPermissions(alias.SiteId, EntityNames.Folder, folderId).ToList();
+            var folder = _folderRepository.GetFolder(folderId, false);
+            IEnumerable<Permission> permissions = _permissions.GetPermissions(folder.SiteId, EntityNames.Folder, folderId).ToList();
+
             IEnumerable<File> files;
             if (tracking)
             {
@@ -46,6 +47,7 @@ namespace Oqtane.Repository
             foreach (File file in files)
             {
                 file.Folder.PermissionList = permissions.ToList();
+                var alias = _tenants.GetAlias();
                 file.Url = GetFileUrl(file, alias);
             }
             return files;

Oqtane.Server/Repository/SiteRepository.cs

@@ -224,21 +224,21 @@ namespace Oqtane.Repository
             _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = RoleNames.Admin, Description = RoleNames.Admin, IsAutoAssigned = false, IsSystem = true});
 
             _profileRepository.AddProfile(new Profile
-                {SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = ""});
+            { SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "", Rows = 1 });
             _profileRepository.AddProfile(new Profile
-                {SiteId = site.SiteId, Name = "LastName", Title = "Last Name", Description = "Your Last Or Family Name", Category = "Name", ViewOrder = 2, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "" });
+            { SiteId = site.SiteId, Name = "LastName", Title = "Last Name", Description = "Your Last Or Family Name", Category = "Name", ViewOrder = 2, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "", Rows = 1 });
             _profileRepository.AddProfile(new Profile
-                {SiteId = site.SiteId, Name = "Street", Title = "Street", Description = "Street Or Building Address", Category = "Address", ViewOrder = 3, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "" });
-            _profileRepository.AddProfile(
-                new Profile {SiteId = site.SiteId, Name = "City", Title = "City", Description = "City", Category = "Address", ViewOrder = 4, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "" });
+            { SiteId = site.SiteId, Name = "Street", Title = "Street", Description = "Street Or Building Address", Category = "Address", ViewOrder = 3, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "", Rows = 1 });
+            _profileRepository.AddProfile(new Profile 
+            { SiteId = site.SiteId, Name = "City", Title = "City", Description = "City", Category = "Address", ViewOrder = 4, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "", Rows = 1 });
             _profileRepository.AddProfile(new Profile
-                {SiteId = site.SiteId, Name = "Region", Title = "Region", Description = "State Or Province", Category = "Address", ViewOrder = 5, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "" });
+            { SiteId = site.SiteId, Name = "Region", Title = "Region", Description = "State Or Province", Category = "Address", ViewOrder = 5, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "", Rows = 1 });
             _profileRepository.AddProfile(new Profile
-                {SiteId = site.SiteId, Name = "Country", Title = "Country", Description = "Country", Category = "Address", ViewOrder = 6, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "" });
+            { SiteId = site.SiteId, Name = "Country", Title = "Country", Description = "Country", Category = "Address", ViewOrder = 6, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "", Rows = 1 });
             _profileRepository.AddProfile(new Profile
-                {SiteId = site.SiteId, Name = "PostalCode", Title = "Postal Code", Description = "Postal Code Or Zip Code", Category = "Address", ViewOrder = 7, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "" });
+            { SiteId = site.SiteId, Name = "PostalCode", Title = "Postal Code", Description = "Postal Code Or Zip Code", Category = "Address", ViewOrder = 7, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "", Rows = 1 });
             _profileRepository.AddProfile(new Profile
-                {SiteId = site.SiteId, Name = "Phone", Title = "Phone Number", Description = "Phone Number", Category = "Contact", ViewOrder = 8, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "" });
+            { SiteId = site.SiteId, Name = "Phone", Title = "Phone Number", Description = "Phone Number", Category = "Contact", ViewOrder = 8, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = "", Rows = 1 });
 
             Folder folder = _folderRepository.AddFolder(new Folder
             {

Oqtane.Server/appsettings.json

@@ -1,7 +1,7 @@
 {
   "Runtime": "Server",
   "RenderMode": "ServerPrerendered",
-   "Database": {
+  "Database": {
     "DefaultDBType": ""
   },
   "ConnectionStrings": {
@@ -44,5 +44,15 @@
       "ControlType": "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client",
       "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL"
     }
-  ]
+  ],
+  "Logging": {
+    "FileLogger": {
+      "LogLevel": {
+        "Default": "Error"
+      }
+    },
+    "LogLevel": {
+      "Default": "Information"
+    }
+  }
 }

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Version>1.0.0</Version>
     <Authors>[Owner]</Authors>
     <Company>[Owner]</Company>
@@ -9,14 +9,15 @@
     <Product>[Owner].Module.[Module]</Product>
     <Copyright>[Owner]</Copyright>
     <AssemblyName>[Owner].Module.[Module].Client.Oqtane</AssemblyName>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.5" />
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
   </ItemGroup>
 

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 

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

@@ -20,13 +20,13 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\Client\bin\Release\net7.0\[Owner].Module.[Module].Client.Oqtane.dll" target="lib\net7.0" /> 
-    <file src="..\Client\bin\Release\net7.0\[Owner].Module.[Module].Client.Oqtane.pdb" target="lib\net7.0" /> 
-    <file src="..\Server\bin\Release\net7.0\[Owner].Module.[Module].Server.Oqtane.dll" target="lib\net7.0" /> 
-    <file src="..\Server\bin\Release\net7.0\[Owner].Module.[Module].Server.Oqtane.pdb" target="lib\net7.0" /> 
-    <file src="..\Shared\bin\Release\net7.0\[Owner].Module.[Module].Shared.Oqtane.dll" target="lib\net7.0" /> 
-    <file src="..\Shared\bin\Release\net7.0\[Owner].Module.[Module].Shared.Oqtane.pdb" target="lib\net7.0" /> 
+    <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>
+</package>

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

@@ -1,7 +1,7 @@
-XCOPY "..\Client\bin\Debug\net7.0\[Owner].Module.[Module].Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y
-XCOPY "..\Client\bin\Debug\net7.0\[Owner].Module.[Module].Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y
-XCOPY "..\Server\bin\Debug\net7.0\[Owner].Module.[Module].Server.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y
-XCOPY "..\Server\bin\Debug\net7.0\[Owner].Module.[Module].Server.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y
-XCOPY "..\Shared\bin\Debug\net7.0\[Owner].Module.[Module].Shared.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y
-XCOPY "..\Shared\bin\Debug\net7.0\[Owner].Module.[Module].Shared.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y
+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

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

@@ -1,7 +1,7 @@
-cp -f "../Client/bin/Debug/net7.0/[Owner].Module.[Module].Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/net7.0/"
-cp -f "../Client/bin/Debug/net7.0/[Owner].Module.[Module].Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/net7.0/"
-cp -f "../Server/bin/Debug/net7.0/[Owner].Module.[Module].Server.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/net7.0/"
-cp -f "../Server/bin/Debug/net7.0/[Owner].Module.[Module].Server.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/net7.0/"
-cp -f "../Shared/bin/Debug/net7.0/[Owner].Module.[Module].Shared.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/net7.0/"
-cp -f "../Shared/bin/Debug/net7.0/[Owner].Module.[Module].Shared.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/net7.0/"
-cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"
+cp -f "../Client/bin/Debug/net8.0/[Owner].Module.[Module].Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/net8.0/"
+cp -f "../Client/bin/Debug/net8.0/[Owner].Module.[Module].Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/net8.0/"
+cp -f "../Server/bin/Debug/net8.0/[Owner].Module.[Module].Server.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/net8.0/"
+cp -f "../Server/bin/Debug/net8.0/[Owner].Module.[Module].Server.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/net8.0/"
+cp -f "../Shared/bin/Debug/net8.0/[Owner].Module.[Module].Shared.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/net8.0/"
+cp -f "../Shared/bin/Debug/net8.0/[Owner].Module.[Module].Shared.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/net8.0/"
+cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <Version>1.0.0</Version>
     <Product>[Owner].Module.[Module]</Product>
@@ -19,10 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>    
+    <TargetFramework>net8.0</TargetFramework>    
     <Version>1.0.0</Version>
     <Product>[Owner].Module.[Module]</Product>
     <Authors>[Owner]</Authors>

Oqtane.Server/wwwroot/Modules/Templates/External/template.json

@@ -1,6 +1,6 @@
 {
   "Title": "Default Module Template",
   "Type": "External",
-  "Version": "4.0.3",
+  "Version": "5.0.0",
   "Namespace": "[Owner].Module.[Module]"
 }

Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Version>1.0.0</Version>
     <Authors>[Owner]</Authors>
     <Company>[Owner]</Company>
@@ -12,11 +12,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.5" />
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].Theme.[Theme].Package.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 

Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].Theme.[Theme].nuspec

@@ -20,9 +20,9 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\Client\bin\Release\net7.0\[Owner].Theme.[Theme].Client.Oqtane.dll" target="lib\net7.0" /> 
-    <file src="..\Client\bin\Release\net7.0\[Owner].Theme.[Theme].Client.Oqtane.pdb" target="lib\net7.0" /> 
+    <file src="..\Client\bin\Release\net8.0\[Owner].Theme.[Theme].Client.Oqtane.dll" target="lib\net8.0" /> 
+    <file src="..\Client\bin\Release\net8.0\[Owner].Theme.[Theme].Client.Oqtane.pdb" target="lib\net8.0" /> 
     <file src="..\Client\wwwroot\**\*.*" target="wwwroot" /> 
     <file src="icon.png" target="" />
   </files>
-</package>
+</package>

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

@@ -1,3 +1,3 @@
-XCOPY "..\Client\bin\Debug\net7.0\[Owner].Theme.[Theme].Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y
-XCOPY "..\Client\bin\Debug\net7.0\[Owner].Theme.[Theme].Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net7.0\" /Y
+XCOPY "..\Client\bin\Debug\net8.0\[Owner].Theme.[Theme].Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net8.0\" /Y
+XCOPY "..\Client\bin\Debug\net8.0\[Owner].Theme.[Theme].Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net8.0\" /Y
 XCOPY "..\Client\wwwroot\*" "..\..\[RootFolder]\Oqtane.Server\wwwroot\" /Y /S /I

Oqtane.Server/wwwroot/Themes/Templates/External/Package/debug.sh

@@ -1,3 +1,3 @@
-cp -f "../Client/bin/Debug/net7.0/[Owner].Theme.[Theme].Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/net7.0/"
-cp -f "../Client/bin/Debug/net7.0/[Owner].Theme.[Theme].Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/net7.0/"
-cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"
+cp -f "../Client/bin/Debug/net8.0/[Owner].Theme.[Theme].Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/net8.0/"
+cp -f "../Client/bin/Debug/net8.0/[Owner].Theme.[Theme].Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/net8.0/"
+cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"

Oqtane.Server/wwwroot/Themes/Templates/External/template.json

@@ -1,6 +1,6 @@
 {
   "Title": "Default Theme Template",
   "Type": "External",
-  "Version": "4.0.3",
+  "Version": "5.0.0",
   "Namespace": "[Owner].Theme.[Theme]"
 }

Oqtane.Shared/Models/Profile.cs

@@ -73,5 +73,10 @@ namespace Oqtane.Models
         /// Optional RegExp validation expression 
         /// </summary>
         public string Validation { get; set; }
+
+        /// <summary>
+        /// Optional number of rows (textarea)
+        /// </summary>
+        public int Rows { get; set; }
     }
 }

Oqtane.Shared/Oqtane.Shared.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>4.0.5</Version>
+    <Version>5.0.0</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/v4.0.5</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -19,11 +19,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="7.0.2" />
+    <PackageReference Include="System.Text.Json" Version="8.0.0" />
   </ItemGroup>
 
 </Project>

Oqtane.Shared/Shared/Constants.cs

@@ -7,8 +7,8 @@ namespace Oqtane.Shared
 {
     public class Constants
     {
-        public static readonly string Version = "4.0.5";
-        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5";
+        public static readonly string Version = "5.0.0";
+        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5,4.0.6,5.0.0";
         public const string PackageId = "Oqtane.Framework";
         public const string ClientId = "Oqtane.Client";
         public const string UpdaterPackageId = "Oqtane.Updater";

Oqtane.Shared/Shared/SiteState.cs

@@ -9,7 +9,7 @@ namespace Oqtane.Shared
         public string AntiForgeryToken { get; set; } // passed from server for use in service calls on client
         public string AuthorizationToken { get; set; } // passed from server for use in service calls on client
         public string RemoteIPAddress { get; set; } // passed from server as cannot be reliably retrieved on client
-        public bool IsPrerendering{ get; set; } 
+        public bool IsPrerendering { get; set; }
 
         private dynamic _properties;
         public dynamic Properties => _properties ?? (_properties = new PropertyDictionary());

Oqtane.Shared/Shared/Utilities.cs

@@ -1,8 +1,6 @@
 using Oqtane.Models;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -389,13 +387,20 @@ namespace Oqtane.Shared
         }
 
         public static string UrlCombine(params string[] segments)
-{
-            segments = segments.Where(item => !string.IsNullOrEmpty(item) && item != "/" && item != "\\").ToArray();
-            for (int i = 1; i < segments.Length; i++)
+        {
+            var url = new List<string>();
+            for (int i = 0; i < segments.Length; i++)
             {
                 segments[i] = segments[i].Replace("\\", "/");
+                if (!string.IsNullOrEmpty(segments[i]) && segments[i] != "/")
+                {
+                    foreach (var segment in segments[i].Split('/', StringSplitOptions.RemoveEmptyEntries))
+                    {
+                        url.Add(segment);
+                    }
+                }
             }
-            return string.Join("/", segments);
+            return string.Join("/", url);
         }
 
         public static bool IsPathValid(this Folder folder)

Oqtane.Updater/Oqtane.Updater.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <Version>4.0.5</Version>
+    <Version>5.0.0</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/v4.0.5</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v5.0.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>