Update README.md

fix logic issue in url mapping, improve 404 handling, add property change component notifications

Oqtane.Client/App.razor

@@ -45,6 +45,9 @@
 	[Parameter]
 	public string RemoteIPAddress { get; set; }
 
+	[Parameter]
+	public string AuthorizationToken { get; set; }
+
 	private bool _initialized = false;
 	private string _display = "display: none;";
 	private Installation _installation = new Installation { Success = false, Message = "" };
@@ -55,17 +58,13 @@
 	{
 		SiteState.RemoteIPAddress = RemoteIPAddress;
 		SiteState.AntiForgeryToken = AntiForgeryToken;
-		InstallationService.SetAntiForgeryTokenHeader(AntiForgeryToken);
+		SiteState.AuthorizationToken = AuthorizationToken;
 
         _installation = await InstallationService.IsInstalled();
         if (_installation.Alias != null)
         {
             SiteState.Alias = _installation.Alias;
         }
-        else
-        {
-            _installation.Message = "Site Not Configured Correctly - No Matching Alias Exists For Host Name";
-        }
         _initialized = true;
     }
 

Oqtane.Client/Installer/Installer.razor

@@ -121,90 +121,97 @@
 		{
 			_databaseName = "LocalDB";
 		}
-        LoadDatabaseConfigComponent();
-    }
+		LoadDatabaseConfigComponent();
+	}
 
-    private void DatabaseChanged(ChangeEventArgs eventArgs)
-    {
-        try
-        {
-            _databaseName = (string)eventArgs.Value;
+	private void DatabaseChanged(ChangeEventArgs eventArgs)
+	{
+		try
+		{
+			_databaseName = (string)eventArgs.Value;
 
-            LoadDatabaseConfigComponent();
-        }
-        catch
-        {
-            _message = Localizer["Error.DbConfig.Load"];
-        }
-    }
+			LoadDatabaseConfigComponent();
+		}
+		catch
+		{
+			_message = Localizer["Error.DbConfig.Load"];
+		}
+	}
 
-    private void LoadDatabaseConfigComponent()
-    {
-        var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
-        if (database != null)
-        {
-            _databaseConfigType = Type.GetType(database.ControlType);
-            DatabaseConfigComponent = builder =>
-            {
-                builder.OpenComponent(0, _databaseConfigType);
-                builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
-                builder.CloseComponent();
-            };
-        }
-    }
+	private void LoadDatabaseConfigComponent()
+	{
+		var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+		if (database != null)
+		{
+			_databaseConfigType = Type.GetType(database.ControlType);
+			DatabaseConfigComponent = builder =>
+			{
+				builder.OpenComponent(0, _databaseConfigType);
+				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+				builder.CloseComponent();
+			};
+		}
+	}
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("", "stylesheet", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css", "text/css", "sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==", "anonymous", "");
-            await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.bundle.min.js", "sha512-pax4MlgXjHEPfCwcJLQhigY7+N8rt6bVvWLFyUMuxShv170X53TRzGPmPkZmGBhk+jikR8WBM4yl7A9WMHHqvg==", "anonymous", "", "head", "");
-        }
-    }
+	protected override async Task OnAfterRenderAsync(bool firstRender)
+	{
+		if (firstRender)
+		{
+			var interop = new Interop(JSRuntime);
+			await interop.IncludeLink("", "stylesheet", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css", "text/css", "sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==", "anonymous", "");
+			await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.bundle.min.js", "sha512-pax4MlgXjHEPfCwcJLQhigY7+N8rt6bVvWLFyUMuxShv170X53TRzGPmPkZmGBhk+jikR8WBM4yl7A9WMHHqvg==", "anonymous", "", "head");
+		}
+	}
 
-    private async Task Install()
-    {
-        var connectionString = String.Empty;
-        if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
-        {
-            connectionString = databaseConfigControl.GetConnectionString();
-        }
+	private async Task Install()
+	{
+		var connectionString = String.Empty;
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			connectionString = databaseConfigControl.GetConnectionString();
+		}
 
-        if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && _hostPassword.Length >= 6 && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@"))
-        {
-            _loadingDisplay = "";
-            StateHasChanged();
+		if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@"))
+		{
+			if (await UserService.ValidatePasswordAsync(_hostPassword))
+			{
+				_loadingDisplay = "";
+				StateHasChanged();
 
-            Uri uri = new Uri(NavigationManager.Uri);
+				Uri uri = new Uri(NavigationManager.Uri);
 
-            var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+				var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
 
-            var config = new InstallConfig
-            {
-                DatabaseType = database.DBType,
-                ConnectionString = connectionString,
-                Aliases = uri.Authority,
-                HostUsername = _hostUsername,
-                HostPassword = _hostPassword,
-                HostEmail = _hostEmail,
-                HostName = _hostUsername,
-                TenantName = TenantNames.Master,
-                IsNewTenant = true,
-                SiteName = Constants.DefaultSite,
-                Register = _register
-            };
+				var config = new InstallConfig
+				{
+					DatabaseType = database.DBType,
+					ConnectionString = connectionString,
+					Aliases = uri.Authority,
+					HostUsername = _hostUsername,
+					HostPassword = _hostPassword,
+					HostEmail = _hostEmail,
+					HostName = _hostUsername,
+					TenantName = TenantNames.Master,
+					IsNewTenant = true,
+					SiteName = Constants.DefaultSite,
+					Register = _register
+				};
 
-            var installation = await InstallationService.Install(config);
-            if (installation.Success)
-            {
-                NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
-            }
-            else
-            {
-                _message = installation.Message;
-                _loadingDisplay = "display: none;";
-            }
+				var installation = await InstallationService.Install(config);
+				if (installation.Success)
+				{
+					NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
+				}
+				else
+				{
+					_message = installation.Message;
+					_loadingDisplay = "display: none;";
+				}				
+			}
+			else
+			{
+				_message = Localizer["Message.Password.Invalid"];				
+			}
         }
         else
         {

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

@@ -27,6 +27,6 @@
     protected override void OnInitialized()
     {
         var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
-        _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId && !item.IsDeleted).ToList();
+        _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList();
     }
 }

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

@@ -7,10 +7,6 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_message != string.Empty)
-{
-    <ModuleMessage Message="@_message" Type="@_type" />
-}
 <AuthorizeView Roles="@RoleNames.Registered">
     <Authorizing>
         <text>...</text>
@@ -19,185 +15,285 @@
 		<div>@Localizer["Info.SignedIn"]</div>
     </Authorized>
     <NotAuthorized>
-        <form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-            <div class="container Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
-                <div class="form-group">
-                    <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
-                    <input type="text" @ref="username" name="Username" class="form-control username" placeholder="Username" @bind="@_username" id="Username" required />
-                </div>
-                <div class="form-group">
-                    <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
-                    <input type="password" name="Password" class="form-control password" placeholder="Password" @bind="@_password" id="Password" required />
-                </div>
-                <div class="form-group">
-                    <div class="form-check form-check-inline">
-                        <label class="form-check-label" for="Remember">@Localizer["RememberMe"]</label>&nbsp;
-                        <input type="checkbox" class="form-check-input" name="Remember" @bind="@_remember" id="Remember" />
-                    </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>
-                <br /><br />
-                <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>
-            </div>
-        </form>
-    </NotAuthorized>
+		@if (!twofactor)
+		{
+			<form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+				<div class="Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
+				@if (_allowexternallogin)
+				{
+					<button type="button" class="btn btn-primary" @onclick="ExternalLogin">@Localizer["Use"] @PageState.Site.Settings["ExternalLogin:ProviderName"]</button>						
+					<br /><br />
+				}
+				@if (_allowsitelogin)
+				{
+					<div class="form-group">
+						<Label Class="control-label" For="username" HelpText="Please enter your Username" ResourceKey="Username">Username:</Label>
+						<input id="username" type="text" @ref="username" class="form-control" placeholder="@Localizer["Username.Placeholder"]" @bind="@_username" required />
+					</div>
+					<div class="form-group mt-2">
+						<Label Class="control-label" For="password" HelpText="Please enter your Password" ResourceKey="Password">Password:</Label>
+						<div class="input-group">
+							<input id="password" type="@_passwordtype" name="Password" class="form-control" placeholder="@Localizer["Password.Placeholder"]" @bind="@_password" required />
+							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+						</div>
+					</div>
+					<div class="form-group mt-2">
+						<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>
+					<br /><br />
+					<button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>		
+				}
+				</div>
+			</form>
+		}
+		else
+		{
+			<form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+				<div class="container Oqtane-Modules-Admin-Login">
+					<div class="form-group">
+						<Label Class="control-label" For="code" HelpText="Please enter the secure verification code which was sent to you by email" ResourceKey="Code">Verification Code:</Label>
+						<input id="code" class="form-control" @bind="@_code" placeholder="@Localizer["Code.Placeholder"]" maxlength="6" required />
+					</div>
+					<br />
+					<button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+					<button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Cancel"]</button>
+				</div>
+			</form>
+		}
+	</NotAuthorized>
 </AuthorizeView>
 
 @code {
-    private string _returnUrl = string.Empty;
-    private string _message = string.Empty;
-    private MessageType _type = MessageType.Info;
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private bool _remember = false;
-    private bool validated = false;
+	private bool _allowsitelogin = true;
+	private bool _allowexternallogin = false;
+	private ElementReference login;
+	private bool validated = false;
+	private bool twofactor = false;
+	private string _username = string.Empty;
+	private ElementReference username;
+	private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
+	private bool _remember = false;
+	private string _code = string.Empty;
 
-    private ElementReference login;
-    private ElementReference username;
+	private string _returnUrl = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
-    public override List<Resource> Resources => new List<Resource>()
+	public override List<Resource> Resources => new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
     };
 
-    protected override async Task OnInitializedAsync()
-    {
-        if (PageState.QueryString.ContainsKey("returnurl"))
-        {
-            _returnUrl = PageState.QueryString["returnurl"];
-        }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_togglepassword = Localizer["ShowPassword"];
 
-        if (PageState.QueryString.ContainsKey("name"))
-        {
-            _username = PageState.QueryString["name"];
-        }
+			if (PageState.Site.Settings.ContainsKey("LoginOptions:AllowSiteLogin") && !string.IsNullOrEmpty(PageState.Site.Settings["LoginOptions:AllowSiteLogin"]))
+			{
+				_allowsitelogin = bool.Parse(PageState.Site.Settings["LoginOptions:AllowSiteLogin"]);
+			}
 
-        if (PageState.QueryString.ContainsKey("token"))
-        {
-            var user = new User();
-            user.SiteId = PageState.Site.SiteId;
-            user.Username = _username;
-            user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
+			if (PageState.Site.Settings.ContainsKey("ExternalLogin:ProviderType") && !string.IsNullOrEmpty(PageState.Site.Settings["ExternalLogin:ProviderType"]))
+			{
+				_allowexternallogin = true;
+			}
 
-            if (user != null)
-            {
-                await logger.LogInformation(LogFunction.Security, "Email Verified For For Username {Username}", _username);
-                _message = Localizer["Success.Account.Verified"];
-            }
-            else
-            {
-                await logger.LogError(LogFunction.Security, "Email Verification Failed For Username {Username}", _username);
-                _message = Localizer["Message.Account.NotVerfied"];
-                _type = MessageType.Warning;
-            }
-        }
-    }
+			if (PageState.QueryString.ContainsKey("returnurl"))
+			{
+				_returnUrl = PageState.QueryString["returnurl"];
+			}
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            if(PageState.User == null)
-            {
-                await username.FocusAsync();
-            }
-        }
-    }
+			if (PageState.QueryString.ContainsKey("name"))
+			{
+				_username = PageState.QueryString["name"];
+			}
 
-    private async Task Login()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(login))
-        {
-            if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
-            {
-                var user = new User();
-                user.SiteId = PageState.Site.SiteId;
-                user.Username = _username;
-                user.Password = _password;
-                user = await UserService.LoginUserAsync(user, false, false);
+			if (PageState.QueryString.ContainsKey("token"))
+			{
+				var user = new User();
+				user.SiteId = PageState.Site.SiteId;
+				user.Username = _username;
+				user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
 
-                if (user.IsAuthenticated)
-                {
-                    await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
-                    // server-side Blazor needs to post to the Login page so that the cookies are set correctly
-                    var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
-                    string url = Utilities.TenantUrl(PageState.Alias, "/pages/login/");
-                    await interop.SubmitForm(url, fields);
-                }
-                else
-                {
-                    await logger.LogError(LogFunction.Security, "Login Failed For Username {Username}", _username);
-                    AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
-                }
-            }
-            else
-            {
-                // client-side Blazor
-                var user = new User();
-                user.SiteId = PageState.Site.SiteId;
-                user.Username = _username;
-                user.Password = _password;
-                user = await UserService.LoginUserAsync(user, true, _remember);
-                if (user.IsAuthenticated)
-                {
-                    await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
-                    var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
-                    authstateprovider.NotifyAuthenticationChanged();
-                    NavigationManager.NavigateTo(NavigateUrl(_returnUrl, true));
-                }
-                else
-                {
-                    await logger.LogError(LogFunction.Security, "Login Failed For Username {Username}", _username);
-                    AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
-                }
-            }
-        }
-        else
-        {
-            AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
-        }
-    }
+				if (user != null)
+				{
+					await logger.LogInformation(LogFunction.Security, "Email Verified For For Username {Username}", _username);
+					AddModuleMessage(Localizer["Success.Account.Verified"], MessageType.Info);						
+				}
+				else
+				{
+					await logger.LogError(LogFunction.Security, "Email Verification Failed For Username {Username}", _username);
+					AddModuleMessage(Localizer["Message.Account.NotVerfied"], MessageType.Warning);						
+				}
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Login {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.LoadLogin"], MessageType.Error);
+		}
+	}
 
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo(_returnUrl);
-    }
+	protected override async Task OnAfterRenderAsync(bool firstRender)
+	{
+		if (firstRender && PageState.User == null)
+		{
+			await username.FocusAsync();
+		}
+	}
 
-    private async Task Forgot()
-    {
-        if (_username != string.Empty)
-        {
-            var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
-            if (user != null)
-            {
-                await UserService.ForgotPasswordAsync(user);
-                await logger.LogInformation(LogFunction.Security, "Password Reset Notification Sent For Username {Username}", _username);
-                _message = Localizer["Message.ForgotUser"];
-            }
-            else
-            {
-                _message = Localizer["Message.UserDoesNotExist"];
-                _type = MessageType.Warning;
-            }
-        }
-        else
-        {
-            _message = Localizer["Message.ForgotPassword"];
-        }
+	private async Task Login()
+	{
+		try
+		{
+			validated = true;
+			var interop = new Interop(JSRuntime);
+			if (await interop.FormValid(login))
+			{
+				var user = new User { SiteId = PageState.Site.SiteId, Username = _username, Password = _password};
 
-        StateHasChanged();
-    }
+				if (!twofactor)
+				{
+					user = await UserService.LoginUserAsync(user, false, false);
+				}
+				else
+				{
+					user = await UserService.VerifyTwoFactorAsync(user, _code);
+				}
+
+				if (user.IsAuthenticated)
+				{
+					await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
+
+					if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
+					{
+						// server-side Blazor needs to post to the Login page so that the cookies are set correctly
+						var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
+						string url = Utilities.TenantUrl(PageState.Alias, "/pages/login/");
+						await interop.SubmitForm(url, fields);
+					}
+					else
+					{
+						var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
+						authstateprovider.NotifyAuthenticationChanged();
+						NavigationManager.NavigateTo(NavigateUrl(_returnUrl, true));
+					}
+				}
+				else
+				{
+					if (user.TwoFactorRequired)
+					{
+						twofactor = true;
+						validated = false;
+						AddModuleMessage(Localizer["Message.TwoFactor"], MessageType.Info);
+					}
+					else
+					{
+						if (!twofactor)
+						{
+							await logger.LogInformation(LogFunction.Security, "Login Failed For Username {Username}", _username);
+							AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);						
+						}
+						else
+						{
+							await logger.LogInformation(LogFunction.Security, "Two Factor Verification Failed For Username {Username}", _username);
+							AddModuleMessage(Localizer["Error.TwoFactor.Fail"], MessageType.Error);						
+						}
+					}
+				}
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Performing Login {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Login"], MessageType.Error);
+		}
+	}
+
+	private void Cancel()
+	{
+		NavigationManager.NavigateTo(_returnUrl);
+	}
+
+	private async Task Forgot()
+	{
+		try
+		{
+			if (_username != string.Empty)
+			{
+				var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
+				if (user != null)
+				{
+					await UserService.ForgotPasswordAsync(user);
+					await logger.LogInformation(LogFunction.Security, "Password Reset Notification Sent For Username {Username}", _username);
+					AddModuleMessage(Localizer["Message.ForgotUser"], MessageType.Info);
+				}
+				else
+				{
+					AddModuleMessage(Localizer["Message.UserDoesNotExist"], MessageType.Warning);
+				}
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Message.ForgotPassword"], MessageType.Info);
+			}
+
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Resetting Password {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.ResetPassword"], MessageType.Error);
+		}
+	}
+
+	private void Reset()
+	{
+		twofactor = false;
+		_username = "";
+		_password = "";
+		ClearModuleMessage();
+		StateHasChanged();
+	}
+
+	private async Task KeyPressed(KeyboardEventArgs e)
+	{
+		if (e.Code == "Enter" || e.Code == "NumpadEnter")
+		{
+			await Login();
+		}
+	}
+
+	private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = Localizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = Localizer["ShowPassword"];
+		}
+	}
+
+	private void ExternalLogin()
+	{
+        NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + _returnUrl), true);
+	}
 
-    private async Task KeyPressed(KeyboardEventArgs e)
-    {
-        if (e.Code == "Enter" || e.Code == "NumpadEnter")
-        {
-            await Login();
-        }
-    }
 }

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

@@ -9,86 +9,88 @@
 @inject IStringLocalizer<Detail> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <div class="container">
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
-            <div class="col-sm-9">
-                <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
-            <div class="col-sm-9">
-                <input id="level" class="form-control" @bind="@_level" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
-            <div class="col-sm-9">
-                <input id="feature" class="form-control" @bind="@_feature" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
-            <div class="col-sm-9">
-                <input id="function" class="form-control" @bind="@_function" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
-            <div class="col-sm-9">
-                <input id="category" class="form-control" @bind="@_category" readonly />
-            </div>
-       </div>
-        @if (_pageName != string.Empty)
-        {
-           <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
-                <div class="col-sm-9">
-                    <input id="page" class="form-control" @bind="@_pageName" readonly />
-                </div>
-           </div>
-        }
-        @if (_moduleTitle != string.Empty)
-        {
-           <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
-                <div class="col-sm-9">
-                    <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
-                </div>
-           </div>
-        }
-        @if (_username != string.Empty)
-        {
-           <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
-                 <div class="col-sm-9">
-                    <input id="user" class="form-control" @bind="@_username" readonly />
-                </div>
-           </div>
-        }
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
-            <div class="col-sm-9">
-                <input id="url" class="form-control" @bind="@_url" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
-            <div class="col-sm-9">
-                <input id="template" class="form-control" @bind="@_template" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="message" HelpText="The message that the system generated" ResourceKey="Message">Message: </Label>
-            <div class="col-sm-9">
-                <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
-            </div>
-       </div>
-        @if (!string.IsNullOrEmpty(_exception))
-        {
-           <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
+@if (_initialized)
+{
+	<div class="container">
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
+			<div class="col-sm-9">
+				<input id="dateTime" class="form-control" @bind="@_logDate" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
+			<div class="col-sm-9">
+				<input id="level" class="form-control" @bind="@_level" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
+			<div class="col-sm-9">
+				<input id="feature" class="form-control" @bind="@_feature" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
+			<div class="col-sm-9">
+				<input id="function" class="form-control" @bind="@_function" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
+			<div class="col-sm-9">
+				<input id="category" class="form-control" @bind="@_category" readonly />
+			</div>
+		</div>
+		@if (_pageName != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
+				<div class="col-sm-9">
+					<input id="page" class="form-control" @bind="@_pageName" readonly />
+				</div>
+			</div>
+		}
+		@if (_moduleTitle != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
+				<div class="col-sm-9">
+					<input id="module" class="form-control" @bind="@_moduleTitle" readonly />
+				</div>
+			</div>
+		}
+		@if (_username != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
+				<div class="col-sm-9">
+					<input id="user" class="form-control" @bind="@_username" readonly />
+				</div>
+			</div>
+		}
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
+			<div class="col-sm-9">
+				<input id="url" class="form-control" @bind="@_url" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
+			<div class="col-sm-9">
+				<input id="template" class="form-control" @bind="@_template" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="message" HelpText="The message that the system generated" ResourceKey="Message">Message: </Label>
+			<div class="col-sm-9">
+				<textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
+			</div>
+		</div>
+		@if (!string.IsNullOrEmpty(_exception))
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
 				<div class="col-sm-9">
                     <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
                 </div>
@@ -107,81 +109,95 @@
             </div>
         </div>
     </div>
+}
+<NavLink class="btn btn-secondary" href="@CloseUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+@code {
+	private bool _initialized = false;
+    private int _logId;
+    private string _logDate = string.Empty;
+    private string _level = string.Empty;
+    private string _feature = string.Empty;
+    private string _function = string.Empty;
+    private string _category = string.Empty;
+    private string _pageName = string.Empty;
+    private string _moduleTitle = string.Empty;
+    private string _username = string.Empty;
+    private string _url = string.Empty;
+    private string _template = string.Empty;
+    private string _message = string.Empty;
+    private string _exception = string.Empty;
+    private string _properties = string.Empty;
+    private string _server = string.Empty;
 
-    @code {
-        private int _logId;
-        private string _logDate = string.Empty;
-        private string _level = string.Empty;
-        private string _feature = string.Empty;
-        private string _function = string.Empty;
-        private string _category = string.Empty;
-        private string _pageName = string.Empty;
-        private string _moduleTitle = string.Empty;
-        private string _username = string.Empty;
-        private string _url = string.Empty;
-        private string _template = string.Empty;
-        private string _message = string.Empty;
-        private string _exception = string.Empty;
-        private string _properties = string.Empty;
-        private string _server = string.Empty;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-        public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
-
-        protected override async Task OnInitializedAsync()
+    protected override async Task OnInitializedAsync()
+    {
+        try
         {
-            try
+            _logId = Int32.Parse(PageState.QueryString["id"]);
+            var log = await LogService.GetLogAsync(_logId);
+            if (log != null)
             {
-                _logId = Int32.Parse(PageState.QueryString["id"]);
-                var log = await LogService.GetLogAsync(_logId);
-                if (log != null)
+                _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture);
+                _level = log.Level;
+                _feature = log.Feature;
+                _function = log.Function;
+                _category = log.Category;
+
+                if (log.PageId != null)
                 {
-                    _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture);
-                    _level = log.Level;
-                    _feature = log.Feature;
-                    _function = log.Function;
-                    _category = log.Category;
-
-                    if (log.PageId != null)
+                    var page = await PageService.GetPageAsync(log.PageId.Value);
+                    if (page != null)
                     {
-                        var page = await PageService.GetPageAsync(log.PageId.Value);
-                        if (page != null)
-                        {
-                            _pageName = page.Name;
-                        }
+                        _pageName = page.Name;
                     }
-
-                    if (log.PageId != null && log.ModuleId != null)
-                    {
-                        var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
-                        if (pagemodule != null)
-                        {
-                            _moduleTitle = pagemodule.Title;
-                        }
-                    }
-
-                    if (log.UserId != null)
-                    {
-                        var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId);
-                        if (user != null)
-                        {
-                            _username = user.Username;
-                        }
-                    }
-
-                    _url = log.Url;
-                    _template = log.MessageTemplate;
-                    _message = log.Message;
-                    _exception = log.Exception;
-                    _properties = log.Properties;
-                    _server = log.Server;
                 }
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message);
-                AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
+
+                if (log.PageId != null && log.ModuleId != null && log.ModuleId != -1)
+                {
+                    var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
+                    if (pagemodule != null)
+                    {
+                        _moduleTitle = pagemodule.Title;
+                    }
+                }
+
+                if (log.UserId != null)
+                {
+                    var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId);
+                    if (user != null)
+                    {
+                        _username = user.Username;
+                    }
+                }
+
+                _url = log.Url;
+                _template = log.MessageTemplate;
+                _message = log.Message;
+                _exception = log.Exception;
+                _properties = log.Properties;
+                _server = log.Server;
+				_initialized = true;
             }
         }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
+        }
     }
+
+	private string CloseUrl()
+	{
+		if (!PageState.QueryString.ContainsKey("level"))
+		{
+			return NavigateUrl();
+		}
+		else
+		{
+			return NavigateUrl(PageState.Page.Path, "level=" + PageState.QueryString["level"] + "&function=" + PageState.QueryString["function"] + "&rows=" + PageState.QueryString["rows"] + "&page=" + PageState.QueryString["page"]);
+		}
+	}
+}

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

@@ -17,7 +17,7 @@ else
 				<div class="row mb-1 align-items-center">
 					<div class="col-sm-4">
 						<Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
-						<select id="level" class="form-select" @onchange="(e => LevelChanged(e))">
+						<select id="level" class="form-select" value="@_level" @onchange="(e => LevelChanged(e))">
 							<option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
 							<option value="Trace">@Localizer["Trace"]</option>
 							<option value="Debug">@Localizer["Debug"]</option>
@@ -29,7 +29,7 @@ else
 					</div>            
 					<div class="col-sm-4">
 						<Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
-						<select id="function" class="form-select" @onchange="(e => FunctionChanged(e))">
+						<select id="function" class="form-select" value="@_function" @onchange="(e => FunctionChanged(e))">
 							<option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
 							<option value="Create">@Localizer["Create"]</option>
 							<option value="Read">@Localizer["Read"]</option>
@@ -41,7 +41,7 @@ else
 					</div>            
 					<div class="col-sm-4">
 						<Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
-						<select id="rows" class="form-select" @onchange="(e => RowsChanged(e))">
+						<select id="rows" class="form-select" value="@_rows" @onchange="(e => RowsChanged(e))">
 							<option value="10">10</option>
 							<option value="50">50</option>
 							<option value="100">100</option>
@@ -53,7 +53,7 @@ else
 
 			@if (_logs.Any())
 			{
-				<Pager Items="@_logs">
+				<Pager Items="@_logs" CurrentPage="@_page.ToString()" OnPageChange="OnPageChange">
 					<Header>
 						<th style="width: 1px;">&nbsp;</th>
 						<th>@Localizer["Date"]</th>
@@ -62,7 +62,7 @@ else
 						<th>@Localizer["Function"]</th>
 					</Header>
 					<Row>
-						<td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
+						<td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString() + "&level=" + _level + "&function=" + _function + "&rows=" + _rows + "&page=" + _page.ToString())" ResourceKey="LogDetails" /></td>
 						<td class="@GetClass(context.Function)">@context.LogDate</td>
 						<td class="@GetClass(context.Function)">@context.Level</td>
 						<td class="@GetClass(context.Function)">@context.Feature</td>
@@ -94,6 +94,7 @@ else
     private string _level = "-";
     private string _function = "-";
     private string _rows = "10";
+	private int _page = 1;
     private List<Log> _logs;
     private string _retention = "";
 
@@ -103,8 +104,27 @@ else
     {
         try
         {
+			if (PageState.QueryString.ContainsKey("level"))
+			{
+				_level = PageState.QueryString["level"];
+			}
+			if (PageState.QueryString.ContainsKey("function"))
+			{
+				_function = PageState.QueryString["function"];
+			}
+			if (PageState.QueryString.ContainsKey("rows"))
+			{
+				_rows = PageState.QueryString["rows"];
+			}
+			if (PageState.QueryString.ContainsKey("page") && int.TryParse(PageState.QueryString["page"], out int page))
+			{
+				_page = page;
+			}
+
             await GetLogs();
-			_retention = SettingService.GetSetting(PageState.Site.Settings, "LogRetention", "30");
+
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			_retention = SettingService.GetSetting(settings, "LogRetention", "30");
         }
         catch (Exception ex)
         {
@@ -208,4 +228,9 @@ else
 		}
 	}
 
+	private void OnPageChange(int page)
+	{
+		_page = page;	
+	}
+
 }

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

@@ -37,7 +37,7 @@ else
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
-                @if(context.AssemblyName == "Oqtane.Client" || PageState.Modules.Where(m => m.ModuleDefinition.ModuleDefinitionId == context.ModuleDefinitionId).Count() > 0)
+                @if(context.AssemblyName == "Oqtane.Client" || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
                 {
                     <span>@SharedLocalizer["Yes"]</span>
                 }

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

@@ -95,6 +95,12 @@
                                 <input id="title" class="form-control" @bind="@_title" />
                             </div>
                         </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="meta" HelpText="Optionally enter meta tags (in exactly the form you want them to be included in the page output)." ResourceKey="Meta">Meta: </Label>
+                            <div class="col-sm-9">
+								<textarea id="meta" class="form-control" @bind="@_meta" rows="3"></textarea>
+                            </div>
+                        </div>
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                             <div class="col-sm-9">
@@ -156,220 +162,222 @@
 </form>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    private List<Theme> _themeList;
-    private List<ThemeControl> _themes = new List<ThemeControl>();
-    private List<ThemeControl> _containers = new List<ThemeControl>();
-    private List<Page> _pageList;
-    private string _name;
-    private string _title;
-    private string _path = string.Empty;
-    private string _parentid = "-1";
-    private string _insert = ">>";
-    private List<Page> _children;
-    private int _childid = -1;
-    private string _isnavigation = "True";
-    private string _isclickable = "True";
-    private string _url;
-    private string _ispersonalizable = "False";
-    private string _themetype = string.Empty;
-    private string _containertype = string.Empty;
-    private string _icon = string.Empty;
-    private string _permissions = string.Empty;
-    private PermissionGrid _permissionGrid;
-    private Type _themeSettingsType;
-    private object _themeSettings;
-    private RenderFragment ThemeSettingsComponent { get; set; }
-    private bool _refresh = false;
-    private ElementReference form;
-    private bool validated = false;
+	private List<Theme> _themeList;
+	private List<ThemeControl> _themes = new List<ThemeControl>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
+	private List<Page> _pageList;
+	private string _name;
+	private string _title;
+	private string _meta;
+	private string _path = string.Empty;
+	private string _parentid = "-1";
+	private string _insert = ">>";
+	private List<Page> _children;
+	private int _childid = -1;
+	private string _isnavigation = "True";
+	private string _isclickable = "True";
+	private string _url;
+	private string _ispersonalizable = "False";
+	private string _themetype = string.Empty;
+	private string _containertype = string.Empty;
+	private string _icon = string.Empty;
+	private string _permissions = string.Empty;
+	private PermissionGrid _permissionGrid;
+	private Type _themeSettingsType;
+	private object _themeSettings;
+	private RenderFragment ThemeSettingsComponent { get; set; }
+	private bool _refresh = false;
+	private ElementReference form;
+	private bool validated = false;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _themeList = await ThemeService.GetThemesAsync();
-            _themes = ThemeService.GetThemeControls(_themeList);
-            _themetype = PageState.Site.DefaultThemeType;
-            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
-            _containertype = PageState.Site.DefaultContainerType;
-            _pageList = PageState.Pages;
-            _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
-            _permissions = string.Empty;
-            ThemeSettings();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error.Page.Initialize"], MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_themeList = await ThemeService.GetThemesAsync();
+			_themes = ThemeService.GetThemeControls(_themeList);
+			_themetype = PageState.Site.DefaultThemeType;
+			_containers = ThemeService.GetContainerControls(_themeList, _themetype);
+			_containertype = PageState.Site.DefaultContainerType;
+			_pageList = PageState.Pages;
+			_children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+			_permissions = string.Empty;
+			ThemeSettings();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Page.Initialize"], MessageType.Error);
+		}
+	}
 
-    private async void ParentChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _parentid = (string)e.Value;
-            _children = new List<Page>();
-            if (_parentid == "-1")
-            {
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
-                {
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                    {
-                        _children.Add(p);
-                    }
-                }
-            }
-            else
-            {
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
-                {
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                    {
-                        _children.Add(p);
-                    }
-                }
-            }
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
-            AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
-        }
-    }
+	private async void ParentChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_parentid = (string)e.Value;
+			_children = new List<Page>();
+			if (_parentid == "-1")
+			{
+				foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
+				{
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					{
+						_children.Add(p);
+					}
+				}
+			}
+			else
+			{
+				foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
+				{
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					{
+						_children.Add(p);
+					}
+				}
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
+			AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
+		}
+	}
 
-    private async void ThemeChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _themetype = (string)e.Value;
-            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
-            _containertype = "-";
-            ThemeSettings();
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
-        }
-    }
+	private async void ThemeChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_themetype = (string)e.Value;
+			_containers = ThemeService.GetContainerControls(_themeList, _themetype);
+			_containertype = "-";
+			ThemeSettings();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
+			AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
+		}
+	}
 
-    private void ThemeSettings()
-    {
-        _themeSettingsType = null;
-        var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
-        if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
-        {
-            _themeSettingsType = Type.GetType(theme.ThemeSettingsType);
-            if (_themeSettingsType != null)
-            {
-                ThemeSettingsComponent = builder =>
-                {
-                    builder.OpenComponent(0, _themeSettingsType);
-                    builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
-                    builder.CloseComponent();
-                };
-            }
-            _refresh = true;
-        }
-    }
+	private void ThemeSettings()
+	{
+		_themeSettingsType = null;
+		var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
+		if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
+		{
+			_themeSettingsType = Type.GetType(theme.ThemeSettingsType);
+			if (_themeSettingsType != null)
+			{
+				ThemeSettingsComponent = builder =>
+				{
+					builder.OpenComponent(0, _themeSettingsType);
+					builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
+					builder.CloseComponent();
+				};
+			}
+			_refresh = true;
+		}
+	}
 
-    private async Task SavePage()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
-        {
-            Page page = null;
-            try
-            {
-                if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
-                {
-                    page = new Page();
-                    page.SiteId = PageState.Page.SiteId;
-                    page.Name = _name;
-                    page.Title = _title;
+	private async Task SavePage()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			Page page = null;
+			try
+			{
+				if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
+				{
+					page = new Page();
+					page.SiteId = PageState.Page.SiteId;
+					page.Name = _name;
+					page.Title = _title;
 
-                    if (string.IsNullOrEmpty(_path))
-                    {
-                        _path = _name;
-                    }
-                    if (_path.Contains("/"))
-                    {
-                        _path = _path.Substring(_path.LastIndexOf("/") + 1);
-                    }
+					if (string.IsNullOrEmpty(_path))
+					{
+						_path = _name;
+					}
+					if (_path.Contains("/"))
+					{
+						_path = _path.Substring(_path.LastIndexOf("/") + 1);
+					}
 
-                    if (_parentid == "-1")
-                    {
-                        page.ParentId = null;
-                        page.Path = Utilities.GetFriendlyUrl(_path);
-                    }
-                    else
-                    {
-                        page.ParentId = Int32.Parse(_parentid);
-                        var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
-                        if (parent.Path == string.Empty)
-                        {
-                            page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
-                        }
-                        else
-                        {
-                            page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
-                        }
-                    }
+					if (_parentid == "-1")
+					{
+						page.ParentId = null;
+						page.Path = Utilities.GetFriendlyUrl(_path);
+					}
+					else
+					{
+						page.ParentId = Int32.Parse(_parentid);
+						var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
+						if (parent.Path == string.Empty)
+						{
+							page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
+						}
+						else
+						{
+							page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
+						}
+					}
 
-                    if(PagePathIsDeleted(page.Path, page.SiteId, _pageList))
-                    {
-                        AddModuleMessage(string.Format(Localizer["Message.Page.Deleted"], _path), MessageType.Warning);
-                        return;
-                    }
+					if(PagePathIsDeleted(page.Path, page.SiteId, _pageList))
+					{
+						AddModuleMessage(string.Format(Localizer["Message.Page.Deleted"], _path), MessageType.Warning);
+						return;
+					}
 
-                    if (!PagePathIsUnique(page.Path, page.SiteId, _pageList))
-                    {
-                        AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
-                        return;
-                    }
+					if (!PagePathIsUnique(page.Path, page.SiteId, _pageList))
+					{
+						AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
+						return;
+					}
 
-                    Page child;
-                    switch (_insert)
-                    {
-                        case "<<":
-                            page.Order = 0;
-                            break;
-                        case "<":
-                            child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
-                            page.Order = child.Order - 1;
-                            break;
-                        case ">":
-                            child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
-                            page.Order = child.Order + 1;
-                            break;
-                        case ">>":
-                            page.Order = int.MaxValue;
-                            break;
-                    }
+					Page child;
+					switch (_insert)
+					{
+						case "<<":
+							page.Order = 0;
+							break;
+						case "<":
+							child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
+							page.Order = child.Order - 1;
+							break;
+						case ">":
+							child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
+							page.Order = child.Order + 1;
+							break;
+						case ">>":
+							page.Order = int.MaxValue;
+							break;
+					}
 
-                    page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
-                    page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
-                    page.Url = _url;
-                    page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
-                    if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
-                    {
-                        page.ThemeType = string.Empty;
-                    }
-                    page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
-                    if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
-                    {
-                        page.DefaultContainerType = string.Empty;
-                    }
-                    page.Icon = (_icon == null ? string.Empty : _icon);
-                    page.Permissions = _permissionGrid.GetPermissions();
-                    page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
-                    page.UserId = null;
+					page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
+					page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
+					page.Url = _url;
+					page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
+					if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
+					{
+						page.ThemeType = string.Empty;
+					}
+					page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
+					if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
+					{
+						page.DefaultContainerType = string.Empty;
+					}
+					page.Icon = (_icon == null ? string.Empty : _icon);
+					page.Permissions = _permissionGrid.GetPermissions();
+					page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
+					page.UserId = null;
+					page.Meta = _meta;
 
                     page = await PageService.AddPageAsync(page);
                     await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);

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

@@ -102,6 +102,12 @@
                                 <input id="title" class="form-control" @bind="@_title" maxlength="200"/>
                             </div>
                         </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="meta" HelpText="Optionally enter meta tags (in exactly the form you want them to be included in the page output)." ResourceKey="Meta">Meta: </Label>
+                            <div class="col-sm-9">
+								<textarea id="meta" class="form-control" @bind="@_meta" rows="3"></textarea>
+                            </div>
+                        </div>
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                             <div class="col-sm-9">
@@ -200,6 +206,7 @@
 	private int _pageId;
 	private string _name;
 	private string _title;
+	private string _meta;
 	private string _path;
 	private string _currentparentid;
 	private string _parentid = "-1";
@@ -243,8 +250,9 @@
 			{
 				_name = page.Name;
 				_title = page.Title;
+				_meta = page.Meta;
 				_path = page.Path;
-				_pageModules = PageState.Modules.Where(m => m.PageId == page.PageId && m.IsDeleted == false).ToList();
+				_pageModules = PageState.Modules.Where(m => m.PageId == page.PageId).ToList();
 
 				if (string.IsNullOrEmpty(_path))
 				{
@@ -313,183 +321,187 @@
 			_pageModules.RemoveAll(item => item.PageModuleId == pagemodule.PageModuleId);
 			StateHasChanged();
 			NavigationManager.NavigateTo(NavigationManager.Uri + "&tab=PageModules");
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting Module {Title} {Error}", module.Title, ex.Message);
-            AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
-        }
-    }
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting Module {Title} {Error}", module.Title, ex.Message);
+			AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
+		}
+	}
 
-    private async void ParentChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _parentid = (string)e.Value;
-            _children = new List<Page>();
-            if (_parentid == "-1")
-            {
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
-                {
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                    {
-                        _children.Add(p);
-                    }
-                }
-            }
-            else
-            {
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
-                {
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                    {
-                        _children.Add(p);
-                    }
-                }
-            }
-            if (_parentid == _currentparentid)
-            {
-                _insert = "=";
-            }
-            else
-            {
-                _insert = ">>";
-            }
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
-            AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
-        }
-    }
+	private async void ParentChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_parentid = (string)e.Value;
+			_children = new List<Page>();
+			if (_parentid == "-1")
+			{
+				foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
+				{
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					{
+						_children.Add(p);
+					}
+				}
+			}
+			else
+			{
+				foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
+				{
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					{
+						_children.Add(p);
+					}
+				}
+			}
+			if (_parentid == _currentparentid)
+			{
+				_insert = "=";
+			}
+			else
+			{
+				_insert = ">>";
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
+			AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
+		}
+	}
 
-    private async void ThemeChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _themetype = (string)e.Value;
-            _containers = ThemeService.GetContainerControls(_themeList, _themetype);
-            _containertype = "-";
-            ThemeSettings();
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
-        }
-    }
+	private async void ThemeChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_themetype = (string)e.Value;
+			_containers = ThemeService.GetContainerControls(_themeList, _themetype);
+			_containertype = "-";
+			ThemeSettings();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
+			AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
+		}
+	}
 
-    private void ThemeSettings()
-    {
-        _themeSettingsType = null;
-        var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
-        if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
-        {
-            _themeSettingsType = Type.GetType(theme.ThemeSettingsType);
-            if (_themeSettingsType != null)
-            {
-                ThemeSettingsComponent = builder =>
-                {
-                    builder.OpenComponent(0, _themeSettingsType);
-                    builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
-                    builder.CloseComponent();
-                };
-            }
-            _refresh = true;
-        }
-    }
+	private void ThemeSettings()
+	{
+		_themeSettingsType = null;
+		if (PageState.QueryString.ContainsKey("cp")) // can only be displayed if invoked from Control Panel
+		{
+			var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
+			if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
+			{
+				_themeSettingsType = Type.GetType(theme.ThemeSettingsType);
+				if (_themeSettingsType != null)
+				{
+					ThemeSettingsComponent = builder =>
+					{
+						builder.OpenComponent(0, _themeSettingsType);
+						builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
+						builder.CloseComponent();
+					};
+				}
+				_refresh = true;
+			}
+		}
+	}
 
-    private async Task SavePage()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
-        {
-            Page page = null;
-            try
-            {
-                if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
-                {
-                    page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
-                    string currentPath = page.Path;
+	private async Task SavePage()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			Page page = null;
+			try
+			{
+				if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
+				{
+					page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
+					string currentPath = page.Path;
 
-                    page.Name = _name;
-                    page.Title = _title;
+					page.Name = _name;
+					page.Title = _title;
 
-                    if (string.IsNullOrEmpty(_path))
-                    {
-                        _path = _name;
-                    }
-                    if (_path.Contains("/"))
-                    {
-                        _path = _path.Substring(_path.LastIndexOf("/") + 1);
-                    }
+					if (string.IsNullOrEmpty(_path))
+					{
+						_path = _name;
+					}
+					if (_path.Contains("/"))
+					{
+						_path = _path.Substring(_path.LastIndexOf("/") + 1);
+					}
 
-                    if (_parentid == "-1")
-                    {
-                        page.ParentId = null;
-                        page.Path = Utilities.GetFriendlyUrl(_path);
-                    }
-                    else
-                    {
-                        page.ParentId = Int32.Parse(_parentid);
-                        Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == page.ParentId);
-                        if (parent.Path == string.Empty)
-                        {
-                            page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
-                        }
-                        else
-                        {
-                            page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
-                        }
-                    }
+					if (_parentid == "-1")
+					{
+						page.ParentId = null;
+						page.Path = Utilities.GetFriendlyUrl(_path);
+					}
+					else
+					{
+						page.ParentId = Int32.Parse(_parentid);
+						Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == page.ParentId);
+						if (parent.Path == string.Empty)
+						{
+							page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
+						}
+						else
+						{
+							page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
+						}
+					}
 
-                    if (!PagePathIsUnique(page.Path, page.SiteId, page.PageId, _pageList))
-                    {
-                        AddModuleMessage(string.Format(Localizer["Mesage.Page.PathExists"], _path), MessageType.Warning);
-                        return;
-                    }
+					if (!PagePathIsUnique(page.Path, page.SiteId, page.PageId, _pageList))
+					{
+						AddModuleMessage(string.Format(Localizer["Mesage.Page.PathExists"], _path), MessageType.Warning);
+						return;
+					}
 
-                    if (_insert != "=")
-                    {
-                        Page child;
-                        switch (_insert)
-                        {
-                            case "<<":
-                                page.Order = 0;
-                                break;
-                            case "<":
-                                child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
-                                if (child != null) page.Order = child.Order - 1;
-                                break;
-                            case ">":
-                                child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
-                                if (child != null) page.Order = child.Order + 1;
-                                break;
-                            case ">>":
-                                page.Order = int.MaxValue;
-                                break;
-                        }
-                    }
-                    page.IsNavigation = (_isnavigation == null || Boolean.Parse(_isnavigation));
-                    page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
-                    page.Url = _url;
-                    page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
-                    if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
-                    {
-                        page.ThemeType = string.Empty;
-                    }
-                    page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
-                    if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
-                    {
-                        page.DefaultContainerType = string.Empty;
-                    }
-                    page.Icon = _icon ?? string.Empty;
-                    page.Permissions = _permissionGrid.GetPermissions();
-                    page.IsPersonalizable = (_ispersonalizable != null && Boolean.Parse(_ispersonalizable));
-                    page.UserId = null;
+					if (_insert != "=")
+					{
+						Page child;
+						switch (_insert)
+						{
+							case "<<":
+								page.Order = 0;
+								break;
+							case "<":
+								child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
+								if (child != null) page.Order = child.Order - 1;
+								break;
+							case ">":
+								child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
+								if (child != null) page.Order = child.Order + 1;
+								break;
+							case ">>":
+								page.Order = int.MaxValue;
+								break;
+						}
+					}
+					page.IsNavigation = (_isnavigation == null || Boolean.Parse(_isnavigation));
+					page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
+					page.Url = _url;
+					page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
+					if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
+					{
+						page.ThemeType = string.Empty;
+					}
+					page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
+					if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
+					{
+						page.DefaultContainerType = string.Empty;
+					}
+					page.Icon = _icon ?? string.Empty;
+					page.Permissions = _permissionGrid.GetPermissions();
+					page.IsPersonalizable = (_ispersonalizable != null && Boolean.Parse(_ispersonalizable));
+					page.UserId = null;
+					page.Meta = _meta;
 
                     page = await PageService.UpdatePageAsync(page);
                     await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);

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

@@ -13,6 +13,7 @@
         <Header>
         <th style="width: 1px;">&nbsp;</th>
         <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
         <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>

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

@@ -25,7 +25,7 @@
                     <th>@Localizer["DeletedOn"]</th>
                 </Header>
                 <Row>
-                    <td><button type="button" @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
+                    <td><button type="button" @onclick="@(() => RestorePage(context))" class="btn btn-success" title="Restore">Restore</button></td>
                     <td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
                     <td>@context.Name</td>
                     <td>@context.DeletedBy</td>
@@ -56,7 +56,7 @@
                     <th>@Localizer["DeletedOn"]</th>
                 </Header>
                 <Row>
-                    <td><button type="button" @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">@Localizer["Restore"]</button></td>
+                    <td><button type="button" @onclick="@(() => RestoreModule(context))" class="btn btn-success" title="Restore">@Localizer["Restore"]</button></td>
                     <td><ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete"], context.Title)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
                     <td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
                     <td>@context.Title</td>

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

@@ -90,9 +90,10 @@ else
                         {
                             SiteId = PageState.Site.SiteId,
                             Username = _username,
-                            DisplayName = (_displayname == string.Empty ? _username : _displayname),
+                            Password = _password,
                             Email = _email,
-                            Password = _password
+                            DisplayName = (_displayname == string.Empty ? _username : _displayname),
+							PhotoFileId = null
                         };
                         user = await UserService.AddUserAsync(user);
 

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

@@ -53,12 +53,14 @@ else
                     <Pager Items="@userroles">
                         <Header>
                             <th>@Localizer["Users"]</th>
+                            <th>@SharedLocalizer["Username"]</th>
                             <th>@Localizer["Effective"]</th>
                             <th>@Localizer["Expiry"]</th>
                             <th>&nbsp;</th>
                         </Header>
                         <Row>
                             <td>@context.User.DisplayName</td>
+                            <td>@context.User.Username</td>
                             <td>@context.EffectiveDate</td>
                             <td>@context.ExpiryDate</td>
                             <td>

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

@@ -120,7 +120,10 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="Enter the password for your SMTP account" ResourceKey="SmtpPassword">Password: </Label>
                     <div class="col-sm-9">
-                        <input id="password" type="password" class="form-control" @bind="@_smtppassword" />
+						<div class="input-group">
+							<input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" />
+							<button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword">@_togglesmtppassword</button>
+						</div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -129,6 +132,12 @@
                         <input id="sender" class="form-control" @bind="@_smtpsender" />
                     </div>
                 </div>
+                <div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of notifications to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+						<input id="retention" class="form-control" @bind="@_retention" />
+					</div>
+                </div>
                 <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button>
                 <br /><br />
             </div>
@@ -260,7 +269,10 @@
 	private string _smtpssl = "False";
 	private string _smtpusername = string.Empty;
 	private string _smtppassword = string.Empty;
+	private string _smtppasswordtype = "password";
+	private string _togglesmtppassword = string.Empty;
 	private string _smtpsender = string.Empty;
+	private string _retention = string.Empty;
 	private string _pwaisenabled;
 	private int _pwaappiconfileid = -1;
 	private FileManager _pwaappiconfilemanager;
@@ -329,7 +341,9 @@
 				_smtpssl = SettingService.GetSetting(settings, "SMTPSSL", "False");
 				_smtpusername = SettingService.GetSetting(settings, "SMTPUsername", string.Empty);
 				_smtppassword = SettingService.GetSetting(settings, "SMTPPassword", string.Empty);
+				_togglesmtppassword = Localizer["Show"];
 				_smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
+				_retention = SettingService.GetSetting(settings, "NotificationRetention", "30");
 
 				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 				{
@@ -479,12 +493,13 @@
 							site = await SiteService.UpdateSiteAsync(site);
 
 							var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-							SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
-							SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
-							SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
-							SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
-							SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
-							SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+							settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+							settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+							settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+							settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+							settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+							settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+							settings = SettingService.SetSetting(settings, "NotificationRetention", _retention, true);
 							await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
 							if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
@@ -605,8 +620,10 @@
 				await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
 				await logger.LogInformation("Site SMTP Settings Saved");
 
-				await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User.DisplayName, PageState.User.Email, PageState.User.DisplayName, PageState.User.Email, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
+				await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
 				AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
+				var interop = new Interop(JSRuntime);
+				await interop.ScrollTo(0, 0, "smooth");
 			}
 			catch (Exception ex)
 			{
@@ -616,7 +633,7 @@
 		}
 		else
 		{
-			AddModuleMessage(Localizer["Message.required.Smtp"], MessageType.Warning);
+			AddModuleMessage(Localizer["Message.Required.Smtp"], MessageType.Warning);
 		}
 	}
 
@@ -633,4 +650,18 @@
 		}
 		if (string.IsNullOrEmpty(_defaultalias)) _defaultalias = _aliases.First().Name.Trim();
 	}
+
+	private void ToggleSMTPPassword()
+	{
+		if (_smtppasswordtype == "password")
+		{
+			_smtppasswordtype = "text";
+			_togglesmtppassword = Localizer["Hide"];
+		}
+		else
+		{
+			_smtppasswordtype = "password";
+			_togglesmtppassword = Localizer["Show"];
+		}
+	}
 }

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

@@ -27,9 +27,27 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="serverpath" HelpText="Server Path" ResourceKey="ServerPath">Server Path: </Label>
+                <Label Class="col-sm-3" For="machinename" HelpText="Machine Name" ResourceKey="MachineName">Machine Name: </Label>
                 <div class="col-sm-9">
-                    <input id="serverpath" class="form-control" @bind="@_serverpath" readonly />
+                    <input id="machinename" class="form-control" @bind="@_machinename" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="ipaddress" HelpText="Server IP Address" ResourceKey="IPAddress">IP Address: </Label>
+                <div class="col-sm-9">
+                    <input id="ipaddress" class="form-control" @bind="@_ipaddress" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="contentrootpath" HelpText="Root Path" ResourceKey="ContentRootPath">Root Path: </Label>
+                <div class="col-sm-9">
+                    <input id="contentrootpath" class="form-control" @bind="@_contentrootpath" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="webrootpath" HelpText="Web Path" ResourceKey="WebRootPath">Web Path: </Label>
+                <div class="col-sm-9">
+                    <input id="webrootpath" class="form-control" @bind="@_webrootpath" readonly />
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
@@ -38,6 +56,18 @@
                     <input id="servertime" class="form-control" @bind="@_servertime" readonly />
                 </div>
             </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="tickcount" HelpText="Amount Of Time The Service Has Been Available And Operational" ResourceKey="TickCount">Service Uptime: </Label>
+                <div class="col-sm-9">
+                    <input id="tickcount" class="form-control" @bind="@_tickcount" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="workingset" HelpText="Memory Allocation Of Service (in MB)" ResourceKey="WorkingSet">Memory Allocation: </Label>
+                <div class="col-sm-9">
+                    <input id="workingset" class="form-control" @bind="@_workingset" readonly />
+                </div>
+            </div>
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label>
                 <div class="col-sm-9">
@@ -69,6 +99,21 @@
                         <option value="Warning">@Localizer["Warning"]</option>
                         <option value="Error">@Localizer["Error"]</option>
                         <option value="Critical">@Localizer["Critical"]</option>
+                        <option value="None">@Localizer["None"]</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="notificationlevel" HelpText="The Minimum Logging Level For Which Notifications Should Be Sent To Host Users." ResourceKey="NotificationLevel">Notification Level: </Label>
+                <div class="col-sm-9">
+                    <select id="notificationlevel" class="form-select" @bind="@_notificationlevel">
+                        <option value="Trace">@Localizer["Trace"]</option>
+                        <option value="Debug">@Localizer["Debug"]</option>
+                        <option value="Information">@Localizer["Information"]</option>
+                        <option value="Warning">@Localizer["Warning"]</option>
+                        <option value="Error">@Localizer["Error"]</option>
+                        <option value="Critical">@Localizer["Critical"]</option>
+                        <option value="None">@Localizer["None"]</option>
                     </select>
                 </div>
             </div>
@@ -104,12 +149,18 @@
 	private string _version = string.Empty;
 	private string _clrversion = string.Empty;
 	private string _osversion = string.Empty;
-	private string _serverpath = string.Empty;
+	private string _machinename = string.Empty;
+	private string _ipaddress = string.Empty;
+	private string _contentrootpath = string.Empty;
+	private string _webrootpath = string.Empty;
 	private string _servertime = string.Empty;
+	private string _tickcount = string.Empty;
+	private string _workingset = string.Empty;
 	private string _installationid = string.Empty;
 
 	private string _detailederrors = string.Empty;
 	private string _logginglevel = string.Empty;
+	private string _notificationlevel = string.Empty;
 	private string _swagger = string.Empty;
 	private string _packageservice = string.Empty;
 
@@ -117,31 +168,42 @@
 	{
 		_version = Constants.Version;
 
-		Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
+		Dictionary<string, object> systeminfo = await SystemService.GetSystemInfoAsync("environment");
 		if (systeminfo != null)
 		{
-			_clrversion = systeminfo["clrversion"];
-			_osversion = systeminfo["osversion"];
-			_serverpath = systeminfo["serverpath"];
-			_servertime = systeminfo["servertime"] + " UTC";
-			_installationid = systeminfo["installationid"];
+			_clrversion = systeminfo["CLRVersion"].ToString();
+			_osversion = systeminfo["OSVersion"].ToString();
+			_machinename = systeminfo["MachineName"].ToString();
+			_ipaddress = systeminfo["IPAddress"].ToString();
+			_contentrootpath = systeminfo["ContentRootPath"].ToString();
+			_webrootpath = systeminfo["WebRootPath"].ToString();
+			_servertime = systeminfo["ServerTime"].ToString() + " UTC";
+			_tickcount = TimeSpan.FromMilliseconds(Convert.ToInt64(systeminfo["TickCount"].ToString())).ToString();
+			_workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
+		}
 
-            _detailederrors = systeminfo["detailederrors"];
-            _logginglevel = systeminfo["logginglevel"];
-            _swagger = systeminfo["swagger"];
-            _packageservice = systeminfo["packageservice"];
-        }
-    }
+		systeminfo = await SystemService.GetSystemInfoAsync();
+		if (systeminfo != null)
+		{
+			_installationid = systeminfo["InstallationId"].ToString();
+            _detailederrors = systeminfo["DetailedErrors"].ToString();
+            _logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
+            _notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
+            _swagger = systeminfo["UseSwagger"].ToString();
+            _packageservice = systeminfo["PackageService"].ToString();
+		}
+	}
 
     private async Task SaveConfig()
     {
         try
         {
-            var settings = new Dictionary<string, string>();
-            settings.Add("detailederrors", _detailederrors);
-            settings.Add("logginglevel", _logginglevel);
-            settings.Add("swagger", _swagger);
-            settings.Add("packageservice", _packageservice);
+            var settings = new Dictionary<string, object>();
+            settings.Add("DetailedErrors", _detailederrors);
+            settings.Add("Logging:LogLevel:Default", _logginglevel);
+            settings.Add("Logging:LogLevel:Notify", _notificationlevel);
+            settings.Add("UseSwagger", _swagger);
+            settings.Add("PackageService", _packageservice);
             await SystemService.UpdateSystemInfoAsync(settings);
             AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
         }

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

@@ -13,7 +13,7 @@
         <Label Class="col-sm-3" For="to" HelpText="Enter the username 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> >
+        </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>
@@ -49,7 +49,7 @@
             var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
             if (user != null)
             {
-                var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body, 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(NavigateUrl());

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

@@ -41,6 +41,18 @@ else
                         <input id="confirm" type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
                     </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">
@@ -201,104 +213,125 @@ else
         }
     </TabPanel>
 </TabStrip>
+<br /><br />
 
 @code {
-    private string username = string.Empty;
-    private string password = string.Empty;
-    private string confirm = string.Empty;
-    private string email = string.Empty;
-    private string displayname = string.Empty;
-    private FileManager filemanager;
-    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 username = string.Empty;
+	private string password = string.Empty;
+	private string confirm = string.Empty;
+	private bool allowtwofactor = false;
+	private string twofactor = "False";
+	private string email = string.Empty;
+	private string displayname = string.Empty;
+	private FileManager filemanager;
+	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;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
-    protected override async Task OnParametersSetAsync()
-    {
-        try
-        {
-            if (PageState.User != null)
-            {
-                username = PageState.User.Username;
-                email = PageState.User.Email;
-                displayname = PageState.User.DisplayName;
+	protected override async Task OnParametersSetAsync()
+	{
+		try
+		{
+			if (PageState.Site.Settings.ContainsKey("LoginOptions:TwoFactor") && !string.IsNullOrEmpty(PageState.Site.Settings["LoginOptions:TwoFactor"]))
+			{
+				allowtwofactor = bool.Parse(PageState.Site.Settings["LoginOptions:TwoFactor"]);
+			}
 
-                // get user folder
-                var folder = await FolderService.GetFolderAsync(ModuleState.SiteId, PageState.User.FolderPath);
-                if (folder != null)
-                {
-                    folderid = folder.FolderId;
-                }
+			if (PageState.User != null)
+			{
+				username = PageState.User.Username;
+				twofactor = PageState.User.TwoFactorRequired.ToString();
+				email = PageState.User.Email;
+				displayname = PageState.User.DisplayName;
 
-                if (PageState.User.PhotoFileId != null)
-                {
-                    photofileid = PageState.User.PhotoFileId.Value;
-                    photo = await FileService.GetFileAsync(photofileid);
-                }
-                else
-                {
-                    photofileid = -1;
-                    photo = null;
-                }
+				// get user folder
+				var folder = await FolderService.GetFolderAsync(ModuleState.SiteId, PageState.User.FolderPath);
+				if (folder != null)
+				{
+					folderid = folder.FolderId;
+				}
 
-                profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
-                settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+				if (PageState.User.PhotoFileId != null)
+				{
+					photofileid = PageState.User.PhotoFileId.Value;
+					photo = await FileService.GetFileAsync(photofileid);
+				}
+				else
+				{
+					photofileid = -1;
+					photo = null;
+				}
 
-                await LoadNotificationsAsync();
-            }
-            else
-            {
-                AddModuleMessage(Localizer["Message.User.NoLogIn"], MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading User Profile {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error.Profile.Load"], MessageType.Error);
-        }
-    }
+				profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+				settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
 
-    private async Task LoadNotificationsAsync()
-    {
-        notifications = await NotificationService.GetNotificationsAsync(PageState.Site.SiteId, filter, PageState.User.UserId);
-        notifications = notifications.Where(item => item.DeletedBy != PageState.User.Username).ToList();
-    }
+				await LoadNotificationsAsync();
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Message.User.NoLogIn"], MessageType.Warning);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading User Profile {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Profile.Load"], MessageType.Error);
+		}
+	}
 
-    private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+	private async Task LoadNotificationsAsync()
+	{
+		notifications = await NotificationService.GetNotificationsAsync(PageState.Site.SiteId, filter, PageState.User.UserId);
+		notifications = notifications.Where(item => item.DeletedBy != PageState.User.Username).ToList();
+	}
 
-    private async Task Save()
-    {
-        try
-        {
-            if (username != string.Empty && email != string.Empty && ValidateProfiles())
-            {
-                if (password == confirm)
-                {
-                    var user = PageState.User;
-                    user.Username = username;
-                    user.Password = password;
-                    user.Email = email;
-                    user.DisplayName = (displayname == string.Empty ? username : displayname);
-                    user.PhotoFileId = filemanager.GetFileId();
-                    if (user.PhotoFileId == -1)
-                    {
-                        user.PhotoFileId = null;
-                    }
+	private string GetProfileValue(string SettingName, string DefaultValue)
+		=> SettingService.GetSetting(settings, SettingName, DefaultValue);
 
-                    await UserService.UpdateUserAsync(user);
-                    await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
-                    await logger.LogInformation("User Profile Saved");
+	private async Task Save()
+	{
+		try
+		{
+			if (username != string.Empty && email != string.Empty && ValidateProfiles())
+			{
+				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)
+					{
+						user.PhotoFileId = null;
+					}
+					if (user.PhotoFileId != null)
+					{
+						photofileid = user.PhotoFileId.Value;
+						photo = await FileService.GetFileAsync(photofileid);
+					}
+					else
+					{
+						photofileid = -1;
+						photo = null;
+					}
 
-                    NavigationManager.NavigateTo(NavigateUrl());
-                }
+					await UserService.UpdateUserAsync(user);
+					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.Invalid"], MessageType.Warning);

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

@@ -36,6 +36,7 @@ else
 				<th style="width: 1px;">&nbsp;</th>
 				<th style="width: 1px;">&nbsp;</th>
 				<th>@SharedLocalizer["Name"]</th>
+				<th>@SharedLocalizer["Username"]</th>
 				</Header>
 				<Row>
 					<td>
@@ -48,20 +49,287 @@ else
 						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
 					</td>
 					<td>@context.User.DisplayName</td>
+					<td>@context.User.Username</td>
 				</Row>
 			</Pager>
 	</TabPanel>
         <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
 			<div class="container">
-				<div class="row mb-1 align-items-center">
-					<Label Class="col-sm-3" For="allowregistration" HelpText="Do you want to allow visitors to be able to register for a user account on the site" ResourceKey="AllowRegistration">Allow User Registration? </Label>
-					<div class="col-sm-9">
-						<select id="allowregistration" class="form-select" @bind="@_allowregistration" required>
-							<option value="True">@SharedLocalizer["Yes"]</option>
-							<option value="False">@SharedLocalizer["No"]</option>
-						</select>
+				<Section Name="User" Heading="User Settings" ResourceKey="UserSettings">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="allowregistration" HelpText="Do you want anonymous visitors to be able to register for an account on the site" ResourceKey="AllowRegistration">Allow User Registration?</Label>
+						<div class="col-sm-9">
+							<select id="allowregistration" class="form-select" @bind="@_allowregistration">
+								<option value="True">@SharedLocalizer["Yes"]</option>
+								<option value="False">@SharedLocalizer["No"]</option>
+							</select>
+						</div>
 					</div>
-				</div>
+					@if (_providertype != "")
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Login?</Label>
+							<div class="col-sm-9">
+								<select id="allowsitelogin" class="form-select" @bind="@_allowsitelogin">
+									<option value="true">@SharedLocalizer["Yes"]</option>
+									<option value="false">@SharedLocalizer["No"]</option>
+								</select>
+							</div>
+						</div>
+					}
+					else
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Login?</Label>
+							<div class="col-sm-9">
+								<input id="allowsitelogin" class="form-control" value="@SharedLocalizer["Yes"]" readonly />
+							</div>
+						</div>						
+					}
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="twofactor" HelpText="Do you want to allow users to use two factor authentication? Note that the Notification Job in Scheduled Jobs needs to be enabled for this option to work properly." ResourceKey="TwoFactor">Allow Two Factor?</Label>
+						<div class="col-sm-9">
+							<select id="twofactor" class="form-select" @bind="@_twofactor">
+								<option value="true">@SharedLocalizer["Yes"]</option>
+								<option value="false">@SharedLocalizer["No"]</option>
+							</select>
+						</div>
+					</div>
+					@if (!string.IsNullOrEmpty(PageState.Alias.Path))
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="cookietype" HelpText="Cookies are usually managed per domain. However you can also choose to have distinct cookies for each site (this option is only applicable to micro-sites)." ResourceKey="CookieType">Cookie Type:</Label>
+							<div class="col-sm-9">
+								<select id="cookietype" class="form-select" @bind="@_cookietype">
+									<option value="domain">@Localizer["Domain"]</option>
+									<option value="site">@Localizer["Site"]</option>
+								</select>
+							</div>
+						</div>
+					}
+				</Section>
+				<Section Name="Password" Heading="Password Settings" ResourceKey="PasswordSettings">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="minimumlength" HelpText="The Minimum Length For A Password" ResourceKey="RequiredLength">Minimum Length:</Label>
+						<div class="col-sm-9">
+							<input id="minimumlength" class="form-control" @bind="@_minimumlength" required />
+						</div>
+					</div>					
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="uniquecharacters" HelpText="The Minimum Number Of Unique Characters Which A Password Must Contain" ResourceKey="UniqueCharacters">Unique Characters:</Label>
+						<div class="col-sm-9">
+							<input id="uniquecharacters" class="form-control" @bind="@_uniquecharacters" required />
+						</div>
+					</div>					
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="requiredigit" HelpText="Indicate If Passwords Must Contain A Digit" ResourceKey="RequireDigit">Require Digit?</Label>
+						<div class="col-sm-9">
+							<select id="requiredigit" class="form-select" @bind="@_requiredigit" 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="requireupper" HelpText="Indicate If Passwords Must Contain An Upper Case Character" ResourceKey="RequireUpper">Require Uppercase?</Label>
+						<div class="col-sm-9">
+							<select id="requireupper" class="form-select" @bind="@_requireupper" 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="requirelower" HelpText="Indicate If Passwords Must Contain A Lower Case Character" ResourceKey="RequireLower">Require Lowercase?</Label>
+						<div class="col-sm-9">
+							<select id="requirelower" class="form-select" @bind="@_requirelower" 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="requirepunctuation" HelpText="Indicate if Passwords Must Contain A Non-alphanumeric Character (ie. Punctuation)" ResourceKey="RequirePunctuation">Require Punctuation?</Label>
+						<div class="col-sm-9">
+							<select id="requirepunctuation" class="form-select" @bind="@_requirepunctuation" required>
+								<option value="true">@SharedLocalizer["Yes"]</option>
+								<option value="false">@SharedLocalizer["No"]</option>
+							</select>
+						</div>
+					</div>					
+				</Section>
+				<Section Name="Lockout" Heading="Lockout Settings" ResourceKey="LockoutSettings">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="maximum" HelpText="The Maximum Number Of Sign In Attempts Before A User Is Locked Out" ResourceKey="MaximumFailures">Maximum Failures:</Label>
+						<div class="col-sm-9">
+							<input id="maximum" class="form-control" @bind="@_maximumfailures" required />
+						</div>
+					</div>					
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="lockoutduration" HelpText="The Number Of Minutes A User Should Be Locked Out" ResourceKey="LockoutDuration">Lockout Duration:</Label>
+						<div class="col-sm-9">
+							<input id="lockoutduration" class="form-control" @bind="@_lockoutduration" required />
+						</div>
+					</div>					
+				</Section>
+				<Section Name="ExternalLogin" Heading="External Login Settings" ResourceKey="ExternalLoginSettings">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="providertype" HelpText="Select the external login provider type" ResourceKey="ProviderType">Provider Type:</Label>
+						<div class="col-sm-9">
+							<select id="providertype" class="form-select" value="@_providertype" @onchange="(e => ProviderTypeChanged(e))">
+								<option value="" selected>@Localizer["Not Specified"]</option>
+								<option value="@AuthenticationProviderTypes.OpenIDConnect">@Localizer["OpenID Connect"]</option>
+								<option value="@AuthenticationProviderTypes.OAuth2">@Localizer["OAuth 2.0"]</option>
+							</select>
+						</div>
+					</div>		
+					@if (_providertype != "")
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="providername" HelpText="The external login provider name which will be displayed on the login page" ResourceKey="ProviderName">Provider Name:</Label>
+							<div class="col-sm-9">
+								<input id="providername" class="form-control" @bind="@_providername" />
+							</div>
+						</div>
+					}
+					@if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="authority" HelpText="The Authority Url or Issuer Url associated with the OpenID Connect provider" ResourceKey="Authority">Authority:</Label>
+							<div class="col-sm-9">
+								<input id="authority" class="form-control" @bind="@_authority" />
+							</div>
+						</div>
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="metadataurl" HelpText="The discovery endpoint for obtaining metadata for this provider. Only specify if the OpenID Connect provider does not use the standard approach (ie. /.well-known/openid-configuration)" ResourceKey="MetadataUrl">Metadata Url:</Label>
+							<div class="col-sm-9">
+								<input id="metadataurl" class="form-control" @bind="@_metadataurl" />
+							</div>
+						</div>
+					}
+					@if (_providertype == AuthenticationProviderTypes.OAuth2)
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="authorizationurl" HelpText="The endpoint for obtaining an Authorization Code" ResourceKey="AuthorizationUrl">Authorization Url:</Label>
+							<div class="col-sm-9">
+								<input id="authorizationurl" class="form-control" @bind="@_authorizationurl" />
+							</div>
+						</div>
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="tokenurl" HelpText="The endpoint for obtaining an Auth Token" ResourceKey="TokenUrl">Token Url:</Label>
+							<div class="col-sm-9">
+								<input id="tokenurl" class="form-control" @bind="@_tokenurl" />
+							</div>
+						</div>
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="userinfourl" HelpText="The endpoint for obtaining user information. This should be an API or Page Url which contains the users email address." ResourceKey="UserInfoUrl">User Info Url:</Label>
+							<div class="col-sm-9">
+								<input id="userinfourl" class="form-control" @bind="@_userinfourl" />
+							</div>
+						</div>
+					}
+					@if (_providertype != "")
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="clientid" HelpText="The Client ID from the provider" ResourceKey="ClientID">Client ID:</Label>
+							<div class="col-sm-9">
+								<input id="clientid" class="form-control" @bind="@_clientid" />
+							</div>
+						</div>
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="clientsecret" HelpText="The Client Secret from the provider" ResourceKey="ClientSecret">Client Secret:</Label>
+							<div class="col-sm-9">
+								<div class="input-group">
+									<input type="@_clientsecrettype" id="clientsecret" class="form-control" @bind="@_clientsecret" />
+									<button type="button" class="btn btn-secondary" @onclick="@ToggleClientSecret">@_toggleclientsecret</button>
+								</div>
+							</div>
+						</div>
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="scopes" HelpText="A list of Scopes to request from the provider (separated by commas). If none are specified, standard Scopes will be used by default." ResourceKey="Scopes">Scopes:</Label>
+							<div class="col-sm-9">
+								<input id="scopes" class="form-control" @bind="@_scopes" />
+							</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>
+									<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="redirecturl" HelpText="The Redirect Url (or Callback Url) which usually needs to be registered with the provider" ResourceKey="RedirectUrl">Redirect Url:</Label>
+							<div class="col-sm-9">
+								<input id="redirecturl" class="form-control" @bind="@_redirecturl" readonly />
+							</div>
+						</div>
+						@if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+						{
+							<div class="row mb-1 align-items-center">
+								<Label Class="col-sm-3" For="emailclaimtype" HelpText="The type name for the email address claim provided by the provider" ResourceKey="EmailClaimType">Email Claim Type:</Label>
+								<div class="col-sm-9">
+									<input id="emailclaimtype" class="form-control" @bind="@_emailclaimtype" />
+								</div>
+							</div>
+						}
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="domainfilter" HelpText="Provide any email domain filter criteria (separated by commas). Domains to exclude should be prefixed with an exclamation point (!). For example 'microsoft.com,!hotmail.com' would include microsoft.com email addresses but not hotmail.com email addresses." ResourceKey="DomainFilter">Domain Filter:</Label>
+							<div class="col-sm-9">
+								<input id="domainfilter" class="form-control" @bind="@_domainfilter" />
+							</div>
+						</div>
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="createusers" HelpText="Do you want new users to be created automatically? If you disable this option, users must already be registered on the site in order to sign in with their external login." ResourceKey="CreateUsers">Create New Users?</Label>
+							<div class="col-sm-9">
+								<select id="createusers" class="form-select" @bind="@_createusers">
+									<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">
+						<Label Class="col-sm-3" For="secret" HelpText="If you want to want to provide API access, please specify a secret which will be used to encrypt your tokens. The secret should be 16 characters or more to ensure optimal security. Please note that if you change this secret, all existing tokens will become invalid and will need to be regenerated." ResourceKey="Secret">Secret:</Label>
+						<div class="col-sm-9">
+							<div class="input-group">
+								<input type="@_secrettype" id="secret" class="form-control" @bind="@_secret" />
+								<button type="button" class="btn btn-secondary" @onclick="@ToggleSecret">@_togglesecret</button>
+							</div>
+						</div>
+					</div>					
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="issuer" HelpText="Optionally provide the issuer of the token" ResourceKey="Issuer">Issuer:</Label>
+						<div class="col-sm-9">
+							<input id="issuer" class="form-control" @bind="@_issuer" />
+						</div>
+					</div>					
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="audience" HelpText="Optionally provide the audience for the token" ResourceKey="Audience">Audience:</Label>
+						<div class="col-sm-9">
+							<input id="audience" class="form-control" @bind="@_audience" />
+						</div>
+					</div>					
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="lifetime" HelpText="The number of minutes for which a token should be valid" ResourceKey="Lifetime">Lifetime:</Label>
+						<div class="col-sm-9">
+							<input id="lifetime" class="form-control" @bind="@_lifetime" />
+						</div>
+					</div>					
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="token" HelpText="Select the Create Token button to generate a long-lived access token (valid for 1 year). Be sure to store this token in a safe location as you will not be able to access it in the future." ResourceKey="Token">Access Token:</Label>
+						<div class="col-sm-9">
+							<div class="input-group">
+								<input id="token" class="form-control" @bind="@_token" />
+								<button type="button" class="btn btn-secondary" @onclick="@CreateToken">@Localizer["CreateToken"]</button>
+							</div>
+						</div>
+					</div>					
+				</Section>
 			</div>
 			<br />
 			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
@@ -70,79 +338,156 @@ else
 }
 
 @code {
-    private List<UserRole> allroles;
-    private List<UserRole> userroles;
-    private string _search;
+	private List<UserRole> allroles;
+	private List<UserRole> userroles;
+	private string _search;
+
 	private string _allowregistration;
+	private string _allowsitelogin;
+	private string _twofactor;
+	private string _cookietype;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	private string _minimumlength;
+	private string _uniquecharacters;
+	private string _requiredigit;
+	private string _requireupper;
+	private string _requirelower;
+	private string _requirepunctuation;
+	private string _maximumfailures;
+	private string _lockoutduration;
 
-    protected override async Task OnInitializedAsync()
-    {
-        allroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-        await LoadSettingsAsync();
-        userroles = Search(_search);
+	private string _providertype;
+	private string _providername;
+	private string _authority;
+	private string _metadataurl;
+	private string _authorizationurl;
+	private string _tokenurl;
+	private string _userinfourl;
+	private string _clientid;
+	private string _clientsecret;
+	private string _clientsecrettype = "password";
+	private string _toggleclientsecret = string.Empty;
+	private string _scopes;
+	private string _pkce;
+	private string _redirecturl;
+	private string _emailclaimtype;
+	private string _domainfilter;
+	private string _createusers;
+
+	private string _secret;
+	private string _secrettype = "password";
+	private string _togglesecret = string.Empty;
+	private string _issuer;
+	private string _audience;
+	private string _lifetime;
+	private string _token;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnInitializedAsync()
+	{
+		allroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
+		await LoadSettingsAsync();
+		userroles = Search(_search);
+
+		var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
 		_allowregistration = PageState.Site.AllowRegistration.ToString();
-    }
+		_allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
+		_twofactor = SettingService.GetSetting(settings, "LoginOptions:TwoFactor", "false");
+		_cookietype = SettingService.GetSetting(settings, "LoginOptions:CookieType", "domain");
 
-    private List<UserRole> Search(string search)
-    {
-        var results = allroles.Where(item => item.Role.Name == RoleNames.Registered || (item.Role.Name == RoleNames.Host && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)));
+		_minimumlength = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredLength", "6");
+		_uniquecharacters = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", "1");
+		_requiredigit = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireDigit", "true");
+		_requireupper = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireUppercase", "true");
+		_requirelower = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireLowercase", "true");
+		_requirepunctuation = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireNonAlphanumeric", "true");
 
-        if (!string.IsNullOrEmpty(_search))
-        {
-            results = results.Where(item =>
-                (
-                    item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) ||
-                    item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) ||
-                    item.User.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase)
-                )
-            );
-        }
-        return results.ToList();
-    }
+		_maximumfailures = SettingService.GetSetting(settings, "IdentityOptions:Lockout:MaxFailedAccessAttempts", "5");
+		_lockoutduration = TimeSpan.Parse(SettingService.GetSetting(settings, "IdentityOptions:Lockout:DefaultLockoutTimeSpan", "00:05:00")).TotalMinutes.ToString();
 
-    private async Task OnSearch()
-    {
-        userroles = Search(_search);
-        await UpdateSettingsAsync();
-    }
+		_providertype = SettingService.GetSetting(settings, "ExternalLogin:ProviderType", "");
+		_providername = SettingService.GetSetting(settings, "ExternalLogin:ProviderName", "");
+		_authority = SettingService.GetSetting(settings, "ExternalLogin:Authority", "");
+		_metadataurl = SettingService.GetSetting(settings, "ExternalLogin:MetadataUrl", "");
+		_authorizationurl = SettingService.GetSetting(settings, "ExternalLogin:AuthorizationUrl", "");
+		_tokenurl = SettingService.GetSetting(settings, "ExternalLogin:TokenUrl", "");
+		_userinfourl = SettingService.GetSetting(settings, "ExternalLogin:UserInfoUrl", "");
+		_clientid = SettingService.GetSetting(settings, "ExternalLogin:ClientId", "");
+		_clientsecret = SettingService.GetSetting(settings, "ExternalLogin:ClientSecret", "");
+		_toggleclientsecret = Localizer["Show"];
+		_scopes = SettingService.GetSetting(settings, "ExternalLogin:Scopes", "");
+		_pkce = SettingService.GetSetting(settings, "ExternalLogin:PKCE", "false");
+		_redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
+		_emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress");
+		_domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
+		_createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
 
-    private async Task DeleteUser(UserRole UserRole)
-    {
-        try
-        {
-            var user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
-            if (user != null)
-            {
-                await UserService.DeleteUserAsync(user.UserId, PageState.Site.SiteId);
-                await logger.LogInformation("User Deleted {User}", UserRole.User);
-                allroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-                userroles = Search(_search);
-                StateHasChanged();
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting User {User} {Error}", UserRole.User, ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
+		_secret = SettingService.GetSetting(settings, "JwtOptions:Secret", "");
+		_togglesecret = Localizer["Show"];
+		_issuer = SettingService.GetSetting(settings, "JwtOptions:Issuer", PageState.Uri.Scheme + "://" + PageState.Alias.Name);
+		_audience = SettingService.GetSetting(settings, "JwtOptions:Audience", "");
+		_lifetime = SettingService.GetSetting(settings, "JwtOptions:Lifetime", "20");
+	}
 
-    private string settingSearch = "AU-search";
+	private List<UserRole> Search(string search)
+	{
+		var results = allroles.Where(item => item.Role.Name == RoleNames.Registered || (item.Role.Name == RoleNames.Host && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)));
 
-    private async Task LoadSettingsAsync()
-    {
-        Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-        _search = SettingService.GetSetting(settings, settingSearch, "");
-    }
+		if (!string.IsNullOrEmpty(_search))
+		{
+			results = results.Where(item =>
+				(
+					item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) ||
+					item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) ||
+					item.User.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase)
+				)
+			);
+		}
+		return results.ToList();
+	}
 
-    private async Task UpdateSettingsAsync()
-    {
-        Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-        SettingService.SetSetting(settings, settingSearch, _search);
-        await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
-    }
+	private async Task OnSearch()
+	{
+		userroles = Search(_search);
+		await UpdateSettingsAsync();
+	}
+
+	private async Task DeleteUser(UserRole UserRole)
+	{
+		try
+		{
+			var user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
+			if (user != null)
+			{
+				await UserService.DeleteUserAsync(user.UserId, PageState.Site.SiteId);
+				await logger.LogInformation("User Deleted {User}", UserRole.User);
+				allroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
+				userroles = Search(_search);
+				StateHasChanged();
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting User {User} {Error}", UserRole.User, ex.Message);
+			AddModuleMessage(ex.Message, MessageType.Error);
+		}
+	}
+
+	private string settingSearch = "AU-search";
+
+	private async Task LoadSettingsAsync()
+	{
+		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+		_search = SettingService.GetSetting(settings, settingSearch, "");
+	}
+
+	private async Task UpdateSettingsAsync()
+	{
+		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+		SettingService.SetSetting(settings, settingSearch, _search);
+		await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
+	}
 
 	private async Task SaveSiteSettings()
 	{
@@ -151,7 +496,47 @@ else
 			var site = PageState.Site;
 			site.AllowRegistration = bool.Parse(_allowregistration);
 			await SiteService.UpdateSiteAsync(site);
-			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+
+			var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+			settings = SettingService.SetSetting(settings, "LoginOptions:AllowSiteLogin", _allowsitelogin, false);
+			settings = SettingService.SetSetting(settings, "LoginOptions:TwoFactor", _twofactor, false);
+			settings = SettingService.SetSetting(settings, "LoginOptions:CookieType", _cookietype, true);
+
+			settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequiredLength", _minimumlength, true);
+			settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", _uniquecharacters, true);
+			settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequireDigit", _requiredigit, true);
+			settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequireUppercase", _requireupper, true);
+			settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequireLowercase", _requirelower, true);
+			settings = SettingService.SetSetting(settings, "IdentityOptions:Password:RequireNonAlphanumeric", _requirepunctuation, true);
+
+			settings = SettingService.SetSetting(settings, "IdentityOptions:Lockout:MaxFailedAccessAttempts", _maximumfailures, true);
+			settings = SettingService.SetSetting(settings, "IdentityOptions:Lockout:DefaultLockoutTimeSpan", TimeSpan.FromMinutes(Convert.ToInt64(_lockoutduration)).ToString(), true);
+
+			settings = SettingService.SetSetting(settings, "ExternalLogin:ProviderType", _providertype, false);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:ProviderName", _providername, false);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:Authority", _authority, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:MetadataUrl", _metadataurl, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:AuthorizationUrl", _authorizationurl, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:TokenUrl", _tokenurl, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:UserInfoUrl", _userinfourl, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:ClientId", _clientid, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:ClientSecret", _clientsecret, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:Scopes", _scopes, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:PKCE", _pkce, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:EmailClaimType", _emailclaimtype, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:DomainFilter", _domainfilter, true);
+			settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
+
+			if (!string.IsNullOrEmpty(_secret) && _secret.Length < 16) _secret = (_secret + "????????????????").Substring(0, 16);
+			settings = SettingService.SetSetting(settings, "JwtOptions:Secret", _secret, true);
+			settings = SettingService.SetSetting(settings, "JwtOptions:Issuer", _issuer, true);
+			settings = SettingService.SetSetting(settings, "JwtOptions:Audience", _audience, true);
+			settings = SettingService.SetSetting(settings, "JwtOptions:Lifetime", _lifetime, true);
+
+			await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
+			await SettingService.ClearSiteSettingsCacheAsync();
+
+			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);				
 		}
 		catch (Exception ex)
 		{
@@ -160,4 +545,51 @@ else
 		}
 	}
 
+	private void ProviderTypeChanged(ChangeEventArgs e)
+	{
+		_providertype = (string)e.Value;
+		if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+		{
+			_scopes = "openid,profile,email";
+		}
+		else
+		{
+			_scopes = "";
+		}
+		_redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
+		StateHasChanged();
+	}
+
+	private async Task CreateToken()
+	{
+		_token = await UserService.GetTokenAsync();
+	}
+
+	private void ToggleClientSecret()
+	{
+		if (_clientsecrettype == "password")
+		{
+			_clientsecrettype = "text";
+			_toggleclientsecret = Localizer["Hide"];
+		}
+		else
+		{
+			_clientsecrettype = "password";
+			_toggleclientsecret = Localizer["Show"];
+		}
+	}
+
+	private void ToggleSecret()
+	{
+		if (_secrettype == "password")
+		{
+			_secrettype = "text";
+			_togglesecret = Localizer["Hide"];
+		}
+		else
+		{
+			_secrettype = "password";
+			_togglesecret = Localizer["Show"];
+		}
+	}
 }

Oqtane.Client/Modules/Admin/Visitors/Detail.razor

@@ -7,69 +7,73 @@
 @inject IStringLocalizer<Detail> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <div class="container">
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="ip" HelpText="The last recorded IP address for this visitor" ResourceKey="IP">IP Address: </Label>
-            <div class="col-sm-9">
-                <input id="ip" class="form-control" @bind="@_ip" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="language" HelpText="The last recorded language for this visitor" ResourceKey="Language">Language: </Label>
-            <div class="col-sm-9">
-                <input id="language" class="form-control" @bind="@_language" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="useragent" HelpText="The last recorded user agent for this visitor" ResourceKey="UserAgent">User Agent: </Label>
-            <div class="col-sm-9">
-                <input id="useragent" class="form-control" @bind="@_useragent" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="url" HelpText="The last recorded url for this visitor" ResourceKey="Url">Url: </Label>
-            <div class="col-sm-9">
-                <input id="url" class="form-control" @bind="@_url" readonly />
-            </div>
-       </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="referrer" HelpText="The last recorded referrer for this visitor" ResourceKey="Referrer">Referrer: </Label>
-            <div class="col-sm-9">
-                <input id="referrer" class="form-control" @bind="@_referrer" readonly />
-            </div>
-       </div>
-        @if (_user != string.Empty)
-        {
-           <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="user" HelpText="The last recorded user associated with this visitor" ResourceKey="User">User: </Label>
-                <div class="col-sm-9">
-                    <input id="user" class="form-control" @bind="@_user" readonly />
-                </div>
-           </div>
-        }
-        <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="visits" HelpText="The total number of visits by this visitor all time" ResourceKey="Visits">Visits: </Label>
-            <div class="col-sm-9">
-                <input id="visits" class="form-control" @bind="@_visits" readonly />
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="visited" HelpText="The last recorded date/time when the visitor visited the site" ResourceKey="Visited">Visited: </Label>
-                <div class="col-sm-9">
-                <input id="visited" class="form-control" @bind="@_visited" readonly />
-            </div>
-        </div>
-       <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="created" HelpText="The first recorded date/time when this visitor visited the site" ResourceKey="Created">Created: </Label>
-            <div class="col-sm-9">
-                <input id="created" class="form-control" @bind="@_created" readonly />
-            </div>
-       </div>
+@if (_initialized)
+{
+	<div class="container">
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="ip" HelpText="The last recorded IP address for this visitor" ResourceKey="IP">IP Address: </Label>
+			<div class="col-sm-9">
+				<input id="ip" class="form-control" @bind="@_ip" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="language" HelpText="The last recorded language for this visitor" ResourceKey="Language">Language: </Label>
+			<div class="col-sm-9">
+				<input id="language" class="form-control" @bind="@_language" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="useragent" HelpText="The last recorded user agent for this visitor" ResourceKey="UserAgent">User Agent: </Label>
+			<div class="col-sm-9">
+				<input id="useragent" class="form-control" @bind="@_useragent" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="url" HelpText="The last recorded url for this visitor" ResourceKey="Url">Url: </Label>
+			<div class="col-sm-9">
+				<input id="url" class="form-control" @bind="@_url" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="referrer" HelpText="The last recorded referrer for this visitor" ResourceKey="Referrer">Referrer: </Label>
+			<div class="col-sm-9">
+				<input id="referrer" class="form-control" @bind="@_referrer" readonly />
+			</div>
+		</div>
+		@if (_user != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="user" HelpText="The last recorded user associated with this visitor" ResourceKey="User">User: </Label>
+				<div class="col-sm-9">
+					<input id="user" class="form-control" @bind="@_user" readonly />
+				</div>
+			</div>
+		}
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="visits" HelpText="The total number of visits by this visitor all time" ResourceKey="Visits">Visits: </Label>
+			<div class="col-sm-9">
+				<input id="visits" class="form-control" @bind="@_visits" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="visited" HelpText="The last recorded date/time when the visitor visited the site" ResourceKey="Visited">Visited: </Label>
+				<div class="col-sm-9">
+				<input id="visited" class="form-control" @bind="@_visited" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="created" HelpText="The first recorded date/time when this visitor visited the site" ResourceKey="Created">Created: </Label>
+			<div class="col-sm-9">
+				<input id="created" class="form-control" @bind="@_created" readonly />
+			</div>
+		</div>
 	</div>
+}
 
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+<NavLink class="btn btn-secondary" href="@CloseUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
+	private bool _initialized = false;
 	private int _visitorId;
 	private string _ip = string.Empty;
 	private string _language = string.Empty;
@@ -108,6 +112,7 @@
 						_user = user.DisplayName;
 					}
 				}
+				_initialized = true;
 			}
 			else
 			{
@@ -120,4 +125,16 @@
 			AddModuleMessage(Localizer["Error.LoadVisitor"], MessageType.Error);
 		}
 	}
-    }
+
+	private string CloseUrl()
+	{
+		if (!PageState.QueryString.ContainsKey("type"))
+		{
+			return NavigateUrl();
+		}
+		else
+		{
+			return NavigateUrl(PageState.Page.Path, "type=" + PageState.QueryString["type"] + "&days=" + PageState.QueryString["days"] + "&page=" + PageState.QueryString["page"]);
+		}
+	}
+}

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

@@ -17,13 +17,13 @@ else
 			<div class="container">
 				<div class="row mb-1 align-items-center">
 					<div class="col-sm-6">
-						<select id="type" class="form-select custom-select" @onchange="(e => TypeChanged(e))">
-							<option value="false">@Localizer["AllVisitors"]</option>
-							<option value="true">@Localizer["UsersOnly"]</option>
+						<select id="type" class="form-select custom-select" value="@_type" @onchange="(e => TypeChanged(e))">
+							<option value="visitors">@Localizer["AllVisitors"]</option>
+							<option value="users">@Localizer["UsersOnly"]</option>
 						</select>
 					</div>
 					<div class="col-sm-6">
-						<select id="type" class="form-select custom-select" @onchange="(e => DateChanged(e))">
+						<select id="days" class="form-select custom-select" value="@_days" @onchange="(e => DaysChanged(e))">
 							<option value="1">@Localizer["PastDay"]</option>
 							<option value="7">@Localizer["PastWeek"]</option>
 							<option value="30">@Localizer["PastMonth"]</option>
@@ -32,7 +32,7 @@ else
 				</div>
 			</div>
 			<br/>
-			<Pager Items="@_visitors">
+			<Pager Items="@_visitors" CurrentPage="@_page.ToString()" OnPageChange="OnPageChange">
 				<Header>
 					<th style="width: 1px;">&nbsp;</th>
 					<th>@Localizer["IP"]</th>
@@ -43,7 +43,7 @@ else
 					<th>@Localizer["Created"]</th>
 				</Header>
 				<Row>
-					<td><ActionLink Action="Detail" Parameters="@($"id=" + context.VisitorId.ToString())" ResourceKey="Details" /></td>
+					<td><ActionLink Action="Detail" Parameters="@($"id=" + context.VisitorId.ToString() + "&type=" + _type.ToString() + "&days=" + _days.ToString() + "&page=" + _page.ToString())" ResourceKey="Details" /></td>
 					<td>@context.IPAddress</td>
 					<td>
 						@if (context.UserId != null)
@@ -70,7 +70,7 @@ else
 					</div>
 				</div>
 				<div class="row mb-1 align-items-center">
-					<Label Class="col-sm-3" For="filter" HelpText="Comma delimited list of terms which may exist in IP addresses, user agents, or languages which identify visitors which should not be tracked (ie. bots)" ResourceKey="Filter">Filter: </Label>
+					<Label Class="col-sm-3" For="filter" HelpText="Comma delimited list of terms which may exist in IP addresses, user agents, or languages identifying visitors which should not be tracked" ResourceKey="Filter">Filter: </Label>
 					<div class="col-sm-9">
 						<textarea id="filter" class="form-control" @bind="@_filter" rows="3"></textarea>
 					</div>
@@ -81,6 +81,15 @@ else
 						<input id="retention" class="form-control" @bind="@_retention" />
 					</div>
 				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="correlation" HelpText="Indicate if new visitors to this site should be correlated based on their IP Address" ResourceKey="Correlation">Correlate Visitors? </Label>
+					<div class="col-sm-9">
+                        <select id="correlation" class="form-select" @bind="@_correlation">
+							<option value="true">@SharedLocalizer["True"]</option>
+							<option value="false">@SharedLocalizer["False"]</option>
+                        </select>
+					</div>
+				</div>
 			</div>
 			<br />
 			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
@@ -89,28 +98,46 @@ else
 }
 
 @code {
-	private bool _users = false;
+	private string _type = "visitors";
 	private int _days = 1;
+	private int _page = 1;
 	private List<Visitor> _visitors;
 	private string _tracking;
 	private string _filter = "";
 	private string _retention = "";
+	private string _correlation = "true";
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
 	protected override async Task OnParametersSetAsync()
 	{
+		if (PageState.QueryString.ContainsKey("type"))
+		{
+			_type = PageState.QueryString["type"];
+		}
+		if (PageState.QueryString.ContainsKey("days") && int.TryParse(PageState.QueryString["days"], out int days))
+		{
+			_days = days;
+		}
+		if (PageState.QueryString.ContainsKey("page") && int.TryParse(PageState.QueryString["page"], out int page))
+		{
+			_page = page;
+		}
+
 		await GetVisitors();
+
 		_tracking = PageState.Site.VisitorTracking.ToString();
-		_filter = SettingService.GetSetting(PageState.Site.Settings, "VisitorFilter", "");
-		_retention = SettingService.GetSetting(PageState.Site.Settings, "VisitorRetention", "30");
+		var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+		_filter = SettingService.GetSetting(settings, "VisitorFilter", Constants.DefaultVisitorFilter);
+		_retention = SettingService.GetSetting(settings, "VisitorRetention", "30");
+		_correlation = SettingService.GetSetting(settings, "VisitorCorrelation", "true");
 	}
 
 	private async void TypeChanged(ChangeEventArgs e)
 	{
 		try
 		{
-			_users = bool.Parse(e.Value.ToString());
+			_type = e.Value.ToString();
 			await GetVisitors();
 			StateHasChanged();
 		}
@@ -120,7 +147,7 @@ else
 		}
 	}
 
-	private async void DateChanged(ChangeEventArgs e)
+	private async void DaysChanged(ChangeEventArgs e)
 	{
 		try
 		{
@@ -137,7 +164,7 @@ else
 	private async Task GetVisitors()
 	{
 		_visitors = await VisitorService.GetVisitorsAsync(PageState.Site.SiteId, DateTime.UtcNow.AddDays(-_days));
-		if (_users)
+		if (_type == "users")
 		{
 			_visitors = _visitors.Where(item => item.UserId != null).ToList();
 		}
@@ -154,6 +181,7 @@ else
 			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
 			settings = SettingService.SetSetting(settings, "VisitorFilter", _filter, true);
 			settings = SettingService.SetSetting(settings, "VisitorRetention", _retention, true);
+			settings = SettingService.SetSetting(settings, "VisitorCorrelation", _correlation, true);
             await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
 
 			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
@@ -164,4 +192,9 @@ else
 			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
 		}
 	}
+
+	private void OnPageChange(int page)
+	{
+		_page = page;	
+	}
 }

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -52,7 +52,7 @@
                                     <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
                                 }
                             </div>
-                            <div class="col mt-2 text-center">
+                            <div class="col mt-2 text-end">
                                 <button type="button" class="btn btn-success" @onclick="UploadFile">@SharedLocalizer["Upload"]</button>
                                 @if (ShowFiles && GetFileId() != -1)
                                 {

Oqtane.Client/Modules/Controls/Pager.razor

@@ -57,12 +57,12 @@
 		<div class="table-responsive">
 			<table class="@Class">
 				<thead>
-					<tr>@Header</tr>
+					<tr class="@RowClass">@Header</tr>
 				</thead>
 				<tbody>
 					@foreach (var item in ItemList)
 					{
-						<tr>@Row(item)</tr>
+						<tr class="@RowClass">@Row(item)</tr>
 						@if (Detail != null)
 						{
 							<tr>@Detail(item)</tr>
@@ -75,28 +75,37 @@
     @if (Format == "Grid" && Row != null)
     {
         int count = 0;
-        if (ItemList != null)
+		int rows = 0;
+		int cols = 0;
+		if (ItemList != null)
         {
-            count = (int)Math.Ceiling(ItemList.Count() / (decimal)_columns) * _columns;
+			if (_columns == 0)
+			{
+				count = ItemList.Count();
+				rows = 1;
+				cols = count;
+			}
+			else
+			{
+				count = (int)Math.Ceiling(ItemList.Count() / (decimal)_columns) * _columns;
+				rows = count / _columns;
+				cols = _columns;
+			}
         }
         <div class="@Class">
-            @if (Header != null)
+            @for (int row = 0; row < rows; row++)
             {
-                <div class="row"><div class="col">@Header</div></div>
-            }
-            @for (int row = 0; row < (count / _columns); row++)
-            {
-                <div class="row">
-                    @for (int col = 0; col < _columns; col++)
+                <div class="@RowClass">
+                    @for (int col = 0; col < cols; col++)
                     {
                         int index = (row * _columns) + col;
                         if (index < ItemList.Count())
                         {
-                            <div class="col">@Row(ItemList.ElementAt(index))</div>
+                            <div class="@ColumnClass">@Row(ItemList.ElementAt(index))</div>
                         }
                         else
                         {
-                            <div class="col">&nbsp;</div>
+                            <div>&nbsp;</div>
                         }
                     }
                 </div>
@@ -160,7 +169,7 @@
     private int _displayPages = 5;
     private int _startPage = 0;
     private int _endPage = 0;
-    private int _columns = 1;
+    private int _columns = 0;
 
     [Parameter]
     public string Format { get; set; } // Table or Grid
@@ -169,10 +178,10 @@
     public string Toolbar { get; set; } // Top, Bottom or Both
 
     [Parameter]
-    public RenderFragment Header { get; set; } = null;
+    public RenderFragment Header { get; set; } = null; // only applicable to Table layouts
 
     [Parameter]
-    public RenderFragment<TableItem> Row { get; set; } = null;
+    public RenderFragment<TableItem> Row { get; set; } = null; // required
 
     [Parameter]
     public RenderFragment<TableItem> Detail { get; set; } = null; // only applicable to Table layouts
@@ -184,16 +193,25 @@
     public string PageSize { get; set; } // number of items to display on a page
 
     [Parameter]
-    public string Columns { get; set; } // only applicable to Grid layouts
+    public string Columns { get; set; } // only applicable to Grid layouts - default is zero indicating use responsive behavior
 
     [Parameter]
-    public string CurrentPage { get; set; } // optional property to set the initial page to display
+    public string CurrentPage { get; set; } // sets the initial page to display
 
     [Parameter]
     public string DisplayPages { get; set; } // maximum number of page numbers to display for user selection
 
     [Parameter]
-    public string Class { get; set; }
+    public string Class { get; set; } // class for the containing element - ie. <table> for Table or <div> for Grid
+
+    [Parameter]
+    public string RowClass { get; set; } // class for row element - ie. <tr> for Table or <div> for Grid
+
+	[Parameter]
+    public string ColumnClass { get; set; } // class for column element - only applicable to Grid format
+
+    [Parameter]
+    public Action<int> OnPageChange { get; set; } // a method to be executed in the calling component when the page changes
 
     private IEnumerable<TableItem> ItemList { get; set; }
 
@@ -217,11 +235,35 @@
             }
             else
             {
-                Class = "container-fluid px-0";
+                Class = "container-fluid";
             }
         }
 
-        if (!string.IsNullOrEmpty(PageSize))
+        if (string.IsNullOrEmpty(RowClass))
+        {
+            if (Format == "Table")
+            {
+                RowClass = "";
+            }
+            else
+            {
+                RowClass = "row";
+            }
+        }	
+		
+        if (string.IsNullOrEmpty(ColumnClass))
+        {
+            if (Format == "Table")
+            {
+                ColumnClass = "";
+            }
+            else
+            {
+                ColumnClass = "col";
+            }
+        }	
+		
+		if (!string.IsNullOrEmpty(PageSize))
         {
             _maxItems = int.Parse(PageSize);
         }
@@ -268,6 +310,7 @@
         {
             _endPage = _pages;
         }
+        OnPageChange?.Invoke(_page);
         StateHasChanged();
     }
 

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -100,160 +100,172 @@
 }
 
 @code {
-    private string _permissionnames = string.Empty;
-    private List<Role> _roles;
-    private List<PermissionString> _permissions;
-    private List<User> _users = new List<User>();
-    private string _username = string.Empty;
-    private string _message = string.Empty;
+	private string _permissionnames = string.Empty;
+	private List<Role> _roles;
+	private List<PermissionString> _permissions;
+	private List<User> _users = new List<User>();
+	private string _username = string.Empty;
+	private string _message = string.Empty;
 
-    [Parameter]
-    public string EntityName { get; set; }
+	[Parameter]
+	public string EntityName { get; set; }
 
-    [Parameter]
-    public string PermissionNames { get; set; }
+	[Parameter]
+	public string PermissionNames { get; set; }
 
-    [Parameter]
-    public string Permissions { get; set; }
+	[Parameter]
+	public string Permissions { get; set; }
 
-    protected override async Task OnInitializedAsync()
-    {
-        if (string.IsNullOrEmpty(PermissionNames))
-        {
-            _permissionnames = Shared.PermissionNames.View + "," + Shared.PermissionNames.Edit;
-        }
-        else
-        {
-            _permissionnames = PermissionNames;
-        }
+	protected override async Task OnInitializedAsync()
+	{
+		if (string.IsNullOrEmpty(PermissionNames))
+		{
+			_permissionnames = Shared.PermissionNames.View + "," + Shared.PermissionNames.Edit;
+		}
+		else
+		{
+			_permissionnames = PermissionNames;
+		}
 
-        _roles = await RoleService.GetRolesAsync(ModuleState.SiteId);
-        _roles.Insert(0, new Role { Name = RoleNames.Everyone });
+		_roles = await RoleService.GetRolesAsync(ModuleState.SiteId);
+		_roles.Insert(0, new Role { Name = RoleNames.Everyone });
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			_roles.Add(new Role { Name = RoleNames.Host });
+		}
 
-        _permissions = new List<PermissionString>();
+		_permissions = new List<PermissionString>();
 
-        foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
-        {
-            // initialize with admin role
-            _permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = RoleNames.Admin });
-        }
+		foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+		{
+			// initialize with admin role
+			_permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = RoleNames.Admin });
+		}
 
-        if (!string.IsNullOrEmpty(Permissions))
-        {
-            // populate permissions
-            foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
-            {
-                if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
-                {
-                    _permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
-                }
+		if (!string.IsNullOrEmpty(Permissions))
+		{
+			// populate permissions
+			foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
+			{
+				if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
+				{
+					_permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
+				}
 
-                if (permissionstring.Permissions.Contains("["))
-                {
-                    foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, StringSplitOptions.RemoveEmptyEntries))
-                    {
-                        if (user.Contains("]"))
-                        {
-                            var userid = int.Parse(user.Substring(0, user.IndexOf("]")));
-                            if (_users.Where(item => item.UserId == userid).FirstOrDefault() == null)
-                            {
-                                _users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+				if (permissionstring.Permissions.Contains("["))
+				{
+					foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, StringSplitOptions.RemoveEmptyEntries))
+					{
+						if (user.Contains("]"))
+						{
+							var userid = int.Parse(user.Substring(0, user.IndexOf("]")));
+							if (_users.Where(item => item.UserId == userid).FirstOrDefault() == null)
+							{
+								_users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId));
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 
-    private bool? GetPermissionValue(string permissions, string securityKey)
-    {
-        if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
-        {
-            return false; // deny permission
-        }
-        else
-        {
-            if ((";" + permissions + ";").Contains(";" + securityKey + ";"))
-            {
-                return true; // grant permission
-            }
-            else
-            {
-                return null; // not specified
-            }
-        }
-    }
+	private bool? GetPermissionValue(string permissions, string securityKey)
+	{
+		if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
+		{
+			return false; // deny permission
+		}
+		else
+		{
+			if ((";" + permissions + ";").Contains(";" + securityKey + ";"))
+			{
+				return true; // grant permission
+			}
+			else
+			{
+				return null; // not specified
+			}
+		}
+	}
 
-    private bool GetPermissionDisabled(string roleName)
-        => roleName == RoleNames.Admin
-            ? true
-            : false;
+	private bool GetPermissionDisabled(string roleName)
+		=> (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) ? true : false;
 
-    private async Task AddUser()
-    {
-        if (_users.Where(item => item.Username == _username).FirstOrDefault() == null)
-        {
-            try
-            {
-                var user = await UserService.GetUserAsync(_username, ModuleState.SiteId);
-                if (user != null)
-                {
-                    _users.Add(user);
-                }
-            }
-            catch
-            {
-                _message = Localizer["Message.Username.DontExist"];
-            }
-        }
+	private async Task AddUser()
+	{
+		if (_users.Where(item => item.Username == _username).FirstOrDefault() == null)
+		{
+			try
+			{
+				var user = await UserService.GetUserAsync(_username, ModuleState.SiteId);
+				if (user != null)
+				{
+					_users.Add(user);
+				}
+			}
+			catch
+			{
+				_message = Localizer["Message.Username.DontExist"];
+			}
+		}
 
-        _username = string.Empty;
-    }
+		_username = string.Empty;
+	}
 
-    private void PermissionChanged(bool? value, string permissionName, string securityId)
-    {
-        var selected = value;
-        var permission = _permissions.Find(item => item.PermissionName == permissionName);
-        if (permission != null)
-        {
-            var ids = permission.Permissions.Split(';').ToList();
+	private void PermissionChanged(bool? value, string permissionName, string securityId)
+	{
+		var selected = value;
+		var permission = _permissions.Find(item => item.PermissionName == permissionName);
+		if (permission != null)
+		{
+			var ids = permission.Permissions.Split(';').ToList();
 
-            ids.Remove(securityId); // remove grant permission
-            ids.Remove("!" + securityId); // remove deny permission
+			ids.Remove(securityId); // remove grant permission
+			ids.Remove("!" + securityId); // remove deny permission
 
-            switch (selected)
-            {
-                case true:
-                    ids.Add(securityId); // add grant permission
-                    break;
-                case false:
-                    ids.Add("!" + securityId); // add deny permission
-                    break;
-                case null:
-                    break; // permission not specified
-            }
+			switch (selected)
+			{
+				case true:
+					ids.Add(securityId); // add grant permission
+					break;
+				case false:
+					ids.Add("!" + securityId); // add deny permission
+					break;
+				case null:
+					break; // permission not specified
+			}
 
-            _permissions[_permissions.FindIndex(item => item.PermissionName == permissionName)].Permissions = string.Join(";", ids.ToArray());
-        }
-    }
+			_permissions[_permissions.FindIndex(item => item.PermissionName == permissionName)].Permissions = string.Join(";", ids.ToArray());
+		}
+	}
 
-    public string GetPermissions()
-    {
-        ValidatePermissions();
-        return UserSecurity.SetPermissionStrings(_permissions);
-    }
+	public string GetPermissions()
+	{
+		ValidatePermissions();
+		return UserSecurity.SetPermissionStrings(_permissions);
+	}
 
-    private void ValidatePermissions()
-    {
-        PermissionString permission;
-        for (int i = 0; i < _permissions.Count; i++)
-        {
-            permission = _permissions[i];
-            List<string> ids = permission.Permissions.Split(';').ToList();
-            ids.Remove("!" + RoleNames.Everyone); // remove deny all users
-            ids.Remove("!" + RoleNames.Registered); // remove deny registered users
-            permission.Permissions = string.Join(";", ids.ToArray());
+	private void ValidatePermissions()
+	{
+		PermissionString permission;
+		for (int i = 0; i < _permissions.Count; i++)
+		{
+			permission = _permissions[i];
+			List<string> ids = permission.Permissions.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
+			ids.Remove("!" + RoleNames.Everyone); // remove deny all users
+			ids.Remove("!" + RoleNames.Registered); // remove deny registered users
+			if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+				ids.Remove("!" + RoleNames.Admin); // remove deny administrators
+				ids.Remove("!" + RoleNames.Host); // remove deny host users
+				if (!ids.Contains(RoleNames.Host) && !ids.Contains(RoleNames.Admin))
+				{
+					// add administrators role if host user role is not assigned
+					ids.Add(RoleNames.Admin);				
+				}
+			}
+			permission.Permissions = string.Join(";", ids.ToArray());
             _permissions[i] = permission;
         }
     }

Oqtane.Client/Modules/Controls/RichTextEditor.razor

@@ -71,11 +71,11 @@
                 </div>
                 @if (ReadOnly)
                 {
-                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_content" rows="10" readonly></textarea>
+                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_rawhtml" rows="10" readonly></textarea>
                 }
                 else
                 {
-                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_content" rows="10"></textarea>
+                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_rawhtml" rows="10"></textarea>
                 }
             </TabPanel>
         </TabStrip>
@@ -83,110 +83,121 @@
 </div>
 
 @code {
-    private ElementReference _editorElement;
-    private ElementReference _toolBar;
-    private bool _filemanagervisible = false;
-    private FileManager _fileManager;
-    private string _content = string.Empty;
-    private string _original = string.Empty;
-    private string _message = string.Empty;
+	private ElementReference _editorElement;
+	private ElementReference _toolBar;
+	private bool _filemanagervisible = false;
+	private FileManager _fileManager;
+	private string _richhtml = string.Empty;
+	private string _originalrichhtml = string.Empty;
+	private string _rawhtml = string.Empty;
+	private string _originalrawhtml = string.Empty;
+	private string _message = string.Empty;
 
-    [Parameter]
-    public string Content { get; set; }
+	[Parameter]
+	public string Content { get; set; }
 
-    [Parameter]
-    public bool ReadOnly { get; set; } = false;
+	[Parameter]
+	public bool ReadOnly { get; set; } = false;
 
-    [Parameter]
-    public string Placeholder { get; set; } = "Enter Your Content...";
+	[Parameter]
+	public string Placeholder { get; set; } = "Enter Your Content...";
 
-    // parameters only applicable to rich text editor
-    [Parameter]
-    public RenderFragment ToolbarContent { get; set; }
+	// parameters only applicable to rich text editor
+	[Parameter]
+	public RenderFragment ToolbarContent { get; set; }
 
-    [Parameter]
-    public string Theme { get; set; } = "snow";
+	[Parameter]
+	public string Theme { get; set; } = "snow";
 
-    [Parameter]
-    public string DebugLevel { get; set; } = "info";
+	[Parameter]
+	public string DebugLevel { get; set; } = "info";
 
-    [Parameter]
-    public bool AllowFileManagement { get; set; } = true;
+	[Parameter]
+	public bool AllowFileManagement { get; set; } = true;
 
-    public override List<Resource> Resources => new List<Resource>()
+	public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill1.3.7.min.js" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill.min.js" },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js" },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }
     };
 
-    protected override async Task OnParametersSetAsync()
-    {
-        _content = Content; // raw HTML
-        await RefreshRichText();
-    }
+	protected override void OnParametersSet()
+	{
+		_richhtml = Content;
+		_rawhtml = Content;
+		_originalrawhtml = _rawhtml; // preserve for comparison later
+	}
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        if (firstRender)
-        {
-            await base.OnAfterRenderAsync(firstRender);
+	protected override async Task OnAfterRenderAsync(bool firstRender)
+	{
+		await base.OnAfterRenderAsync(firstRender);
 
+		var interop = new RichTextEditorInterop(JSRuntime);
 
-            await interop.CreateEditor(
-                _editorElement,
-                _toolBar,
-                ReadOnly,
-                Placeholder,
-                Theme,
-                DebugLevel);
+		if (firstRender)
+		{
+			await interop.CreateEditor(
+				_editorElement,
+				_toolBar,
+				ReadOnly,
+				Placeholder,
+				Theme,
+				DebugLevel);
 
-            await interop.LoadEditorContent(_editorElement, Content);
+			await interop.LoadEditorContent(_editorElement, _richhtml);
 
-            _content = Content; // raw HTML
+			// preserve a copy of the rich text content (Quill sanitizes content so we need to retrieve it from the editor)
+			_originalrichhtml = await interop.GetHtml(_editorElement);
+		}
+		else
+		{
+			await interop.LoadEditorContent(_editorElement, _richhtml);	
+		}
+	}
 
-        }
-            // preserve a copy of the rich text content ( Quill sanitizes content so we need to retrieve it from the editor )
-            _original = await interop.GetHtml(_editorElement);
-    }
+	public void CloseFileManager()
+	{
+		_filemanagervisible = false;
+		_message = string.Empty;
+		StateHasChanged();
+	}
 
-    public void CloseFileManager()
-    {
-        _filemanagervisible = false;
-        _message = string.Empty;
-        StateHasChanged();
-    }
+	public void RefreshRichText()
+	{
+		_richhtml = _rawhtml;
+		StateHasChanged();
+	}
 
-    public async Task RefreshRichText()
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        await interop.LoadEditorContent(_editorElement, _content);
-    }
+	public async Task RefreshRawHtml()
+	{
+		var interop = new RichTextEditorInterop(JSRuntime);
+		_rawhtml = await interop.GetHtml(_editorElement);
+		StateHasChanged();
+	}
 
-    public async Task RefreshRawHtml()
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        _content = await interop.GetHtml(_editorElement);
-        StateHasChanged();
-    }
-
-    public async Task<string> GetHtml()
-    {
-        // get rich text content
-        var interop = new RichTextEditorInterop(JSRuntime);
-        string content = await interop.GetHtml(_editorElement);
-
-        if (_original != content)
-        {
-            // rich text content has changed - return it
-            return content;
-        }
-        else
-        {
-            // return raw html content
-            return _content;
-        }
+	public async Task<string> GetHtml()
+	{
+		// evaluate raw html content as first priority
+		if (_rawhtml != _originalrawhtml)
+		{
+			return _rawhtml;
+		}
+		else
+		{
+			// return rich text content if it has changed
+			var interop = new RichTextEditorInterop(JSRuntime);
+			var richhtml = await interop.GetHtml(_editorElement);
+			if (richhtml != _originalrichhtml)
+			{
+				return richhtml;
+			}
+			else
+			{
+				// return original raw html content
+				return _originalrawhtml;
+			}
+		}
     }
 
     public async Task InsertImage()
@@ -212,23 +223,4 @@
         }
         StateHasChanged();
     }
-
-    // other rich text editor methods which can be used by developers
-    public async Task<string> GetText()
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        return await interop.GetText(_editorElement);
-    }
-
-    public async Task<string> GetContent()
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        return await interop.GetContent(_editorElement);
-    }
-
-    public async Task EnableEditor(bool mode)
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        await interop.EnableEditor(_editorElement, mode);
-    }
 }

Oqtane.Client/Modules/HtmlText/Edit.razor

@@ -9,95 +9,186 @@
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_content != null)
-{
-    <RichTextEditor Content="@_content" AllowFileManagement="@_allowfilemanagement" @ref="@RichTextEditorHtml"></RichTextEditor>
-    <button type="button" class="btn btn-success" @onclick="SaveContent">@SharedLocalizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-    @if (!string.IsNullOrEmpty(_content))
-    {
-        <br />
-        <br />
-        <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
-    }
-}
+<TabStrip>
+    <TabPanel Name="Edit" Heading="Edit" ResourceKey="Edit">
+		@if (_content != null)
+		{
+			<RichTextEditor Content="@_content" AllowFileManagement="@_allowfilemanagement" @ref="@RichTextEditorHtml"></RichTextEditor>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveContent">@SharedLocalizer["Save"]</button>
+			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+			@if (!string.IsNullOrEmpty(_content))
+			{
+				<br />
+				<br />
+				<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+			}
+		}
+	</TabPanel>
+    <TabPanel Name="Versions" Heading="Versions" ResourceKey="Versions">
+		<Pager Items="@_htmltexts">
+			<Header>
+				<th style="width: 1px;">&nbsp;</th>
+				<th style="width: 1px;">&nbsp;</th>
+				<th style="width: 1px;">&nbsp;</th>
+				<th>@SharedLocalizer["CreatedOn"]</th>
+				<th>@SharedLocalizer["CreatedBy"]</th>
+			</Header>
+			<Row>
+				<td><ActionLink Action="View" Security="SecurityAccessLevel.Edit" OnClick="@(async () => await View(context))" ResourceKey="View" /></td>
+				<td><ActionDialog Header="Restore Version" Message="@string.Format(Localizer["Confirm.Restore"], context.CreatedOn)" Action="Restore" Security="SecurityAccessLevel.Edit" Class="btn btn-success" OnClick="@(async () => await Restore(context))" ResourceKey="Restore" /></td>
+				<td><ActionDialog Header="Delete Version" Message="@string.Format(Localizer["Confirm.Delete"], context.CreatedOn)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" ResourceKey="Delete" /></td>
+				<td>@context.CreatedOn</td>
+				<td>@context.CreatedBy</td>
+			</Row>
+		</Pager>
+		@((MarkupString)_view)
+	</TabPanel>
+</TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
-    public override string Title => "Edit Html/Text";
+	public override string Title => "Edit Html/Text";
 
-    public override List<Resource> Resources => new List<Resource>()
-{
+	public override List<Resource> Resources => new List<Resource>()
+	{
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.7.bubble.css" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.7.snow.css" }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.bubble.css" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.snow.css" }
     };
 
-    private RichTextEditor RichTextEditorHtml;
-    private bool _allowfilemanagement;
-    private string _content = null;
-    private string _createdby;
-    private DateTime _createdon;
-    private string _modifiedby;
-    private DateTime _modifiedon;
+	private RichTextEditor RichTextEditorHtml;
+	private bool _allowfilemanagement;
+	private string _content = null;
+	private string _createdby;
+	private DateTime _createdon;
+	private string _modifiedby;
+	private DateTime _modifiedon;
+	private List<Models.HtmlText> _htmltexts;
+	private string _view = "";
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _allowfilemanagement = bool.Parse(SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true"));
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_allowfilemanagement = bool.Parse(SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true"));
+			await LoadContent();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.Load"], MessageType.Error);
+		}
+	}
 
-            var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
-            if (htmltext != null)
-            {
-                _content = htmltext.Content;
-                _content = Utilities.FormatContent(_content, PageState.Alias, "render");
-                _createdby = htmltext.CreatedBy;
-                _createdon = htmltext.CreatedOn;
-                _modifiedby = htmltext.ModifiedBy;
-                _modifiedon = htmltext.ModifiedOn;
-            }
-            else
-            {
-                _content = string.Empty;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Content {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error.Content.Load"], MessageType.Error);
-        }
-    }
+	private async Task LoadContent()
+	{
+		var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
+		if (htmltext != null)
+		{
+			_content = htmltext.Content;
+			_content = Utilities.FormatContent(_content, PageState.Alias, "render");
+			_createdby = htmltext.CreatedBy;
+			_createdon = htmltext.CreatedOn;
+			_modifiedby = htmltext.ModifiedBy;
+			_modifiedon = htmltext.ModifiedOn;
+		}
+		else
+		{
+			_content = string.Empty;
+		}
 
-    private async Task SaveContent()
-    {
-        string content = await RichTextEditorHtml.GetHtml();
-        content = Utilities.FormatContent(content, PageState.Alias, "save");
+		_htmltexts = await HtmlTextService.GetHtmlTextsAsync(ModuleState.ModuleId);
+		_htmltexts = _htmltexts.OrderByDescending(item => item.CreatedOn).ToList();
 
-        try
-        {
-            var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
-            if (htmltext != null)
-            {
-                htmltext.Content = content;
-                await HtmlTextService.UpdateHtmlTextAsync(htmltext);
-            }
-            else
-            {
-                htmltext = new HtmlText();
-                htmltext.ModuleId = ModuleState.ModuleId;
-                htmltext.Content = content;
-                await HtmlTextService.AddHtmlTextAsync(htmltext);
-            }
+		_view = "";
+	}
 
-            await logger.LogInformation("Content Saved {HtmlText}", htmltext);
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Saving Content {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error.Content.Save"], MessageType.Error);
-        }
-    }
+	private async Task SaveContent()
+	{
+		string content = await RichTextEditorHtml.GetHtml();
+		content = Utilities.FormatContent(content, PageState.Alias, "save");
+
+		try
+		{
+			var htmltext = new HtmlText();
+			htmltext.ModuleId = ModuleState.ModuleId;
+			htmltext.Content = content;
+			await HtmlTextService.AddHtmlTextAsync(htmltext);
+
+			await logger.LogInformation("Content Saved {HtmlText}", htmltext);
+			NavigationManager.NavigateTo(NavigateUrl());
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.Save"], MessageType.Error);
+		}
+	}
+
+	private async Task View(Models.HtmlText htmltext)
+	{
+		try
+		{
+			htmltext = await HtmlTextService.GetHtmlTextAsync(htmltext.HtmlTextId, htmltext.ModuleId);
+			if (htmltext != null)
+			{
+				_view = htmltext.Content;
+				_view = Utilities.FormatContent(_view, PageState.Alias, "render");
+				StateHasChanged();
+			}		
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Viewing Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.View"], MessageType.Error);
+		}
+	}
+
+	private async Task Restore(Models.HtmlText htmltext)
+	{
+		try
+		{
+			htmltext = await HtmlTextService.GetHtmlTextAsync(htmltext.HtmlTextId, ModuleState.ModuleId);
+			if (htmltext != null)
+			{
+				var content = htmltext.Content;
+				htmltext = new HtmlText();
+				htmltext.ModuleId = ModuleState.ModuleId;
+				htmltext.Content = content;
+				await HtmlTextService.AddHtmlTextAsync(htmltext);
+				await logger.LogInformation("Content Restored {HtmlText}", htmltext);
+				AddModuleMessage(Localizer["Message.Content.Restored"], MessageType.Success);
+				await LoadContent();
+				StateHasChanged();
+			}				
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Restoring Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.Restore"], MessageType.Error);
+		}
+	}
+
+	private async Task Delete(Models.HtmlText htmltext)
+	{
+		try
+		{
+			htmltext = await HtmlTextService.GetHtmlTextAsync(htmltext.HtmlTextId, ModuleState.ModuleId);
+			if (htmltext != null)
+			{
+				await HtmlTextService.DeleteHtmlTextAsync(htmltext.HtmlTextId, htmltext.ModuleId);
+				await logger.LogInformation("Content Deleted {HtmlText}", htmltext);
+				AddModuleMessage(Localizer["Message.Content.Deleted"], MessageType.Success);
+				await LoadContent();
+				StateHasChanged();
+			}		
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting Content {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Content.Delete"], MessageType.Error);
+		}
+	}
 }

Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Oqtane.Documentation;
@@ -13,24 +15,29 @@ namespace Oqtane.Modules.HtmlText.Services
 
         private string ApiUrl => CreateApiUrl("HtmlText");
 
+        public async Task<List<Models.HtmlText>> GetHtmlTextsAsync(int moduleId)
+        {
+            return await GetJsonAsync<List<Models.HtmlText>>(CreateAuthorizationPolicyUrl($"{ApiUrl}?moduleid={moduleId}", EntityNames.Module, moduleId));
+        }
+
         public async Task<Models.HtmlText> GetHtmlTextAsync(int moduleId)
         {
             return await GetJsonAsync<Models.HtmlText>(CreateAuthorizationPolicyUrl($"{ApiUrl}/{moduleId}", EntityNames.Module, moduleId));
         }
 
+        public async Task<Models.HtmlText> GetHtmlTextAsync(int htmlTextId, int moduleId)
+        {
+            return await GetJsonAsync<Models.HtmlText>(CreateAuthorizationPolicyUrl($"{ApiUrl}/{htmlTextId}/{moduleId}", EntityNames.Module, moduleId));
+        }
+
         public async Task AddHtmlTextAsync(Models.HtmlText htmlText)
         {
             await PostJsonAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}", EntityNames.Module, htmlText.ModuleId), htmlText);
         }
 
-        public async Task UpdateHtmlTextAsync(Models.HtmlText htmlText)
+        public async Task DeleteHtmlTextAsync(int htmlTextId, int moduleId)
         {
-            await PutJsonAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{htmlText.HtmlTextId}", EntityNames.Module, htmlText.ModuleId), htmlText);
-        }
-
-        public async Task DeleteHtmlTextAsync(int moduleId)
-        {
-            await DeleteAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{moduleId}", EntityNames.Module, moduleId));
+            await DeleteAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{htmlTextId}/{moduleId}", EntityNames.Module, moduleId));
         }
     }
 }

Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs

@@ -1,19 +1,20 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Oqtane.Documentation;
-using Oqtane.Modules.HtmlText.Models;
 
 namespace Oqtane.Modules.HtmlText.Services
 {
     [PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
     public interface IHtmlTextService 
     {
-        Task<Models.HtmlText> GetHtmlTextAsync(int ModuleId);
+        Task<List<Models.HtmlText>> GetHtmlTextsAsync(int moduleId);
+
+        Task<Models.HtmlText> GetHtmlTextAsync(int moduleId);
+
+        Task<Models.HtmlText> GetHtmlTextAsync(int htmlTextId, int moduleId);
 
         Task AddHtmlTextAsync(Models.HtmlText htmltext);
 
-        Task UpdateHtmlTextAsync(Models.HtmlText htmltext);
-
-        Task DeleteHtmlTextAsync(int ModuleId);
+        Task DeleteHtmlTextAsync(int htmlTextId, int moduleId);
     }
 }

Oqtane.Client/Modules/ModuleBase.cs

@@ -53,9 +53,9 @@ namespace Oqtane.Modules
                 if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
                 {
                     var scripts = new List<object>();
-                    foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global))
+                    foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
                     {
-                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" });
+                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module });
                     }
                     if (scripts.Any())
                     {

Oqtane.Client/Oqtane.Client.csproj

@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.0.2</Version>
+    <Version>3.1.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -13,7 +13,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -22,11 +22,12 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.3" />
     <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 

Oqtane.Client/Program.cs

@@ -28,8 +28,9 @@ namespace Oqtane.Client
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
             var httpClient = new HttpClient {BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)};
+            builder.Services.AddSingleton(httpClient);            
+            builder.Services.AddHttpClient(); // IHttpClientFactory for calling remote services via RemoteServiceBase
 
-            builder.Services.AddSingleton(httpClient);
             builder.Services.AddOptions();
 
             // Register localization services

Oqtane.Client/Resources/Installer/Installer.resx

@@ -130,12 +130,15 @@
     <value>Install Now</value>
   </data>
   <data name="Error.DbConfig.Load" xml:space="preserve">
-    <value>Error loading Database Configuration Control</value>
+    <value>Error Loading Database Configuration Control</value>
   </data>
   <data name="Message.Require.DbInfo" xml:space="preserve">
-    <value>Please Enter All Required Fields. Ensure Passwords Match And Are Greater Than 5 Characters In Length. Ensure Email Address Provided Is Valid.</value>
+    <value>Please Enter All Required Fields. Ensure Passwords Match And Email Address Provided Is Valid.</value>
   </data>
-  <data name="Register" xml:space="preserve">
+    <data name="Message.Password.Invalid" xml:space="preserve">
+    <value>The Password Provided Does Not Meet The Password Policy. Please Verify The Minimum Password Length And Complexity Requirements.</value>
+  </data>
+    <data name="Register" xml:space="preserve">
     <value>Please Register Me For Major Product Updates And Security Bulletins</value>
   </data>
   <data name="Confirm.HelpText" xml:space="preserve">

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

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="RememberMe" xml:space="preserve">
-    <value>Remember Me?</value>
-  </data>
   <data name="ForgotPassword" xml:space="preserve">
     <value>Forgot Password</value>
   </data>
@@ -130,10 +127,10 @@
     <value>User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions.</value>
   </data>
   <data name="Error.Login.Fail" xml:space="preserve">
-    <value>Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email.</value>
+    <value>Login Failed. Please Remember That Passwords Are Case Sensitive. If You Have Attempted To Sign In Multiple Times Unsuccessfully, Your Account Will Be Locked Out For A Period Of Time. Note That User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email If You Are A New User.</value>
   </data>
   <data name="Message.Required.UserInfo" xml:space="preserve">
-    <value>Please Provide Your Username And Password</value>
+    <value>Please Provide All Required Fields</value>
   </data>
   <data name="Info.SignedIn" xml:space="preserve">
     <value>You Are Already Signed In</value>
@@ -147,4 +144,61 @@
   <data name="Message.UserDoesNotExist" xml:space="preserve">
     <value>User Does Not Exist</value>
   </data>
+  <data name="Code.HelpText" xml:space="preserve">
+    <value>Please Enter The Secure Verification Code Which Was Sent To You By Email.</value>
+  </data>
+  <data name="Code.Placeholder" xml:space="preserve">
+    <value>Verification Code</value>
+  </data>
+  <data name="Code.Text" xml:space="preserve">
+    <value>Verification Code:</value>
+  </data>
+  <data name="Error.TwoFactor.Fail" xml:space="preserve">
+    <value>Verification Failed. Please Ensure You Entered The Code Exactly In The Form Provided In Your Email. If You Wish To Request A New Verification Code Please Select The Cancel Option And Sign In Again. </value>
+  </data>
+  <data name="Message.TwoFactor" xml:space="preserve">
+    <value>A Secure Verification Code Has Been Sent To Your Email Address. Please Enter The Code That You Received. If You Do Not Receive The Code Or You Have Lost Access To Your Email, Please Contact Your Administrator.</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>Please Enter The Password Related To Your Account. Remember That Passwords Are Case Sensitive. If You Attempt Unsuccessfully To Log In To Your Account Multiple Times, You Will Be Locked Out For A Period Of Time.</value>
+  </data>
+  <data name="Password.Placeholder" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Remember.HelpText" xml:space="preserve">
+    <value>Specify If You Would Like To Be Signed Back In Automatically The Next Time You Visit This Site</value>
+  </data>
+  <data name="Remember.Text" xml:space="preserve">
+    <value>Remember Me?</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>Please Enter The Username Related To Your Account</value>
+  </data>
+  <data name="Username.Placeholder" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
+  <data name="HidePassword" xml:space="preserve">
+    <value>Hide</value>
+  </data>
+  <data name="ShowPassword" xml:space="preserve">
+    <value>Show</value>
+  </data>
+  <data name="Use" xml:space="preserve">
+    <value>Use</value>
+  </data>
+  <data name="Error.LoadLogin" xml:space="preserve">
+    <value>Error Loading Login</value>
+  </data>
+  <data name="Error.Login" xml:space="preserve">
+    <value>Error Performing Login</value>
+  </data>
+  <data name="Error.ResetPassword" xml:space="preserve">
+    <value>Error Resetting Password</value>
+  </data>
 </root>

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

@@ -231,4 +231,10 @@
   <data name="Message.Page.Deleted" xml:space="preserve">
     <value>A page with path {0} already exists for the selected parent page in the Recycle Bin. Either recover the page or remove from the Recycle Bin and create it again.</value>
   </data>
+  <data name="Meta.HelpText" xml:space="preserve">
+    <value>Optionally enter meta tags (in exactly the form you want them to be included in the page output).</value>
+  </data>
+  <data name="Meta.Text" xml:space="preserve">
+    <value>Meta:</value>
+  </data>
 </root>

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

@@ -264,4 +264,10 @@
   <data name="Clickable.Text" xml:space="preserve">
     <value>Clickable?</value>
   </data>
+  <data name="Meta.HelpText" xml:space="preserve">
+    <value>Optionally enter meta tags (in exactly the form you want them to be included in the page output).</value>
+  </data>
+  <data name="Meta.Text" xml:space="preserve">
+    <value>Meta:</value>
+  </data>
 </root>

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

@@ -318,10 +318,16 @@
   <data name="DefaultAlias.HelpText" xml:space="preserve">
     <value>The default alias for the site. Requests for non-default aliases will be redirected to the default alias.</value>
   </data>
-    <data name="DefaultAlias.Text" xml:space="preserve">
+  <data name="DefaultAlias.Text" xml:space="preserve">
     <value>Default Alias: </value>
   </data>
   <data name="Aliases.Heading" xml:space="preserve">
     <value>Aliases</value>
   </data>
+  <data name="Hide" xml:space="preserve">
+    <value>Hide</value>
+  </data>
+  <data name="Show" xml:space="preserve">
+    <value>Show</value>
+  </data>
 </root>

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

@@ -129,8 +129,8 @@
   <data name="OSVersion.HelpText" xml:space="preserve">
     <value>Operating System Version</value>
   </data>
-  <data name="ServerPath.HelpText" xml:space="preserve">
-    <value>Server Path</value>
+  <data name="ContentRootPath.HelpText" xml:space="preserve">
+    <value>Server Root Path</value>
   </data>
   <data name="ServerTime.HelpText" xml:space="preserve">
     <value>Server Date/Time (in UTC)</value>
@@ -144,8 +144,8 @@
   <data name="OSVersion.Text" xml:space="preserve">
     <value>OS Version: </value>
   </data>
-  <data name="ServerPath.Text" xml:space="preserve">
-    <value>Server Path: </value>
+  <data name="ContentRootPath.Text" xml:space="preserve">
+    <value>Root Path: </value>
   </data>
   <data name="ServerTime.Text" xml:space="preserve">
     <value>Server Date/Time: </value>
@@ -231,4 +231,43 @@
   <data name="RestartApplication.Text" xml:space="preserve">
     <value>Restart Application</value>
   </data>
+  <data name="None" xml:space="preserve">
+    <value>None</value>
+  </data>
+  <data name="NotificationLevel.HelpText" xml:space="preserve">
+    <value>The Minimum Logging Level For Which Notifications Should Be Sent To Host Users.</value>
+  </data>
+  <data name="NotificationLevel.Text" xml:space="preserve">
+    <value>Notification Level:</value>
+  </data>
+  <data name="IPAddress.HelpText" xml:space="preserve">
+    <value>Server IP Address</value>
+  </data>
+  <data name="IPAddress.Text" xml:space="preserve">
+    <value>IP Address:</value>
+  </data>
+  <data name="MachineName.HelpText" xml:space="preserve">
+    <value>Server Machine Name</value>
+  </data>
+  <data name="MachineName.Text" xml:space="preserve">
+    <value>Machine Name:</value>
+  </data>
+  <data name="TickCount.HelpText" xml:space="preserve">
+    <value>Amount Of Time The Service Has Been Available And Operational</value>
+  </data>
+  <data name="TickCount.Text" xml:space="preserve">
+    <value>Service Uptime:</value>
+  </data>
+  <data name="WebRootPath.HelpText" xml:space="preserve">
+    <value>Server Web Root Path</value>
+  </data>
+  <data name="WebRootPath.Text" xml:space="preserve">
+    <value>Web Path:</value>
+  </data>
+  <data name="WorkingSet.HelpText" xml:space="preserve">
+    <value>Memory Allocation Of Service (in MB)</value>
+  </data>
+  <data name="WorkingSet.Text" xml:space="preserve">
+    <value>Memory Allocation:</value>
+  </data>
 </root>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -169,10 +169,10 @@
     <value>Identity</value>
   </data>
   <data name="Confirm.HelpText" xml:space="preserve">
-    <value>If you are changing your password you must enter it again to confirm it matches</value>
+    <value>If you are changing your password you must enter it again to confirm it matches the value entered above</value>
   </data>
   <data name="Confirm.Text" xml:space="preserve">
-    <value>Confirm Password:</value>
+    <value>Confirmation:</value>
   </data>
   <data name="DisplayName.HelpText" xml:space="preserve">
     <value>Your full name</value>
@@ -204,4 +204,10 @@
   <data name="Username.Text" xml:space="preserve">
     <value>Username:</value>
   </data>
+  <data name="TwoFactor.HelpText" xml:space="preserve">
+    <value>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.</value>
+  </data>
+  <data name="TwoFactor.Text" xml:space="preserve">
+    <value>Two Factor?</value>
+  </data>
 </root>

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

@@ -127,10 +127,10 @@
     <value>Delete User</value>
   </data>
   <data name="AllowRegistration.HelpText" xml:space="preserve">
-    <value>Do you want the users to be able to register for an account on the site</value>
+    <value>Do you want anonymous visitors to be able to register for an account on the site</value>
   </data>
   <data name="AllowRegistration.Text" xml:space="preserve">
-    <value>Allow User Registration? </value>
+    <value>Allow Registration? </value>
   </data>
   <data name="Error.SaveSiteSettings" xml:space="preserve">
     <value>Error Saving Settings</value>
@@ -153,4 +153,217 @@
   <data name="Roles.Text" xml:space="preserve">
     <value>Roles</value>
   </data>
+  <data name="LockoutDuration.HelpText" xml:space="preserve">
+    <value>The number of minutes a user should be locked out</value>
+  </data>
+  <data name="LockoutDuration.Text" xml:space="preserve">
+    <value>Lockout Duration:</value>
+  </data>
+  <data name="MaximumFailures.HelpText" xml:space="preserve">
+    <value>The maximum number of sign in attempts before a user is locked out</value>
+  </data>
+  <data name="MaximumFailures.Text" xml:space="preserve">
+    <value>Maximum Failures:</value>
+  </data>
+  <data name="RequireDigit.HelpText" xml:space="preserve">
+    <value>Indicate if passwords must contain a digit</value>
+  </data>
+  <data name="RequireDigit.Text" xml:space="preserve">
+    <value>Require Digit?</value>
+  </data>
+  <data name="RequiredLength.HelpText" xml:space="preserve">
+    <value>The minimum length for a password</value>
+  </data>
+  <data name="RequiredLength.Text" xml:space="preserve">
+    <value>Minimum Length:</value>
+  </data>
+  <data name="RequireLower.HelpText" xml:space="preserve">
+    <value>Indicate if passwords must contain a lower case character</value>
+  </data>
+  <data name="RequireLower.Text" xml:space="preserve">
+    <value>Require Lowercase?</value>
+  </data>
+  <data name="RequirePunctuation.HelpText" xml:space="preserve">
+    <value>Indicate if passwords must contain a non-alphanumeric character (ie. punctuation)</value>
+  </data>
+  <data name="RequirePunctuation.Text" xml:space="preserve">
+    <value>Require Punctuation?</value>
+  </data>
+  <data name="RequireUpper.HelpText" xml:space="preserve">
+    <value>Indicate if passwords must contain an upper case character</value>
+  </data>
+  <data name="RequireUpper.Text" xml:space="preserve">
+    <value>Require Uppercase?</value>
+  </data>
+  <data name="Success.UpdateConfig.Restart" xml:space="preserve">
+    <value>Configuration Updated. Please Select Restart Application For These Changes To Be Activated.</value>
+  </data>
+  <data name="UniqueCharacters.HelpText" xml:space="preserve">
+    <value>The minimum number of unique characters which a password must contain</value>
+  </data>
+  <data name="UniqueCharacters.Text" xml:space="preserve">
+    <value>Unique Characters:</value>
+  </data>
+  <data name="AllowSiteLogin.HelpText" xml:space="preserve">
+    <value>Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site.</value>
+  </data>
+  <data name="AllowSiteLogin.Text" xml:space="preserve">
+    <value>Allow Login?</value>
+  </data>
+  <data name="Authority.HelpText" xml:space="preserve">
+    <value>The Authority Url or Issuer Url associated with the OpenID Connect provider</value>
+  </data>
+  <data name="Authority.Text" xml:space="preserve">
+    <value>Authority:</value>
+  </data>
+  <data name="AuthorizationUrl.HelpText" xml:space="preserve">
+    <value>The endpoint for obtaining an Authorization Code</value>
+  </data>
+  <data name="AuthorizationUrl.Text" xml:space="preserve">
+    <value>Authorization Url:</value>
+  </data>
+  <data name="ClientID.HelpText" xml:space="preserve">
+    <value>The Client ID from the provider</value>
+  </data>
+  <data name="ClientID.Text" xml:space="preserve">
+    <value>Client ID:</value>
+  </data>
+  <data name="ClientSecret.HelpText" xml:space="preserve">
+    <value>The Client Secret from the provider</value>
+  </data>
+  <data name="ClientSecret.Text" xml:space="preserve">
+    <value>Client Secret:</value>
+  </data>
+  <data name="CreateUsers.HelpText" xml:space="preserve">
+    <value>Do you want new users to be created automatically? If you disable this option, users must already be registered on the site in order to sign in with their external login.</value>
+  </data>
+  <data name="CreateUsers.Text" xml:space="preserve">
+    <value>Create New Users?</value>
+  </data>
+  <data name="DomainFilter.HelpText" xml:space="preserve">
+    <value>Provide any email domain filter criteria (separated by commas). Domains to exclude should be prefixed with an exclamation point (!). For example 'microsoft.com,!hotmail.com' would include microsoft.com email addresses but not hotmail.com email addresses.</value>
+  </data>
+  <data name="DomainFilter.Text" xml:space="preserve">
+    <value>Domain Filter:</value>
+  </data>
+  <data name="EmailClaimType.HelpText" xml:space="preserve">
+    <value>The type name for the email address claim provided by the provider</value>
+  </data>
+  <data name="EmailClaimType.Text" xml:space="preserve">
+    <value>Email Claim Type:</value>
+  </data>
+  <data name="ExternalLoginSettings.Heading" xml:space="preserve">
+    <value>External Login Settings</value>
+  </data>
+  <data name="LockoutSettings.Heading" xml:space="preserve">
+    <value>Lockout Settings</value>
+  </data>
+  <data name="MetadataUrl.HelpText" xml:space="preserve">
+    <value>The discovery endpoint for obtaining metadata for this provider. Only specify if the OpenID Connect provider does not use the standard approach (ie. /.well-known/openid-configuration)</value>
+  </data>
+  <data name="MetadataUrl.Text" xml:space="preserve">
+    <value>Metadata Url:</value>
+  </data>
+  <data name="PasswordSettings.Heading" xml:space="preserve">
+    <value>Password Settings</value>
+  </data>
+  <data name="PKCE.HelpText" xml:space="preserve">
+    <value>Indicate if the provider supports Proof Key for Code Exchange (PKCE)</value>
+  </data>
+  <data name="PKCE.Text" xml:space="preserve">
+    <value>Use PKCE?</value>
+  </data>
+  <data name="ProviderName.HelpText" xml:space="preserve">
+    <value>The external login provider name which will be displayed on the login page</value>
+  </data>
+  <data name="ProviderName.Text" xml:space="preserve">
+    <value>Provider Name:</value>
+  </data>
+  <data name="ProviderType.HelpText" xml:space="preserve">
+    <value>Select the external login provider type</value>
+  </data>
+  <data name="ProviderType.Text" xml:space="preserve">
+    <value>Provider Type:</value>
+  </data>
+  <data name="RedirectUrl.HelpText" xml:space="preserve">
+    <value>The Redirect Url (or Callback Url) which usually needs to be registered with the provider</value>
+  </data>
+  <data name="RedirectUrl.Text" xml:space="preserve">
+    <value>Redirect Url:</value>
+  </data>
+  <data name="Scopes.HelpText" xml:space="preserve">
+    <value>A list of Scopes to request from the provider (separated by commas). If none are specified, standard Scopes will be used by default.</value>
+  </data>
+  <data name="Scopes.Text" xml:space="preserve">
+    <value>Scopes:</value>
+  </data>
+  <data name="TokenUrl.HelpText" xml:space="preserve">
+    <value>The endpoint for obtaining an Auth Token</value>
+  </data>
+  <data name="TokenUrl.Text" xml:space="preserve">
+    <value>Token Url:</value>
+  </data>
+  <data name="UserInfoUrl.HelpText" xml:space="preserve">
+    <value>The endpoint for obtaining user information. This should be an API or Page Url which contains the users email address.</value>
+  </data>
+  <data name="UserInfoUrl.Text" xml:space="preserve">
+    <value>User Info Url:</value>
+  </data>
+  <data name="Audience.HelpText" xml:space="preserve">
+    <value>Optionally provide the audience for the token</value>
+  </data>
+  <data name="Audience.Text" xml:space="preserve">
+    <value>Audience:</value>
+  </data>
+  <data name="UserSettings.Heading" xml:space="preserve">
+    <value>User Settings</value>
+  </data>
+  <data name="CookieType.HelpText" xml:space="preserve">
+    <value>Cookies are usually managed per domain. However you can also choose to have distinct cookies for each site (this option is only applicable to micro-sites).</value>
+  </data>
+  <data name="CookieType.Text" xml:space="preserve">
+    <value>Login Cookie Type:</value>
+  </data>
+  <data name="CreateToken" xml:space="preserve">
+    <value>Create Token</value>
+  </data>
+  <data name="Issuer.HelpText" xml:space="preserve">
+    <value>Optionally provide the issuer of the token</value>
+  </data>
+  <data name="Issuer.Text" xml:space="preserve">
+    <value>Issuer:</value>
+  </data>
+  <data name="Lifetime.HelpText" xml:space="preserve">
+    <value>The number of minutes for which a token should be valid</value>
+  </data>
+  <data name="Lifetime.Text" xml:space="preserve">
+    <value>Lifetime:</value>
+  </data>
+  <data name="Secret.HelpText" xml:space="preserve">
+    <value>If you want to want to provide API access, please specify a secret which will be used to encrypt your tokens. The secret should be 16 characters or more to ensure optimal security. Please note that if you change this secret, all existing tokens will become invalid and will need to be regenerated.</value>
+  </data>
+  <data name="Secret.Text" xml:space="preserve">
+    <value>Secret:</value>
+  </data>
+  <data name="Token.HelpText" xml:space="preserve">
+    <value>Select the Create Token button to generate a long-lived access token (valid for 1 year). Be sure to store this token in a safe location as you will not be able to access it in the future.</value>
+  </data>
+  <data name="Token.Text" xml:space="preserve">
+    <value>Token:</value>
+  </data>
+  <data name="TokenSettings.Heading" xml:space="preserve">
+    <value>Token Settings</value>
+  </data>
+  <data name="TwoFactor.HelpText" xml:space="preserve">
+    <value>Do you want to allow users to use two factor authentication? Note that the Notification Job in Scheduled Jobs needs to be enabled and your SMTP options need to be configured in Site Settings for this option to work properly.</value>
+  </data>
+  <data name="TwoFactor.Text" xml:space="preserve">
+    <value>Allow Two Factor?</value>
+  </data>
+  <data name="Hide" xml:space="preserve">
+    <value>Hide</value>
+  </data>
+  <data name="Show" xml:space="preserve">
+    <value>Show</value>
+  </data>
 </root>

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

@@ -175,7 +175,7 @@
     <value>Details</value>
   </data>
   <data name="Filter.HelpText" xml:space="preserve">
-    <value>Comma delimited list of terms which may exist in IP addresses, user agents, or languages which identify visitors which should not be tracked (ie. bots)</value>
+    <value>Comma delimited list of terms which may exist in IP addresses, user agents, or languages identifying visitors which should not be tracked</value>
   </data>
   <data name="Filter.Text" xml:space="preserve">
     <value>Filter:</value>
@@ -186,4 +186,10 @@
   <data name="Retention.Text" xml:space="preserve">
     <value>Retention (Days):</value>
   </data>
+  <data name="Correlation.HelpText" xml:space="preserve">
+    <value>Indicate if new visitors to this site should be correlated based on their IP Address</value>
+  </data>
+  <data name="Correlation.Text" xml:space="preserve">
+    <value>Correlate Visitors?</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/HtmlText/Edit.resx

@@ -117,10 +117,52 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Confirm.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete The {0} Version?</value>
+  </data>
+  <data name="Confirm.Restore" xml:space="preserve">
+    <value>Are You Sure You Wish To Restore The {0} Version?</value>
+  </data>
+  <data name="CreatedBy" xml:space="preserve">
+    <value>Created By</value>
+  </data>
+  <data name="CreatedOn" xml:space="preserve">
+    <value>Created On</value>
+  </data>
+  <data name="Delete.Header" xml:space="preserve">
+    <value>Delete Version</value>
+  </data>
+  <data name="Delete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Error.Content.Delete" xml:space="preserve">
+    <value>Error Deleting Version</value>
+  </data>
   <data name="Error.Content.Load" xml:space="preserve">
     <value>An Error Occurred Loading Content</value>
   </data>
+  <data name="Error.Content.Restore" xml:space="preserve">
+    <value>Error Restoring Version</value>
+  </data>
   <data name="Error.Content.Save" xml:space="preserve">
     <value>An Error Occurred Saving Content</value>
   </data>
+  <data name="Error.Content.View" xml:space="preserve">
+    <value>Error Viewing Version</value>
+  </data>
+  <data name="Message.Content.Deleted" xml:space="preserve">
+    <value>Version Deleted</value>
+  </data>
+  <data name="Message.Content.Restored" xml:space="preserve">
+    <value>Version Restored</value>
+  </data>
+  <data name="Restore.Header" xml:space="preserve">
+    <value>Restore Version</value>
+  </data>
+  <data name="Restore.Text" xml:space="preserve">
+    <value>Restore</value>
+  </data>
+  <data name="View.Text" xml:space="preserve">
+    <value>View</value>
+  </data>
 </root>

Oqtane.Client/Resources/SharedResources.resx

@@ -259,7 +259,7 @@
     <value>Upgrade</value>
   </data>
   <data name="Username" xml:space="preserve">
-    <value>Username:</value>
+    <value>Username</value>
   </data>
   <data name="Version" xml:space="preserve">
     <value>Version</value>

Oqtane.Client/Services/InstallationService.cs

@@ -21,7 +21,9 @@ namespace Oqtane.Services
             _siteState = siteState;
         }
 
-        private string ApiUrl => CreateApiUrl("Installation", null, ControllerRoutes.ApiRoute); // tenant agnostic
+        private string ApiUrl => (_siteState.Alias == null)
+            ? CreateApiUrl("Installation", null, ControllerRoutes.ApiRoute) // tenant agnostic needed for initial installation
+            : CreateApiUrl("Installation", _siteState.Alias); 
 
         public async Task<Installation> IsInstalled()
         {
@@ -48,14 +50,5 @@ namespace Oqtane.Services
         {
             await PostJsonAsync($"{ApiUrl}/register?email={WebUtility.UrlEncode(email)}", true);
         }
-
-        public void SetAntiForgeryTokenHeader(string antiforgerytokenvalue)
-        {
-            if (!string.IsNullOrEmpty(antiforgerytokenvalue))
-            {
-                AddRequestHeader(Constants.AntiForgeryTokenHeaderName, antiforgerytokenvalue);
-            }
-        }
-
     }
 }

Oqtane.Client/Services/Interfaces/IInstallationService.cs

@@ -42,10 +42,5 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task RegisterAsync(string email);
 
-        /// <summary>
-        /// Sets the antiforgerytoken header so that it is included on all HttpClient calls for the lifetime of the app 
-        /// </summary>
-        /// <returns></returns>
-        void SetAntiForgeryTokenHeader(string antiforgerytokenvalue);
     }
 }

Oqtane.Client/Services/Interfaces/ISettingService.cs

@@ -38,6 +38,12 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task UpdateSiteSettingsAsync(Dictionary<string, string> siteSettings, int siteId);
 
+        /// <summary>
+        /// Clears site option cache
+        /// </summary>
+        /// <returns></returns>
+        Task ClearSiteSettingsCacheAsync();
+
         /// <summary>
         /// Returns a key-value dictionary of all page settings for the given page
         /// </summary>
@@ -149,7 +155,6 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<Dictionary<string, string>> GetSettingsAsync(string entityName, int entityId);
 
-
         /// <summary>
         /// Updates settings for a given entityName and Id
         /// </summary>
@@ -166,7 +171,6 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<Setting> GetSettingAsync(string entityName, int settingId);
 
-
         /// <summary>
         /// Creates a new setting
         /// </summary>

Oqtane.Client/Services/Interfaces/ISystemService.cs

@@ -9,16 +9,34 @@ namespace Oqtane.Services
     public interface ISystemService
     {
         /// <summary>
-        /// returns a key-value directory with the current system information (os-version, clr-version, etc.)
+        /// returns a key-value directory with the current system configuration information
         /// </summary>
         /// <returns></returns>
-        Task<Dictionary<string, string>> GetSystemInfoAsync();
+        Task<Dictionary<string, object>> GetSystemInfoAsync();
+
+        /// <summary>
+        /// returns a key-value directory with the current system information - "environment" or "configuration"
+        /// </summary>
+        /// <returns></returns>
+        Task<Dictionary<string, object>> GetSystemInfoAsync(string type);
+
+        /// <summary>
+        /// returns a config value
+        /// </summary>
+        /// <returns></returns>
+        Task<object> GetSystemInfoAsync(string settingKey, object defaultValue);
 
         /// <summary>
         /// Updates system information
         /// </summary>
         /// <param name="settings"></param>
         /// <returns></returns>
-        Task UpdateSystemInfoAsync(Dictionary<string, string> settings);
+        Task UpdateSystemInfoAsync(Dictionary<string, object> settings);
+
+        /// <summary>
+        /// updates a config value
+        /// </summary>
+        /// <returns></returns>
+        Task UpdateSystemInfoAsync(string settingKey, object settingValue);
     }
 }

Oqtane.Client/Services/Interfaces/IUserService.cs

@@ -88,5 +88,26 @@ namespace Oqtane.Services
         /// <param name="token"></param>
         /// <returns></returns>
         Task<User> ResetPasswordAsync(User user, string token);
+
+        /// <summary>
+        /// Verify the two factor verification code <see cref="User"/>
+        /// </summary>
+        /// <param name="user"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<User> VerifyTwoFactorAsync(User user, string token);
+
+        /// <summary>
+        /// Validate a users password against the password policy 
+        /// </summary>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        Task<bool> ValidatePasswordAsync(string password);
+
+        /// <summary>
+        /// Get token for current user
+        /// </summary>
+        /// <returns></returns>
+        Task<string> GetTokenAsync();
     }
 }

Oqtane.Client/Services/RemoteServiceBase.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Net.Http.Headers;
+using Oqtane.Shared;
+
+namespace Oqtane.Services
+{
+    public class RemoteServiceBase
+    {
+        private readonly SiteState _siteState;
+        private readonly IHttpClientFactory _httpClientFactory;
+
+        protected RemoteServiceBase(IHttpClientFactory httpClientFactory, SiteState siteState)
+        {
+            _siteState = siteState;
+            _httpClientFactory = httpClientFactory;
+        }
+
+        private HttpClient GetHttpClient()
+        {
+            var httpClient = _httpClientFactory.CreateClient("Remote");
+            if (!httpClient.DefaultRequestHeaders.Contains(HeaderNames.Authorization) && _siteState != null && !string.IsNullOrEmpty(_siteState.AuthorizationToken))
+            {
+                httpClient.DefaultRequestHeaders.Add(HeaderNames.Authorization, "Bearer " + _siteState.AuthorizationToken);
+            }
+            return httpClient;
+        }
+
+        protected async Task GetAsync(string uri)
+        {
+            var response = await GetHttpClient().GetAsync(uri);
+            CheckResponse(response);
+        }
+
+        protected async Task<string> GetStringAsync(string uri)
+        {
+            try
+            {
+                return await GetHttpClient().GetStringAsync(uri);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+
+            return default;
+        }
+
+        protected async Task<byte[]> GetByteArrayAsync(string uri)
+        {
+            try
+            {
+                return await GetHttpClient().GetByteArrayAsync(uri);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+
+            return default;
+        }
+
+        protected async Task<T> GetJsonAsync<T>(string uri)
+        {
+            var response = await GetHttpClient().GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, CancellationToken.None);
+            if (CheckResponse(response) && ValidateJsonContent(response.Content))
+            {
+                return await response.Content.ReadFromJsonAsync<T>();
+            }
+
+            return default;
+        }
+
+        protected async Task PutAsync(string uri)
+        {
+            var response = await GetHttpClient().PutAsync(uri, null);
+            CheckResponse(response);
+        }
+
+        protected async Task<T> PutJsonAsync<T>(string uri, T value)
+        {
+            return await PutJsonAsync<T, T>(uri, value);
+        }
+
+        protected async Task<TResult> PutJsonAsync<TValue, TResult>(string uri, TValue value)
+        {
+            var response = await GetHttpClient().PutAsJsonAsync(uri, value);
+            if (CheckResponse(response) && ValidateJsonContent(response.Content))
+            {
+                var result = await response.Content.ReadFromJsonAsync<TResult>();
+                return result;
+            }
+            return default;
+        }
+
+        protected async Task PostAsync(string uri)
+        {
+            var response = await GetHttpClient().PostAsync(uri, null);
+            CheckResponse(response);
+        }
+
+        protected async Task<T> PostJsonAsync<T>(string uri, T value)
+        {
+            return await PostJsonAsync<T, T>(uri, value);
+        }
+
+        protected async Task<TResult> PostJsonAsync<TValue, TResult>(string uri, TValue value)
+        {
+            var response = await GetHttpClient().PostAsJsonAsync(uri, value);
+            if (CheckResponse(response) && ValidateJsonContent(response.Content))
+            {
+                var result = await response.Content.ReadFromJsonAsync<TResult>();
+                return result;
+            }
+
+            return default;
+        }
+
+        protected async Task DeleteAsync(string uri)
+        {
+            var response = await GetHttpClient().DeleteAsync(uri);
+            CheckResponse(response);
+        }
+
+        private bool CheckResponse(HttpResponseMessage response)
+        {
+            if (response.IsSuccessStatusCode) return true;
+            if (response.StatusCode != HttpStatusCode.NoContent && response.StatusCode != HttpStatusCode.NotFound)
+            {
+                Console.WriteLine($"Request: {response.RequestMessage.RequestUri}");
+                Console.WriteLine($"Response status: {response.StatusCode} {response.ReasonPhrase}");
+            }
+
+            return false;
+        }
+
+        private static bool ValidateJsonContent(HttpContent content)
+        {
+            var mediaType = content?.Headers.ContentType?.MediaType;
+            return mediaType != null && mediaType.Equals("application/json", StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}

Oqtane.Client/Services/ServiceBase.cs

@@ -5,24 +5,31 @@ using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Oqtane.Documentation;
 using Oqtane.Models;
 using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
-    [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class ServiceBase
     {
-        private readonly HttpClient _http;
+        private readonly HttpClient _httpClient;
         private readonly SiteState _siteState;
 
-        protected ServiceBase(HttpClient client, SiteState siteState)
+        protected ServiceBase(HttpClient httpClient, SiteState siteState)
         {
-            _http = client;
+            _httpClient = httpClient;
             _siteState = siteState;
         }
 
+        private HttpClient GetHttpClient()
+        {
+            if (!_httpClient.DefaultRequestHeaders.Contains(Constants.AntiForgeryTokenHeaderName) && _siteState != null && !string.IsNullOrEmpty(_siteState.AntiForgeryToken))
+            {
+                _httpClient.DefaultRequestHeaders.Add(Constants.AntiForgeryTokenHeaderName, _siteState.AntiForgeryToken);
+            }
+            return _httpClient;
+        }
+
         // should be used with new constructor
         public string CreateApiUrl(string serviceName)
         {
@@ -95,24 +102,9 @@ namespace Oqtane.Services
             }
         }
 
-        // note that HttpClient is registered as a Scoped(shared) service and therefore you should not use request headers whose value can vary over the lifetime of the service
-        protected void AddRequestHeader(string name, string value)
-        {
-            RemoveRequestHeader(name);
-            _http.DefaultRequestHeaders.Add(name, value);
-        }
-
-        protected void RemoveRequestHeader(string name)
-        {
-            if (_http.DefaultRequestHeaders.Contains(name))
-            {
-                _http.DefaultRequestHeaders.Remove(name);
-            }
-        }
-
         protected async Task GetAsync(string uri)
         {
-            var response = await _http.GetAsync(uri);
+            var response = await GetHttpClient().GetAsync(uri);
             CheckResponse(response);
         }
 
@@ -120,7 +112,7 @@ namespace Oqtane.Services
         {
             try
             {
-                return await _http.GetStringAsync(uri);
+                return await GetHttpClient().GetStringAsync(uri);
             }
             catch (Exception e)
             {
@@ -134,7 +126,7 @@ namespace Oqtane.Services
         {
             try
             {
-                return await _http.GetByteArrayAsync(uri);
+                return await GetHttpClient().GetByteArrayAsync(uri);
             }
             catch (Exception e)
             {
@@ -146,7 +138,7 @@ namespace Oqtane.Services
 
         protected async Task<T> GetJsonAsync<T>(string uri)
         {
-            var response = await _http.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, CancellationToken.None);
+            var response = await GetHttpClient().GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, CancellationToken.None);
             if (CheckResponse(response) && ValidateJsonContent(response.Content))
             {
                 return await response.Content.ReadFromJsonAsync<T>();
@@ -157,7 +149,7 @@ namespace Oqtane.Services
 
         protected async Task PutAsync(string uri)
         {
-            var response = await _http.PutAsync(uri, null);
+            var response = await GetHttpClient().PutAsync(uri, null);
             CheckResponse(response);
         }
 
@@ -168,7 +160,7 @@ namespace Oqtane.Services
 
         protected async Task<TResult> PutJsonAsync<TValue, TResult>(string uri, TValue value)
         {
-            var response = await _http.PutAsJsonAsync(uri, value);
+            var response = await GetHttpClient().PutAsJsonAsync(uri, value);
             if (CheckResponse(response) && ValidateJsonContent(response.Content))
             {
                 var result = await response.Content.ReadFromJsonAsync<TResult>();
@@ -179,7 +171,7 @@ namespace Oqtane.Services
 
         protected async Task PostAsync(string uri)
         {
-            var response = await _http.PostAsync(uri, null);
+            var response = await GetHttpClient().PostAsync(uri, null);
             CheckResponse(response);
         }
 
@@ -190,7 +182,7 @@ namespace Oqtane.Services
 
         protected async Task<TResult> PostJsonAsync<TValue, TResult>(string uri, TValue value)
         {
-            var response = await _http.PostAsJsonAsync(uri, value);
+            var response = await GetHttpClient().PostAsJsonAsync(uri, value);
             if (CheckResponse(response) && ValidateJsonContent(response.Content))
             {
                 var result = await response.Content.ReadFromJsonAsync<TResult>();
@@ -202,7 +194,7 @@ namespace Oqtane.Services
 
         protected async Task DeleteAsync(string uri)
         {
-            var response = await _http.DeleteAsync(uri);
+            var response = await GetHttpClient().DeleteAsync(uri);
             CheckResponse(response);
         }
 
@@ -228,7 +220,7 @@ namespace Oqtane.Services
         // This constructor is obsolete. Use ServiceBase(HttpClient client, SiteState siteState) : base(http, siteState) {} instead.
         protected ServiceBase(HttpClient client)
         {
-            _http = client;
+            _httpClient = client;
         }
 
         [Obsolete("This method is obsolete. Use CreateApiUrl(string serviceName, Alias alias) in conjunction with ControllerRoutes.ApiRoute in Controllers instead.", false)]
@@ -240,7 +232,7 @@ namespace Oqtane.Services
         [Obsolete("This property of ServiceBase is deprecated. Cross tenant service calls are not supported.", false)]
         public Alias Alias { get; set; }
 
-        [Obsolete("This method is obsolete. Use CreateApiUrl(string entityName, int entityId) instead.", false)]
+        [Obsolete("This method is obsolete. Use CreateAuthorizationPolicyUrl(string url, string entityName, int entityId) where entityName = EntityNames.Module instead.", false)]
         public string CreateAuthorizationPolicyUrl(string url, int entityId)
         {
             return url + ((url.Contains("?")) ? "&" : "?") + "entityid=" + entityId.ToString();

Oqtane.Client/Services/SettingService.cs

@@ -42,6 +42,11 @@ namespace Oqtane.Services
             await UpdateSettingsAsync(siteSettings, EntityNames.Site, siteId);
         }
 
+        public async Task ClearSiteSettingsCacheAsync()
+        {
+            await DeleteAsync($"{Apiurl}/clear");
+        }
+
         public async Task<Dictionary<string, string>> GetPageSettingsAsync(int pageId)
         {
             return await GetSettingsAsync(EntityNames.Page, pageId);

Oqtane.Client/Services/SiteService.cs

@@ -16,8 +16,7 @@ namespace Oqtane.Services
         private readonly SiteState _siteState;
 
         public SiteService(HttpClient http, SiteState siteState) : base(http)
-        {
-            
+        {            
             _siteState = siteState;
         }
 

Oqtane.Client/Services/SystemService.cs

@@ -18,14 +18,28 @@ namespace Oqtane.Services
 
         private string Apiurl => CreateApiUrl("System", _siteState.Alias);
 
-        public async Task<Dictionary<string, string>> GetSystemInfoAsync()
+        public async Task<Dictionary<string, object>> GetSystemInfoAsync()
         {
-            return await GetJsonAsync<Dictionary<string, string>>(Apiurl);
+            return await GetSystemInfoAsync("configuration");
         }
 
-        public async Task UpdateSystemInfoAsync(Dictionary<string, string> settings)
+        public async Task<Dictionary<string, object>> GetSystemInfoAsync(string type)
+        {
+            return await GetJsonAsync<Dictionary<string, object>>($"{Apiurl}?type={type}");
+        }
+
+        public async Task<object> GetSystemInfoAsync(string settingKey, object defaultValue)
+        {
+            return await GetJsonAsync<object>($"{Apiurl}/{settingKey}/{defaultValue}");
+        }
+
+        public async Task UpdateSystemInfoAsync(Dictionary<string, object> settings)
         {
             await PostJsonAsync(Apiurl, settings);
         }
+        public async Task UpdateSystemInfoAsync(string settingKey, object settingValue)
+        {
+            await PutJsonAsync($"{Apiurl}/{settingKey}/{settingValue}", "");
+        }
     }
 }

Oqtane.Client/Services/UserService.cs

@@ -3,6 +3,7 @@ using Oqtane.Models;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Oqtane.Documentation;
+using System.Net;
 
 namespace Oqtane.Services
 {
@@ -68,5 +69,20 @@ namespace Oqtane.Services
         {
             return await PostJsonAsync<User>($"{Apiurl}/reset?token={token}", user);
         }
+
+        public async Task<User> VerifyTwoFactorAsync(User user, string token)
+        {
+            return await PostJsonAsync<User>($"{Apiurl}/twofactor?token={token}", user);
+        }
+
+        public async Task<bool> ValidatePasswordAsync(string password)
+        {
+            return await GetJsonAsync<bool>($"{Apiurl}/validate/{WebUtility.UrlEncode(password)}");
+        }
+
+        public async Task<string> GetTokenAsync()
+        {
+            return await GetStringAsync($"{Apiurl}/token");
+        }
     }
 }

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

@@ -31,7 +31,7 @@
     public override List<Resource> Resources => new List<Resource>()
     {
 		// obtained from https://cdnjs.com/libraries
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.2/css/bootstrap.min.css", Integrity = "sha512-usVBAd66/NpVNfBge19gws2j6JZinnca12rAe2l+d+QkLU9fiG02O1X8Q6hepIpr/EYKZvKx/I9WsnujJuOmBA==", CrossOrigin = "anonymous" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css", Integrity = "sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==", CrossOrigin = "anonymous" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.bundle.min.js", Integrity = "sha512-pax4MlgXjHEPfCwcJLQhigY7+N8rt6bVvWLFyUMuxShv170X53TRzGPmPkZmGBhk+jikR8WBM4yl7A9WMHHqvg==", CrossOrigin = "anonymous" }
     };

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

@@ -3,7 +3,9 @@
 @attribute [OqtaneIgnore]
 
 <span class="app-moduletitle">
-    @((MarkupString)title)
+	<a id="@ModuleState.PageModuleId.ToString()">
+		@((MarkupString)title)
+	</a>
 </span>
 
 @code {

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

@@ -333,9 +333,8 @@
 		if (PageId != "-")
 		{
 			_modules = PageState.Modules
-				.Where(module => module.PageId == int.Parse(PageId)
-									&& !module.IsDeleted
-									&& UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
+				.Where(module => module.PageId == int.Parse(PageId) &&
+				UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
 				.ToList();
 		}
 		ModuleId = "-";

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

@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
@@ -33,25 +34,26 @@ namespace Oqtane.Themes.Controls
         protected async Task LogoutUser()
         {
             await UserService.LogoutUserAsync(PageState.User);
-            await LoggingService.Log(PageState.Alias, PageState.Page.PageId, PageState.ModuleId, PageState.User.UserId, GetType().AssemblyQualifiedName, "Logout", LogFunction.Security, LogLevel.Information, null, "User Logout For Username {Username}", PageState.User.Username);
-
+            await LoggingService.Log(PageState.Alias, PageState.Page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "Logout", LogFunction.Security, LogLevel.Information, null, "User Logout For Username {Username}", PageState.User.Username);
             PageState.User = null;
-            bool authorizedtoviewpage = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, PageState.Page.Permissions);
 
-            if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
+            var url = PageState.Alias.Path + "/" + PageState.Page.Path;
+            if (!UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, PageState.Page.Permissions))
             {
-                // server-side Blazor needs to post to the Logout page
-                var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, returnurl = !authorizedtoviewpage ? PageState.Alias.Path : PageState.Alias.Path + "/" + PageState.Page.Path };
-                string url = Utilities.TenantUrl(PageState.Alias, "/pages/logout/");
-                var interop = new Interop(jsRuntime);
-                await interop.SubmitForm(url, fields);
+                url = PageState.Alias.Path;
+            }            
+
+            if (PageState.Runtime == Shared.Runtime.Server)
+            {
+                // server-side Blazor needs to redirect to the Logout page
+                NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/logout/") + "?returnurl=" + WebUtility.UrlEncode(url), true);
             }
             else
             {
                 // client-side Blazor
                 var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
                 authstateprovider.NotifyAuthenticationChanged();
-                NavigationManager.NavigateTo(NavigateUrl(!authorizedtoviewpage ? PageState.Alias.Path : PageState.Page.Path, true));
+                NavigationManager.NavigateTo(NavigateUrl(url, true));
             }
         }
     }

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

@@ -30,7 +30,7 @@ namespace Oqtane.Themes.Controls
         private IEnumerable<Page> GetMenuPages()
         {
             var securityLevel = int.MaxValue;
-            foreach (Page p in PageState.Pages.Where(item => item.IsNavigation && !item.IsDeleted))
+            foreach (Page p in PageState.Pages.Where(item => item.IsNavigation))
             {
                 if (p.Level <= securityLevel && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
                 {

Oqtane.Client/Themes/ThemeBase.cs

@@ -32,9 +32,9 @@ namespace Oqtane.Themes
                 if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
                 {
                     var scripts = new List<object>();
-                    foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global))
+                    foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
                     {
-                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" });
+                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module });
                     }
                     if (scripts.Any())
                     {

Oqtane.Client/UI/Interop.cs

@@ -72,13 +72,13 @@ namespace Oqtane.UI
             }
         }
 
-        public Task IncludeLink(string id, string rel, string href, string type, string integrity, string crossorigin, string key)
+        public Task IncludeLink(string id, string rel, string href, string type, string integrity, string crossorigin, string includebefore)
         {
             try
             {
                 _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.includeLink",
-                    id, rel, href, type, integrity, crossorigin, key);
+                    id, rel, href, type, integrity, crossorigin, includebefore);
                 return Task.CompletedTask;
             }
             catch
@@ -102,13 +102,13 @@ namespace Oqtane.UI
             }
         }
 
-        public Task IncludeScript(string id, string src, string integrity, string crossorigin, string content, string location, string key)
+        public Task IncludeScript(string id, string src, string integrity, string crossorigin, string content, string location)
         {
             try
             {
                 _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.includeScript",
-                    id, src, integrity, crossorigin, content, location, key);
+                    id, src, integrity, crossorigin, content, location);
                 return Task.CompletedTask;
             }
             catch
@@ -279,5 +279,19 @@ namespace Oqtane.UI
             }
         }
 
+        public Task ScrollToId(string id)
+        {
+            try
+            {
+                _jsRuntime.InvokeVoidAsync(
+                    "Oqtane.Interop.scrollToId",
+                    id);
+                return Task.CompletedTask;
+            }
+            catch
+            {
+                return Task.CompletedTask;
+            }
+        }
     }
 }

Oqtane.Client/UI/Pane.razor

@@ -48,7 +48,7 @@ else
                 if (Name.ToLower() == PaneNames.Admin.ToLower())
                 {
                     Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
-                    if (module != null && !module.IsDeleted)
+                    if (module != null)
                     {
                         var moduleType = Type.GetType(module.ModuleType);
                         if (moduleType != null)
@@ -97,7 +97,7 @@ else
                 if (PageState.ModuleId != -1)
                 {
                     Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
-                    if (module != null && module.Pane.ToLower() == Name.ToLower() && !module.IsDeleted)
+                    if (module != null && module.Pane.ToLower() == Name.ToLower())
                     {
                         // check if user is authorized to view module
                         if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
@@ -108,7 +108,7 @@ else
                 }
                 else
                 {
-                    foreach (Module module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId && item.Pane.ToLower() == Name.ToLower() && !item.IsDeleted).OrderBy(x => x.Order).ToArray())
+                    foreach (Module module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId && item.Pane.ToLower() == Name.ToLower()).OrderBy(x => x.Order).ToArray())
                     {
                         // check if user is authorized to view module
                         if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))

Oqtane.Client/UI/SiteRouter.razor

@@ -11,6 +11,7 @@
 @inject IModuleService ModuleService
 @inject IUrlMappingService UrlMappingService
 @inject ILogService LogService
+@inject IJSRuntime JSRuntime
 @implements IHandleAfterRender
 
 @DynamicComponent
@@ -163,6 +164,7 @@
 			if (PageState == null || refresh == UI.Refresh.Site)
 			{
 				pages = await PageService.GetPagesAsync(site.SiteId);
+				pages = pages.Where(item => !item.IsDeleted).ToList();
 			}
 			else
 			{
@@ -205,6 +207,7 @@
 					if (PageState == null || refresh == UI.Refresh.Site)
 					{
 						modules = await ModuleService.GetModulesAsync(site.SiteId);
+						modules = modules.Where(item => !item.IsDeleted).ToList();
 					}
 					else
 					{
@@ -234,6 +237,7 @@
                     };
 
 					OnStateChange?.Invoke(_pagestate);
+					await ScrollToFragment(_pagestate.Uri);
 				}
 			}
 			else // page not found
@@ -242,7 +246,7 @@
 				var urlMapping = await UrlMappingService.GetUrlMappingAsync(site.SiteId, route.PagePath);
 				if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl))
 				{
-                    var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl;
+					var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl;
 					NavigationManager.NavigateTo(url, false);
 				}
 				else // not mapped
@@ -254,246 +258,273 @@
 					}
 					else
 					{
-						await LogService.Log(null, null, user.UserId, GetType().AssemblyQualifiedName, Utilities.GetTypeNameLastSegment(GetType().AssemblyQualifiedName, 1), LogFunction.Security, LogLevel.Error, null, "Page Does Not Exist Or User Is Not Authorized To View Page {Path}", route.PagePath);
-						if (route.PagePath != "")
+						if (route.PagePath != "404")
 						{
-							// redirect to home page
+							await LogService.Log(null, null, user.UserId, "SiteRouter", "SiteRouter", LogFunction.Other, LogLevel.Information, null, "Page Path /{Path} Does Not Exist Or User Is Not Authorized To View", route.PagePath);
+							// redirect to 404 page
+							NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "404", ""));
+						}
+						else
+						{
+							// redirect to home page as a fallback
 							NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "", ""));
 						}
 					}
 				}
-            }
+			}
+		}
+		else
+		{
+			// site does not exist
+		}
+	}
+
+	private async void LocationChanged(object sender, LocationChangedEventArgs args)
+	{
+		_absoluteUri = args.Location;
+		await Refresh();
+	}
+
+	Task IHandleAfterRender.OnAfterRenderAsync()
+	{
+		if (!_navigationInterceptionEnabled)
+		{
+			_navigationInterceptionEnabled = true;
+			return NavigationInterception.EnableNavigationInterceptionAsync();
+		}
+		return Task.CompletedTask;
+	}
+
+	private Dictionary<string, string> ParseQueryString(string query)
+	{
+		Dictionary<string, string> querystring = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); // case insensistive keys
+		if (!string.IsNullOrEmpty(query))
+		{
+			if (query.StartsWith("?"))
+			{
+				query = query.Substring(1); // ignore "?"
+			}
+			foreach (string kvp in query.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries))
+			{
+				if (kvp != "")
+				{
+					if (kvp.Contains("="))
+					{
+						string[] pair = kvp.Split('=');
+						querystring.Add(pair[0], pair[1]);
+					}
+					else
+					{
+						querystring.Add(kvp, "true"); // default parameter when no value is provided
+					}
+				}
+			}
+		}
+		return querystring;
+	}
+
+	private async Task<Page> ProcessPage(Page page, Site site, User user)
+	{
+		try
+		{
+			if (page.IsPersonalizable && user != null)
+			{
+				// load the personalized page
+				page = await PageService.GetPageAsync(page.PageId, user.UserId);
+			}
+
+			if (string.IsNullOrEmpty(page.ThemeType))
+			{
+				page.ThemeType = site.DefaultThemeType;
+			}
+
+			page.Panes = new List<string>();
+			page.Resources = new List<Resource>();
+
+			string panes = PaneNames.Admin;
+			Type themetype = Type.GetType(page.ThemeType);
+			if (themetype == null)
+			{
+				// fallback
+				page.ThemeType = Constants.DefaultTheme;
+				themetype = Type.GetType(Constants.DefaultTheme);
+			}
+			if (themetype != null)
+			{
+				var themeobject = Activator.CreateInstance(themetype) as IThemeControl;
+				if (themeobject != null)
+				{
+					if (!string.IsNullOrEmpty(themeobject.Panes))
+					{
+						panes = themeobject.Panes;
+					}
+					page.Resources = ManagePageResources(page.Resources, themeobject.Resources, ResourceLevel.Page);
+				}
+			}
+			page.Panes = panes.Replace(";", ",").Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+		}
+		catch
+		{
+			// error loading theme or layout
+		}
+
+		return page;
+	}
+
+	private (Page Page, List<Module> Modules) ProcessModules(Page page, List<Module> modules, int moduleid, string action, string defaultcontainertype)
+	{
+		var paneindex = new Dictionary<string, int>();
+		foreach (Module module in modules)
+		{
+			// initialize module control properties
+			module.SecurityAccessLevel = SecurityAccessLevel.Host;
+			module.ControlTitle = "";
+			module.Actions = "";
+			module.UseAdminContainer = false;
+			module.PaneModuleIndex = -1;
+			module.PaneModuleCount = 0;
+
+			if ((module.PageId == page.PageId || module.ModuleId == moduleid))
+			{
+				var typename = Constants.ErrorModule;
+				if (module.ModuleDefinition != null && (module.ModuleDefinition.Runtimes == "" || module.ModuleDefinition.Runtimes.Contains(Runtime)))
+				{
+					typename = module.ModuleDefinition.ControlTypeTemplate;
+
+					// handle default action
+					if (action == Constants.DefaultAction && !string.IsNullOrEmpty(module.ModuleDefinition.DefaultAction))
+					{
+						action = module.ModuleDefinition.DefaultAction;
+					}
+
+					// check if the module defines custom action routes
+					if (module.ModuleDefinition.ControlTypeRoutes != "")
+					{
+						foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+						{
+							if (route.StartsWith(action + "="))
+							{
+								typename = route.Replace(action + "=", "");
+							}
+						}
+					}
+				}
+
+				// ensure component exists and implements IModuleControl
+				module.ModuleType = "";
+				if (Constants.DefaultModuleActions.Contains(action, StringComparer.OrdinalIgnoreCase))
+				{
+					typename = Constants.DefaultModuleActionsTemplate.Replace(Constants.ActionToken, action);
+				}
+				else
+				{
+					typename = typename.Replace(Constants.ActionToken, action);
+				}
+				Type moduletype = Type.GetType(typename, false, true); // case insensitive
+				if (moduletype != null && moduletype.GetInterfaces().Contains(typeof(IModuleControl)))
+				{
+					module.ModuleType = Utilities.GetFullTypeName(moduletype.AssemblyQualifiedName); // get actual type name
+				}
+
+				// get additional metadata from IModuleControl interface
+				if (moduletype != null && module.ModuleType != "")
+				{
+					// retrieve module component resources
+					var moduleobject = Activator.CreateInstance(moduletype) as IModuleControl;
+					page.Resources = ManagePageResources(page.Resources, moduleobject.Resources, ResourceLevel.Module);
+					if (action.ToLower() == "settings" && module.ModuleDefinition != null)
+					{
+						// settings components are embedded within a framework settings module
+						moduletype = Type.GetType(module.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, action), false, true);
+						if (moduletype != null)
+						{
+							moduleobject = Activator.CreateInstance(moduletype) as IModuleControl;
+							page.Resources = ManagePageResources(page.Resources, moduleobject.Resources, ResourceLevel.Module);
+						}
+					}
+
+					// additional metadata needed for admin components
+					if (module.ModuleId == moduleid && action != "")
+					{
+						module.SecurityAccessLevel = moduleobject.SecurityAccessLevel;
+						module.ControlTitle = moduleobject.Title;
+						module.Actions = moduleobject.Actions;
+						module.UseAdminContainer = moduleobject.UseAdminContainer;
+					}
+				}
+
+				// ensure module's pane exists in current page and if not, assign it to the Admin pane
+				if (page.Panes == null || page.Panes.FindIndex(item => item.Equals(module.Pane, StringComparison.OrdinalIgnoreCase)) == -1)
+				{
+					module.Pane = PaneNames.Admin;
+				}
+
+				// calculate module position within pane
+				if (paneindex.ContainsKey(module.Pane.ToLower()))
+				{
+					paneindex[module.Pane.ToLower()] += 1;
+				}
+				else
+				{
+					paneindex.Add(module.Pane.ToLower(), 0);
+				}
+
+				module.PaneModuleIndex = paneindex[module.Pane.ToLower()];
+
+				// container fallback
+				if (string.IsNullOrEmpty(module.ContainerType))
+				{
+					module.ContainerType = defaultcontainertype;
+				}
+			}
+		}
+
+		foreach (Module module in modules.Where(item => item.PageId == page.PageId))
+		{
+			if (paneindex.ContainsKey(module.Pane.ToLower()))
+			{
+				module.PaneModuleCount = paneindex[module.Pane.ToLower()] + 1;
+			}
+		}
+
+		return (page, modules);
+	}
+
+	private List<Resource> ManagePageResources(List<Resource> pageresources, List<Resource> resources, ResourceLevel level)
+	{
+		if (resources != null)
+		{
+			foreach (var resource in resources)
+			{
+				// ensure resource does not exist already
+				if (pageresources.Find(item => item.Url == resource.Url) == null)
+				{
+					resource.Level = level;
+					pageresources.Add(resource);
+				}
+			}
+		}
+		return pageresources;
+	}
+
+	private async Task ScrollToFragment(Uri uri)
+	{
+		var fragment = uri.Fragment;
+		if (fragment.StartsWith('#'))
+		{
+			// handle text fragment (https://example.org/#test:~:text=foo)
+			var id = fragment.Substring(1);
+			var index = id.IndexOf(":~:", StringComparison.Ordinal);
+			if (index > 0)
+			{
+				id = id.Substring(0, index);
+			}
+
+			if (!string.IsNullOrEmpty(id))
+			{
+				var interop = new Interop(JSRuntime);
+				await interop.ScrollToId(id);
+			}
         }
-        else
-        {
-            // site does not exist
-        }
-    }
-
-    private async void LocationChanged(object sender, LocationChangedEventArgs args)
-    {
-        _absoluteUri = args.Location;
-        await Refresh();
-    }
-
-    Task IHandleAfterRender.OnAfterRenderAsync()
-    {
-        if (!_navigationInterceptionEnabled)
-        {
-            _navigationInterceptionEnabled = true;
-            return NavigationInterception.EnableNavigationInterceptionAsync();
-        }
-        return Task.CompletedTask;
-    }
-
-    private Dictionary<string, string> ParseQueryString(string query)
-    {
-        Dictionary<string, string> querystring = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); // case insensistive keys
-        if (!string.IsNullOrEmpty(query))
-        {
-            if (query.StartsWith("?"))
-            {
-                query = query.Substring(1); // ignore "?"
-            }
-            foreach (string kvp in query.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                if (kvp != "")
-                {
-                    if (kvp.Contains("="))
-                    {
-                        string[] pair = kvp.Split('=');
-                        querystring.Add(pair[0], pair[1]);
-                    }
-                    else
-                    {
-                        querystring.Add(kvp, "true"); // default parameter when no value is provided
-                    }
-                }
-            }
-        }
-        return querystring;
-    }
-
-    private async Task<Page> ProcessPage(Page page, Site site, User user)
-    {
-        try
-        {
-            if (page.IsPersonalizable && user != null)
-            {
-                // load the personalized page
-                page = await PageService.GetPageAsync(page.PageId, user.UserId);
-            }
-
-            if (string.IsNullOrEmpty(page.ThemeType))
-            {
-                page.ThemeType = site.DefaultThemeType;
-            }
-
-            page.Panes = new List<string>();
-            page.Resources = new List<Resource>();
-
-            string panes = PaneNames.Admin;
-            Type themetype = Type.GetType(page.ThemeType);
-            if (themetype == null)
-            {
-                // fallback
-                page.ThemeType = Constants.DefaultTheme;
-                themetype = Type.GetType(Constants.DefaultTheme);
-            }
-            if (themetype != null)
-            {
-                var themeobject = Activator.CreateInstance(themetype) as IThemeControl;
-                if (themeobject != null)
-                {
-                    if (!string.IsNullOrEmpty(themeobject.Panes))
-                    {
-                        panes = themeobject.Panes;
-                    }
-                    page.Resources = ManagePageResources(page.Resources, themeobject.Resources);
-                }
-            }
-            page.Panes = panes.Replace(";", ",").Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
-        }
-        catch
-        {
-            // error loading theme or layout
-        }
-
-        return page;
-    }
-
-    private (Page Page, List<Module> Modules) ProcessModules(Page page, List<Module> modules, int moduleid, string action, string defaultcontainertype)
-    {
-        var paneindex = new Dictionary<string, int>();
-        foreach (Module module in modules)
-        {
-            // initialize module control properties
-            module.SecurityAccessLevel = SecurityAccessLevel.Host;
-            module.ControlTitle = "";
-            module.Actions = "";
-            module.UseAdminContainer = false;
-            module.PaneModuleIndex = -1;
-            module.PaneModuleCount = 0;
-
-            if ((module.PageId == page.PageId || module.ModuleId == moduleid))
-            {
-                var typename = Constants.ErrorModule;
-                if (module.ModuleDefinition != null && (module.ModuleDefinition.Runtimes == "" || module.ModuleDefinition.Runtimes.Contains(Runtime)))
-                {
-                    typename = module.ModuleDefinition.ControlTypeTemplate;
-
-                    // handle default action
-                    if (action == Constants.DefaultAction && !string.IsNullOrEmpty(module.ModuleDefinition.DefaultAction))
-                    {
-                        action = module.ModuleDefinition.DefaultAction;
-                    }
-
-                    // check if the module defines custom action routes
-                    if (module.ModuleDefinition.ControlTypeRoutes != "")
-                    {
-                        foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
-                        {
-                            if (route.StartsWith(action + "="))
-                            {
-                                typename = route.Replace(action + "=", "");
-                            }
-                        }
-                    }
-                }
-
-                // ensure component exists and implements IModuleControl
-                module.ModuleType = "";
-                if (Constants.DefaultModuleActions.Contains(action, StringComparer.OrdinalIgnoreCase))
-                {
-                    typename = Constants.DefaultModuleActionsTemplate.Replace(Constants.ActionToken, action);
-                }
-                else
-                {
-                    typename = typename.Replace(Constants.ActionToken, action);
-                }
-                Type moduletype = Type.GetType(typename, false, true); // case insensitive
-                if (moduletype != null && moduletype.GetInterfaces().Contains(typeof(IModuleControl)))
-                {
-                    module.ModuleType = Utilities.GetFullTypeName(moduletype.AssemblyQualifiedName); // get actual type name
-                }
-
-                // get additional metadata from IModuleControl interface
-                if (moduletype != null && module.ModuleType != "")
-                {
-                    // retrieve module component resources
-                    var moduleobject = Activator.CreateInstance(moduletype) as IModuleControl;
-                    page.Resources = ManagePageResources(page.Resources, moduleobject.Resources);
-                    if (action.ToLower() == "settings" && module.ModuleDefinition != null)
-                    {
-                        // settings components are embedded within a framework settings module
-                        moduletype = Type.GetType(module.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, action), false, true);
-                        if (moduletype != null)
-                        {
-                            moduleobject = Activator.CreateInstance(moduletype) as IModuleControl;
-                            page.Resources = ManagePageResources(page.Resources, moduleobject.Resources);
-                        }
-                    }
-
-                    // additional metadata needed for admin components
-                    if (module.ModuleId == moduleid && action != "")
-                    {
-                        module.SecurityAccessLevel = moduleobject.SecurityAccessLevel;
-                        module.ControlTitle = moduleobject.Title;
-                        module.Actions = moduleobject.Actions;
-                        module.UseAdminContainer = moduleobject.UseAdminContainer;
-                    }
-                }
-
-                // ensure module's pane exists in current page and if not, assign it to the Admin pane
-                if (page.Panes == null || page.Panes.FindIndex(item => item.Equals(module.Pane, StringComparison.OrdinalIgnoreCase)) == -1)
-                {
-                    module.Pane = PaneNames.Admin;
-                }
-
-                // calculate module position within pane
-                if (paneindex.ContainsKey(module.Pane.ToLower()))
-                {
-                    paneindex[module.Pane.ToLower()] += 1;
-                }
-                else
-                {
-                    paneindex.Add(module.Pane.ToLower(), 0);
-                }
-
-                module.PaneModuleIndex = paneindex[module.Pane.ToLower()];
-
-                // container fallback
-                if (string.IsNullOrEmpty(module.ContainerType))
-                {
-                    module.ContainerType = defaultcontainertype;
-                }
-            }
-        }
-
-        foreach (Module module in modules.Where(item => item.PageId == page.PageId))
-        {
-            if (paneindex.ContainsKey(module.Pane.ToLower()))
-            {
-                module.PaneModuleCount = paneindex[module.Pane.ToLower()] + 1;
-            }
-        }
-
-        return (page, modules);
-    }
-
-    private List<Resource> ManagePageResources(List<Resource> pageresources, List<Resource> resources)
-    {
-        if (resources != null)
-        {
-            foreach (var resource in resources)
-            {
-                // ensure resource does not exist already
-                if (pageresources.Find(item => item.Url == resource.Url) == null)
-                {
-                    pageresources.Add(resource);
-                }
-            }
-        }
-        return pageresources;
     }
 }

Oqtane.Client/UI/ThemeBuilder.razor

@@ -28,20 +28,22 @@
 
 	protected override async Task OnAfterRenderAsync(bool firstRender)
 	{
-        var interop = new Interop(JsRuntime);
+		var interop = new Interop(JsRuntime);
 
         // manage stylesheets for this page 
-        string batch = DateTime.UtcNow.ToString("yyyyMMddHHmmssfff");
-        var links = new List<object>();
-        foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet && item.Declaration != ResourceDeclaration.Global))
-        {
-            links.Add(new { id = "app-stylesheet-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" });
+		string batch = DateTime.UtcNow.ToString("yyyyMMddHHmmssfff");
+		var links = new List<object>();
+		foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
+		{
+			var prefix = "app-stylesheet-" + resource.Level.ToString().ToLower();
+			links.Add(new { id = prefix + "-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", insertbefore = prefix });
         }
         if (links.Any())
         {
             await interop.IncludeLinks(links.ToArray());
         }
-		await interop.RemoveElementsById("app-stylesheet", "", "app-stylesheet-" + batch + "-00");
+		await interop.RemoveElementsById("app-stylesheet-page-", "", "app-stylesheet-page-" + batch + "-00");
+		await interop.RemoveElementsById("app-stylesheet-module-", "", "app-stylesheet-module-" + batch + "-00");
 
 		// set page title
 		if (!string.IsNullOrEmpty(PageState.Page.Title))

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.2</Version>
+    <Version>3.1.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -29,7 +29,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MySql.EntityFrameworkCore" Version="6.0.0-preview3.1" />
+    <PackageReference Include="MySql.EntityFrameworkCore" Version="6.0.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>3.0.2</version>
+        <version>3.1.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane MySQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.2</Version>
+    <Version>3.1.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.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="6.0.0-rc.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
+    <PackageReference Include="EFCore.NamingConventions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.3" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
   </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>3.0.2</version>
+        <version>3.1.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane PostgreSQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.2</Version>
+    <Version>3.1.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.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="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.3" />
   </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>3.0.2</version>
+        <version>3.1.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQL Server Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.2</Version>
+    <Version>3.1.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.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="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.3" />
   </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>3.0.2</version>
+        <version>3.1.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQLite Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Database.Sqlite/SqliteDatabase.cs

@@ -30,6 +30,16 @@ namespace Oqtane.Database.Sqlite
             return table.Column<int>(name: name, nullable: false).Annotation("Sqlite:Autoincrement", true);
         }
 
+        public override void DropColumn(MigrationBuilder builder, string name, string table)
+        {
+            // not implemented as SQLite does not support dropping columns
+        }
+
+        public override void AlterStringColumn(MigrationBuilder builder, string name, string table, int length, bool nullable, bool unicode)
+        {
+            // not implemented as SQLite does not support altering columns
+        }
+
         public override string ConcatenateSql(params string[] values)
         {
             var returnValue = String.Empty;

Oqtane.Package/Oqtane.Client.nuspec

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

Oqtane.Package/Oqtane.Framework.nuspec

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

Oqtane.Package/Oqtane.Server.nuspec

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

Oqtane.Package/Oqtane.Shared.nuspec

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

Oqtane.Package/Oqtane.Updater.nuspec

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

Oqtane.Package/install.ps1

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

Oqtane.Package/upgrade.ps1

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

Oqtane.Server/Controllers/SettingController.cs

@@ -8,6 +8,12 @@ using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using System.Net;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.Extensions.Options;
 
 namespace Oqtane.Controllers
 {
@@ -18,16 +24,26 @@ namespace Oqtane.Controllers
         private readonly IPageModuleRepository _pageModules;
         private readonly IUserPermissions _userPermissions;
         private readonly ISyncManager _syncManager;
+        private readonly IAliasAccessor _aliasAccessor;
+        private readonly IOptionsMonitorCache<CookieAuthenticationOptions> _cookieCache;
+        private readonly IOptionsMonitorCache<OpenIdConnectOptions> _oidcCache;
+        private readonly IOptionsMonitorCache<OAuthOptions> _oauthCache;
+        private readonly IOptionsMonitorCache<IdentityOptions> _identityCache;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
         private readonly string _visitorCookie;
 
-        public SettingController(ISettingRepository settings, IPageModuleRepository pageModules, IUserPermissions userPermissions, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger)
+        public SettingController(ISettingRepository settings, IPageModuleRepository pageModules, IUserPermissions userPermissions, ITenantManager tenantManager, ISyncManager syncManager, IAliasAccessor aliasAccessor, IOptionsMonitorCache<CookieAuthenticationOptions> cookieCache, IOptionsMonitorCache<OpenIdConnectOptions> oidcCache, IOptionsMonitorCache<OAuthOptions> oauthCache, IOptionsMonitorCache<IdentityOptions> identityCache, ILogManager logger)
         {
             _settings = settings;
             _pageModules = pageModules;
             _userPermissions = userPermissions;
             _syncManager = syncManager;
+            _aliasAccessor = aliasAccessor;
+            _cookieCache = cookieCache;
+            _oidcCache = oidcCache;
+            _oauthCache = oauthCache;
+            _identityCache = identityCache;
             _logger = logger;
             _alias = tenantManager.GetAlias();
             _visitorCookie = "APP_VISITOR_" + _alias.SiteId.ToString();
@@ -131,6 +147,30 @@ namespace Oqtane.Controllers
             }
         }
 
+        // DELETE api/<controller>/clear
+        [HttpDelete("clear")]
+        [Authorize(Roles = RoleNames.Admin)]
+        public void Clear()
+        {
+            // clear SiteOptionsCache for each option type
+            var cookieCache = new SiteOptionsCache<CookieAuthenticationOptions>(_aliasAccessor);
+            cookieCache.Clear();
+            var oidcCache = new SiteOptionsCache<OpenIdConnectOptions>(_aliasAccessor);
+            oidcCache.Clear();
+            var oauthCache = new SiteOptionsCache<OAuthOptions>(_aliasAccessor);
+            oauthCache.Clear();
+            var identityCache = new SiteOptionsCache<IdentityOptions>(_aliasAccessor);
+            identityCache.Clear();
+
+            // clear IOptionsMonitorCache for each option type
+            _cookieCache.Clear();
+            _oidcCache.Clear();
+            _oauthCache.Clear();
+            _identityCache.Clear();
+
+            _logger.Log(LogLevel.Information, this, LogFunction.Other, "Site Options Cache Cleared");
+        }
+
         private bool IsAuthorized(string entityName, int entityId, string permissionName)
         {
             bool authorized = false;

Oqtane.Server/Controllers/SystemController.cs

@@ -5,6 +5,7 @@ using Oqtane.Shared;
 using System;
 using Microsoft.AspNetCore.Hosting;
 using Oqtane.Infrastructure;
+using Microsoft.AspNetCore.Http.Features;
 
 namespace Oqtane.Controllers
 {
@@ -20,58 +21,68 @@ namespace Oqtane.Controllers
             _configManager = configManager;
         }
 
-        // GET: api/<controller>
+        // GET: api/<controller>?type=x
         [HttpGet]
         [Authorize(Roles = RoleNames.Host)]
-        public Dictionary<string, string> Get()
+        public Dictionary<string, object> Get(string type)
         {
-            Dictionary<string, string> systeminfo = new Dictionary<string, string>();
+            Dictionary<string, object> systeminfo = new Dictionary<string, object>();
 
-            systeminfo.Add("clrversion", Environment.Version.ToString());
-            systeminfo.Add("osversion", Environment.OSVersion.ToString());
-            systeminfo.Add("machinename", Environment.MachineName);
-            systeminfo.Add("serverpath", _environment.ContentRootPath);
-            systeminfo.Add("servertime", DateTime.UtcNow.ToString());
-            systeminfo.Add("installationid", _configManager.GetInstallationId());
-
-            systeminfo.Add("runtime", _configManager.GetSetting("Runtime", "Server"));
-            systeminfo.Add("rendermode", _configManager.GetSetting("RenderMode", "ServerPrerendered"));
-            systeminfo.Add("detailederrors", _configManager.GetSetting("DetailedErrors", "false"));
-            systeminfo.Add("logginglevel", _configManager.GetSetting("Logging:LogLevel:Default", "Information"));
-            systeminfo.Add("swagger", _configManager.GetSetting("UseSwagger", "true"));
-            systeminfo.Add("packageservice", _configManager.GetSetting("PackageService", "true"));
+            switch (type.ToLower())
+            {
+                case "environment":
+                    systeminfo.Add("CLRVersion", Environment.Version.ToString());
+                    systeminfo.Add("OSVersion", Environment.OSVersion.ToString());
+                    systeminfo.Add("MachineName", Environment.MachineName);
+                    systeminfo.Add("WorkingSet", Environment.WorkingSet.ToString());
+                    systeminfo.Add("TickCount", Environment.TickCount64.ToString());
+                    systeminfo.Add("ContentRootPath", _environment.ContentRootPath);
+                    systeminfo.Add("WebRootPath", _environment.WebRootPath);
+                    systeminfo.Add("ServerTime", DateTime.UtcNow.ToString());
+                    var feature = HttpContext.Features.Get<IHttpConnectionFeature>();
+                    systeminfo.Add("IPAddress", feature?.LocalIpAddress?.ToString());
+                    break;
+                case "configuration":
+                    systeminfo.Add("InstallationId", _configManager.GetInstallationId());
+                    systeminfo.Add("Runtime", _configManager.GetSetting("Runtime", "Server"));
+                    systeminfo.Add("RenderMode", _configManager.GetSetting("RenderMode", "ServerPrerendered"));
+                    systeminfo.Add("DetailedErrors", _configManager.GetSetting("DetailedErrors", "false"));
+                    systeminfo.Add("Logging:LogLevel:Default", _configManager.GetSetting("Logging:LogLevel:Default", "Information"));
+                    systeminfo.Add("Logging:LogLevel:Notify", _configManager.GetSetting("Logging:LogLevel:Notify", "Error"));
+                    systeminfo.Add("UseSwagger", _configManager.GetSetting("UseSwagger", "true"));
+                    systeminfo.Add("PackageService", _configManager.GetSetting("PackageService", "true"));
+                    break;
+            }
 
             return systeminfo;
         }
 
+
+        // GET: api/<controller>
+        [HttpGet("{key}/{value}")]
+        [Authorize(Roles = RoleNames.Host)]
+        public object Get(string key, object value)
+        {
+            return _configManager.GetSetting(key, value);
+        }
+
+        // POST: api/<controller>
         [HttpPost]
         [Authorize(Roles = RoleNames.Host)]
-        public void Post([FromBody] Dictionary<string, string> settings)
+        public void Post([FromBody] Dictionary<string, object> settings)
         {
-            foreach(KeyValuePair<string, string> kvp in settings)
+            foreach(KeyValuePair<string, object> kvp in settings)
             {
-                switch (kvp.Key)
-                {
-                    case "runtime":
-                        _configManager.AddOrUpdateSetting("Runtime", kvp.Value, false);
-                        break;
-                    case "rendermode":
-                        _configManager.AddOrUpdateSetting("RenderMode", kvp.Value, false);
-                        break;
-                    case "detailederrors":
-                        _configManager.AddOrUpdateSetting("DetailedErrors", kvp.Value, false);
-                        break;
-                    case "logginglevel":
-                        _configManager.AddOrUpdateSetting("Logging:LogLevel:Default", kvp.Value, false);
-                        break;
-                    case "swagger":
-                        _configManager.AddOrUpdateSetting("UseSwagger", kvp.Value, false);
-                        break;
-                    case "packageservice":
-                        _configManager.AddOrUpdateSetting("PackageService", kvp.Value, false);
-                        break;
-                }
+                _configManager.AddOrUpdateSetting(kvp.Key, kvp.Value, false);
             }
         }
+
+        // PUT: api/<controller>
+        [HttpPut("{key}/{value}")]
+        [Authorize(Roles = RoleNames.Host)]
+        public void Put(string key, object value)
+        {
+            _configManager.AddOrUpdateSetting(key, value, false);
+        }
     }
 }

Oqtane.Server/Controllers/UserController.cs

@@ -14,6 +14,7 @@ using System.Net;
 using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
+using Oqtane.Security;
 using Oqtane.Extensions;
 
 namespace Oqtane.Controllers
@@ -26,26 +27,28 @@ namespace Oqtane.Controllers
         private readonly IUserRoleRepository _userRoles;
         private readonly UserManager<IdentityUser> _identityUserManager;
         private readonly SignInManager<IdentityUser> _identitySignInManager;
+        private readonly ITenantManager _tenantManager;
         private readonly INotificationRepository _notifications;
         private readonly IFolderRepository _folders;
         private readonly ISyncManager _syncManager;
         private readonly ISiteRepository _sites;
+        private readonly IJwtManager _jwtManager;
         private readonly ILogManager _logger;
-        private readonly Alias _alias;
 
-        public UserController(IUserRepository users, IRoleRepository roles, IUserRoleRepository userRoles, UserManager<IdentityUser> identityUserManager, SignInManager<IdentityUser> identitySignInManager, ITenantManager tenantManager, INotificationRepository notifications, IFolderRepository folders, ISyncManager syncManager, ISiteRepository sites, ILogManager logger)
+        public UserController(IUserRepository users, IRoleRepository roles, IUserRoleRepository userRoles, UserManager<IdentityUser> identityUserManager, SignInManager<IdentityUser> identitySignInManager, ITenantManager tenantManager, INotificationRepository notifications, IFolderRepository folders, ISyncManager syncManager, ISiteRepository sites, IJwtManager jwtManager, ILogManager logger)
         {
             _users = users;
             _roles = roles;
             _userRoles = userRoles;
             _identityUserManager = identityUserManager;
             _identitySignInManager = identitySignInManager;
+            _tenantManager = tenantManager;
             _folders = folders;
             _notifications = notifications;
             _syncManager = syncManager;
             _sites = sites;
+            _jwtManager = jwtManager;
             _logger = logger;
-            _alias = tenantManager.GetAlias();
         }
 
         // GET api/<controller>/5?siteid=x
@@ -54,7 +57,7 @@ namespace Oqtane.Controllers
         public User Get(int id, string siteid)
         {
             int SiteId;
-            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
+            if (int.TryParse(siteid, out SiteId) && SiteId == _tenantManager.GetAlias().SiteId)
             {
                 User user = _users.GetUser(id);
                 if (user != null)
@@ -77,7 +80,7 @@ namespace Oqtane.Controllers
         public User Get(string name, string siteid)
         {
             int SiteId;
-            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
+            if (int.TryParse(siteid, out SiteId) && SiteId == _tenantManager.GetAlias().SiteId)
             {
                 User user = _users.GetUser(name);
                 if (user != null)
@@ -97,23 +100,30 @@ namespace Oqtane.Controllers
 
         private User Filter(User user)
         {
-            if (user != null && !User.IsInRole(RoleNames.Admin) && User.Identity.Name?.ToLower() != user.Username.ToLower())
+            if (user != null)
             {
-                user.DisplayName = "";
-                user.Email = "";
-                user.PhotoFileId = null;
-                user.LastLoginOn = DateTime.MinValue;
-                user.LastIPAddress = "";
-                user.Roles = "";
-                user.CreatedBy = "";
-                user.CreatedOn = DateTime.MinValue;
-                user.ModifiedBy = "";
-                user.ModifiedOn = DateTime.MinValue;
-                user.DeletedBy = "";
-                user.DeletedOn = DateTime.MinValue;
-                user.IsDeleted = false;
                 user.Password = "";
                 user.IsAuthenticated = false;
+                user.TwoFactorCode = "";
+                user.TwoFactorExpiry = null;
+
+                if (!User.IsInRole(RoleNames.Admin) && User.Identity.Name?.ToLower() != user.Username.ToLower())
+                {
+                    user.DisplayName = "";
+                    user.Email = "";
+                    user.PhotoFileId = null;
+                    user.LastLoginOn = DateTime.MinValue;
+                    user.LastIPAddress = "";
+                    user.Roles = "";
+                    user.CreatedBy = "";
+                    user.CreatedOn = DateTime.MinValue;
+                    user.ModifiedBy = "";
+                    user.ModifiedOn = DateTime.MinValue;
+                    user.DeletedBy = "";
+                    user.DeletedOn = DateTime.MinValue;
+                    user.IsDeleted = false;
+                    user.TwoFactorRequired = false;
+                }
             }
             return user;
         }
@@ -122,7 +132,7 @@ namespace Oqtane.Controllers
         [HttpPost]
         public async Task<User> Post([FromBody] User user)
         {
-            if (ModelState.IsValid && user.SiteId == _alias.SiteId)
+            if (ModelState.IsValid && user.SiteId == _tenantManager.GetAlias().SiteId)
             {
                 var User = await CreateUser(user);
                 return User;
@@ -155,6 +165,7 @@ namespace Oqtane.Controllers
 
             if (allowregistration)
             {
+                bool succeeded;
                 IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                 if (identityuser == null)
                 {
@@ -163,74 +174,48 @@ namespace Oqtane.Controllers
                     identityuser.Email = user.Email;
                     identityuser.EmailConfirmed = verified;
                     var result = await _identityUserManager.CreateAsync(identityuser, user.Password);
-                    if (result.Succeeded)
-                    {
-                        user.LastLoginOn = null;
-                        user.LastIPAddress = "";
-                        newUser = _users.AddUser(user);
-                        if (!verified)
-                        {
-                            string token = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
-                            string url = HttpContext.Request.Scheme + "://" + _alias.Name + "/login?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
-                            string body = "Dear " + user.DisplayName + ",\n\nIn Order To Complete The Registration Of Your User Account Please Click The Link Displayed Below:\n\n" + url + "\n\nThank You!";
-                            var notification = new Notification(user.SiteId, null, newUser, "User Account Verification", body, null);
-                            _notifications.AddNotification(notification);
-                        }
-
-                        // add folder for user
-                        Folder folder = _folders.GetFolder(user.SiteId, Utilities.PathCombine("Users",Path.DirectorySeparatorChar.ToString()));
-                        if (folder != null)
-                        {
-                            _folders.AddFolder(new Folder
-                            {
-                                SiteId = folder.SiteId,
-                                ParentId = folder.FolderId,
-                                Name = "My Folder",
-                                Type = FolderTypes.Private,
-                                Path = Utilities.PathCombine(folder.Path, newUser.UserId.ToString(), Path.DirectorySeparatorChar.ToString()),
-                                Order = 1,
-                                ImageSizes = "",
-                                Capacity = Constants.UserFolderCapacity,
-                                IsSystem = true,
-                                Permissions = new List<Permission>
-                                {
-                                    new Permission(PermissionNames.Browse, newUser.UserId, true),
-                                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                                    new Permission(PermissionNames.Edit, newUser.UserId, true)
-                                }.EncodePermissions()
-                            }) ;
-                        }
-                    }
+                    succeeded = result.Succeeded;
                 }
                 else
                 {
                     var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, user.Password, false);
-                    if (result.Succeeded)
-                    {
-                        newUser = _users.GetUser(user.Username);
-                    }
+                    succeeded = result.Succeeded;
+                    verified = true;
+                }
+
+                if (succeeded)
+                {
+                    user.LastLoginOn = null;
+                    user.LastIPAddress = "";
+                    newUser = _users.AddUser(user);
                 }
 
                 if (newUser != null)
                 {
-                    // add auto assigned roles to user for site
-                    List<Role> roles = _roles.GetRoles(user.SiteId).Where(item => item.IsAutoAssigned).ToList();
-                    foreach (Role role in roles)
+                    if (!verified)
                     {
-                        UserRole userrole = new UserRole();
-                        userrole.UserId = newUser.UserId;
-                        userrole.RoleId = role.RoleId;
-                        userrole.EffectiveDate = null;
-                        userrole.ExpiryDate = null;
-                        _userRoles.AddUserRole(userrole);
+                        string token = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
+                        string url = HttpContext.Request.Scheme + "://" + _tenantManager.GetAlias().Name + "/login?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
+                        string body = "Dear " + user.DisplayName + ",\n\nIn Order To Complete The Registration Of Your User Account Please Click The Link Displayed Below:\n\n" + url + "\n\nThank You!";
+                        var notification = new Notification(user.SiteId, newUser, "User Account Verification", body);
+                        _notifications.AddNotification(notification);
+                    }
+                    else
+                    {
+                        string url = HttpContext.Request.Scheme + "://" + _tenantManager.GetAlias().Name;
+                        string body = "Dear " + user.DisplayName + ",\n\nA User Account Has Been Succesfully Created For You. Please Use The Following Link To Access The Site:\n\n" + url + "\n\nThank You!";
+                        var notification = new Notification(user.SiteId, newUser, "User Account Notification", body);
+                        _notifications.AddNotification(notification);
                     }
-                }
 
-                if (newUser != null)
-                {
                     newUser.Password = ""; // remove sensitive information
                     _logger.Log(user.SiteId, LogLevel.Information, this, LogFunction.Create, "User Added {User}", newUser);
                 }
+                else
+                {
+                    user.Password = ""; // remove sensitive information
+                    _logger.Log(user.SiteId, LogLevel.Error, this, LogFunction.Create, "Unable To Add User {User}", user);
+                }
             }
             else
             {
@@ -245,19 +230,20 @@ namespace Oqtane.Controllers
         [Authorize]
         public async Task<User> Put(int id, [FromBody] User user)
         {
-            if (ModelState.IsValid && user.SiteId == _alias.SiteId && _users.GetUser(user.UserId, false) != null && (User.IsInRole(RoleNames.Admin) || User.Identity.Name == user.Username))
+            if (ModelState.IsValid && user.SiteId == _tenantManager.GetAlias().SiteId && _users.GetUser(user.UserId, false) != null && (User.IsInRole(RoleNames.Admin) || User.Identity.Name == user.Username))
             {
-                if (user.Password != "")
+                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
+                if (identityuser != null)
                 {
-                    IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
-                    if (identityuser != null)
+                    identityuser.Email = user.Email;
+                    if (user.Password != "")
                     {
                         identityuser.PasswordHash = _identityUserManager.PasswordHasher.HashPassword(identityuser, user.Password);
-                        await _identityUserManager.UpdateAsync(identityuser);
                     }
+                    await _identityUserManager.UpdateAsync(identityuser);
                 }
                 user = _users.UpdateUser(user);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.User, user.UserId);
+                _syncManager.AddSyncEvent(_tenantManager.GetAlias().TenantId, EntityNames.User, user.UserId);
                 user.Password = ""; // remove sensitive information
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Updated {User}", user);
             }
@@ -278,7 +264,7 @@ namespace Oqtane.Controllers
         {
             int SiteId;
             User user = _users.GetUser(id);
-            if (user != null && int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
+            if (user != null && int.TryParse(siteid, out SiteId) && SiteId == _tenantManager.GetAlias().SiteId)
             {
                 // remove user roles for site
                 foreach (UserRole userrole in _userRoles.GetUserRoles(user.UserId, SiteId).ToList())
@@ -332,40 +318,75 @@ namespace Oqtane.Controllers
         [HttpPost("login")]
         public async Task<User> Login([FromBody] User user, bool setCookie, bool isPersistent)
         {
-            User loginUser = new User { Username = user.Username, IsAuthenticated = false };
+            User loginUser = new User { SiteId = user.SiteId, Username = user.Username, IsAuthenticated = false };
 
             if (ModelState.IsValid)
             {
                 IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                 if (identityuser != null)
                 {
-                    var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, user.Password, false);
+                    var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, user.Password, true);
                     if (result.Succeeded)
                     {
-                        loginUser = _users.GetUser(identityuser.UserName);
-                        if (loginUser != null)
+                        user = _users.GetUser(user.Username);
+                        if (user.TwoFactorRequired)
                         {
-                            if (identityuser.EmailConfirmed)
+                            var token = await _identityUserManager.GenerateTwoFactorTokenAsync(identityuser, "Email");
+                            user.TwoFactorCode = token;
+                            user.TwoFactorExpiry = DateTime.UtcNow.AddMinutes(10);
+                            _users.UpdateUser(user);
+
+                            string body = "Dear " + user.DisplayName + ",\n\nYou requested a secure verification code to log in to your account. Please enter the secure verification code on the site:\n\n" + token +
+                                "\n\nPlease note that the code is only valid for 10 minutes so if you are unable to take action within that time period, you should initiate a new login on the site." +
+                                "\n\nThank You!";
+                            var notification = new Notification(loginUser.SiteId, user, "User Verification Code", body);
+                            _notifications.AddNotification(notification);
+
+                            _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Verification Notification Sent For {Username}", user.Username);
+                            loginUser.TwoFactorRequired = true;
+                        }
+                        else
+                        {
+                            loginUser = _users.GetUser(identityuser.UserName);
+                            if (loginUser != null)
                             {
-                                loginUser.IsAuthenticated = true;
-                                loginUser.LastLoginOn = DateTime.UtcNow;
-                                loginUser.LastIPAddress = HttpContext.Connection.RemoteIpAddress.ToString();
-                                _users.UpdateUser(loginUser);
-                                _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful {Username}", user.Username);
-                                if (setCookie)
+                                if (identityuser.EmailConfirmed)
                                 {
-                                    await _identitySignInManager.SignInAsync(identityuser, isPersistent);
+                                    loginUser.IsAuthenticated = true;
+                                    loginUser.LastLoginOn = DateTime.UtcNow;
+                                    loginUser.LastIPAddress = HttpContext.Connection.RemoteIpAddress.ToString();
+                                    _users.UpdateUser(loginUser);
+                                    _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful {Username}", user.Username);
+                                    if (setCookie)
+                                    {
+                                        await _identitySignInManager.SignInAsync(identityuser, isPersistent);
+                                    }
+                                }
+                                else
+                                {
+                                    _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Not Verified {Username}", user.Username);
                                 }
-                            }
-                            else
-                            {
-                                _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Not Verified {Username}", user.Username);
                             }
                         }
                     }
                     else
                     {
-                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "User Login Failed {Username}", user.Username);
+                        if (result.IsLockedOut)
+                        {
+                            user = _users.GetUser(user.Username);
+                            string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser);
+                            string url = HttpContext.Request.Scheme + "://" + _tenantManager.GetAlias().Name + "/reset?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
+                            string body = "Dear " + user.DisplayName + ",\n\nYou attempted multiple times unsuccessfully to log in to your account and it is now locked out. Please wait a few minutes and then try again... or use the link below to reset your password:\n\n" + url +
+                                "\n\nPlease note that the link is only valid for 24 hours so if you are unable to take action within that time period, you should initiate another password reset on the site." +
+                                "\n\nThank You!";
+                            var notification = new Notification(loginUser.SiteId, user, "User Lockout", body);
+                            _notifications.AddNotification(notification);
+                            _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Lockout Notification Sent For {Username}", user.Username);
+                        }
+                        else
+                        {
+                            _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Failed {Username}", user.Username);
+                        }
                     }
                 }
             }
@@ -422,13 +443,13 @@ namespace Oqtane.Controllers
                 {
                     user = _users.GetUser(user.Username);
                     string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser);
-                    string url = HttpContext.Request.Scheme + "://" + _alias.Name + "/reset?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
+                    string url = HttpContext.Request.Scheme + "://" + _tenantManager.GetAlias().Name + "/reset?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
                     string body = "Dear " + user.DisplayName + ",\n\nYou recently requested to reset your password. Please use the link below to complete the process:\n\n" + url +
                         "\n\nPlease note that the link is only valid for 24 hours so if you are unable to take action within that time period, you should initiate another password reset on the site." +
                         "\n\nIf you did not request to reset your password you can safely ignore this message." +
                         "\n\nThank You!";
                  
-                    var notification = new Notification(user.SiteId, null, user, "User Password Reset", body, null);
+                    var notification = new Notification(_tenantManager.GetAlias().SiteId, user, "User Password Reset", body);
                     _notifications.AddNotification(notification);
                     _logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset Notification Sent For {Username}", user.Username);
                 }
@@ -469,6 +490,52 @@ namespace Oqtane.Controllers
             return user;
         }
 
+        // POST api/<controller>/twofactor
+        [HttpPost("twofactor")]
+        public User TwoFactor([FromBody] User user, string token)
+        {
+            User loginUser = new User { SiteId = user.SiteId, Username = user.Username, IsAuthenticated = false };
+
+            if (ModelState.IsValid && !string.IsNullOrEmpty(token))
+            {
+                user = _users.GetUser(user.Username);
+                if (user != null)
+                {
+                    if (user.TwoFactorRequired && user.TwoFactorCode == token && DateTime.UtcNow < user.TwoFactorExpiry)
+                    {
+                        loginUser.IsAuthenticated = true;
+                    }
+                }
+            }
+
+            return loginUser;
+        }
+
+        // GET api/<controller>/validate/x
+        [HttpGet("validate/{password}")]
+        public async Task<bool> Validate(string password)
+        {
+            var validator = new PasswordValidator<IdentityUser>();
+            var result = await validator.ValidateAsync(_identityUserManager, null, password);
+            return result.Succeeded;
+        }
+
+        // GET api/<controller>/token
+        [HttpGet("token")]
+        [Authorize(Roles = RoleNames.Admin)]
+        public string Token()
+        {
+            var token = "";
+            var sitesettings = HttpContext.GetSiteSettings();
+            var secret = sitesettings.GetValue("JwtOptions:Secret", "");
+            if (!string.IsNullOrEmpty(secret))
+            {
+                var lifetime = 525600; // long-lived token set to 1 year
+                token = _jwtManager.GenerateToken(_tenantManager.GetAlias(), (ClaimsIdentity)User.Identity, secret, sitesettings.GetValue("JwtOptions:Issuer", ""), sitesettings.GetValue("JwtOptions:Audience", ""), lifetime);
+            }
+            return token;
+        }
+
         // GET api/<controller>/authenticate
         [HttpGet("authenticate")]
         public User Authenticate()
@@ -477,7 +544,10 @@ namespace Oqtane.Controllers
             if (user.IsAuthenticated)
             {
                 user.Username = User.Identity.Name;
-                user.UserId = int.Parse(User.Claims.First(item => item.Type == ClaimTypes.PrimarySid).Value);
+                if (User.HasClaim(item => item.Type == ClaimTypes.NameIdentifier))
+                {
+                    user.UserId = int.Parse(User.Claims.First(item => item.Type == ClaimTypes.NameIdentifier).Value);
+                }
                 string roles = "";
                 foreach (var claim in User.Claims.Where(item => item.Type == ClaimTypes.Role))
                 {

Oqtane.Server/Controllers/UserRoleController.cs

@@ -73,13 +73,6 @@ namespace Oqtane.Controllers
             var role = _roles.GetRole(userRole.RoleId);
             if (ModelState.IsValid && role != null && SiteValid(role.SiteId) && RoleValid(role.Name))
             {
-                if (role.Name == RoleNames.Host)
-                {
-                    // host roles can only exist at global level - remove all site specific user roles
-                    _userRoles.DeleteUserRoles(userRole.UserId);
-                    _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Roles Deleted For UserId {UserId}", userRole.UserId);
-                }
-
                 userRole = _userRoles.AddUserRole(userRole);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole);
 

Oqtane.Server/Databases/DatabaseBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Migrations.Operations;
 using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
 using Oqtane.Databases.Interfaces;
@@ -75,6 +76,16 @@ namespace Oqtane.Databases
 
         }
 
+        public virtual void DropColumn(MigrationBuilder builder, string name, string table)
+        {
+            builder.DropColumn(name, table);
+        }
+
+        public virtual void AlterStringColumn(MigrationBuilder builder, string name, string table, int length, bool nullable, bool unicode)
+        {
+            builder.AlterColumn<string>(RewriteName(name), RewriteName(table), maxLength: length, nullable: nullable, unicode: unicode);
+        }
+
         public abstract DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString);
     }
 }

Oqtane.Server/Databases/Interfaces/IDatabase.cs

@@ -1,5 +1,6 @@
 using System.Data;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Migrations.Operations;
 using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
 
@@ -31,6 +32,10 @@ namespace Oqtane.Databases.Interfaces
 
         public void UpdateIdentityStoreTableNames(ModelBuilder builder);
 
+        public void DropColumn(MigrationBuilder builder, string name, string table);
+
+        public void AlterStringColumn(MigrationBuilder builder, string name, string table, int length, bool nullable, bool unicode);
+
         public DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString);
     }
 }

Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs

@@ -41,5 +41,8 @@ namespace Oqtane.Extensions
 
         public static IApplicationBuilder UseTenantResolution(this IApplicationBuilder builder)
           => builder.UseMiddleware<TenantMiddleware>();
+
+        public static IApplicationBuilder UseJwtAuthorization(this IApplicationBuilder builder)
+          => builder.UseMiddleware<JwtMiddleware>();
     }
 }

Oqtane.Server/Extensions/DictionaryExtensions.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+namespace Oqtane.Extensions
+{
+    public static class DictionaryExtensions
+    {
+        public static TValue GetValue<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, TValue defaultValue, bool nullOrEmptyValueIsValid = false)
+        {
+            if (dictionary != null && key != null && dictionary.ContainsKey(key))
+            {
+                if (nullOrEmptyValueIsValid || (dictionary[key] != null && !string.IsNullOrEmpty(dictionary[key].ToString())))
+                {
+                    return dictionary[key];
+                }
+            }
+            return defaultValue;
+        }
+    }
+}

Oqtane.Server/Extensions/HttpContextExtensions.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Extensions
+{
+    public static class HttpContextExtensions
+    {
+        public static Alias GetAlias(this HttpContext context)
+        {
+            if (context != null && context.Items.ContainsKey(Constants.HttpContextAliasKey))
+            {
+                return context.Items[Constants.HttpContextAliasKey] as Alias;
+            }
+            return null;
+        }
+
+        public static Dictionary<string, string> GetSiteSettings(this HttpContext context)
+        {
+            if (context != null && context.Items.ContainsKey(Constants.HttpContextSiteSettingsKey))
+            {
+                return context.Items[Constants.HttpContextSiteSettingsKey] as Dictionary<string, string>;
+            }
+            return null;
+        }
+    }
+}

Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -7,9 +7,12 @@ using System.Net.Http;
 using System.Reflection;
 using System.Runtime.Loader;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
@@ -24,11 +27,11 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class OqtaneServiceCollectionExtensions
     {
-        public static IServiceCollection AddOqtane(this IServiceCollection services, Runtime runtime, string[] supportedCultures)
+        public static IServiceCollection AddOqtane(this IServiceCollection services, string[] supportedCultures)
         {
             LoadAssemblies();
             LoadSatelliteAssemblies(supportedCultures);
-            services.AddOqtaneServices(runtime);
+            services.AddOqtaneServices();
 
             return services;
         }
@@ -57,6 +60,11 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
+        public static OqtaneSiteOptionsBuilder AddOqtaneSiteOptions(this IServiceCollection services)
+        {
+            return new OqtaneSiteOptionsBuilder(services);
+        }
+
         internal static IServiceCollection AddOqtaneSingletonServices(this IServiceCollection services)
         {
             services.AddSingleton<IInstallationManager, InstallationManager>();
@@ -67,13 +75,22 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
+        internal static IServiceCollection AddOqtaneServerScopedServices(this IServiceCollection services)
+        {
+            services.AddScoped<Oqtane.Infrastructure.SiteState>();
+            return services;
+        }
+
         internal static IServiceCollection AddOqtaneTransientServices(this IServiceCollection services)
         {
             services.AddTransient<ITenantManager, TenantManager>();
-            services.AddTransient<IModuleDefinitionRepository, ModuleDefinitionRepository>();
-            services.AddTransient<IThemeRepository, ThemeRepository>();
+            services.AddTransient<IAliasAccessor, AliasAccessor>();
             services.AddTransient<IUserPermissions, UserPermissions>();
             services.AddTransient<ITenantResolver, TenantResolver>();
+            services.AddTransient<IJwtManager, JwtManager>();
+
+            services.AddTransient<IModuleDefinitionRepository, ModuleDefinitionRepository>();
+            services.AddTransient<IThemeRepository, ThemeRepository>();
             services.AddTransient<IAliasRepository, AliasRepository>();
             services.AddTransient<ITenantRepository, TenantRepository>();
             services.AddTransient<ISiteRepository, SiteRepository>();
@@ -100,6 +117,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddTransient<ILanguageRepository, LanguageRepository>();
             services.AddTransient<IVisitorRepository, VisitorRepository>();
             services.AddTransient<IUrlMappingRepository, UrlMappingRepository>();
+
             // obsolete - replaced by ITenantManager
             services.AddTransient<ITenantResolver, TenantResolver>();
 
@@ -123,36 +141,60 @@ namespace Microsoft.Extensions.DependencyInjection
                     context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                     return Task.CompletedTask;
                 };
+                options.Events.OnRedirectToLogout = context =>
+                {
+                    context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    return Task.CompletedTask;
+                };
                 options.Events.OnValidatePrincipal = PrincipalValidator.ValidateAsync;
             });
 
             return services;
         }
 
-        public static IServiceCollection ConfigureOqtaneIdentityOptions(this IServiceCollection services)
+        public static IServiceCollection ConfigureOqtaneAuthenticationOptions(this IServiceCollection services, IConfigurationRoot Configuration)
         {
-            services.Configure<IdentityOptions>(options =>
-            {
-                // Password settings
-                options.Password.RequireDigit = false;
-                options.Password.RequiredLength = 6;
-                options.Password.RequireNonAlphanumeric = false;
-                options.Password.RequireUppercase = false;
-                options.Password.RequireLowercase = false;
-
-                // Lockout settings
-                options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromMinutes(30);
-                options.Lockout.MaxFailedAccessAttempts = 10;
-                options.Lockout.AllowedForNewUsers = true;
-
-                // User settings
-                options.User.RequireUniqueEmail = false;
-            });
+            // settings defined in appsettings
+            services.Configure<OAuthOptions>(Configuration);
+            services.Configure<OpenIdConnectOptions>(Configuration);
 
             return services;
         }
 
-        internal static IServiceCollection TryAddHttpClientWithAuthenticationCookie(this IServiceCollection services)
+        public static IServiceCollection ConfigureOqtaneIdentityOptions(this IServiceCollection services, IConfigurationRoot Configuration)
+        {
+            // default settings
+            services.Configure<IdentityOptions>(options =>
+            {
+                // Password settings
+                options.Password.RequireDigit = true;
+                options.Password.RequiredLength = 6;
+                options.Password.RequireNonAlphanumeric = true;
+                options.Password.RequireUppercase = true;
+                options.Password.RequireLowercase = true;
+                options.Password.RequiredUniqueChars = 1;
+
+                // Lockout settings
+                options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromMinutes(5);
+                options.Lockout.MaxFailedAccessAttempts = 5;
+                options.Lockout.AllowedForNewUsers = false;
+
+                // SignIn settings
+                options.SignIn.RequireConfirmedEmail = true;
+                options.SignIn.RequireConfirmedPhoneNumber = false;
+
+                // User settings
+                options.User.RequireUniqueEmail = false; // changing to true will cause issues for legacy data
+                options.User.AllowedUserNameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+";
+            });
+
+            // overrides defined in appsettings
+            services.Configure<IdentityOptions>(Configuration);
+
+            return services;
+        }
+
+        internal static IServiceCollection AddHttpClients(this IServiceCollection services)
         {
             if (!services.Any(x => x.ServiceType == typeof(HttpClient)))
             {
@@ -174,6 +216,9 @@ namespace Microsoft.Extensions.DependencyInjection
                 });
             }
 
+            // IHttpClientFactory for calling remote services via RemoteServiceBase
+            services.AddHttpClient();
+
             return services;
         }
 
@@ -190,7 +235,7 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
-        private static IServiceCollection AddOqtaneServices(this IServiceCollection services, Runtime runtime)
+        private static IServiceCollection AddOqtaneServices(this IServiceCollection services)
         {
             if (services is null)
             {
@@ -223,20 +268,15 @@ namespace Microsoft.Extensions.DependencyInjection
                     }
                 }
 
-                // register server startup services
-                var startUps = assembly.GetInstances<IServerStartup>();
-                foreach (var startup in startUps)
-                {
-                    startup.ConfigureServices(services);
-                }
+                // dynamically register server startup services
+                assembly.GetInstances<IServerStartup>()
+                    .ToList()
+                    .ForEach(x => x.ConfigureServices(services));
 
-                if (runtime == Runtime.Server)
-                {
-                    // register client startup services if running on server
-                    assembly.GetInstances<IClientStartup>()
-                        .ToList()
-                        .ForEach(x => x.ConfigureServices(services));
-                }
+                // dynamically register client startup services (these services will only be used when running on Blazor Server)
+                assembly.GetInstances<IClientStartup>()
+                    .ToList()
+                    .ForEach(x => x.ConfigureServices(services));
             }
             return services;
         }
@@ -308,7 +348,7 @@ namespace Microsoft.Extensions.DependencyInjection
 
                         try
                         {
-                            Assembly assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(assemblyFile.FullName)));
+                            Assembly assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(System.IO.File.ReadAllBytes(assemblyFile.FullName)));
                             Debug.WriteLine($"Oqtane Info: Loaded Assembly {assemblyName}");
                         }
                         catch (Exception ex)
@@ -327,9 +367,9 @@ namespace Microsoft.Extensions.DependencyInjection
         private static Assembly ResolveDependencies(AssemblyLoadContext context, AssemblyName name)
         {
             var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location) + Path.DirectorySeparatorChar + name.Name + ".dll";
-            if (File.Exists(assemblyPath))
+            if (System.IO.File.Exists(assemblyPath))
             {
-                return context.LoadFromStream(new MemoryStream(File.ReadAllBytes(assemblyPath)));
+                return context.LoadFromStream(new MemoryStream(System.IO.File.ReadAllBytes(assemblyPath)));
             }
             else
             {

Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs

@@ -0,0 +1,357 @@
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
+using Oqtane.Infrastructure;
+using Oqtane.Models;
+using Oqtane.Shared;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
+using Oqtane.Repository;
+using Oqtane.Security;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Authentication.Cookies;
+
+namespace Oqtane.Extensions
+{
+    public static class OqtaneSiteAuthenticationBuilderExtensions
+    {
+        public static OqtaneSiteOptionsBuilder WithSiteAuthentication(this OqtaneSiteOptionsBuilder builder)
+        {
+            // site cookie authentication options
+            builder.AddSiteOptions<CookieAuthenticationOptions>((options, alias, sitesettings) =>
+            {
+                if (sitesettings.GetValue("LoginOptions:CookieType", "domain") == "domain")
+                {
+                    options.Cookie.Name = ".AspNetCore.Identity.Application";
+                }
+                else
+                {
+                    // use unique cookie name for site
+                    options.Cookie.Name = ".AspNetCore.Identity.Application" + alias.SiteKey;
+                }
+            });
+
+            // site OpenId Connect options
+            builder.AddSiteOptions<OpenIdConnectOptions>((options, alias, sitesettings) =>
+            {
+                if (sitesettings.GetValue("ExternalLogin:ProviderType", "") == AuthenticationProviderTypes.OpenIDConnect)
+                {
+                    // default options
+                    options.SignInScheme = Constants.AuthenticationScheme; // identity cookie
+                    options.RequireHttpsMetadata = true;
+                    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.ResponseMode = OpenIdConnectResponseMode.FormPost; // recommended as most secure
+
+                    // cookie config is required to avoid Correlation Failed errors
+                    options.NonceCookie.SameSite = SameSiteMode.Unspecified;
+                    options.CorrelationCookie.SameSite = SameSiteMode.Unspecified;
+
+                    // site options
+                    options.Authority = sitesettings.GetValue("ExternalLogin:Authority", "");
+                    options.MetadataAddress = sitesettings.GetValue("ExternalLogin:MetadataUrl", "");
+                    options.ClientId = sitesettings.GetValue("ExternalLogin:ClientId", "");
+                    options.ClientSecret = sitesettings.GetValue("ExternalLogin:ClientSecret", "");
+                    options.UsePkce = bool.Parse(sitesettings.GetValue("ExternalLogin:PKCE", "false"));
+                    options.Scope.Clear();
+                    foreach (var scope in sitesettings.GetValue("ExternalLogin:Scopes", "openid,profile,email").Split(',', StringSplitOptions.RemoveEmptyEntries))
+                    {
+                        options.Scope.Add(scope);
+                    }
+
+                    // openid connect events
+                    options.Events.OnTokenValidated = OnTokenValidated;
+                    options.Events.OnAccessDenied = OnAccessDenied;
+                    options.Events.OnRemoteFailure = OnRemoteFailure;
+                }
+            });
+
+            // site OAuth 2.0 options
+            builder.AddSiteOptions<OAuthOptions>((options, alias, sitesettings) =>
+            {
+                if (sitesettings.GetValue("ExternalLogin:ProviderType", "") == AuthenticationProviderTypes.OAuth2)
+                {
+                    // default options
+                    options.SignInScheme = Constants.AuthenticationScheme; // identity cookie
+                    options.CallbackPath = string.IsNullOrEmpty(alias.Path) ? "/signin-" + AuthenticationProviderTypes.OAuth2 : "/" + alias.Path + "/signin-" + AuthenticationProviderTypes.OAuth2;
+                    options.SaveTokens = false;
+
+                    // site options
+                    options.AuthorizationEndpoint = sitesettings.GetValue("ExternalLogin:AuthorizationUrl", "");
+                    options.TokenEndpoint = sitesettings.GetValue("ExternalLogin:TokenUrl", "");
+                    options.UserInformationEndpoint = sitesettings.GetValue("ExternalLogin:UserInfoUrl", "");
+                    options.ClientId = sitesettings.GetValue("ExternalLogin:ClientId", "");
+                    options.ClientSecret = sitesettings.GetValue("ExternalLogin:ClientSecret", "");
+                    options.UsePkce = bool.Parse(sitesettings.GetValue("ExternalLogin:PKCE", "false"));
+                    options.Scope.Clear();
+                    foreach (var scope in sitesettings.GetValue("ExternalLogin:Scopes", "").Split(',', StringSplitOptions.RemoveEmptyEntries))
+                    {
+                        options.Scope.Add(scope);
+                    }
+
+                    // cookie config is required to avoid Correlation Failed errors
+                    options.CorrelationCookie.SameSite = SameSiteMode.Unspecified;
+
+                    // oauth2 events
+                    options.Events.OnCreatingTicket = OnCreatingTicket;
+                    options.Events.OnAccessDenied = OnAccessDenied;
+                    options.Events.OnRemoteFailure = OnRemoteFailure;
+                }
+            });
+
+            return builder;
+        }
+
+        private static async Task OnCreatingTicket(OAuthCreatingTicketContext context)
+        {
+            // OAuth 2.0
+            var email = "";
+            if (context.Options.UserInformationEndpoint != "")
+            {
+                try
+                {
+                    var request = new HttpRequestMessage(HttpMethod.Get, context.Options.UserInformationEndpoint);
+                    request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+                    request.Headers.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
+                    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", context.AccessToken);
+                    var response = await context.Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, context.HttpContext.RequestAborted);
+                    response.EnsureSuccessStatusCode();
+                    var output = await response.Content.ReadAsStringAsync();
+
+                    // get email address using Regex on the raw output (could be json or html)
+                    var regex = new Regex(@"\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*", RegexOptions.IgnoreCase);
+                    foreach (Match match in regex.Matches(output))
+                    {
+                        if (EmailValid(match.Value, context.HttpContext.GetSiteSettings().GetValue("ExternalLogin:DomainFilter", "")))
+                        {
+                            email = match.Value.ToLower();
+                            break;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var _logger = context.HttpContext.RequestServices.GetRequiredService<ILogManager>();
+                    _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, "An Error Occurred Accessing The User Info Endpoint - {Error}", ex.Message);
+                }
+            }
+
+            // login user
+            await LoginUser(email, context.HttpContext, context.Principal);
+        }
+
+        private static async Task OnTokenValidated(TokenValidatedContext context)
+        {
+            // OpenID Connect
+            var emailClaimType = context.HttpContext.GetSiteSettings().GetValue("ExternalLogin:EmailClaimType", "");
+            var email = context.Principal.FindFirstValue(emailClaimType);
+
+            // login user
+            await LoginUser(email, context.HttpContext, context.Principal);
+        }
+
+        private static Task OnAccessDenied(AccessDeniedContext context)
+        {
+            var _logger = context.HttpContext.RequestServices.GetRequiredService<ILogManager>();
+            _logger.Log(LogLevel.Information, "ExternalLogin", Enums.LogFunction.Security, "External Login Access Denied - User May Have Cancelled Their External Login Attempt");
+            // redirect to login page
+            var alias = context.HttpContext.GetAlias();
+            context.Response.Redirect(alias.Path + "/login?returnurl=" + context.Properties.RedirectUri, true);
+            context.HandleResponse();
+            return Task.CompletedTask;
+        }
+
+        private static Task OnRemoteFailure(RemoteFailureContext context)
+        {
+            var _logger = context.HttpContext.RequestServices.GetRequiredService<ILogManager>();
+            _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, "External Login Remote Failure - {Error}", context.Failure.Message);
+            // redirect to login page
+            var alias = context.HttpContext.GetAlias();
+            context.Response.Redirect(alias.Path + "/login", true);
+            context.HandleResponse();
+            return Task.CompletedTask;
+        }
+
+        private static async Task LoginUser(string email, HttpContext httpContext, ClaimsPrincipal claimsPrincipal)
+        {
+            var _logger = httpContext.RequestServices.GetRequiredService<ILogManager>();
+
+            if (EmailValid(email, httpContext.GetSiteSettings().GetValue("ExternalLogin:DomainFilter", "")))
+            {
+                var _identityUserManager = httpContext.RequestServices.GetRequiredService<UserManager<IdentityUser>>();
+                var _users = httpContext.RequestServices.GetRequiredService<IUserRepository>();
+                var _userRoles = httpContext.RequestServices.GetRequiredService<IUserRoleRepository>();
+                var providerType = httpContext.GetSiteSettings().GetValue("ExternalLogin:ProviderType", "");
+                var providerKey = claimsPrincipal.FindFirstValue(ClaimTypes.NameIdentifier);
+                if (providerKey == null)
+                {
+                    providerKey = email; // OAuth2 does not pass claims
+                }
+                User user = null;
+
+                bool duplicates = false;
+                IdentityUser identityuser = null;
+                try
+                {
+                    identityuser = await _identityUserManager.FindByEmailAsync(email);
+                }
+                catch
+                {
+                    // FindByEmailAsync will throw an error if the email matches multiple user accounts
+                    duplicates = true;
+                }
+                if (identityuser == null)
+                {
+                    if (duplicates)
+                    {
+                        _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, "Multiple Users Exist With Email Address {Email}. Login Denied.", email);
+                    }
+                    else
+                    {
+                        if (bool.Parse(httpContext.GetSiteSettings().GetValue("ExternalLogin:CreateUsers", "true")))
+                        {
+                            identityuser = new IdentityUser();
+                            identityuser.UserName = email;
+                            identityuser.Email = email;
+                            identityuser.EmailConfirmed = true;
+                            var result = await _identityUserManager.CreateAsync(identityuser, DateTime.UtcNow.ToString("yyyy-MMM-dd-HH-mm-ss"));
+                            if (result.Succeeded)
+                            {
+                                user = new User
+                                {
+                                    SiteId = httpContext.GetAlias().SiteId,
+                                    Username = email,
+                                    DisplayName = email,
+                                    Email = email,
+                                    LastLoginOn = null,
+                                    LastIPAddress = ""
+                                };
+                                user = _users.AddUser(user);
+
+                                if (user != null)
+                                {
+                                    var _notifications = httpContext.RequestServices.GetRequiredService<INotificationRepository>();
+                                    string url = httpContext.Request.Scheme + "://" + httpContext.GetAlias().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, providerKey, ""));
+
+                                    _logger.Log(user.SiteId, LogLevel.Information, "ExternalLogin", Enums.LogFunction.Create, "User Added {User}", user);
+                                }
+                                else
+                                {
+                                    _logger.Log(user.SiteId, LogLevel.Error, "ExternalLogin", Enums.LogFunction.Create, "Unable To Add User {Email}", email);
+                                }
+                            }
+                            else
+                            {
+                                _logger.Log(user.SiteId, LogLevel.Error, "ExternalLogin", Enums.LogFunction.Create, "Unable To Add Identity User {Email} {Error}", email, result.Errors.ToString());
+                            }
+                        }
+                        else
+                        {
+                            _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, "Creation Of New Users Is Disabled For This Site. User With Email Address {Email} Will First Need To Be Registered On The Site.", email);
+                        }
+                    }
+                }
+                else
+                {
+                    var logins = await _identityUserManager.GetLoginsAsync(identityuser);
+                    var login = logins.FirstOrDefault(item => item.LoginProvider == providerType);
+                    if (login != null)
+                    {
+                        if (login.ProviderKey == providerKey)
+                        {
+                            user = _users.GetUser(identityuser.UserName);
+                        }
+                        else
+                        {
+                            // provider keys do not match
+                            _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, "Provider Key Does Not Match For User {Username}. Login Denied.", identityuser.UserName);
+                        }
+                    }
+                    else
+                    {
+                        // add user login
+                        await _identityUserManager.AddLoginAsync(identityuser, new UserLoginInfo(providerType, providerKey, ""));
+                        user = _users.GetUser(identityuser.UserName);
+                        _logger.Log(user.SiteId, LogLevel.Information, "ExternalLogin", Enums.LogFunction.Create, "External User Login Added For {Email} Using Provider {Provider}", email, providerType);
+                    }
+                }
+
+                // add claims to principal
+                if (user != null)
+                {
+                    var principal = (ClaimsIdentity)claimsPrincipal.Identity;
+                    UserSecurity.ResetClaimsIdentity(principal);
+                    var identity = UserSecurity.CreateClaimsIdentity(httpContext.GetAlias(), user, _userRoles.GetUserRoles(user.UserId, user.SiteId).ToList());
+                    principal.AddClaims(identity.Claims);
+
+                    // update user
+                    user.LastLoginOn = DateTime.UtcNow;
+                    user.LastIPAddress = httpContext.Connection.RemoteIpAddress.ToString();
+                    _users.UpdateUser(user);
+                    _logger.Log(LogLevel.Information, "ExternalLogin", Enums.LogFunction.Security, "External User Login Successful For {Username} Using Provider {Provider}", user.Username, providerType);
+                }
+                else // user not valid
+                {
+                    await httpContext.SignOutAsync();
+                }
+            }
+            else // email invalid
+            {
+                if (!string.IsNullOrEmpty(email))
+                {
+                    _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, "The Email Address {Email} Is Invalid Or Does Not Match The Domain Filter Criteria. Login Denied.", email);
+                }
+                else
+                {
+                    var emailclaimtype = claimsPrincipal.Claims.FirstOrDefault(item => item.Value.Contains("@") && item.Value.Contains("."));
+                    if (emailclaimtype != null)
+                    {
+                        _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, "Please Verify If \"{ClaimType}\" Is A Valid Email Claim Type For The Provider And Update Your External Login Settings Accordingly", emailclaimtype.Type);
+                    }
+                    else
+                    {
+                        _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, "Provider Did Not Return An Email To Uniquely Identify The User.");
+                    }
+                }
+                await httpContext.SignOutAsync();
+            }
+        }
+
+        private static bool EmailValid(string email, string domainfilter)
+        {
+            if (!string.IsNullOrEmpty(email) && email.Contains("@") && email.Contains("."))
+            {
+                var domains = domainfilter.ToLower().Split(',', StringSplitOptions.RemoveEmptyEntries);
+                foreach (var domain in domains)
+                {
+                    if (domain.StartsWith("!"))
+                    {
+                        if (email.ToLower().Contains(domain.Substring(1))) return false;
+                    }
+                    else
+                    {
+                        if (!email.ToLower().Contains(domain)) return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+    }
+}

Oqtane.Server/Extensions/OqtaneSiteIdentityBuilderExtensions.cs

@@ -0,0 +1,31 @@
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Models;
+using Microsoft.AspNetCore.Identity;
+using System;
+
+namespace Oqtane.Extensions
+{
+    public static class OqtaneSiteIdentityBuilderExtensions
+    {
+        public static OqtaneSiteOptionsBuilder WithSiteIdentity(this OqtaneSiteOptionsBuilder builder)
+        {
+            // site identity options
+            builder.AddSiteOptions<IdentityOptions>((options, alias, sitesettings) =>
+            {
+                // password options
+                options.Password.RequiredLength = int.Parse(sitesettings.GetValue("IdentityOptions:Password:RequiredLength", options.Password.RequiredLength.ToString()));
+                options.Password.RequiredUniqueChars = int.Parse(sitesettings.GetValue("IdentityOptions:Password:RequiredUniqueChars", options.Password.RequiredUniqueChars.ToString()));
+                options.Password.RequireDigit = bool.Parse(sitesettings.GetValue("IdentityOptions:Password:RequireDigit", options.Password.RequireDigit.ToString()));
+                options.Password.RequireUppercase = bool.Parse(sitesettings.GetValue("IdentityOptions:Password:RequireUppercase", options.Password.RequireUppercase.ToString()));
+                options.Password.RequireLowercase = bool.Parse(sitesettings.GetValue("IdentityOptions:Password:RequireLowercase", options.Password.RequireLowercase.ToString()));
+                options.Password.RequireNonAlphanumeric = bool.Parse(sitesettings.GetValue("IdentityOptions:Password:RequireNonAlphanumeric", options.Password.RequireNonAlphanumeric.ToString()));
+
+                // lockout options
+                options.Lockout.MaxFailedAccessAttempts = int.Parse(sitesettings.GetValue("IdentityOptions:Password:MaxFailedAccessAttempts", options.Lockout.MaxFailedAccessAttempts.ToString()));
+                options.Lockout.DefaultLockoutTimeSpan = TimeSpan.Parse(sitesettings.GetValue("IdentityOptions:Password:DefaultLockoutTimeSpan", options.Lockout.DefaultLockoutTimeSpan.ToString()));
+            });
+
+            return builder;
+        }
+    }
+}

Oqtane.Server/Extensions/OqtaneSiteOptionsBuilder.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+using Oqtane.Infrastructure;
+using Oqtane.Models;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public partial class OqtaneSiteOptionsBuilder
+    {
+        public IServiceCollection Services { get; set; }
+
+        public OqtaneSiteOptionsBuilder(IServiceCollection services)
+        {
+            Services = services;
+        }
+
+        public OqtaneSiteOptionsBuilder AddSiteOptions<TOptions>(
+            Action<TOptions, Alias, Dictionary<string, string>> action) where TOptions : class, new()
+        {
+            Services.TryAddSingleton<IOptionsMonitorCache<TOptions>, SiteOptionsCache<TOptions>>();
+            Services.AddSingleton<ISiteOptions<TOptions>, SiteOptions<TOptions>> (sp => new SiteOptions<TOptions>(action));
+            Services.TryAddTransient<IOptionsFactory<TOptions>, SiteOptionsFactory<TOptions>>();
+            Services.TryAddScoped<IOptionsSnapshot<TOptions>>(sp => BuildOptionsManager<TOptions>(sp));
+            Services.TryAddSingleton<IOptions<TOptions>>(sp => BuildOptionsManager<TOptions>(sp));
+
+            return this;
+        }
+
+        private static SiteOptionsManager<TOptions> BuildOptionsManager<TOptions>(IServiceProvider sp)
+            where TOptions : class, new()
+        {
+            var cache = ActivatorUtilities.CreateInstance(sp, typeof(SiteOptionsCache<TOptions>));
+            return (SiteOptionsManager<TOptions>)ActivatorUtilities.CreateInstance(sp, typeof(SiteOptionsManager<TOptions>), new[] { cache });
+        }
+
+    }
+}

Oqtane.Server/Extensions/StringExtensions.cs

@@ -1,7 +1,5 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.StaticFiles;
-using Oqtane.Models;
 
 namespace Oqtane.Extensions
 {

Oqtane.Server/Infrastructure/AliasAccessor.cs

@@ -0,0 +1,18 @@
+using Microsoft.AspNetCore.Http;
+using Oqtane.Extensions;
+using Oqtane.Models;
+
+namespace Oqtane.Infrastructure
+{
+    public class AliasAccessor : IAliasAccessor
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AliasAccessor(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public Alias Alias => _httpContextAccessor.HttpContext.GetAlias();
+    }
+}

Oqtane.Server/Infrastructure/ConfigManager.cs

@@ -100,7 +100,7 @@ namespace Oqtane.Infrastructure
                 switch (action)
                 {
                     case "set":
-                        jsonObj[currentSection] = value;
+                        jsonObj[currentSection] = JToken.FromObject(value);
                         break;
                     case "remove":
                         if (jsonObj.Property(currentSection) != null)

Oqtane.Server/Infrastructure/DatabaseManager.cs

@@ -28,14 +28,14 @@ namespace Oqtane.Infrastructure
 {
     public class DatabaseManager : IDatabaseManager
     {
-        private readonly IConfigurationRoot _config;
+        private readonly IConfigManager _config;
         private readonly IServiceScopeFactory _serviceScopeFactory;
         private readonly IWebHostEnvironment _environment;
         private readonly IMemoryCache _cache;
         private readonly IConfigManager _configManager;
         private readonly ILogger<DatabaseManager> _filelogger;
 
-        public DatabaseManager(IConfigurationRoot config, IServiceScopeFactory serviceScopeFactory, IWebHostEnvironment environment, IMemoryCache cache, IConfigManager configManager, ILogger<DatabaseManager> filelogger)
+        public DatabaseManager(IConfigManager config, IServiceScopeFactory serviceScopeFactory, IWebHostEnvironment environment, IMemoryCache cache, IConfigManager configManager, ILogger<DatabaseManager> filelogger)
         {
             _config = config;
             _serviceScopeFactory = serviceScopeFactory;
@@ -190,6 +190,10 @@ namespace Oqtane.Infrastructure
                                 if (result.Success)
                                 {
                                     result = CreateSite(install);
+                                    if (result.Success)
+                                    {
+                                        result = MigrateSites();
+                                    }
                                 }
                             }
                         }
@@ -620,35 +624,12 @@ namespace Oqtane.Infrastructure
                                             LastIPAddress = "",
                                             LastLoginOn = null
                                         };
-
                                         user = users.AddUser(user);
+
+                                        // add host role
                                         var hostRoleId = roles.GetRoles(user.SiteId, true).FirstOrDefault(item => item.Name == RoleNames.Host)?.RoleId ?? 0;
                                         var userRole = new UserRole { UserId = user.UserId, RoleId = hostRoleId, EffectiveDate = null, ExpiryDate = null };
                                         userRoles.AddUserRole(userRole);
-
-                                        // add user folder
-                                        var folder = folders.GetFolder(user.SiteId, Utilities.PathCombine("Users", Path.DirectorySeparatorChar.ToString()));
-                                        if (folder != null)
-                                        {
-                                            folders.AddFolder(new Folder
-                                            {
-                                                SiteId = folder.SiteId,
-                                                ParentId = folder.FolderId,
-                                                Name = "My Folder",
-                                                Type = FolderTypes.Private,
-                                                Path = Utilities.PathCombine(folder.Path, user.UserId.ToString(), Path.DirectorySeparatorChar.ToString()),
-                                                Order = 1,
-                                                ImageSizes = "",
-                                                Capacity = Constants.UserFolderCapacity,
-                                                IsSystem = true,
-                                                Permissions = new List<Permission>
-                                                {
-                                                    new Permission(PermissionNames.Browse, user.UserId, true),
-                                                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                                                    new Permission(PermissionNames.Edit, user.UserId, true),
-                                                }.EncodePermissions(),
-                                            });
-                                        }
                                     }
                                 }
                             }
@@ -688,6 +669,77 @@ namespace Oqtane.Infrastructure
             return result;
         }
 
+        private Installation MigrateSites()
+        {
+            var result = new Installation { Success = false, Message = string.Empty };
+
+            // get site upgrades
+            Dictionary<string, Type> siteupgrades = new Dictionary<string, Type>();
+            var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
+            foreach (Assembly assembly in assemblies)
+            {
+                foreach (var type in assembly.GetTypes(typeof(ISiteMigration)))
+                {
+                    if (Attribute.IsDefined(type, typeof(SiteMigrationAttribute)))
+                    {
+                        var attribute = (SiteMigrationAttribute)Attribute.GetCustomAttribute(type, typeof(SiteMigrationAttribute));
+                        siteupgrades.Add(attribute.AliasName + " " + attribute.Version, type);
+                    }
+                }
+            }
+
+            // execute site upgrades
+            if (siteupgrades.Count > 0)
+            {
+                using (var scope = _serviceScopeFactory.CreateScope())
+                {
+                    var aliases = scope.ServiceProvider.GetRequiredService<IAliasRepository>();
+                    var tenantManager = scope.ServiceProvider.GetRequiredService<ITenantManager>();
+                    var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
+                    var logger = scope.ServiceProvider.GetRequiredService<ILogManager>();
+
+                    foreach (var alias in aliases.GetAliases().ToList().Where(item => item.IsDefault))
+                    {
+                        foreach (var upgrade in siteupgrades)
+                        {
+                            var aliasname = upgrade.Key.Split(' ').First();
+                            // in the future this equality condition could use RegEx to allow for more flexible matching 
+                            if (string.Equals(alias.Name, aliasname, StringComparison.OrdinalIgnoreCase))
+                            {
+                                tenantManager.SetTenant(alias.TenantId);
+                                var site = sites.GetSites().FirstOrDefault(item => item.SiteId == alias.SiteId);
+                                if (site != null)
+                                {
+                                    var version = upgrade.Key.Split(' ').Last();
+                                    if (string.IsNullOrEmpty(site.Version) || Version.Parse(version) > Version.Parse(site.Version))
+                                    {
+                                        try
+                                        {
+                                            var obj = Activator.CreateInstance(upgrade.Value) as ISiteMigration;
+                                            if (obj != null)
+                                            {
+                                                obj.Up(site, alias);
+                                                site.Version = version;
+                                                sites.UpdateSite(site);
+                                                logger.Log(alias.SiteId, Shared.LogLevel.Information, "Site Migration", LogFunction.Other, "Site Migrated Successfully To Version {version} For {Alias}", version, alias.Name);
+                                            }
+                                        }
+                                        catch (Exception ex)
+                                        {
+                                            logger.Log(alias.SiteId, Shared.LogLevel.Error, "Site Migration", LogFunction.Other, "An Error Occurred Executing Site Migration {Type} For {Alias} And Version {Version} {Error}", upgrade.Value, alias.Name, version, ex.Message);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            result.Success = true;
+            return result;
+        }
+
         private string DenormalizeConnectionString(string connectionString)
         {
             var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();

Oqtane.Server/Infrastructure/InstallationManager.cs

@@ -125,6 +125,12 @@ namespace Oqtane.Infrastructure
                                 case "ref": // ref/net*/...
                                     filename = ExtractFile(entry, Path.Combine(binPath, "ref"), 2);
                                     break;
+                                case "refs": // refs/net*/...
+                                    filename = ExtractFile(entry, Path.Combine(binPath, "refs"), 2);
+                                    break;
+                                case "content": // content/...
+                                    filename = ExtractFile(entry, contentRootPath, 0);
+                                    break;
                             }
 
                             if (filename != "")

Oqtane.Server/Infrastructure/Interfaces/IAliasAccessor.cs

@@ -0,0 +1,9 @@
+using Oqtane.Models;
+
+namespace Oqtane.Infrastructure
+{
+    public interface IAliasAccessor 
+    {
+        Alias Alias { get; }
+    }
+}

Oqtane.Server/Infrastructure/Interfaces/IInstallable.cs

@@ -1,5 +1,3 @@
-using Microsoft.EntityFrameworkCore;
-using Oqtane.Enums;
 using Oqtane.Models;
 
 namespace Oqtane.Infrastructure

Oqtane.Server/Infrastructure/Interfaces/ISiteMigration.cs

@@ -0,0 +1,10 @@
+using Oqtane.Models;
+
+namespace Oqtane.Infrastructure
+{
+    public interface ISiteMigration
+    {
+        void Up(Site site, Alias alias);
+        void Down(Site site, Alias alias); // for future use (if necessary)
+    }
+}

Oqtane.Server/Infrastructure/Interfaces/SiteMigrationAttribute.cs

@@ -0,0 +1,27 @@
+using System;
+
+namespace Oqtane.Infrastructure
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class SiteMigrationAttribute : Attribute
+    {
+        private string aliasname;
+        private string version;
+
+        public SiteMigrationAttribute(string AliasName, string Version)
+        {
+            aliasname = AliasName;
+            version = Version;
+        }
+
+        public virtual string AliasName
+        {
+            get { return aliasname; }
+        }
+
+        public virtual string Version
+        {
+            get { return version; }
+        }
+    }
+}