@@ -457,6 +474,8 @@ else
private string _nameclaimtype;
private string _emailclaimtype;
private string _roleclaimtype;
+ private string _roleclaimmappings;
+ private string _synchronizeroles;
private string _profileclaimtypes;
private string _domainfilter;
private string _createusers;
@@ -521,6 +540,8 @@ else
_nameclaimtype = SettingService.GetSetting(settings, "ExternalLogin:NameClaimType", "name");
_emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "email");
_roleclaimtype = SettingService.GetSetting(settings, "ExternalLogin:RoleClaimType", "");
+ _roleclaimmappings = SettingService.GetSetting(settings, "ExternalLogin:RoleClaimMappings", "");
+ _synchronizeroles = SettingService.GetSetting(settings, "ExternalLogin:SynchronizeRoles", "false");
_profileclaimtypes = SettingService.GetSetting(settings, "ExternalLogin:ProfileClaimTypes", "");
_domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
_createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
@@ -614,7 +635,9 @@ else
settings = SettingService.SetSetting(settings, "ExternalLogin:NameClaimType", _nameclaimtype, true);
settings = SettingService.SetSetting(settings, "ExternalLogin:EmailClaimType", _emailclaimtype, true);
settings = SettingService.SetSetting(settings, "ExternalLogin:RoleClaimType", _roleclaimtype, true);
- settings = SettingService.SetSetting(settings, "ExternalLogin:ProfileClaimTypes", _profileclaimtypes, true);
+ settings = SettingService.SetSetting(settings, "ExternalLogin:RoleClaimMappings", _roleclaimmappings, true);
+ settings = SettingService.SetSetting(settings, "ExternalLogin:SynchronizeRoles", _synchronizeroles, true);
+ settings = SettingService.SetSetting(settings, "ExternalLogin:ProfileClaimTypes", _profileclaimtypes, true);
settings = SettingService.SetSetting(settings, "ExternalLogin:DomainFilter", _domainfilter, true);
settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
settings = SettingService.SetSetting(settings, "ExternalLogin:VerifyUsers", _verifyusers, true);
diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor
index 6fc51e15..b39b4f27 100644
--- a/Oqtane.Client/Modules/Controls/ActionDialog.razor
+++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor
@@ -173,6 +173,12 @@ else
_editmode = bool.Parse(EditMode);
}
+ Text = Localize(nameof(Text), Text);
+ Header = Localize(nameof(Header), Header);
+ Message = Localize(nameof(Message), Message);
+
+ _openText = Text;
+
if (!string.IsNullOrEmpty(IconName))
{
if (IconOnly)
@@ -190,12 +196,7 @@ else
_openIconSpan = $"
{(IconOnly ? "" : " ")}";
_iconSpan = $"
";
}
-
- Text = Localize(nameof(Text), Text);
- Header = Localize(nameof(Header), Header);
- Message = Localize(nameof(Message), Message);
-
- _openText = Text;
+
_permissions = (PermissionList == null) ? ModuleState.PermissionList : PermissionList;
_authorized = IsAuthorized();
diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index b7c603ff..a52f359e 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -359,12 +359,6 @@
}
if (restricted == "")
{
- if (!ShowProgress)
- {
- _uploading = true;
- StateHasChanged();
- }
-
try
{
// upload the files
@@ -374,7 +368,21 @@
if (PageState.Runtime == Shared.Runtime.Hybrid)
{
jwt = await UserService.GetTokenAsync();
+ if (string.IsNullOrEmpty(jwt))
+ {
+ await logger.LogInformation("File Upload Failed From .NET MAUI Due To Missing Security Token. Token Options Must Be Set In User Settings.");
+ _message = "Security Token Not Specified";
+ _messagetype = MessageType.Error;
+ return;
+ }
}
+
+ if (!ShowProgress)
+ {
+ _uploading = true;
+ StateHasChanged();
+ }
+
await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken, jwt);
// uploading is asynchronous so we need to poll to determine if uploads are completed
@@ -387,7 +395,7 @@
var size = Int64.Parse(uploads[upload].Split(':')[1]); // bytes
var megabits = (size / 1048576.0) * 8; // binary conversion
- var uploadspeed = 2; // 2 Mbps (3G ranges from 300Kbps to 3Mbps)
+ var uploadspeed = (PageState.Alias.Name.Contains("localhost")) ? 100 : 3; // 3 Mbps is FCC minimum for broadband upload
var uploadtime = (megabits / uploadspeed); // seconds
var maxattempts = 5; // polling (minimum timeout duration will be 5 seconds)
var sleep = (int)Math.Ceiling(uploadtime / maxattempts) * 1000; // milliseconds
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index 99379903..6bd700bd 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -111,7 +111,7 @@
[Parameter]
public List
PermissionList { get; set; }
- protected override async Task OnParametersSetAsync()
+ protected override async Task OnInitializedAsync()
{
if (!string.IsNullOrEmpty(Permissions))
{
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 1731e22d..4a794630 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -134,6 +134,7 @@ namespace Oqtane.Modules
// url methods
+ // navigate url
public string NavigateUrl()
{
return NavigateUrl(PageState.Page.Path);
@@ -149,24 +150,65 @@ namespace Oqtane.Modules
return NavigateUrl(PageState.Page.Path, refresh);
}
- public string NavigateUrl(string path, string parameters)
+ public string NavigateUrl(string path, string querystring)
{
- return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters);
+ return Utilities.NavigateUrl(PageState.Alias.Path, path, querystring);
+ }
+
+ public string NavigateUrl(string path, Dictionary querystring)
+ {
+ return NavigateUrl(path, Utilities.CreateQueryString(querystring));
}
public string NavigateUrl(string path, bool refresh)
{
- return Utilities.NavigateUrl(PageState.Alias.Path, path, refresh ? "refresh" : "");
+ return NavigateUrl(path, refresh ? "refresh" : "");
}
+ public string NavigateUrl(int moduleId, string action)
+ {
+ return EditUrl(PageState.Page.Path, moduleId, action, "");
+ }
+
+ public string NavigateUrl(int moduleId, string action, string querystring)
+ {
+ return EditUrl(PageState.Page.Path, moduleId, action, querystring);
+ }
+
+ public string NavigateUrl(int moduleId, string action, Dictionary querystring)
+ {
+ return EditUrl(PageState.Page.Path, moduleId, action, querystring);
+ }
+
+ public string NavigateUrl(string path, int moduleId, string action)
+ {
+ return EditUrl(path, moduleId, action, "");
+ }
+
+ public string NavigateUrl(string path, int moduleId, string action, string querystring)
+ {
+ return EditUrl(path, moduleId, action, querystring);
+ }
+
+ public string NavigateUrl(string path, int moduleId, string action, Dictionary querystring)
+ {
+ return EditUrl(path, moduleId, action, querystring);
+ }
+
+ // edit url
public string EditUrl(string action)
{
return EditUrl(ModuleState.ModuleId, action);
}
- public string EditUrl(string action, string parameters)
+ public string EditUrl(string action, string querystring)
{
- return EditUrl(ModuleState.ModuleId, action, parameters);
+ return EditUrl(ModuleState.ModuleId, action, querystring);
+ }
+
+ public string EditUrl(string action, Dictionary querystring)
+ {
+ return EditUrl(ModuleState.ModuleId, action, querystring);
}
public string EditUrl(int moduleId, string action)
@@ -174,16 +216,27 @@ namespace Oqtane.Modules
return EditUrl(moduleId, action, "");
}
- public string EditUrl(int moduleId, string action, string parameters)
+ public string EditUrl(int moduleId, string action, string querystring)
{
- return EditUrl(PageState.Page.Path, moduleId, action, parameters);
+ return EditUrl(PageState.Page.Path, moduleId, action, querystring);
}
- public string EditUrl(string path, int moduleid, string action, string parameters)
+ public string EditUrl(int moduleId, string action, Dictionary querystring)
{
- return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, parameters);
+ return EditUrl(PageState.Page.Path, moduleId, action, querystring);
}
+ public string EditUrl(string path, int moduleid, string action, string querystring)
+ {
+ return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, querystring);
+ }
+
+ public string EditUrl(string path, int moduleid, string action, Dictionary querystring)
+ {
+ return EditUrl(path, moduleid, action, Utilities.CreateQueryString(querystring));
+ }
+
+ // file url
public string FileUrl(string folderpath, string filename)
{
return FileUrl(folderpath, filename, false);
@@ -203,6 +256,8 @@ namespace Oqtane.Modules
return Utilities.FileUrl(PageState.Alias, fileid, download);
}
+ // image url
+
public string ImageUrl(int fileid, int width, int height)
{
return ImageUrl(fileid, width, height, "");
diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
index fd9c693b..b542bf7a 100644
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@@ -4,7 +4,7 @@
net8.0
Exe
Debug;Release
- 5.2.1
+ 5.2.2
Oqtane
Shaun Walker
.NET Foundation
@@ -12,7 +12,7 @@
.NET Foundation
https://www.oqtane.org
https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE
- https://github.com/oqtane/oqtane.framework/releases/tag/v5.2.1
+ https://github.com/oqtane/oqtane.framework/releases/tag/v5.2.2
https://github.com/oqtane/oqtane.framework
Git
Oqtane
diff --git a/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx b/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx
index 7e6b222d..a6f0a739 100644
--- a/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx
@@ -243,4 +243,7 @@
No notifications have been sent
+
+ Logout Everywhere
+
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Add.resx
index 1ad645d9..b25b2477 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Users/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Add.resx
@@ -117,12 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Error Adding User. Please Ensure Password Meets Complexity Requirements And Username And Email Is Not Already In Use.
-
-
- Passwords Entered Do Not Match
-
Error Adding User
@@ -133,17 +127,11 @@
Identity
- You Must Provide A Username, Password, Email Address And All Required Profile Information
+ You Must Provide A Username, Email Address And All Required Profile Information
Username Already Exists
-
- Please enter the password again to confirm it matches with the value above
-
-
- Confirm Password:
-
The full name of the user
@@ -156,21 +144,12 @@
Email:
-
- The user's password. Please choose a password which is sufficiently secure.
-
-
- Password:
-
A unique username for a user. Note that this field can not be modified once it is saved.
Username:
-
- Password
-
Indicate if new users should receive an email notification
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
index 6baae9c1..46c19999 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
@@ -385,10 +385,22 @@
Parameters:
- Optionally provide the type name of the role claim provided by the identity provider. These roles will be used in addition to any internal user roles assigned within the site.
+ Optionally provide the type name of the roles claim provided by the identity provider (the standard default is 'roles'). If role names from the identity provider do not exactly match your site role names, please use the Role Claim Mappings.
- Role Claim:
+ Roles Claim:
+
+
+ Optionally provide a comma delimited list of role names provided by the identity provider, as well as mappings to your site roles. For example if the identity provider includes an 'Admin' role name and you want it to map to the 'Administrators' site role you should specify 'Admin:Administrators'.
+
+
+ Role Claim Mappings:
+
+
+ This option will add or remove role assignments so that the site roles exactly match the roles provided by the identity provider for a user
+
+
+ Synchronize Roles?
Optionally provide a comma delimited list of user profile claim type names provided by the identity provider, as well as mappings to your user profile definition. For example if the identity provider includes a 'given_name' claim and you have a 'FirstName' user profile definition you should specify 'given_name:FirstName'.
diff --git a/Oqtane.Client/Services/Interfaces/IUserService.cs b/Oqtane.Client/Services/Interfaces/IUserService.cs
index c159c4bd..534466a5 100644
--- a/Oqtane.Client/Services/Interfaces/IUserService.cs
+++ b/Oqtane.Client/Services/Interfaces/IUserService.cs
@@ -75,6 +75,13 @@ namespace Oqtane.Services
///
Task LogoutUserAsync(User user);
+ ///
+ /// Logout a
+ ///
+ ///
+ ///
+ Task LogoutUserEverywhereAsync(User user);
+
///
/// Update e-mail verification status of a user.
///
diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs
index 286fc2d4..2133d2de 100644
--- a/Oqtane.Client/Services/UserService.cs
+++ b/Oqtane.Client/Services/UserService.cs
@@ -61,10 +61,14 @@ namespace Oqtane.Services
public async Task LogoutUserAsync(User user)
{
- // best practices recommend post is preferrable to get for logout
await PostJsonAsync($"{Apiurl}/logout", user);
}
+ public async Task LogoutUserEverywhereAsync(User user)
+ {
+ await PostJsonAsync($"{Apiurl}/logouteverywhere", user);
+ }
+
public async Task VerifyEmailAsync(User user, string token)
{
return await PostJsonAsync($"{Apiurl}/verify?token={token}", user);
diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index 8d682ac9..2682018f 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -9,7 +9,7 @@
@@ -41,9 +41,7 @@
Integrity = "sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==",
CrossOrigin = "anonymous" },
new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
- new Resource { ResourceType = ResourceType.Script, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js",
- Integrity = "sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==",
- CrossOrigin = "anonymous", Location = ResourceLocation.Body },
+ new Resource { ResourceType = ResourceType.Script, Url = Constants.BootstrapScriptUrl, Integrity = Constants.BootstrapScriptIntegrity, CrossOrigin = "anonymous", Location = ResourceLocation.Body },
};
}
diff --git a/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs b/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
index 93e935b9..35e8ab3e 100644
--- a/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
+++ b/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
@@ -11,9 +11,6 @@ using System.Net;
using Microsoft.Extensions.Localization;
using Oqtane.UI;
-// ReSharper disable UnassignedGetOnlyAutoProperty
-// ReSharper disable MemberCanBePrivate.Global
-
namespace Oqtane.Themes.Controls
{
public class ModuleActionsBase : ComponentBase
@@ -92,20 +89,21 @@ namespace Oqtane.Themes.Controls
return actionList;
}
- private async Task
EditUrlAsync(string url, int moduleId, string import)
- {
- await Task.Yield();
- return Utilities.EditUrl(PageState.Alias.Path, PageState.Page.Path, moduleId, import, "");
- }
-
protected async Task ModuleAction(ActionViewModel action)
{
if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.PermissionList))
{
- PageModule pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
-
- string url = Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, "edit=true&refresh");
+ var url = NavigationManager.Uri.Substring(NavigationManager.BaseUri.Length - 1);
+ if (!url.Contains("edit="))
+ {
+ url += (!url.Contains("?") ? "?" : "&") + "edit=true";
+ }
+ if (!url.Contains("refresh="))
+ {
+ url += (!url.Contains("?") ? "?" : "&") + "refresh=true";
+ }
+ var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
if (action.Action != null)
{
url = await action.Action(url, pagemodule);
@@ -115,31 +113,10 @@ namespace Oqtane.Themes.Controls
}
}
- private async Task MoveToPane(string url, string newPane, PageModule pagemodule)
+ private Task Settings(string url, PageModule pagemodule)
{
- string oldPane = pagemodule.Pane;
- pagemodule.Pane = newPane;
- pagemodule.Order = int.MaxValue; // add to bottom of pane
- await PageModuleService.UpdatePageModuleAsync(pagemodule);
- await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
- await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, oldPane);
- return url;
- }
-
- private async Task DeleteModule(string url, PageModule pagemodule)
- {
- pagemodule.IsDeleted = true;
- await PageModuleService.UpdatePageModuleAsync(pagemodule);
- await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
- return url;
- }
-
- private async Task Settings(string url, PageModule pagemodule)
- {
- await Task.Yield();
- var returnurl = Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, "edit=true");
- url = Utilities.EditUrl(PageState.Alias.Path, PageState.Page.Path, pagemodule.ModuleId, "Settings", "returnurl=" + WebUtility.UrlEncode(returnurl));
- return url;
+ url = Utilities.EditUrl(PageState.Alias.Path, PageState.Page.Path, pagemodule.ModuleId, "Settings", "returnurl=" + WebUtility.UrlEncode(url));
+ return Task.FromResult(url);
}
private async Task Publish(string url, PageModule pagemodule)
@@ -174,6 +151,20 @@ namespace Oqtane.Themes.Controls
return url;
}
+ private async Task DeleteModule(string url, PageModule pagemodule)
+ {
+ pagemodule.IsDeleted = true;
+ await PageModuleService.UpdatePageModuleAsync(pagemodule);
+ await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+ return url;
+ }
+
+ private Task EditUrlAsync(string url, int moduleId, string import)
+ {
+ url = Utilities.EditUrl(PageState.Alias.Path, PageState.Page.Path, moduleId, import, "returnurl=" + WebUtility.UrlEncode(url));
+ return Task.FromResult(url);
+ }
+
private async Task MoveTop(string url, PageModule pagemodule)
{
pagemodule.Order = 0;
@@ -206,6 +197,17 @@ namespace Oqtane.Themes.Controls
return url;
}
+ private async Task MoveToPane(string url, string newPane, PageModule pagemodule)
+ {
+ string oldPane = pagemodule.Pane;
+ pagemodule.Pane = newPane;
+ pagemodule.Order = int.MaxValue; // add to bottom of pane
+ await PageModuleService.UpdatePageModuleAsync(pagemodule);
+ await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+ await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, oldPane);
+ return url;
+ }
+
public class ActionViewModel
{
public string Icon { get; set; }
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
index 9c195681..a58e82b8 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
@@ -147,8 +147,7 @@
{
if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered))
{
- PageState.EditMode = true;
- NavigationManager.NavigateTo(NavigateUrl(page.Path, "edit=" + ((PageState.EditMode) ? "true" : "false")));
+ NavigationManager.NavigateTo(NavigateUrl(page.Path, "edit=" + PageState.EditMode.ToString()));
}
}
}
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index 730e7dd8..524f264b 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -331,7 +331,7 @@
if (_pageId != "-")
{
_modules = await ModuleService.GetModulesAsync(PageState.Page.SiteId);
- _modules = _modules.Where(module => module.PageId == int.Parse(_pageId) &&
+ _modules = _modules.Where(module => module.PageId == int.Parse(_pageId) && module.IsDeleted == false &&
UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList) &&
(_moduleType == "add" || module.ModuleDefinition.IsPortable))
.ToList();
diff --git a/Oqtane.Client/Themes/Controls/Theme/Login.razor b/Oqtane.Client/Themes/Controls/Theme/Login.razor
index f070d2c1..8b01e34c 100644
--- a/Oqtane.Client/Themes/Controls/Theme/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/Login.razor
@@ -4,31 +4,28 @@
@inject IStringLocalizer SharedLocalizer
-
-
- ...
-
-
- @if (PageState.Runtime == Runtime.Hybrid)
- {
-
- }
- else
- {
-
- }
-
-
- @if (ShowLogin)
- {
- @SharedLocalizer["Login"]
- }
-
-
+ @if (PageState.User != null)
+ {
+ @if (PageState.Runtime == Runtime.Hybrid)
+ {
+
+ }
+ else
+ {
+
+ }
+ }
+ else
+ {
+ @if (ShowLogin)
+ {
+ @SharedLocalizer["Login"]
+ }
+ }
@code
diff --git a/Oqtane.Client/Themes/Controls/Theme/Logo.razor b/Oqtane.Client/Themes/Controls/Theme/Logo.razor
index 594649f1..3e1f26d7 100644
--- a/Oqtane.Client/Themes/Controls/Theme/Logo.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/Logo.razor
@@ -8,4 +8,19 @@
)
-}
\ No newline at end of file
+}
+else
+{
+ if (UseSiteNameAsFallback)
+ {
+
+ @PageState.Site.Name
+
+ }
+}
+
+@code {
+ [Parameter]
+ public bool UseSiteNameAsFallback { get; set; } = false; // indicates if the site name should be displayed in scenarios where a site does not have a logo defined
+}
+
diff --git a/Oqtane.Client/Themes/Controls/Theme/Search.razor b/Oqtane.Client/Themes/Controls/Theme/Search.razor
index 0d8ebb51..19eec4cc 100644
--- a/Oqtane.Client/Themes/Controls/Theme/Search.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/Search.razor
@@ -1,20 +1,23 @@
@namespace Oqtane.Themes.Controls
@using System.Net
-@using Microsoft.AspNetCore.Http
@inherits ThemeControlBase
+@inject ISettingService SettingService
@inject IStringLocalizer Localizer
@inject NavigationManager NavigationManager
@if (_searchResultsPage != null)
{
-
+
}
-
-
@code {
+ private string _defaultCssClass;
private Page _searchResultsPage;
private string _keywords = "";
@@ -32,19 +34,23 @@
public string CssClass { get; set; }
[Parameter]
- public string SearchResultPagePath { get; set; } = "search";
+ public bool AllowTextInput { get; set; } = true; // setting to false will display only the search icon button - not the textbox
- [CascadingParameter]
- HttpContext HttpContext { get; set; }
+ [Parameter]
+ public string SearchResultPagePath { get; set; } = "search"; // setting to "" will disable search
[SupplyParameterFromForm(FormName = "SearchForm")]
public string KeyWords { get => ""; set => _keywords = value; }
protected override void OnInitialized()
{
- if(!string.IsNullOrEmpty(SearchResultPagePath))
+ if (bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "Search_Enabled", "True")))
{
- _searchResultsPage = PageState.Pages.FirstOrDefault(i => i.Path == SearchResultPagePath);
+ _defaultCssClass = (AllowTextInput) ? "app-search" : "app-search-noinput";
+ if (!string.IsNullOrEmpty(SearchResultPagePath))
+ {
+ _searchResultsPage = PageState.Pages.FirstOrDefault(i => i.Path == SearchResultPagePath);
+ }
}
}
diff --git a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
index dee72bbe..7646d320 100644
--- a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
@@ -6,20 +6,17 @@
@inject NavigationManager NavigationManager
-
-
- ...
-
-
- @context.User.Identity.Name
-
-
- @if (ShowRegister && PageState.Site.AllowRegistration)
- {
- @Localizer["Register"]
- }
-
-
+ @if (PageState.User != null)
+ {
+ @PageState.User.Username
+ }
+ else
+ {
+ @if (ShowRegister && PageState.Site.AllowRegistration)
+ {
+ @Localizer["Register"]
+ }
+ }
@code {
diff --git a/Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs b/Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs
index a533d45d..bb528190 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs
+++ b/Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs
@@ -21,9 +21,7 @@ namespace Oqtane.Themes.OqtaneTheme
Integrity = "sha512-M+Wrv9LTvQe81gFD2ZE3xxPTN5V2n1iLCXsldIxXvfs6tP+6VihBCwCMBkkjkQUZVmEHBsowb9Vqsq1et1teEg==",
CrossOrigin = "anonymous" },
new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Theme.css" },
- new Resource { ResourceType = ResourceType.Script, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js",
- Integrity = "sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==",
- CrossOrigin = "anonymous", Location = ResourceLocation.Body },
+ new Resource { ResourceType = ResourceType.Script, Url = Constants.BootstrapScriptUrl, Integrity = Constants.BootstrapScriptIntegrity, CrossOrigin = "anonymous", Location = ResourceLocation.Body }
}
};
}
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
index e00dd363..4814ad2a 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
@@ -4,7 +4,7 @@