Merge pull request #2169 from oqtane/master

Merge pull request #2168 from oqtane/dev

.gitignore

@@ -12,9 +12,7 @@ msbuild.binlog
 *.idea
 
 Oqtane.Server/appsettings.json
-Oqtane.Server/Data/*.mdf
-Oqtane.Server/Data/*.ldf
-Oqtane.Server/Data/*.db
+Oqtane.Server/Data
 
 /Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
 Oqtane.Server/Content
@@ -22,3 +20,10 @@ Oqtane.Server/Packages
 Oqtane.Server/wwwroot/Content
 Oqtane.Server/wwwroot/Packages/*.log
 
+Oqtane.Server/wwwroot/Modules
+!Oqtane.Server/wwwroot/Modules/Oqtane.Modules.*
+!Oqtane.Server/wwwroot/Modules/Templates
+
+Oqtane.Server/wwwroot/Themes
+!Oqtane.Server/wwwroot/Themes/Oqtane.Themes.*
+!Oqtane.Server/wwwroot/Themes/Templates

LICENSE

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

Oqtane.Client/App.razor

@@ -30,38 +30,41 @@
 }
 
 @code {
-    [Parameter]
-    public string AntiForgeryToken { get; set; }
+	[Parameter]
+	public string AntiForgeryToken { get; set; }
 
-    [Parameter]
-    public string Runtime { get; set; }
+	[Parameter]
+	public string Runtime { get; set; }
 
-    [Parameter]
-    public string RenderMode { get; set; }
+	[Parameter]
+	public string RenderMode { get; set; }
 
-    [Parameter]
-    public int VisitorId { get; set; }
+	[Parameter]
+	public int VisitorId { get; set; }
 
-    private bool _initialized = false;
-    private string _display = "display: none;";
-    private Installation _installation = new Installation { Success = false, Message = "" };
+	[Parameter]
+	public string RemoteIPAddress { get; set; }
 
-    private PageState PageState { get; set; }
+	[Parameter]
+	public string AuthorizationToken { get; set; }
 
-    protected override async Task OnParametersSetAsync()
-    {
-        SiteState.AntiForgeryToken = AntiForgeryToken;
-        InstallationService.SetAntiForgeryTokenHeader(AntiForgeryToken);
+	private bool _initialized = false;
+	private string _display = "display: none;";
+	private Installation _installation = new Installation { Success = false, Message = "" };
+
+	private PageState PageState { get; set; }
+
+	protected override async Task OnParametersSetAsync()
+	{
+		SiteState.RemoteIPAddress = RemoteIPAddress;
+		SiteState.AntiForgeryToken = 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/Controls/MySQLConfig.razor

@@ -28,7 +28,7 @@
 <div class="row mb-1 align-items-center">
     <Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
     <div class="col-sm-9">
-        <input id="pwd" type="password" class="form-control" @bind="@_pwd" />
+        <input id="pwd" type="password" class="form-control" @bind="@_pwd" autocomplete="new-password" />
     </div>
 </div>
 

Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor

@@ -40,7 +40,7 @@
     <div class="row mb-1 align-items-center">
         <Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
         <div class="col-sm-9">
-            <input id="pwd" type="password" class="form-control" @bind="@_pwd" />
+            <input id="pwd" type="password" class="form-control" @bind="@_pwd" autocomplete="new-password" />
         </div>
     </div>
 }

Oqtane.Client/Installer/Controls/SqlServerConfig.razor

@@ -35,7 +35,7 @@
     <div class="row mb-1 align-items-center">
         <Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
         <div class="col-sm-9">
-            <input id="pwd" type="password" class="form-control" @bind="@_pwd" />
+            <input id="pwd" type="password" class="form-control" @bind="@_pwd" autocomplete="new-password" />
         </div>
     </div>
 }

Oqtane.Client/Installer/Installer.razor

@@ -62,13 +62,19 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="Provide a password for the primary user account" ResourceKey="Password">Password:</Label>
                     <div class="col-sm-9">
-                        <input id="password" type="password" class="form-control" @bind="@_hostPassword" />
+						<div class="input-group">
+							<input id="password" type="@_passwordtype" class="form-control" @bind="@_hostPassword" autocomplete="new-password" />
+							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+						</div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="confirm" HelpText="Please confirm the password entered above by entering it again" ResourceKey="Confirm">Confirm:</Label>
                     <div class="col-sm-9">
-                        <input id="confirm" type="password" class="form-control" @bind="@_confirmPassword" />
+						<div class="input-group">
+							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirmPassword" autocomplete="new-password" />
+							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+						</div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -104,6 +110,8 @@
 
 	private string _hostUsername = string.Empty;
 	private string _hostPassword = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
 	private string _confirmPassword = string.Empty;
 	private string _hostEmail = string.Empty;
 	private bool _register = true;
@@ -112,6 +120,7 @@
 
 	protected override async Task OnInitializedAsync()
 	{
+		_togglepassword = SharedLocalizer["ShowPassword"];
 		_databases = await DatabaseService.GetDatabasesAsync();
 		if (_databases.Exists(item => item.IsDefault))
 		{
@@ -121,94 +130,115 @@
 		{
 			_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
         {
             _message = Localizer["Message.Require.DbInfo"];
         }
     }
+
+	private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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

@@ -36,7 +36,9 @@
                     <option value="m">@Localizer["Minute(s)"]</option>
                     <option value="H">@Localizer["Hour(s)"]</option>
                     <option value="d">@Localizer["Day(s)"]</option>
+                    <option value="w">@Localizer["Week(s)"]</option>
                     <option value="M">@Localizer["Month(s)"]</option>
+                    <option value="O">@Localizer["Once"]</option>
                 </select>
             </div>
         </div>
@@ -95,82 +97,89 @@
 </form>
 
 @code {
-    private ElementReference form;
-    private bool validated = false;
-    private int _jobId;
-    private string _name = string.Empty;
-    private string _jobType = string.Empty;
-    private string _isEnabled = "True";
-    private string _interval = string.Empty;
-    private string _frequency = string.Empty;
-    private DateTime? _startDate = null;
-    private string _startTime = string.Empty;
-    private DateTime? _endDate = null;
-    private string _endTime = string.Empty;
-    private string _retentionHistory = string.Empty;
-    private DateTime? _nextDate = null;
-    private string _nextTime = string.Empty;
-    private string createdby;
-    private DateTime createdon;
-    private string modifiedby;
-    private DateTime modifiedon;
+	private ElementReference form;
+	private bool validated = false;
+	private int _jobId;
+	private string _name = string.Empty;
+	private string _jobType = string.Empty;
+	private string _isEnabled = "True";
+	private string _interval = string.Empty;
+	private string _frequency = string.Empty;
+	private DateTime? _startDate = null;
+	private string _startTime = string.Empty;
+	private DateTime? _endDate = null;
+	private string _endTime = string.Empty;
+	private string _retentionHistory = string.Empty;
+	private DateTime? _nextDate = null;
+	private string _nextTime = string.Empty;
+	private string createdby;
+	private DateTime createdon;
+	private string modifiedby;
+	private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _jobId = Int32.Parse(PageState.QueryString["id"]);
-            Job job = await JobService.GetJobAsync(_jobId);
-            if (job != null)
-            {
-                _name = job.Name;
-                _jobType = job.JobType;
-                _isEnabled = job.IsEnabled.ToString();
-                _interval = job.Interval.ToString();
-                _frequency = job.Frequency;
-                _startDate = job.StartDate;
-                if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
-                {
-                    _startTime = job.StartDate.Value.ToString("HH:mm");
-                }
-                _endDate = job.EndDate;
-                if (job.EndDate != null && job.EndDate.Value.TimeOfDay.TotalSeconds != 0)
-                {
-                    _endTime = job.EndDate.Value.ToString("HH:mm");
-                }
-                _retentionHistory = job.RetentionHistory.ToString();
-                _nextDate = job.NextExecution;
-                if (job.NextExecution != null && job.NextExecution.Value.TimeOfDay.TotalSeconds != 0)
-                {
-                    _nextTime = job.NextExecution.Value.ToString("HH:mm");
-                }
-                createdby = job.CreatedBy;
-                createdon = job.CreatedOn;
-                modifiedby = job.ModifiedBy;
-                modifiedon = job.ModifiedOn;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
-            AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_jobId = Int32.Parse(PageState.QueryString["id"]);
+			Job job = await JobService.GetJobAsync(_jobId);
+			if (job != null)
+			{
+				_name = job.Name;
+				_jobType = job.JobType;
+				_isEnabled = job.IsEnabled.ToString();
+				_interval = job.Interval.ToString();
+				_frequency = job.Frequency;
+				_startDate = job.StartDate;
+				if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
+				{
+					_startTime = job.StartDate.Value.ToString("HH:mm");
+				}
+				_endDate = job.EndDate;
+				if (job.EndDate != null && job.EndDate.Value.TimeOfDay.TotalSeconds != 0)
+				{
+					_endTime = job.EndDate.Value.ToString("HH:mm");
+				}
+				_retentionHistory = job.RetentionHistory.ToString();
+				_nextDate = job.NextExecution;
+				if (job.NextExecution != null && job.NextExecution.Value.TimeOfDay.TotalSeconds != 0)
+				{
+					_nextTime = job.NextExecution.Value.ToString("HH:mm");
+				}
+				createdby = job.CreatedBy;
+				createdon = job.CreatedOn;
+				modifiedby = job.ModifiedBy;
+				modifiedon = job.ModifiedOn;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
+			AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
+		}
+	}
 
-    private async Task SaveJob()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
-        {
-            var job = await JobService.GetJobAsync(_jobId);
-            job.Name = _name;
-            job.JobType = _jobType;
-            job.IsEnabled = Boolean.Parse(_isEnabled);
-            job.Frequency = _frequency;
-            job.Interval = int.Parse(_interval);
+	private async Task SaveJob()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			var job = await JobService.GetJobAsync(_jobId);
+			job.Name = _name;
+			job.JobType = _jobType;
+			job.IsEnabled = Boolean.Parse(_isEnabled);
+			job.Frequency = _frequency;
+			if (job.Frequency == "O") // once
+			{
+				job.Interval = 1;
+			}
+			else
+			{
+				job.Interval = int.Parse(_interval);
+			}
             job.StartDate = _startDate;
             if (job.StartDate != null)
             {

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

@@ -36,75 +36,75 @@ else
             <td>@context.NextExecution</td>
             <td>
                 @if (context.IsStarted)
-                    {
+                {
                     <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">@Localizer["Stop"]</button>
-                    }
-                    else
-                    {
+                }
+                else
+                {
                     <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">@Localizer["Start"]</button>
-                    }
+                }
             </td>
         </Row>
     </Pager>
 }
 
 @code {
-    private List<Job> _jobs;
+	private List<Job> _jobs;
 
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+	public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
 
-    protected override async Task OnParametersSetAsync()
-    {
-        _jobs = await JobService.GetJobsAsync();
-    }
+	protected override async Task OnParametersSetAsync()
+	{
+		_jobs = await JobService.GetJobsAsync();
+	}
 
-    private string DisplayStatus(bool isEnabled, bool isExecuting)
-    {
-        var status = string.Empty;
-        if (!isEnabled)
-        {
-            status = Localizer["Disabled"];
-        }
-        else
-        {
-            if (isExecuting)
-            {
-                status = Localizer["Executing"];
-            }
-            else
-            {
-                status = Localizer["Idle"];
-            }
-        }
+	private string DisplayStatus(bool isEnabled, bool isExecuting)
+	{
+		var status = string.Empty;
+		if (!isEnabled)
+		{
+			status = Localizer["Disabled"];
+		}
+		else
+		{
+			if (isExecuting)
+			{
+				status = Localizer["Executing"];
+			}
+			else
+			{
+				status = Localizer["Idle"];
+			}
+		}
 
-        return status;
-    }
+		return status;
+	}
 
 
-    private string DisplayFrequency(int interval, string frequency)
-    {
-        var result = $"{Localizer["Every"]} {interval.ToString()} ";
-        switch (frequency)
-        {
-            case "m":
-                result += Localizer["Minute"];
-                break;
-            case "H":
-                result += Localizer["Hour"];
-                break;
-            case "d":
-                result += Localizer["Day"];
-                break;
-            case "M":
-                result += Localizer["Month"];
-                break;
-        }
-
-        if (interval > 1)
-        {
-            result += Localizer["s"];
-        }
-
+	private string DisplayFrequency(int interval, string frequency)
+	{
+		var result = "";
+		switch (frequency)
+		{
+			case "m":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Minute"];
+				break;
+			case "H":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Hour"];
+				break;
+			case "d":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Day"];
+				break;
+			case "w":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Week"];
+				break;
+			case "M":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Month"];
+				break;
+			case "O":
+				result = Localizer["Once"];
+				break;
+		}
         return result;
     }
 
@@ -114,6 +114,7 @@ else
         {
             await JobService.DeleteJobAsync(job.JobId);
             await logger.LogInformation("Job Deleted {Job}", job);
+			_jobs = await JobService.GetJobsAsync();
             StateHasChanged();
         }
         catch (Exception ex)
@@ -125,12 +126,36 @@ else
 
     private async Task StartJob(int jobId)
     {
-        await JobService.StartJobAsync(jobId);
+        try
+        {
+			await JobService.StartJobAsync(jobId);
+            await logger.LogInformation("Job Started {JobId}", jobId);
+            AddModuleMessage(Localizer["Message.Job.Start"], MessageType.Success);
+			_jobs = await JobService.GetJobsAsync();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Starting Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Start"], MessageType.Error);
+        }
     }
 
     private async Task StopJob(int jobId)
     {
-        await JobService.StopJobAsync(jobId);
+        try
+        {
+			await JobService.StopJobAsync(jobId);
+            await logger.LogInformation("Job Stopped {JobId}", jobId);
+            AddModuleMessage(Localizer["Message.Job.Stop"], MessageType.Success);
+			_jobs = await JobService.GetJobsAsync();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Stopping Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Stop"], MessageType.Error);
+        }
     }
 
     private async Task Refresh()

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

@@ -84,7 +84,7 @@ else
             var package = _packages.Where(item => item.PackageId == (Constants.PackageId + ".Client." + code)).FirstOrDefault();
             if (package != null)
             {
-                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
+                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0);
             }
 
         }

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,301 @@
 		<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 = SharedLocalizer["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") && !string.IsNullOrEmpty(_username))
+			{
+				var user = new User();
+				user.SiteId = PageState.Site.SiteId;
+				user.Username = _username;
 
-                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 (PageState.QueryString.ContainsKey("key"))
+				{
+					user = await UserService.LinkUserAsync(user, PageState.QueryString["token"], PageState.Site.Settings["ExternalLogin:ProviderType"], PageState.QueryString["key"], PageState.Site.Settings["ExternalLogin:ProviderName"]);
+					if (user != null)
+					{
+						await logger.LogInformation(LogFunction.Security, "External Login Linkage Successful For Username {Username}", _username);
+						AddModuleMessage(Localizer["Success.Account.Linked"], MessageType.Info);						
+					}
+					else
+					{
+						await logger.LogError(LogFunction.Security, "External Login Linkage Failed For Username {Username}", _username);
+						AddModuleMessage(Localizer["Message.Account.NotLinked"], MessageType.Warning);						
+					}
+					_username = "";
+				}
+				else
+				{
+					user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
+					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.NotVerified"], MessageType.Warning);						
+					}
+				}
+			}
+			else
+			{
+				if (PageState.QueryString.ContainsKey("status"))
+				{
+					AddModuleMessage(Localizer["ExternalLoginStatus." + PageState.QueryString["status"]], MessageType.Info);
+				}
+			}
+		}
+		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 = "Please Check The Email Address Associated To Your User Account For A Password Reset Notification";
-            }
-            else
-            {
-                _message = "User Does Not Exist";
-                _type = MessageType.Warning;
-            }
-        }
-        else
-        {
-            _message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again";
-        }
+	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);
+				}
+				else
+				{
+					user = await UserService.VerifyTwoFactorAsync(user, _code);
+				}
+
+				if (user.IsAuthenticated)
+				{
+					await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
+
+					// post back 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
+				{
+					if (PageState.Site.Settings["LoginOptions:TwoFactor"] == "required" || 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 = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["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

@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
 @inject ILogService LogService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -10,73 +11,92 @@
 }
 else
 {
-    <div class="container g-0">
-        <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))">
-                    <option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
-                    <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>
-                </select>
-            </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))">
-                    <option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
-                    <option value="Create">@Localizer["Create"]</option>
-                    <option value="Read">@Localizer["Read"]</option>
-                    <option value="Update">@SharedLocalizer["Update"]</option>
-                    <option value="Delete">@SharedLocalizer["Delete"]</option>
-                    <option value="Security">@Localizer["Security"]</option>
-                    <option value="Other">@Localizer["Other"]</option>
-                </select>
-            </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))">
-                    <option value="10">10</option>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                </select>
-            </div>
-        </div>
-    </div>
+    <TabStrip>
+        <TabPanel Name="Events" Heading="Events" ResourceKey="Events">
+			<div class="container g-0">
+				<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" 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>
+							<option value="Information">@Localizer["Information"]</option>
+							<option value="Warning">@Localizer["Warning"]</option>
+							<option value="Error">@Localizer["Error"]</option>
+							<option value="Critical">@Localizer["Critical"]</option>
+						</select>
+					</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" 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>
+							<option value="Update">@SharedLocalizer["Update"]</option>
+							<option value="Delete">@SharedLocalizer["Delete"]</option>
+							<option value="Security">@Localizer["Security"]</option>
+							<option value="Other">@Localizer["Other"]</option>
+						</select>
+					</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" value="@_rows" @onchange="(e => RowsChanged(e))">
+							<option value="10">10</option>
+							<option value="50">50</option>
+							<option value="100">100</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br />
 
-    @if (_logs.Any())
-    {
-        <Pager Items="@_logs">
-            <Header>
-				<th style="width: 1px;">&nbsp;</th>
-				<th>@Localizer["Date"]</th>
-				<th>@Localizer["Level"]</th>
-				<th>@Localizer["Feature"]</th>
-				<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)">@context.LogDate</td>
-                <td class="@GetClass(context.Function)">@context.Level</td>
-                <td class="@GetClass(context.Function)">@context.Feature</td>
-                <td class="@GetClass(context.Function)">@context.Function</td>
-            </Row>
-        </Pager>
-    }
-    else
-    {
-        <p><em>@Localizer["NoLogs"]</em></p>
-    }
+			@if (_logs.Any())
+			{
+				<Pager Items="@_logs" CurrentPage="@_page.ToString()" OnPageChange="OnPageChange">
+					<Header>
+						<th style="width: 1px;">&nbsp;</th>
+						<th>@Localizer["Date"]</th>
+						<th>@Localizer["Level"]</th>
+						<th>@Localizer["Feature"]</th>
+						<th>@Localizer["Function"]</th>
+					</Header>
+					<Row>
+						<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>
+						<td class="@GetClass(context.Function)">@context.Function</td>
+					</Row>
+				</Pager>
+			}
+			else
+			{
+				<p><em>@Localizer["NoLogs"]</em></p>
+			}
+		</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="retention" HelpText="Number of days of events to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+						<input id="retention" class="form-control" @bind="@_retention" />
+					</div>
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+	</TabStrip>
 }
 
 @code {
     private string _level = "-";
     private string _function = "-";
     private string _rows = "10";
+	private int _page = 1;
     private List<Log> _logs;
+    private string _retention = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -84,7 +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();
+
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			_retention = SettingService.GetSetting(settings, "LogRetention", "30");
         }
         catch (Exception ex)
         {
@@ -170,4 +210,27 @@ else
         }
         return classname;
     }
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			settings = SettingService.SetSetting(settings, "LogRetention", _retention, true);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+
+			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+		}
+	}
+
+	private void OnPageChange(int page)
+	{
+		_page = page;	
+	}
+
 }

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

@@ -128,7 +128,7 @@ else
                 var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
                 moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
 
-                var settings = ModuleState.Settings;
+				var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
                 SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
                 await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
 

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

@@ -81,7 +81,7 @@
     private List<Template> _templates;
     private string _template = "-";
     private string[] _versions;
-    private string _reference = Constants.Version;
+    private string _reference = "local";
     private string _minversion = "2.0.0";
     private string _location = string.Empty;
 

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>
                 }
@@ -50,9 +50,12 @@ else
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>
             <td>
-                @if (UpgradeAvailable(context.PackageName, context.Version))
+				@{ 
+					var version = UpgradeAvailable(context.PackageName, context.Version);
+				} 
+                @if (version != context.Version)
                 {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
                 }
             </td>
         </Row>
@@ -60,62 +63,60 @@ else
 }
 
 @code {
-    private List<ModuleDefinition> _moduleDefinitions;
-    private List<Package> _packages;
+	private List<ModuleDefinition> _moduleDefinitions;
+	private List<Package> _packages;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnParametersSetAsync()
-    {
-        try
-        {
-            _moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-            _packages = await PackageService.GetPackagesAsync("module");
+	protected override async Task OnParametersSetAsync()
+	{
+		try
+		{
+			_moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+			_packages = await PackageService.GetPackagesAsync("module");
+		}
+		catch (Exception ex)
+		{
+			if (_moduleDefinitions == null)
+			{
+				await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
+				AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
+			}
+		}
+	}
+
+	private string PurchaseLink(string packagename)
+	{
+		string link = "";
+		if (!string.IsNullOrEmpty(packagename) && _packages != null)
+		{
+			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+			if (package != null)
+			{
+				if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
+				{
+					link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+					if (!string.IsNullOrEmpty(package.PaymentUrl))
+					{
+						link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>";
+					}
+				}
+			}
+		}
+		return link;
+	}
+
+	private string UpgradeAvailable(string packagename, string version)
+	{
+		if (!string.IsNullOrEmpty(packagename) && _packages != null)
+		{
+			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+			if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+			{
+				return package.Version;
+			}
         }
-        catch (Exception ex)
-        {
-            if (_moduleDefinitions == null)
-            {
-                await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
-                AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
-            }
-        }
-    }
-
-    private string PurchaseLink(string packagename)
-    {
-        string link = "";
-        if (!string.IsNullOrEmpty(packagename) && _packages != null)
-        {
-            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
-            if (package != null)
-            {
-                if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
-                {
-                    link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
-                    if (!string.IsNullOrEmpty(package.PaymentUrl))
-                    {
-                        link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>";
-                    }
-                }
-            }
-        }
-        return link;
-    }
-
-    private bool UpgradeAvailable(string packagename, string version)
-    {
-        var upgradeavailable = false;
-        if (!string.IsNullOrEmpty(packagename) && _packages != null)
-        {
-            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
-            if (package != null)
-            {
-                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
-            }
-
-        }
-        return upgradeavailable;
+        return version;
     }
 
     private async Task DownloadModule(string packagename, string version)

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

@@ -27,19 +27,25 @@
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="password" HelpText="Please choose a sufficiently secure password and enter it here" ResourceKey="Password"></Label>
                         <div class="col-sm-9">
-                            <input id="password" type="password" class="form-control" @bind="@_password" autocomplete="new-password" required />
+							<div class="input-group">
+								<input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
+								<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+							</div>
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="confirm" HelpText="Enter your password again to confirm it matches the value entered above" ResourceKey="Confirm"></Label>
                         <div class="col-sm-9">
-                            <input id="confirm" type="password" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+							<div class="input-group">
+								<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+								<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+							</div>
                         </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">
-                            <input id="email" class="form-control" @bind="@_email" maxlength="256" required />
+							<input id="email" class="form-control" @bind="@_email" maxlength="256" required />
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
@@ -62,15 +68,22 @@ else
 }
 
 @code {
-    private string _username = string.Empty;
-    private ElementReference form;
-    private bool validated = false;
-    private string _password = string.Empty;
-    private string _confirm = string.Empty;
-    private string _email = string.Empty;
-    private string _displayname = string.Empty;
+	private string _username = string.Empty;
+	private ElementReference form;
+	private bool validated = false;
+	private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
+	private string _confirm = string.Empty;
+	private string _email = string.Empty;
+	private string _displayname = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+
+	protected override void OnParametersSet()
+	{
+		_togglepassword = SharedLocalizer["ShowPassword"];
+	}
 
     private async Task Register()
     {
@@ -90,9 +103,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);
 
@@ -133,4 +147,18 @@ else
     {
         NavigationManager.NavigateTo(NavigateUrl(string.Empty));
     }
+
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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

@@ -7,41 +7,59 @@
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
-        <div class="form-group">
-            <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
-            <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username" />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="username" HelpText="Your username will be populated from the link you received in the password reset notification" ResourceKey="Username">Username: </Label>
+            <div class="col-sm-9">
+                <input id="username" type="text" class="form-control" @bind="@_username" readonly />
+            </div>
         </div>
-        <div class="form-group">
-            <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
-            <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" required />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="password" HelpText="The new password. It must satisfy complexity rules for the site." ResourceKey="Password">Password: </Label>
+            <div class="col-sm-9">
+				<div class="input-group">
+					<input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
+					<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+				</div>
+            </div>
         </div>
-        <div class="form-group">
-            <label for="Confirm" class="control-label">@Localizer["Password.Confirm"] </label>
-            <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" required />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="confirm" HelpText="Enter the password again. It must exactly match the password entered above." ResourceKey="Confirm">Confirm: </Label>
+            <div class="col-sm-9">
+				<div class="input-group">
+					<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+					<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+				</div>
+            </div>
         </div>
-        <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button>
-        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
     </div>
+    <br />
+    <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button>
+    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
 </form>
 
 @code {
-    private ElementReference form;
-    private bool validated = false;
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private string _confirm = string.Empty;
+	private ElementReference form;
+	private bool validated = false;
+	private string _username = string.Empty;
+	private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
+	private string _confirm = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
-    protected override void OnInitialized()
-    {
-        if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
+	protected override async Task OnInitializedAsync()
+	{
+		_togglepassword = SharedLocalizer["ShowPassword"];
+
+		if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
         {
             _username = PageState.QueryString["name"];
         }
         else
         {
-            NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+            await logger.LogError(LogFunction.Security, "Invalid Attempt To Access User Password Reset");
+            NavigationManager.NavigateTo(NavigateUrl("")); // home page
         }
     }
 
@@ -102,4 +120,18 @@
     {
         NavigationManager.NavigateTo(NavigateUrl(string.Empty));
     }
+
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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>
@@ -93,11 +95,7 @@ else
             roleid = Int32.Parse(PageState.QueryString["id"]);
             Role role = await RoleService.GetRoleAsync(roleid);
             name = role.Name;
-            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            users = users
-                .Where(u => u.Role.Name == RoleNames.Registered)
-                .OrderBy(u => u.User.DisplayName)
-                .ToList();
+            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
             await GetUserRoles();
         }
         catch (Exception ex)
@@ -111,8 +109,7 @@ else
     {
         try
         {
-            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            userroles = userroles.Where(item => item.RoleId == roleid).ToList();
+            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, name);
         }
         catch (Exception ex)
         {

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

@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.Site
 @inherits ModuleBase
+@using System.Text.RegularExpressions
 @inject NavigationManager NavigationManager
 @inject ISiteService SiteService
 @inject ITenantService TenantService
@@ -22,81 +23,64 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="alias" HelpText="The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they should be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+                <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
                 <div class="col-sm-9">
-                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                    {
-                        <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
-                    }
-                    else
-                    {
-                        <textarea id="alias" class="form-control" @bind="@_urls" rows="3" readonly></textarea>
-                    }
+                    <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Is Deleted? </Label>
+                <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label>
                 <div class="col-sm-9">
-                    <select id="isDeleted" class="form-select" @bind="@_isdeleted" required>
-                        <option value="True">@SharedLocalizer["Yes"]</option>
-                        <option value="False">@SharedLocalizer["No"]</option>
+                    <FileManager FileId="@_faviconfileid" Filter="ico" @ref="_faviconfilemanager" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
+                        <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
+                        @foreach (var theme in _themes)
+                        {
+                            <option value="@theme.TypeName">@theme.Name</option>
+                        }
                     </select>
                 </div>
             </div>
-        </div>
-        <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance">
-            <div class="container">
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
-                    <div class="col-sm-9">
-                        <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label>
-                    <div class="col-sm-9">
-                        <FileManager FileId="@_faviconfileid" Filter="ico" @ref="_faviconfilemanager" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label>
-                    <div class="col-sm-9">
-                        <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
-                            <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
-                            @foreach (var theme in _themes)
-                            {
-                                <option value="@theme.TypeName">@theme.Name</option>
-                            }
-                        </select>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
-                    <div class="col-sm-9">
-                        <select id="defaultContainer" class="form-select" @bind="@_containertype" required>
-                            <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                            @foreach (var container in _containers)
-                            {
-                                <option value="@container.TypeName">@container.Name</option>
-                            }
-                        </select>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
-                    <div class="col-sm-9">
-                        <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype" required>
-                            <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                            <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
-                            @foreach (var container in _containers)
-                            {
-                                <option value="@container.TypeName">@container.Name</option>
-                            }
-                        </select>
-                    </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultContainer" class="form-select" @bind="@_containertype" required>
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                        @foreach (var container in _containers)
+                        {
+                            <option value="@container.TypeName">@container.Name</option>
+                        }
+                    </select>
                 </div>
             </div>
-        </Section>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype" required>
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                        <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
+                        @foreach (var container in _containers)
+                        {
+                            <option value="@container.TypeName">@container.Name</option>
+                        }
+                    </select>
+                </div>
+            </div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
+				<div class="col-sm-9">
+					<select id="isDeleted" class="form-select" @bind="@_isdeleted" required>
+						<option value="True">@SharedLocalizer["Yes"]</option>
+						<option value="False">@SharedLocalizer["No"]</option>
+					</select>
+				</div>
+			</div>
+		</div>
         <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
             <div class="container">
                 <div class="row mb-1 align-items-center">
@@ -136,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">
@@ -145,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>
@@ -174,8 +167,29 @@
                 </div>
             </div>
         </Section>
-        @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        @if (_aliases != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
+			<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
+                <div class="container">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="alias" HelpText="The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they should be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+						<div class="col-sm-9">
+							<textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="defaultalias" HelpText="The default alias for the site. Requests for non-default aliases will be redirected to the default alias." ResourceKey="DefaultAlias">Default Alias: </Label>
+						<div class="col-sm-9">
+                            <select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
+								@foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
+								{
+									<option value="@name">@name</option>
+								}
+                            </select>
+						</div>
+					</div>
+				</div>
+			</Section>
             <Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting">
                 <div class="container">
                     <div class="row mb-1 align-items-center">
@@ -238,7 +252,8 @@
 	private List<ThemeControl> _themes = new List<ThemeControl>();
 	private List<ThemeControl> _containers = new List<ThemeControl>();
 	private string _name = string.Empty;
-	private List<Alias> _aliasList;
+	private List<Alias> _aliases;
+	private string _defaultalias = string.Empty;
 	private string _urls = string.Empty;
 	private string _runtime = "";
 	private string _prerender = "";
@@ -254,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;
@@ -288,13 +306,7 @@
 
 				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 				{
-					_aliasList = await AliasService.GetAliasesAsync();
-					foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-					{
-						_urls += alias.Name + ",";
-					}
-					_urls = _urls.Substring(0, _urls.Length - 1);
-
+					await GetAliases();
 				}
 
 				if (site.LogoFileId != null)
@@ -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 = SharedLocalizer["ShowPassword"];
 				_smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
+				_retention = SettingService.GetSetting(settings, "NotificationRetention", "30");
 
 				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 				{
@@ -393,18 +407,22 @@
 		{
 			try
 			{
-				if (_name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-")
+				if (_name != string.Empty && _themetype != "-" && _containertype != "-")
 				{
 					var unique = true;
 					if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 					{
-						foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+						_urls = Regex.Replace(_urls, @"\r\n?|\n", ","); // convert line breaks to commas
+						var aliases = await AliasService.GetAliasesAsync();
+						foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
 						{
-							if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))
+							var alias = aliases.Where(item => item.Name == name).FirstOrDefault();
+							if (alias != null && unique)
 							{
-								unique = false;
+								unique = (alias.TenantId == PageState.Site.TenantId && alias.SiteId == PageState.Site.SiteId);
 							}
 						}
+						if (unique && string.IsNullOrEmpty(_defaultalias)) unique = false;
 					}
 
 					if (unique)
@@ -422,7 +440,6 @@
 								{
 									site.Runtime = _runtime;
 									site.RenderMode = _runtime + _prerender;
-									refresh = true;
 									reload = true; // needs to be reloaded on server
 								}
 							}
@@ -461,145 +478,190 @@
 							int? pwaappiconfileid = _pwaappiconfilemanager.GetFileId();
 							if (pwaappiconfileid == -1) pwaappiconfileid = null;
 							if (site.PwaAppIconFileId != pwaappiconfileid)
-                            {
-                                site.PwaAppIconFileId = pwaappiconfileid;
+							{
+								site.PwaAppIconFileId = pwaappiconfileid;
 								reload = true; // needs to be reloaded on server
-                            }
-                            int? pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
+							}
+							int? pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
 							if (pwasplashiconfileid == -1) pwasplashiconfileid = null;
-                            if (site.PwaSplashIconFileId != pwasplashiconfileid)
-                            {
-                                site.PwaSplashIconFileId = pwasplashiconfileid;
+							if (site.PwaSplashIconFileId != pwasplashiconfileid)
+							{
+								site.PwaSplashIconFileId = pwasplashiconfileid;
 								reload = true; // needs to be reloaded on server
-                            }
+							}
 
-                            site = await SiteService.UpdateSiteAsync(site);
+							site = await SiteService.UpdateSiteAsync(site);
 
-                            var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-                            SettingService.SetSetting(settings, "SMTPHost", _smtphost);
-                            SettingService.SetSetting(settings, "SMTPPort", _smtpport);
-                            SettingService.SetSetting(settings, "SMTPSSL", _smtpssl);
-                            SettingService.SetSetting(settings, "SMTPUsername", _smtpusername);
-                            SettingService.SetSetting(settings, "SMTPPassword", _smtppassword);
-                            SettingService.SetSetting(settings, "SMTPSender", _smtpsender);
-                            await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
+							var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+							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))
-                            {
-                                var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                                foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-                                {
-                                    if (!names.Contains(alias.Name))
-                                    {
-                                        await AliasService.DeleteAliasAsync(alias.AliasId);
-                                    }
-                                }
+							if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+							{
+								var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+									.Select(sValue => sValue.Trim()).ToArray();
+								foreach (Alias alias in _aliases)
+								{
+									if (!names.Contains(alias.Name.Trim()))
+									{
+										await AliasService.DeleteAliasAsync(alias.AliasId);
+									}
+								}
 
-                                foreach (string name in names)
-                                {
-                                    if (!_aliasList.Exists(item => item.Name == name))
-                                    {
-                                        Alias alias = new Alias();
-                                        alias.Name = name;
-                                        alias.TenantId = site.TenantId;
-                                        alias.SiteId = site.SiteId;
-                                        await AliasService.AddAliasAsync(alias);
-                                    }
-                                }
-                            }
+								foreach (string name in names)
+								{
+									var alias = _aliases.Find(item => item.Name.Trim() == name);
+									if (alias == null)
+									{
+										alias = new Alias();
+										alias.Name = name;
+										alias.TenantId = site.TenantId;
+										alias.SiteId = site.SiteId;
+										alias.IsDefault = (name == _defaultalias);
+										await AliasService.AddAliasAsync(alias);
+									}
+									else
+									{
+										if (alias.Name != name || alias.IsDefault != (alias.Name.Trim() == _defaultalias))
+										{
+											alias.Name = name;
+											alias.IsDefault = (name == _defaultalias);
+											await AliasService.UpdateAliasAsync(alias);
+										}
+									}
+								}
+								await GetAliases();
+							}
 
-                            await logger.LogInformation("Site Settings Saved {Site}", site);
+							await logger.LogInformation("Site Settings Saved {Site}", site);
 
-                            if (refresh)
-                            {
-                                NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
-                            }
-                            else
-                            {
-                                AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
-                    }
-                }
-                else
-                {
-                    AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
-                }
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-                AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
-        }
-    }
+							if (refresh || reload)
+							{
+								NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
+							}
+							else
+							{
+								AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
+								await interop.ScrollTo(0, 0, "smooth");
+							}
+						}
+					}
+					else // deuplicate alias or default alias not specified
+					{
+						AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
+					}
+				}
+				else
+				{
+					AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
+				}
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+				AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+		}
+	}
 
-    private async Task DeleteSite()
-    {
-        try
-        {
-            var sites = await SiteService.GetSitesAsync();
-            if (sites.Count > 1)
-            {
-                await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
-                await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
+	private async Task DeleteSite()
+	{
+		try
+		{
+			var sites = await SiteService.GetSitesAsync();
+			if (sites.Count > 1)
+			{
+				await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
+				await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
 
-                var aliases = await AliasService.GetAliasesAsync();
-                foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
-                {
-                    await AliasService.DeleteAliasAsync(a.AliasId);
-                }
+				var aliases = await AliasService.GetAliasesAsync();
+				foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
+				{
+					await AliasService.DeleteAliasAsync(a.AliasId);
+				}
 
-                NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
-            }
-            else
-            {
-                AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-            AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
-        }
-    }
+				NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+			AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
+		}
+	}
 
-    private async Task SendEmail()
-    {
-        if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
-        {
-            try
-            {
-                var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-                SettingService.SetSetting(settings, "SMTPHost", _smtphost);
-                SettingService.SetSetting(settings, "SMTPPort", _smtpport);
-                SettingService.SetSetting(settings, "SMTPSSL", _smtpssl);
-                SettingService.SetSetting(settings, "SMTPUsername", _smtpusername);
-                SettingService.SetSetting(settings, "SMTPPassword", _smtppassword);
-                SettingService.SetSetting(settings, "SMTPSender", _smtpsender);
-                await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
-                await logger.LogInformation("Site SMTP Settings Saved");
+	private async Task SendEmail()
+	{
+		if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
+		{
+			try
+			{
+				var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+				SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+				SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+				SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+				SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+				SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+				SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+				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."));
-                AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Testing SMTP Configuration");
-                AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage(Localizer["Message.required.Smtp"], MessageType.Warning);
-        }
-    }
+				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)
+			{
+				await logger.LogError(ex, "Error Testing SMTP Configuration");
+				AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Message.Required.Smtp"], MessageType.Warning);
+		}
+	}
+
+	private async Task GetAliases()
+	{
+		_urls = string.Empty;
+		_defaultalias = string.Empty;
+		_aliases = await AliasService.GetAliasesAsync();
+		_aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
+		foreach (Alias alias in _aliases)
+		{
+			_urls += (_urls == string.Empty) ? alias.Name.Trim() : ", " + alias.Name.Trim();
+			if (alias.IsDefault && string.IsNullOrEmpty(_defaultalias)) _defaultalias = alias.Name.Trim();
+		}
+		if (string.IsNullOrEmpty(_defaultalias)) _defaultalias = _aliases.First().Name.Trim();
+	}
+
+	private void ToggleSMTPPassword()
+	{
+		if (_smtppasswordtype == "password")
+		{
+			_smtppasswordtype = "text";
+			_togglesmtppassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_smtppasswordtype = "password";
+			_togglesmtppassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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

@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.Sites
 @using Oqtane.Interfaces
+@using System.Text.RegularExpressions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject ITenantService TenantService
@@ -155,7 +156,7 @@ else
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="hostPassword" HelpText="Enter the password of an existing host user" ResourceKey="HostPassword">Host Password:</Label>
                     <div class="col-sm-9">
-                        <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" required />
+                        <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" autocomplete="new-password" required />
                     </div>
                 </div>
             }
@@ -282,6 +283,7 @@ else
         {
             if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
             {
+				_urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
                 var duplicates = new List<string>();
                 var aliases = await AliasService.GetAliasesAsync();
                 foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
@@ -305,7 +307,7 @@ else
                             user.SiteId = PageState.Site.SiteId;
                             user.Username = _hostusername;
                             user.Password = _hostpassword;
-                            user = await UserService.LoginUserAsync(user, false, false);
+                            user = await UserService.LoginUserAsync(user);
                             if (user.IsAuthenticated)
                             {
                                 var connectionString = String.Empty;
@@ -370,8 +372,7 @@ else
                         if (installation.Success)
                         {
                             var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
-                            var uri = new Uri(NavigationManager.Uri);
-                            NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true);
+                            NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliasname, true);
                         }
                         else
                         {

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

@@ -30,20 +30,16 @@ else
 
 @code {
     private List<Alias> _sites;
-    private string _scheme;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
-        var uri = new Uri(NavigationManager.Uri);
-        _scheme = uri.Scheme + "://";
-
         var aliases = await AliasService.GetAliasesAsync();
         _sites = new List<Alias>();
         foreach (Alias alias in aliases)
         {
-            if (!_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
+            if (alias.IsDefault && !_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
             {
                 _sites.Add(alias);
             }
@@ -52,16 +48,11 @@ else
 
     private void Edit(string name)
     {
-        if (name.Equals("*"))
-        {
-            var uri = new Uri(NavigationManager.Uri);
-            name = uri.Authority;
-        }
-        NavigationManager.NavigateTo(_scheme + name + "/admin/site/?reload");
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name + "/admin/site", true);
     }
 
     private void Browse(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name + "/?reload");
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name, true);
     }
 }

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

@@ -57,22 +57,20 @@ else
     {
         @if (_results.Count > 0)
         {
-            <div class="table-responsive">
-                <Pager Class="table table-bordered" Items="@_results">
-                    <Header>
-                        @foreach (KeyValuePair<string, string> kvp in _results.First())
-                        {
-                            <th>@kvp.Key</th>
-                        }
-                    </Header>
-                    <Row>
-                        @foreach (KeyValuePair<string, string> kvp in context)
-                        {
-                            <td>@kvp.Value</td>
-                        }
-                    </Row>
-                </Pager>
-            </div>
+            <Pager Class="table table-bordered" Items="@_results">
+                <Header>
+                    @foreach (KeyValuePair<string, string> kvp in _results.First())
+                    {
+                        <th>@kvp.Key</th>
+                    }
+                </Header>
+                <Row>
+                    @foreach (KeyValuePair<string, string> kvp in context)
+                    {
+                        <td>@kvp.Value</td>
+                    }
+                </Row>
+            </Pager>
         }
         else
         {

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

@@ -27,17 +27,47 @@
                 </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="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label>
+                <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">
+                <Label Class="col-sm-3" For="servertime" HelpText="Server Date/Time (in UTC)" ResourceKey="ServerTime">Server Date/Time: </Label>
                 <div class="col-sm-9">
                     <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>
@@ -99,49 +144,66 @@
 </TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    private string _version = string.Empty;
-    private string _clrversion = string.Empty;
-    private string _osversion = string.Empty;
-    private string _serverpath = string.Empty;
-    private string _servertime = string.Empty;
-    private string _installationid = string.Empty;
+	private string _version = string.Empty;
+	private string _clrversion = string.Empty;
+	private string _osversion = 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 _swagger = string.Empty;
-    private string _packageservice = 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;
 
-    protected override async Task OnInitializedAsync()
-    {
-        _version = Constants.Version;
+	protected override async Task OnInitializedAsync()
+	{
+		_version = Constants.Version;
 
-        Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
-        if (systeminfo != null)
-        {
-            _clrversion = systeminfo["clrversion"];
-            _osversion = systeminfo["osversion"];
-            _serverpath = systeminfo["serverpath"];
-            _servertime = systeminfo["servertime"];
-            _installationid = systeminfo["installationid"];
+		Dictionary<string, object> systeminfo = await SystemService.GetSystemInfoAsync("environment");
+		if (systeminfo != null)
+		{
+			_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/Themes/Create.razor

@@ -72,7 +72,7 @@
     private List<Template> _templates;
     private string _template = "-";
     private string[] _versions;
-    private string _reference = Constants.Version;
+    private string _reference = "local";
     private string _minversion = "2.0.0";
     private string _location = string.Empty;
 

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

@@ -40,9 +40,12 @@ else
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>
             <td>
-                @if (UpgradeAvailable(context.PackageName, context.Version))
+				@{ 
+					var version = UpgradeAvailable(context.PackageName, context.Version);
+				} 
+                @if (version != context.Version)
                 {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
                 }
             </td>
             <td></td>
@@ -94,18 +97,17 @@ else
         return link;
     }
 
-    private bool UpgradeAvailable(string packagename, string version)
-    {
-        var upgradeavailable = false;
-        if (!string.IsNullOrEmpty(packagename) && _packages != null)
-        {
-            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
-            if (package != null)
-            {
-                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
-            }
+	private string UpgradeAvailable(string packagename, string version)
+	{
+		if (!string.IsNullOrEmpty(packagename) && _packages != null)
+		{
+			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+			if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+			{
+				return package.Version;
+			}
         }
-        return upgradeavailable;
+        return version;
     }
 
     private async Task DownloadTheme(string packagename, string version)

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

@@ -40,28 +40,46 @@
 		var interop = new Interop(JSRuntime);
 		if (await interop.FormValid(form))
 		{
-			var route = new Route(_url, PageState.Alias.Path);
-			var url = route.SiteUrl + "/" + route.PagePath;
+			if (_url != _mappedurl)
+			{
+				var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+				url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
-			var urlmapping = new UrlMapping();
-			urlmapping.SiteId = PageState.Site.SiteId;
-			urlmapping.Url = url;
-			urlmapping.MappedUrl = _mappedurl;
-			urlmapping.Requests = 0;
-			urlmapping.CreatedOn = DateTime.UtcNow;
-			urlmapping.RequestedOn = DateTime.UtcNow;
+				_url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;
+				_url = (!_url.StartsWith("http")) ? url + _url : _url;
 
-            try
-            {
-                urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
-                await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
-                AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
-            }
+				if (_url.StartsWith(url))
+				{
+					var urlmapping = new UrlMapping();
+					urlmapping.SiteId = PageState.Site.SiteId;
+					var route = new Route(_url, PageState.Alias.Path);
+					urlmapping.Url = route.PagePath;
+					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					urlmapping.Requests = 0;
+					urlmapping.CreatedOn = DateTime.UtcNow;
+					urlmapping.RequestedOn = DateTime.UtcNow;
+
+					try
+					{
+						urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
+						await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+						NavigationManager.NavigateTo(NavigateUrl());
+					}
+					catch (Exception ex)
+					{
+						await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
+						AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+					}
+				}
+				else
+				{
+					AddModuleMessage(Localizer["Message.SaveUrlMapping"], MessageType.Warning);
+				}
+			}
+			else
+			{
+                AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
+			}
         }
         else
         {

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

@@ -26,55 +26,64 @@
 </form>
 
 @code {
-    private ElementReference form;
-    private bool validated = false;
+	private ElementReference form;
+	private bool validated = false;
 
-    private int _urlmappingid;
-    private string _url = string.Empty;
-    private string _mappedurl = string.Empty;
+	private int _urlmappingid;
+	private string _url = string.Empty;
+	private string _mappedurl = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _urlmappingid = Int32.Parse(PageState.QueryString["id"]);
-            var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
-            if (urlmapping != null)
-            {
-                _url = urlmapping.Url;
-                _mappedurl = urlmapping.MappedUrl;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
-            AddModuleMessage(Localizer["Error.LoadUrlMapping"], MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_urlmappingid = Int32.Parse(PageState.QueryString["id"]);
+			var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
+			if (urlmapping != null)
+			{
+				_url = urlmapping.Url;
+				_mappedurl = urlmapping.MappedUrl;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
+			AddModuleMessage(Localizer["Error.LoadUrlMapping"], MessageType.Error);
+		}
+	}
 
-    private async Task SaveUrlMapping()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
-        {
-            var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
-            urlmapping.MappedUrl = _mappedurl;
+	private async Task SaveUrlMapping()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			if (_url != _mappedurl)
+			{
+				try
+				{
+					var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+					url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
-            try
-            {
-                urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping);
-                await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
-                AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
-            }
-        }
+					var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
+					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping);
+					await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+					NavigationManager.NavigateTo(NavigateUrl());
+				}
+				catch (Exception ex)
+				{
+					await logger.LogError(ex, "Error Saving UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
+					AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+				}
+			}
+			else
+			{
+                AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
+			}
+		}
         else
         {
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);

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

@@ -40,10 +40,10 @@ else
 					<td><ActionLink Action="Edit" Parameters="@($"id=" + context.UrlMappingId.ToString())" ResourceKey="Edit" /></td>
 					<td><ActionDialog Header="Delete Url Mapping" Message="@string.Format(Localizer["Confirm.DeleteUrlMapping"], context.Url)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUrlMapping(context))" ResourceKey="DeleteUrlMapping" /></td>
 					<td>
-						<a href="" onclick="@(() => BrowseUrl(context.Url))">@context.Url</a>
+						<a href="@Utilities.TenantUrl(PageState.Alias, context.Url)">@context.Url</a>
 						@if (_mapped)
 						{
-							@((MarkupString)"<br />&gt;&gt;&nbsp;")<a href="" onclick="@(() => BrowseUrl(context.MappedUrl))">@context.MappedUrl</a>
+							@((MarkupString)"<br />&gt;&gt;&nbsp;")<a href="@((context.MappedUrl.StartsWith("http") ? context.MappedUrl : Utilities.TenantUrl(PageState.Alias, context.MappedUrl)))">@context.MappedUrl</a>
 						}
 					</td>
 					<td>@context.Requests</td>
@@ -96,11 +96,6 @@ else
 		}
 	}
 
-	private void BrowseUrl(string url)
-	{
-		NavigationManager.NavigateTo(url, true);		
-	}
-
 	private async Task DeleteUrlMapping(UrlMapping urlMapping)
 	{
 		try

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

@@ -12,7 +12,7 @@
 
 @if (PageState.User != null && photo != null)
 {
-    <img src="@ImageUrl(photofileid, 400, 400, "crop")" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
+    <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
 }
 else
 {
@@ -31,16 +31,34 @@ else
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
-                    <div class="col-sm-9">
-                        <input id="password" type="password" class="form-control" @bind="@password" autocomplete="new-password" />
+					<div class="col-sm-9">
+                        <div class="input-group">
+						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
+						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+					    </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
                     <div class="col-sm-9">
-                        <input id="confirm" type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
+                        <div class="input-group">
+							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
+						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+					    </div>
                     </div>
                 </div>
+				@if (allowtwofactor)
+				{
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="twofactor" HelpText="Indicates if you are using two factor authentication. Two factor authentication requires you to enter a verification code sent via email after you sign in." ResourceKey="TwoFactor"></Label>
+						<div class="col-sm-9">
+							<select id="twofactor" class="form-select" @bind="@twofactor" required>
+								<option value="True">@SharedLocalizer["Yes"]</option>
+								<option value="False">@SharedLocalizer["No"]</option>
+							</select>
+						</div>
+					</div>
+				}
                 <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">
@@ -193,6 +211,8 @@ else
                     </Detail>
                 </Pager>
             }
+            <br />
+            <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
             <br /><hr />
             <select class="form-select" @onchange="(e => FilterChanged(e))">
                 <option value="to">@Localizer["Inbox"]</option>
@@ -201,11 +221,16 @@ else
         }
     </TabPanel>
 </TabStrip>
+<br /><br />
 
 @code {
     private string username = string.Empty;
-    private string password = string.Empty;
+    private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = 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;
@@ -224,9 +249,17 @@ else
     {
         try
         {
+            _togglepassword = SharedLocalizer["ShowPassword"];
+
+            if (PageState.Site.Settings.ContainsKey("LoginOptions:TwoFactor") && !string.IsNullOrEmpty(PageState.Site.Settings["LoginOptions:TwoFactor"]))
+            {
+                allowtwofactor = (PageState.Site.Settings["LoginOptions:TwoFactor"] == "true");
+            }
+
             if (PageState.User != null)
             {
                 username = PageState.User.Username;
+                twofactor = PageState.User.TwoFactorRequired.ToString();
                 email = PageState.User.Email;
                 displayname = PageState.User.DisplayName;
 
@@ -280,11 +313,12 @@ else
         {
             if (username != string.Empty && email != string.Empty && ValidateProfiles())
             {
-                if (password == confirm)
+                if (_password == confirm)
                 {
                     var user = PageState.User;
                     user.Username = username;
-                    user.Password = password;
+                    user.Password = _password;
+                    user.TwoFactorRequired = bool.Parse(twofactor);
                     user.Email = email;
                     user.DisplayName = (displayname == string.Empty ? username : displayname);
                     user.PhotoFileId = filemanager.GetFileId();
@@ -292,12 +326,23 @@ else
                     {
                         user.PhotoFileId = null;
                     }
+                    if (user.PhotoFileId != null)
+                    {
+                        photofileid = user.PhotoFileId.Value;
+                        photo = await FileService.GetFileAsync(photofileid);
+                    }
+                    else
+                    {
+                        photofileid = -1;
+                        photo = null;
+                    }
 
                     await UserService.UpdateUserAsync(user);
                     await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
                     await logger.LogInformation("User Profile Saved");
 
-                    NavigationManager.NavigateTo(NavigateUrl());
+                    AddModuleMessage(Localizer["Success.Profile.Update"], MessageType.Success);
+                    StateHasChanged();
                 }
                 else
                 {
@@ -380,4 +425,47 @@ else
         StateHasChanged();
     }
 
+    private async Task DeleteAllNotifications()
+    {
+        try
+        {
+            foreach(var Notification in notifications)
+            {
+                if (!Notification.IsDeleted)
+                {
+                    Notification.IsDeleted = true;
+                    await NotificationService.UpdateNotificationAsync(Notification);
+                }
+                else
+                {
+                    await NotificationService.DeleteNotificationAsync(Notification.NotificationId);
+                }
+                await logger.LogInformation("Notification Deleted {Notification}", Notification);
+            } 
+            await logger.LogInformation("Notifications Permanently Deleted");
+            await LoadNotificationsAsync();
+            StateHasChanged();            
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Notifications {Error}", ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    
+    }
+
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+
 }

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

@@ -20,14 +20,20 @@
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
-                    <div class="col-sm-9">
-                        <input id="password" type="password" class="form-control" @bind="@password" />
+					<div class="col-sm-9">
+                        <div class="input-group">
+						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
+						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+					    </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
                     <div class="col-sm-9">
-                        <input id="confirm" type="password" class="form-control" @bind="@confirm" />
+                        <div class="input-group">
+							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" required />
+						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+					    </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -88,7 +94,9 @@
 
 @code {
     private string username = string.Empty;
-    private string password = string.Empty;
+    private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
     private string confirm = string.Empty;
     private string email = string.Empty;
     private string displayname = string.Empty;
@@ -102,6 +110,7 @@
     {
         try
         {
+            _togglepassword = SharedLocalizer["ShowPassword"];
             profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
             settings = new Dictionary<string, string>();
         }
@@ -119,9 +128,9 @@
     {
         try
         {
-            if (username != string.Empty && password != string.Empty && confirm != string.Empty && email != string.Empty && ValidateProfiles())
+            if (username != string.Empty && _password != string.Empty && confirm != string.Empty && email != string.Empty && ValidateProfiles())
             {
-                if (password == confirm)
+                if (_password == confirm)
                 {
                     var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
                     if (user == null)
@@ -129,7 +138,7 @@
                         user = new User();
                         user.SiteId = PageState.Site.SiteId;
                         user.Username = username;
-                        user.Password = password;
+                        user.Password = _password;
                         user.Email = email;
                         user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
                         user.PhotoFileId = null;
@@ -193,4 +202,17 @@
         settings = SettingService.SetSetting(settings, SettingName, value);
     }
 
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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

@@ -29,14 +29,20 @@ else
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
-                    <div class="col-sm-9">
-                        <input id="password" type="password" class="form-control" @bind="@password" />
+					<div class="col-sm-9">
+                        <div class="input-group">
+						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
+						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+					    </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
                     <div class="col-sm-9">
-                        <input id="confirm" type="password" class="form-control" @bind="@confirm" />
+                        <div class="input-group">
+							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
+						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+					    </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -133,7 +139,9 @@ else
 @code {
     private int userid;
     private string username = string.Empty;
-    private string password = string.Empty;
+    private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
     private string confirm = string.Empty;
     private string email = string.Empty;
     private string displayname = string.Empty;
@@ -157,9 +165,9 @@ else
     {
         try
         {
-            // OnParametersSetAsync is called when the edit modal is closed - in which case there is no id parameter
             if (PageState.QueryString.ContainsKey("id"))
             {
+                _togglepassword = SharedLocalizer["ShowPassword"];
                 profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
                 userid = Int32.Parse(PageState.QueryString["id"]);
                 var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
@@ -205,12 +213,12 @@ else
         {
             if (username != string.Empty && email != string.Empty && ValidateProfiles())
             {
-                if (password == confirm)
+                if (_password == confirm)
                 {
                     var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
                     user.SiteId = PageState.Site.SiteId;
                     user.Username = username;
-                    user.Password = password;
+                    user.Password = _password;
                     user.Email = email;
                     user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
                     user.PhotoFileId = null;
@@ -268,4 +276,17 @@ else
         settings = SettingService.SetSetting(settings, SettingName, value);
     }
 
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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

@@ -6,8 +6,9 @@
 @inject ISiteService SiteService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject SiteState SiteState
 
-@if (userroles == null)
+@if (users == null)
 {
     <p>
         <em>@SharedLocalizer["Loading"]</em>
@@ -30,12 +31,16 @@ else
 					</div>
 				</div>
 			</div>
-			<Pager Items="@userroles">
+			<Pager Items="@users" RowClass="align-middle">
 				<Header>
 				<th style="width: 1px;">&nbsp;</th>
 				<th style="width: 1px;">&nbsp;</th>
 				<th style="width: 1px;">&nbsp;</th>
 				<th>@SharedLocalizer["Name"]</th>
+				<th>@SharedLocalizer["Username"]</th>
+				<th>@Localizer["LastLoginOn"]</th>
+				<th>@Localizer["LastIPAddress"]</th>
+				<th>@Localizer["CreatedOn"]</th>
 				</Header>
 				<Row>
 					<td>
@@ -48,20 +53,295 @@ else
 						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
 					</td>
 					<td>@context.User.DisplayName</td>
+					<td>@context.User.Username</td>
+					<td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}",context.User.LastLoginOn)</td>
+                    <td>@context.User.LastIPAddress</td>
+                    <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}",context.User.CreatedOn)</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>						
+					}
+					@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+					{
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="twofactor" HelpText="Do you want users to use two factor authentication? Note that you should use the Disabled option until you have successfully verified that the Notification Job in Scheduled Jobs is enabled and your SMTP options in Site Settings are configured or else you will lock yourself out." ResourceKey="TwoFactor">Two Factor?</Label>
+							<div class="col-sm-9">
+								<select id="twofactor" class="form-select" @bind="@_twofactor">
+									<option value="false">@Localizer["Disabled"]</option>
+									<option value="true">@Localizer["Optional"]</option>
+									<option value="required">@Localizer["Required"]</option>
+								</select>
+							</div>
+						</div>
+						<div class="row mb-1 align-items-center">
+							<Label Class="col-sm-3" For="cookiename" HelpText="You can choose to use a custom authentication cookie name for each site. However please be aware that if you want to share an authentication cookie between sites on the same domain they need to use a consistent cookie name. Also be aware that changing the authentication cookie name will logout all current users." ResourceKey="CookieName">Cookie Name:</Label>
+							<div class="col-sm-9">
+								<input id="cookiename" class="form-control" @bind="@_cookiename" />
+							</div>
+						</div>
+					}
+				</Section>
+				@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+				{
+					<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>
+							<div class="row mb-1 align-items-center">
+								<Label Class="col-sm-3" For="identifierclaimtype" HelpText="The name of the unique user identifier claim provided by the provider" ResourceKey="IdentifierClaimType">Identifier Claim:</Label>
+								<div class="col-sm-9">
+									<input id="identifierclaimtype" class="form-control" @bind="@_identifierclaimtype" />
+								</div>
+							</div>
+							<div class="row mb-1 align-items-center">
+								<Label Class="col-sm-3" For="emailclaimtype" HelpText="The name of the email address claim provided by the provider" ResourceKey="EmailClaimType">Email Claim:</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 +350,168 @@ else
 }
 
 @code {
-    private List<UserRole> allroles;
-    private List<UserRole> userroles;
-    private string _search;
+	private List<UserRole> allusers;
+	private List<UserRole> users;
+	private string _search = "";
+
 	private string _allowregistration;
+	private string _allowsitelogin;
+	private string _twofactor;
+	private string _cookiename;
 
-    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 _identifierclaimtype;
+	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()
+	{
+		await LoadUserSettingsAsync();
+		await LoadUsersAsync(true);
+
+		var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
 		_allowregistration = PageState.Site.AllowRegistration.ToString();
-    }
+		_allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
 
-    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)));
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			_twofactor = SettingService.GetSetting(settings, "LoginOptions:TwoFactor", "false");
+			_cookiename = SettingService.GetSetting(settings, "LoginOptions:CookieName", ".AspNetCore.Identity.Application");
 
-        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();
-    }
+			_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");
 
-    private async Task OnSearch()
-    {
-        userroles = Search(_search);
-        await UpdateSettingsAsync();
-    }
+			_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 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);
-        }
-    }
+			_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 = SharedLocalizer["ShowPassword"];
+			_scopes = SettingService.GetSetting(settings, "ExternalLogin:Scopes", "");
+			_pkce = SettingService.GetSetting(settings, "ExternalLogin:PKCE", "false");
+			_redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
+			_identifierclaimtype = SettingService.GetSetting(settings, "ExternalLogin:IdentifierClaimType", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier");
+			_emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress");
+			_domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
+			_createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
 
-    private string settingSearch = "AU-search";
+			_secret = SettingService.GetSetting(settings, "JwtOptions:Secret", "");
+			_togglesecret = SharedLocalizer["ShowPassword"];
+			_issuer = SettingService.GetSetting(settings, "JwtOptions:Issuer", PageState.Uri.Scheme + "://" + PageState.Alias.Name);
+			_audience = SettingService.GetSetting(settings, "JwtOptions:Audience", "");
+			_lifetime = SettingService.GetSetting(settings, "JwtOptions:Lifetime", "20");		}
+	}
 
-    private async Task LoadSettingsAsync()
-    {
-        Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-        _search = SettingService.GetSetting(settings, settingSearch, "");
-    }
+	private async Task LoadUsersAsync(bool load)
+	{
+		if (load)
+		{
+			allusers = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+			if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+				var hosts = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Host);
+				allusers.AddRange(hosts);
+				allusers = allusers.OrderBy(u => u.User.DisplayName).ToList();
+			}			
+		}
 
-    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);
-    }
+		users = allusers;
+		if (!string.IsNullOrEmpty(_search))
+		{
+			users = users.Where(item =>
+				(
+					item.User.Username.Contains(_search, StringComparison.OrdinalIgnoreCase) ||
+					item.User.Email.Contains(_search, StringComparison.OrdinalIgnoreCase) ||
+					item.User.DisplayName.Contains(_search, StringComparison.OrdinalIgnoreCase)
+				)
+			).ToList();
+		}
+	}
+
+	private async Task OnSearch()
+	{
+		await UpdateUserSettingsAsync();
+		await LoadUsersAsync(false);
+	}
+
+	private async Task DeleteUser(UserRole UserRole)
+	{
+		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);
+				await LoadUsersAsync(true);
+				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 LoadUserSettingsAsync()
+	{
+		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+		_search = SettingService.GetSetting(settings, settingSearch, "");
+	}
+
+	private async Task UpdateUserSettingsAsync()
+	{
+		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+		SettingService.SetSetting(settings, settingSearch, _search);
+		await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
+	}
 
 	private async Task SaveSiteSettings()
 	{
@@ -151,6 +520,56 @@ else
 			var site = PageState.Site;
 			site.AllowRegistration = bool.Parse(_allowregistration);
 			await SiteService.UpdateSiteAsync(site);
+
+			var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+			settings = SettingService.SetSetting(settings, "LoginOptions:AllowSiteLogin", _allowsitelogin, false);
+
+			if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+				settings = SettingService.SetSetting(settings, "LoginOptions:TwoFactor", _twofactor, false);
+				settings = SettingService.SetSetting(settings, "LoginOptions:CookieName", _cookiename, 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:IdentifierClaimType", _identifierclaimtype, 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();
+
+			if (!string.IsNullOrEmpty(_secret))
+			{
+				SiteState.AuthorizationToken = await UserService.GetTokenAsync();
+			}
+
 			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);				
 		}
 		catch (Exception ex)
@@ -160,4 +579,58 @@ else
 		}
 	}
 
+	private void ProviderTypeChanged(ChangeEventArgs e)
+	{
+		_providertype = (string)e.Value;
+		if (string.IsNullOrEmpty(_providername))
+		{
+			if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+			{
+				_scopes = "openid,profile,email";
+				_identifierclaimtype = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier";
+				_emailclaimtype = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress";
+			}
+			else
+			{
+				_scopes = "";
+				_identifierclaimtype = "sub";
+				_emailclaimtype = "email";
+			}			
+		}
+		_redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
+		StateHasChanged();
+	}
+
+	private async Task CreateToken()
+	{
+		_token = await UserService.GetPersonalAccessTokenAsync();
+	}
+
+	private void ToggleClientSecret()
+	{
+		if (_clientsecrettype == "password")
+		{
+			_clientsecrettype = "text";
+			_toggleclientsecret = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_clientsecrettype = "password";
+			_toggleclientsecret = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private void ToggleSecret()
+	{
+		if (_secrettype == "password")
+		{
+			_secrettype = "text";
+			_togglesecret = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_secrettype = "password";
+			_togglesecret = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

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

@@ -110,8 +110,7 @@ else
     {
         try
         {
-            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            userroles = userroles.Where(item => item.UserId == userid).ToList();
+            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, userid);
         }
         catch (Exception ex)
         {

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

@@ -2,6 +2,7 @@
 @inherits ModuleBase
 @inject IVisitorService VisitorService
 @inject ISiteService SiteService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -16,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>
@@ -31,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>
@@ -42,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)
@@ -56,18 +57,39 @@ else
 					<td>@context.CreatedOn</td>
 				</Row>
 			</Pager>
-	</TabPanel>
+		</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="visitortracking" HelpText="Specify if visitor tracking is enabled" ResourceKey="VisitorTracking">Visitor Tracking Enabled? </Label>
+					<Label Class="col-sm-3" For="tracking" HelpText="Specify if visitor tracking is enabled" ResourceKey="Tracking">Tracking Enabled? </Label>
 					<div class="col-sm-9">
-						<select id="visitortracking" class="form-select" @bind="@_visitortracking" >
+						<select id="tracking" class="form-select" @bind="@_tracking" >
 							<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="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>
+				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of visitor activity to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+						<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>
@@ -76,24 +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 _visitortracking;
+	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();
-		_visitortracking = PageState.Site.VisitorTracking.ToString();
+
+		_tracking = PageState.Site.VisitorTracking.ToString();
+		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();
 		}
@@ -103,7 +147,7 @@ else
 		}
 	}
 
-	private async void DateChanged(ChangeEventArgs e)
+	private async void DaysChanged(ChangeEventArgs e)
 	{
 		try
 		{
@@ -120,19 +164,26 @@ 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();
 		}
-    }
+	}
 
 	private async Task SaveSiteSettings()
 	{
 		try
 		{
 			var site = PageState.Site;
-			site.VisitorTracking = bool.Parse(_visitortracking);
+			site.VisitorTracking = bool.Parse(_tracking);
 			await SiteService.UpdateSiteAsync(site);
+
+			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);
 		}
 		catch (Exception ex)
@@ -141,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/Label.razor

@@ -25,8 +25,8 @@ else
     [Parameter]
     public string HelpText { get; set; } // optional - tooltip for this label
 
-    private string _spanclass = "app-tooltip";
-    private string _labelclass = "form-label";
+    private string _spanclass;
+    private string _labelclass;
     private string _helptext = string.Empty;
 
     protected override void OnParametersSet()
@@ -36,11 +36,15 @@ else
         if (!string.IsNullOrEmpty(HelpText))
         {
             _helptext = Localize(nameof(HelpText), HelpText);
-            _spanclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _labelclass = "form-label";
+
+            var spanclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _spanclass = "app-tooltip" + spanclass;
         }
         else
         {
-            _labelclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            var labelclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _labelclass = "form-label" + labelclass;
         }
 
         var text = Localize("Text", String.Empty);

Oqtane.Client/Modules/Controls/LocalizableComponent.cs

@@ -13,6 +13,9 @@ namespace Oqtane.Modules.Controls
         [Parameter]
         public string ResourceKey { get; set; }
 
+        [Parameter]
+        public string ResourceType { get; set; }
+
         protected bool IsLocalizable { get; private set; }
 
         protected string Localize(string name) => _localizer?[name] ?? name;
@@ -50,9 +53,14 @@ namespace Oqtane.Modules.Controls
         {
             IsLocalizable = false;
 
-            if (!String.IsNullOrEmpty(ResourceKey) && ModuleState?.ModuleType != null)
+            if (string.IsNullOrEmpty(ResourceType))
             {
-                var moduleType = Type.GetType(ModuleState.ModuleType);
+                ResourceType = ModuleState?.ModuleType;
+            }
+
+            if (!String.IsNullOrEmpty(ResourceKey) && !string.IsNullOrEmpty(ResourceType))
+            {
+                var moduleType = Type.GetType(ResourceType);
                 if (moduleType != null)
                 {
                     using (var scope = ServiceActivator.GetScope())

Oqtane.Client/Modules/Controls/Pager.razor

@@ -54,47 +54,58 @@
     }
     @if (Format == "Table" && Row != null)
     {
-        <table class="@Class">
-            <thead>
-                <tr>@Header</tr>
-            </thead>
-            <tbody>
-                @foreach (var item in ItemList)
-                {
-                    <tr>@Row(item)</tr>
-                    @if (Detail != null)
-                    {
-                        <tr>@Detail(item)</tr>
-                    }
-                }
-            </tbody>
-        </table>
+		<div class="table-responsive">
+			<table class="@Class">
+				<thead>
+					<tr class="@RowClass">@Header</tr>
+				</thead>
+				<tbody>
+					@foreach (var item in ItemList)
+					{
+						<tr class="@RowClass">@Row(item)</tr>
+						@if (Detail != null)
+						{
+							<tr>@Detail(item)</tr>
+						}
+					}
+				</tbody>
+			</table>
+		</div>
     }
     @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>
@@ -107,8 +118,8 @@
             <li class="page-item@((_page > 1) ? "" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
             </li>
-            @if (_pages > _displayPages)
-            {
+            @if (_pages > _displayPages && _displayPages > 1)
+             {
                 <li class="page-item@((_page > _displayPages) ? "" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
                 </li>
@@ -135,7 +146,7 @@
             <li class="page-item@((_page < _pages) ? "" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
             </li>
-            @if (_pages > _displayPages)
+            @if (_pages > _displayPages && _displayPages > 1)
             {
                 <li class="page-item@((_endPage < _pages) ? "" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
@@ -145,7 +156,7 @@
                 <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
             </li>
             <li class="page-item disabled">
-                <a class="page-link">Page @_page of @_pages</a>
+               <a class="page-link" style="white-space: nowrap;">Page @_page of @_pages</a>
             </li>
         </ul>
     }
@@ -158,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
@@ -167,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
@@ -182,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; }
 
@@ -215,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);
         }
@@ -266,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 void OnParametersSet()
-    {
-        _content = Content; // raw HTML
-    }
+	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);
+	protected override async Task OnAfterRenderAsync(bool firstRender)
+	{
+		await base.OnAfterRenderAsync(firstRender);
 
-       if (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 RefreshRichText()
+	{
+		_richhtml = _rawhtml;
+		StateHasChanged();
+	}
 
-    public void CloseFileManager()
-    {
-        _filemanagervisible = false;
-        _message = string.Empty;
-        StateHasChanged();
-    }
+	public async Task RefreshRawHtml()
+	{
+		var interop = new RichTextEditorInterop(JSRuntime);
+		_rawhtml = await interop.GetHtml(_editorElement);
+		StateHasChanged();
+	}
 
-    public async Task RefreshRichText()
-    {
-        var interop = new RichTextEditorInterop(JSRuntime);
-        await interop.LoadEditorContent(_editorElement, _content);
-    }
-
-    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/HtmlText/Settings.razor

@@ -5,44 +5,45 @@
 @inject IStringLocalizer<Settings> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <div class="container">
-        <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="files" ResourceKey="Allow File Management" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
-            <div class="col-sm-9">
-                <select id="files" class="form-select" @bind="@_allowfilemanagement">
-                    <option value="true">@SharedLocalizer["Yes"]</option>
-                    <option value="false">@SharedLocalizer["No"]</option>
-                </select>
-            </div>
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="files" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
+        <div class="col-sm-9">
+            <select id="files" class="form-select" @bind="@_allowfilemanagement">
+                <option value="true">@SharedLocalizer["Yes"]</option>
+                <option value="false">@SharedLocalizer["No"]</option>
+            </select>
         </div>
     </div>
+</div>
 
-    @code {
-        private string _allowfilemanagement;
+@code {		
+	private string resourceType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client"; // for localization
+    private string _allowfilemanagement;
 
-        protected override void OnInitialized()
+    protected override void OnInitialized()
+    {
+        try
         {
-            try
-            {
-                _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
         }
-
-        public async Task UpdateSettings()
+        catch (Exception ex)
         {
-            try
-            {
-                var settings = ModuleState.Settings;
-                settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
-                await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}

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())
                     {
@@ -134,14 +134,19 @@ namespace Oqtane.Modules
             return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
         }
 
-        public string ImageUrl(int fileid, int width, int height, string mode)
+        public string ImageUrl(int fileid, int width, int height)
         {
-            return ImageUrl(fileid, width, height, mode, 0);
+            return ImageUrl(fileid, width, height, "");
         }
 
-        public string ImageUrl(int fileid, int width, int height, string mode, int rotate)
+        public string ImageUrl(int fileid, int width, int height, string mode)
         {
-            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, rotate);
+            return ImageUrl(fileid, width, height, mode, "", "", 0, false);
+        }
+
+        public string ImageUrl(int fileid, int width, int height, string mode, string position, string background, int rotate, bool recreate)
+        {
+            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, position, background, rotate, recreate);
         }
 
         public virtual Dictionary<string, string> GetUrlParameters(string parametersTemplate = "")

Oqtane.Client/Oqtane.Client.csproj

@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.0.1</Version>
+    <Version>3.1.1</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.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.1</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.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/Jobs/Edit.resx

@@ -186,4 +186,10 @@
   <data name="NextExecution.Text" xml:space="preserve">
     <value>Next Execution: </value>
   </data>
+  <data name="Week(s)" xml:space="preserve">
+    <value>Week(s)</value>
+  </data>
+  <data name="Once" xml:space="preserve">
+    <value>Execute Once</value>
+  </data>
 </root>

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

@@ -133,19 +133,16 @@
     <value>Every</value>
   </data>
   <data name="Minute" xml:space="preserve">
-    <value>Minute</value>
+    <value>Minute(s)</value>
   </data>
   <data name="Hour" xml:space="preserve">
-    <value>Hour</value>
+    <value>Hour(s)</value>
   </data>
   <data name="Day" xml:space="preserve">
-    <value>Day</value>
+    <value>Day(s)</value>
   </data>
   <data name="Month" xml:space="preserve">
-    <value>Month</value>
-  </data>
-  <data name="s" xml:space="preserve">
-    <value>s</value>
+    <value>Month(s)</value>
   </data>
   <data name="Error.Job.Delete" xml:space="preserve">
     <value>Error Deleting Job</value>
@@ -177,4 +174,22 @@
   <data name="JobLog.Text" xml:space="preserve">
     <value>Log</value>
   </data>
+  <data name="Error.Job.Start" xml:space="preserve">
+    <value>An error occurred when starting the job</value>
+  </data>
+  <data name="Error.Job.Stop" xml:space="preserve">
+    <value>An error occurred when stopping the job</value>
+  </data>
+  <data name="Message.Job.Start" xml:space="preserve">
+    <value>The process responsible for executing this job has been started. The next execution will be based on the schedule criteria for the job.</value>
+  </data>
+  <data name="Message.Job.Stop" xml:space="preserve">
+    <value>The process responsible for executing this job has been stopped. In order to restart the process you will need to use the Start button or restart the application.</value>
+  </data>
+  <data name="Week" xml:space="preserve">
+    <value>Week(s)</value>
+  </data>
+  <data name="Once" xml:space="preserve">
+    <value>Execute Once</value>
+  </data>
 </root>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,25 +117,112 @@
   <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>
   <data name="Success.Account.Verified" xml:space="preserve">
     <value>User Account Verified Successfully. You Can Now Login With Your Username And Password Below.</value>
   </data>
-  <data name="Message.Account.NotVerfied" xml:space="preserve">
+  <data name="Message.Account.NotVerified" xml:space="preserve">
     <value>User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions.</value>
   </data>
+  <data name="Success.Account.Linked" xml:space="preserve">
+    <value>User Account Linked Successfully. You Can Now Login With Your External Login Below.</value>
+  </data>
+  <data name="Message.Account.NotLinked" xml:space="preserve">
+    <value>External Login Could Not Be Linked. 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>
   </data>
+  <data name="Message.ForgotPassword" xml:space="preserve">
+    <value>Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again</value>
+  </data>
+  <data name="Message.ForgotUser" xml:space="preserve">
+    <value>Please Check The Email Address Associated To Your User Account For A Password Reset Notification</value>
+  </data>
+  <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="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>
+  <data name="ExternalLoginStatus.DuplicateEmail" xml:space="preserve">
+    <value>Multiple User Accounts Already Exist With The Email Address Of Your External Login. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.InvalidEmail" xml:space="preserve">
+    <value>The External Login Provider Did Not Provide A Valid Email Address For Your Account. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.ProviderKeyMismatch" xml:space="preserve">
+    <value>An Error Occurred Verifying Your External Login. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.UserDoesNotExist" xml:space="preserve">
+    <value>A User Account Matching The Email Address Of Your External Login Does Not Exist. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.UserNotCreated" xml:space="preserve">
+    <value>A User Account Could Not Be Created For Your External Login. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.VerificationRequired" xml:space="preserve">
+    <value>In Order To Link Your External Login With Your User Account You Must Verify Your Identity. Please Check Your Email For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.AccessDenied" xml:space="preserve">
+    <value>Your External Login Was Denied Access. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="ExternalLoginStatus.RemoteFailure" xml:space="preserve">
+    <value>Your External Login Failed. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
 </root>

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

@@ -192,4 +192,22 @@
   <data name="LogDetails.Text" xml:space="preserve">
     <value>Details</value>
   </data>
+  <data name="Error.SaveSiteSettings" xml:space="preserve">
+    <value>Error Saving Settings</value>
+  </data>
+  <data name="Events.Heading" xml:space="preserve">
+    <value>Events</value>
+  </data>
+  <data name="Retention.HelpText" xml:space="preserve">
+    <value>Number of days of events to retain</value>
+  </data>
+  <data name="Retention.Text" xml:space="preserve">
+    <value>Retention (Days):</value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Success.SaveSiteSettings" xml:space="preserve">
+    <value>Settings Saved Successfully</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

@@ -258,13 +258,16 @@
   <data name="ThemeSettings.Heading" xml:space="preserve">
     <value>Theme Settings</value>
   </data>
-  <data name="Appearance.Hea" xml:space="preserve">
-    <value />
-  </data>
   <data name="Clickable.HelpText" xml:space="preserve">
     <value>Select whether the link in the site navigation is enabled or disabled</value>
   </data>
   <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/Reset/Index.resx

@@ -117,22 +117,37 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Password.Confirm" xml:space="preserve">
-    <value>Confirm Password:</value>
-  </data>
   <data name="Message.Password.NoMatch" xml:space="preserve">
     <value>Passwords Entered Do Not Match</value>
   </data>
   <data name="Message.Required.UserInfo" xml:space="preserve">
-    <value>You Must Provide A Username, Password, and Email Address</value>
+    <value>You Must Provide The Password And Confirmation</value>
   </data>
   <data name="Password.Reset" xml:space="preserve">
     <value>Reset Password</value>
   </data>
   <data name="Error.Password.ResetInfo" xml:space="preserve">
-    <value>Error Resetting User Password. Please Ensure Password Meets Complexity Requirements.</value>
+    <value>Error Resetting User Password. Please Ensure The Request To Reset Your Password Was Made Within The Past 24 Hours And The New Password Meets The Complexity Requirements.</value>
   </data>
   <data name="Error.Password.Reset" xml:space="preserve">
     <value>Error Resetting User Password</value>
   </data>
+  <data name="Confirm.Text" xml:space="preserve">
+    <value>Confirm:</value>
+  </data>
+  <data name="Conform.HelpText" xml:space="preserve">
+    <value>Enter the password again. It must exactly match the password entered above.</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>The new password. It must satisfy complexity rules for the site.</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>Your username will be populated from the link you received in the password reset notification</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
 </root>

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

@@ -129,9 +129,6 @@
   <data name="DefaultContainer.Text" xml:space="preserve">
     <value>Default Container: </value>
   </data>
-  <data name="Appearance.Heading" xml:space="preserve">
-    <value>Appearance</value>
-  </data>
   <data name="DefaultAdminContainer" xml:space="preserve">
     <value>Default Admin Container</value>
   </data>
@@ -145,7 +142,7 @@
     <value>Site Settings Saved</value>
   </data>
   <data name="Message.Aliases.Taken" xml:space="preserve">
-    <value>An Alias Specified Has Already Been Used For Another Site</value>
+    <value>The Default Alias Has Not Been Specified Or An Alias Was Specified That Has Already Been Used For Another Site</value>
   </data>
   <data name="Message.Required.SiteName" xml:space="preserve">
     <value>You Must Provide A Site Name, Alias, And Default Theme/Container</value>
@@ -223,7 +220,7 @@
     <value>Aliases: </value>
   </data>
   <data name="IsDeleted.Text" xml:space="preserve">
-    <value>Is Deleted? </value>
+    <value>Deleted? </value>
   </data>
   <data name="Logo.Text" xml:space="preserve">
     <value>Logo: </value>
@@ -318,4 +315,13 @@
   <data name="DeleteSite.Text" xml:space="preserve">
     <value>Delete Site</value>
   </data>
+  <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">
+    <value>Default Alias: </value>
+  </data>
+  <data name="Aliases.Heading" xml:space="preserve">
+    <value>Aliases</value>
+  </data>
 </root>

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

@@ -129,11 +129,11 @@
   <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 Time</value>
+    <value>Server Date/Time (in UTC)</value>
   </data>
   <data name="FrameworkVersion.Text" xml:space="preserve">
     <value>Framework Version: </value>
@@ -144,11 +144,11 @@
   <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 Time: </value>
+    <value>Server Date/Time: </value>
   </data>
   <data name="RestartApplication.Header" xml:space="preserve">
     <value>Restart Application</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/UrlMappings/Add.resx

@@ -121,10 +121,10 @@
     <value>Redirect To:</value>
   </data>
   <data name="MappedUrl.HelpText" xml:space="preserve">
-    <value>A fully qualified Url where the user will be redirected</value>
+    <value>A relative or absolute Url where the user will be redirected</value>
   </data>
   <data name="Url.HelpText" xml:space="preserve">
-    <value>A fully qualified Url for this site</value>
+    <value>An absolute Url identifying a path to a specific page in the site</value>
   </data>
   <data name="Url.Text" xml:space="preserve">
     <value>Url:</value>
@@ -135,4 +135,10 @@
   <data name="Message.InfoRequired" xml:space="preserve">
     <value>Please Provide All Required Information</value>
   </data>
+  <data name="Message.DuplicateUrlMapping" xml:space="preserve">
+    <value>The Url and Redirect To cannot be the same</value>
+  </data>
+  <data name="Message.SaveUrlMapping" xml:space="preserve">
+    <value>The Url must belong to the current site</value>
+  </data>
 </root>

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

@@ -121,10 +121,10 @@
     <value>Redirect To:</value>
   </data>
   <data name="MappedUrl.HelpText" xml:space="preserve">
-    <value>A fully qualified Url where the user will be redirected</value>
+    <value>A relative or absolute Url where the user will be redirected</value>
   </data>
   <data name="Url.HelpText" xml:space="preserve">
-    <value>A fully qualified Url for this site</value>
+    <value>A relative Url identifying a path to a specific page in the site</value>
   </data>
   <data name="Url.Text" xml:space="preserve">
     <value>Url:</value>
@@ -138,4 +138,7 @@
   <data name="Message.InfoRequired" xml:space="preserve">
     <value>Please Provide All Required Information</value>
   </data>
+  <data name="Message.DuplicateUrlMapping" xml:space="preserve">
+    <value>The Url and Redirect To cannot be the same</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,19 @@
   <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>
+  <data name="DeleteAllNotifications.Header" xml:space="preserve">
+    <value>Clear Notifications</value>
+  </data>
+  <data name="DeleteAllNotifications.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Permanently Delete All Notifications?</value>
+  </data>
+  <data name="DeleteAllNotifications.Text" xml:space="preserve">
+    <value>Delete ALL Notifications</value>
+  </data>
 </root>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -168,4 +168,7 @@
   <data name="Username.Text" xml:space="preserve">
     <value>Username:</value>
   </data>
+  <data name="Password.Placeholder" xml:space="preserve">
+    <value>Password</value>
+  </data>
 </root>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -183,4 +183,7 @@
   <data name="Profile.Heading" xml:space="preserve">
     <value>Profile</value>
   </data>
+  <data name="Password.Placeholder" xml:space="preserve">
+    <value>Password</value>
+  </data>
 </root>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -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,235 @@
   <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 name of the email address claim provided by the provider</value>
+  </data>
+  <data name="EmailClaimType.Text" xml:space="preserve">
+    <value>Email Claim:</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="CookieName.HelpText" xml:space="preserve">
+    <value>You can choose to use a custom authentication cookie name for each site. However please be aware that if you want to share an authentication cookie between sites on the same domain they need to use a consistent cookie name. Also be aware that changing the authentication cookie name will logout all current users.</value>
+  </data>
+  <data name="CookieName.Text" xml:space="preserve">
+    <value>Cookie Name:</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 users to use two factor authentication? Note that you should use the Disabled option until you have successfully verified that the Notification Job in Scheduled Jobs is enabled and your SMTP options in Site Settings are configured or else you will lock yourself out.</value>
+  </data>
+  <data name="TwoFactor.Text" xml:space="preserve">
+    <value>Two Factor?</value>
+  </data>
+  <data name="Disabled" xml:space="preserve">
+    <value>Disabled</value>
+  </data>
+  <data name="Optional" xml:space="preserve">
+    <value>Optional</value>
+  </data>
+  <data name="Required" xml:space="preserve">
+    <value>Required</value>
+  </data>
+  <data name="CreatedOn" xml:space="preserve">
+    <value>Created On</value>
+  </data>
+  <data name="LastIPAddress" xml:space="preserve">
+    <value>Last IP Address</value>
+  </data>
+  <data name="LastLoginOn" xml:space="preserve">
+    <value>Last Login</value>
+  </data>
+  <data name="IdentifierClaimType.HelpText" xml:space="preserve">
+    <value>The name of the unique user identifier claim provided by the provider</value>
+  </data>
+  <data name="IdentifierClaimType.Text" xml:space="preserve">
+    <value>Identifier Claim:</value>
+  </data>
 </root>

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

@@ -156,11 +156,11 @@
   <data name="Visitors.Heading" xml:space="preserve">
     <value>Visitors</value>
   </data>
-  <data name="VisitorTracking.HelpText" xml:space="preserve">
+  <data name="Tracking.HelpText" xml:space="preserve">
     <value>Specify if visitor tracking is enabled</value>
   </data>
-  <data name="VisitorTracking.Text" xml:space="preserve">
-    <value>Visitor Tracking Enabled?</value>
+  <data name="Tracking.Text" xml:space="preserve">
+    <value>Tracking Enabled?</value>
   </data>
   <data name="IP" xml:space="preserve">
     <value>IP</value>
@@ -171,4 +171,25 @@
   <data name="Created" xml:space="preserve">
     <value>Created</value>
   </data>
+  <data name="Details.Text" xml:space="preserve">
+    <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 identifying visitors which should not be tracked</value>
+  </data>
+  <data name="Filter.Text" xml:space="preserve">
+    <value>Filter:</value>
+  </data>
+  <data name="Retention.HelpText" xml:space="preserve">
+    <value>Number of days of visitor activity to retain</value>
+  </data>
+  <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>
@@ -274,7 +274,7 @@
     <value>Full Name:</value>
   </data>
   <data name="LocalVersion" xml:space="preserve">
-    <value>Local Version</value>
+    <value>Installed Version</value>
   </data>
   <data name="Search.Source" xml:space="preserve">
     <value>source</value>
@@ -321,4 +321,10 @@
   <data name="Settings" xml:space="preserve">
     <value>Settings</value>
   </data>
+  <data name="HidePassword" xml:space="preserve">
+    <value>Hide</value>
+  </data>
+  <data name="ShowPassword" xml:space="preserve">
+    <value>Show</value>
+  </data>
 </root>

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

@@ -177,4 +177,13 @@
   <data name="System.Update" xml:space="preserve">
     <value>Check For System Updates</value>
   </data>
+  <data name="Visibility" xml:space="preserve">
+    <value>Visibility:</value>
+  </data>
+  <data name="VisibilityEdit" xml:space="preserve">
+    <value>Page Editors Only</value>
+  </data>
+  <data name="VisibilityView" xml:space="preserve">
+    <value>Same As Page</value>
+  </data>
 </root>

Oqtane.Client/Resources/Themes/OqtaneTheme/ContainerSettings.resx

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

Oqtane.Client/Resources/Themes/OqtaneTheme/ThemeSettings.resx

@@ -121,7 +121,7 @@
     <value>Specify if a Footer pane should always be displayed in a fixed location at the bottom of the page.</value>
   </data>
   <data name="Footer.Text" xml:space="preserve">
-    <value>Display Footer?</value>
+    <value>Display Fixed Footer?</value>
   </data>
   <data name="Login.HelpText" xml:space="preserve">
     <value>Specify if a Login option should be displayed,  Note that this option does not prevent the login page from being accessible via a direct url.</value>

Oqtane.Client/Services/AliasService.cs

@@ -12,18 +12,12 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class AliasService : ServiceBase, IAliasService
     {
-
-        private readonly SiteState _siteState;
-
         /// <summary>
         /// Constructor - should only be used by Dependency Injection
         /// </summary>
-        public AliasService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
+        public AliasService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        private string ApiUrl => CreateApiUrl("Alias", _siteState.Alias);
+        private string ApiUrl => CreateApiUrl("Alias");
 
         /// <inheritdoc />
         public async Task<List<Alias>> GetAliasesAsync()

Oqtane.Client/Services/DatabaseService.cs

@@ -11,15 +11,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class DatabaseService : ServiceBase, IDatabaseService
     {
+        public DatabaseService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        private readonly SiteState _siteState;
-
-        public DatabaseService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("Database", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Database");
 
         public async Task<List<Database>> GetDatabasesAsync()
         {

Oqtane.Client/Services/FileService.cs

@@ -14,16 +14,14 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class FileService : ServiceBase, IFileService
     {
-        private readonly SiteState _siteState;
         private readonly IJSRuntime _jsRuntime;
 
-        public FileService(HttpClient http, SiteState siteState, IJSRuntime jsRuntime) : base(http)
+        public FileService(HttpClient http, SiteState siteState, IJSRuntime jsRuntime) : base(http, siteState)
         {
-            _siteState = siteState;
             _jsRuntime = jsRuntime;
         }
 
-        private string Apiurl => CreateApiUrl("File", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("File");
 
         public async Task<List<File>> GetFilesAsync(int folderId)
         {

Oqtane.Client/Services/FolderService.cs

@@ -14,14 +14,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class FolderService : ServiceBase, IFolderService
     {
-        private readonly SiteState _siteState;
+        public FolderService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        public FolderService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string ApiUrl => CreateApiUrl("Folder", _siteState.Alias);
+        private string ApiUrl => CreateApiUrl("Folder");
 
         public async Task<List<Folder>> GetFoldersAsync(int siteId)
         {

Oqtane.Client/Services/InstallationService.cs

@@ -15,13 +15,15 @@ namespace Oqtane.Services
         private readonly NavigationManager _navigationManager;
         private readonly SiteState _siteState;
 
-        public InstallationService(HttpClient http, NavigationManager navigationManager, SiteState siteState) : base(http)
+        public InstallationService(HttpClient http, SiteState siteState, NavigationManager navigationManager) : base(http, siteState)
         {
             _navigationManager = navigationManager;
             _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>
@@ -206,7 +210,7 @@ namespace Oqtane.Services
         /// <returns></returns>
         Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue);
 
-        Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPublic);
+        Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPrivate);
 
         Dictionary<string, string> MergeSettings(Dictionary<string, string> settings1, Dictionary<string, string> settings2);
 

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

@@ -24,6 +24,14 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<UrlMapping> GetUrlMappingAsync(int urlMappingId);
 
+        /// <summary>
+        /// Get one specific <see cref="UrlMapping"/>
+        /// </summary>
+        /// <param name="siteId">ID-reference of a <see cref="Site"/></param>
+        /// <param name="url">A url</param>
+        /// <returns></returns>
+        Task<UrlMapping> GetUrlMappingAsync(int siteId, string url);
+
         /// <summary>
         /// Add / save a new <see cref="UrlMapping"/> to the database.
         /// </summary>

Oqtane.Client/Services/Interfaces/IUserRoleService.cs

@@ -16,6 +16,31 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<List<UserRole>> GetUserRolesAsync(int siteId);
 
+        /// <summary>
+        /// Get all <see cref="UserRole"/>s on a <see cref="Site"/>
+        /// </summary>
+        /// <param name="siteId">ID-reference to a <see cref="Site"/></param>
+        /// <param name="userId">ID-reference to a <see cref="User"/></param>
+        /// <returns></returns>
+        Task<List<UserRole>> GetUserRolesAsync(int siteId, int userId);
+
+        /// <summary>
+        /// Get all <see cref="UserRole"/>s on a <see cref="Site"/>
+        /// </summary>
+        /// <param name="siteId">ID-reference to a <see cref="Site"/></param>
+        /// <param name="roleName">Name reference a <see cref="Role"/></param>
+        /// <returns></returns>
+        Task<List<UserRole>> GetUserRolesAsync(int siteId, string roleName);
+
+        /// <summary>
+        /// Get all <see cref="UserRole"/>s on a <see cref="Site"/>
+        /// </summary>
+        /// <param name="siteId">ID-reference to a <see cref="Site"/></param>
+        /// <param name="userId">ID-reference to a <see cref="User"/></param>
+        /// <param name="roleName">Name reference a <see cref="Role"/></param>
+        /// <returns></returns>
+        Task<List<UserRole>> GetUserRolesAsync(int siteId, int userId, string roleName);
+
         /// <summary>
         /// Get one specific <see cref="UserRole"/>
         /// </summary>

Oqtane.Client/Services/Interfaces/IUserService.cs

@@ -54,10 +54,8 @@ namespace Oqtane.Services
         /// Note that this will probably not be a real User, but a user object where the `Username` and `Password` have been filled.
         /// </summary>
         /// <param name="user">A <see cref="User"/> object which should have at least the <see cref="User.Username"/> and <see cref="User.Password"/> set.</param>
-        /// <param name="setCookie">Determines if the login should be stored in the cookie.</param>
-        /// <param name="isPersistent">Determines if the login should be persisted in the cookie for a long time.</param>
         /// <returns></returns>
-        Task<User> LoginUserAsync(User user, bool setCookie, bool isPersistent);
+        Task<User> LoginUserAsync(User user);
 
         /// <summary>
         /// Logout a <see cref="User"/>
@@ -88,5 +86,45 @@ 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();
+
+        /// <summary>
+        /// Get personal access token for current user (administrators only)
+        /// </summary>
+        /// <returns></returns>
+        Task<string> GetPersonalAccessTokenAsync();
+
+        /// <summary>
+        /// Link an external login with a local user account
+        /// </summary>
+        /// <param name="user">The <see cref="User"/> we're verifying</param>
+        /// <param name="token">A Hash value in the URL which verifies this user got the e-mail (containing this token)</param>
+        /// <param name="type">External Login provider type</param>
+        /// <param name="key">External Login provider key</param>
+        /// <param name="name">External Login provider display name</param>
+        /// <returns></returns>
+        Task<User> LinkUserAsync(User user, string token, string type, string key, string name);
+
+
     }
 }

Oqtane.Client/Services/JobLogService.cs

@@ -11,14 +11,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class JobLogService : ServiceBase, IJobLogService
     {
-        private readonly SiteState _siteState;
+        public JobLogService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        public JobLogService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("JobLog", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("JobLog");
 
         public async Task<List<JobLog>> GetJobLogsAsync()
         {

Oqtane.Client/Services/JobService.cs

@@ -11,14 +11,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class JobService : ServiceBase, IJobService
     {
-        private readonly SiteState _siteState;
+        public JobService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        public JobService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("Job", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Job");
         
         public async Task<List<Job>> GetJobsAsync()
         {

Oqtane.Client/Services/LanguageService.cs

@@ -11,15 +11,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class LanguageService : ServiceBase, ILanguageService
     {        
+        public LanguageService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        private readonly SiteState _siteState;
-
-        public LanguageService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("Language", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Language");
 
         public async Task<List<Language>> GetLanguagesAsync(int siteId)
         {

Oqtane.Client/Services/LocalizationService.cs

@@ -10,14 +10,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class LocalizationService : ServiceBase, ILocalizationService
     {
-        private readonly SiteState _siteState;
+        public LocalizationService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        public LocalizationService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("Localization", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Localization");
 
         public async Task<IEnumerable<Culture>> GetCulturesAsync() => await GetJsonAsync<IEnumerable<Culture>>(Apiurl);
     }

Oqtane.Client/Services/LogService.cs

@@ -14,18 +14,16 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class LogService : ServiceBase, ILogService
     {
-        
         private readonly SiteState _siteState;
         private readonly NavigationManager _navigationManager;
 
-        public LogService(HttpClient http, SiteState siteState, NavigationManager navigationManager) : base(http)
+        public LogService(HttpClient http, SiteState siteState, NavigationManager navigationManager) : base(http, siteState)
         {
-            
             _siteState = siteState;
             _navigationManager = navigationManager;
         }
 
-        private string Apiurl => CreateApiUrl("Log", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Log");
 
         public async Task<List<Log>> GetLogsAsync(int siteId, string level, string function, int rows)
         {

Oqtane.Client/Services/ModuleDefinitionService.cs

@@ -14,16 +14,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class ModuleDefinitionService : ServiceBase, IModuleDefinitionService
     {
-        private readonly HttpClient _http;
-        private readonly SiteState _siteState;
+        public ModuleDefinitionService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        public ModuleDefinitionService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _http = http;
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("ModuleDefinition", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("ModuleDefinition");
 
         public async Task<List<ModuleDefinition>> GetModuleDefinitionsAsync(int siteId)
         {

Oqtane.Client/Services/ModuleService.cs

@@ -11,15 +11,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class ModuleService : ServiceBase, IModuleService
     {
+        public ModuleService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        private readonly SiteState _siteState;
-
-        public ModuleService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("Module", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Module");
 
         public async Task<List<Module>> GetModulesAsync(int siteId)
         {

Oqtane.Client/Services/NotificationService.cs

@@ -11,14 +11,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class NotificationService : ServiceBase, INotificationService
     {
-        private readonly SiteState _siteState;
+        public NotificationService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        public NotificationService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("Notification", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Notification");
 
         public async Task<List<Notification>> GetNotificationsAsync(int siteId, string direction, int userId)
         {

Oqtane.Client/Services/PackageService.cs

@@ -12,13 +12,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class PackageService : ServiceBase, IPackageService
     {
-        private readonly SiteState _siteState;
+        public PackageService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        public PackageService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-        private string Apiurl => CreateApiUrl("Package", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Package");
 
         public async Task<List<Package>> GetPackagesAsync(string type)
         {

Oqtane.Client/Services/PageModuleService.cs

@@ -9,15 +9,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class PageModuleService : ServiceBase, IPageModuleService
     {
+        public PageModuleService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        private readonly SiteState _siteState;
-
-        public PageModuleService(HttpClient http, SiteState siteState) : base(http)
-        {            
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("PageModule", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("PageModule");
 
         public async Task<PageModule> GetPageModuleAsync(int pageModuleId)
         {

Oqtane.Client/Services/PageService.cs

@@ -13,16 +13,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class PageService : ServiceBase, IPageService
     {
+        public PageService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        private readonly SiteState _siteState;
-
-        public PageService(HttpClient http, SiteState siteState) : base(http)
-        {
-            
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("Page", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Page");
 
         public async Task<List<Page>> GetPagesAsync(int siteId)
         {

Oqtane.Client/Services/ProfileService.cs

@@ -11,15 +11,9 @@ namespace Oqtane.Services
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class ProfileService : ServiceBase, IProfileService
     {
+        public ProfileService(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        private readonly SiteState _siteState;
-
-        public ProfileService(HttpClient http, SiteState siteState) : base(http)
-        {            
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("Profile", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("Profile");
 
         public async Task<List<Profile>> GetProfilesAsync(int siteId)
         {

Oqtane.Client/Services/RemoteServiceBase.cs

@@ -0,0 +1,152 @@
+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()
+        {
+            return GetHttpClient(_siteState?.AuthorizationToken);
+        }
+
+        private HttpClient GetHttpClient(string AuthorizationToken)
+        {
+            var httpClient = _httpClientFactory.CreateClient("Remote");
+            if (!httpClient.DefaultRequestHeaders.Contains(HeaderNames.Authorization) && !string.IsNullOrEmpty(AuthorizationToken))
+            {
+                httpClient.DefaultRequestHeaders.Add(HeaderNames.Authorization, "Bearer " + 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);
+        }
+    }
+}