diff --git a/.deployment b/.deployment deleted file mode 100644 index 3f3f33f2..00000000 --- a/.deployment +++ /dev/null @@ -1,2 +0,0 @@ -[config] -project = Oqtane.Server/Oqtane.Server.csproj diff --git a/Oqtane.Client/Installer/Controls/AzureSqlConfig.razor b/Oqtane.Client/Installer/Controls/AzureSqlConfig.razor new file mode 100644 index 00000000..18bb881f --- /dev/null +++ b/Oqtane.Client/Installer/Controls/AzureSqlConfig.razor @@ -0,0 +1,119 @@ +@namespace Oqtane.Installer.Controls +@implements Oqtane.Interfaces.IDatabaseConfigControl +@inject IStringLocalizer Localizer +@inject IStringLocalizer SharedLocalizer + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+@if (_security == "custom") +{ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+} +
+ +
+ +
+
+@if (_encryption == "true") +{ +
+ +
+ +
+
+} + +@code { + private string _server = "tcp:{SQL Server Name}.database.windows.net,1433"; + private string _database = "{SQL Database Name}"; + private string _security = "custom"; + private string _uid = "{SQL Administrator Login}"; + private string _pwd = String.Empty; + private string _passwordType = "password"; + private string _togglePassword = string.Empty; + private string _encryption = "true"; + private string _trustservercertificate = "false"; + + protected override void OnInitialized() + { + _togglePassword = SharedLocalizer["ShowPassword"]; + } + + public string GetConnectionString() + { + var connectionString = String.Empty; + + if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database)) + { + connectionString = $"Data Source={_server};Initial Catalog={_database};"; + } + + if (_security == "integrated") + { + connectionString += "Integrated Security=SSPI;"; + } + else + { + connectionString += $"User ID={_uid};Password={_pwd};"; + } + connectionString += $"Encrypt={_encryption};"; + connectionString += $"TrustServerCertificate={_trustservercertificate};"; + + return connectionString; + } + + private void TogglePassword() + { + if (_passwordType == "password") + { + _passwordType = "text"; + _togglePassword = SharedLocalizer["HidePassword"]; + } + else + { + _passwordType = "password"; + _togglePassword = SharedLocalizer["ShowPassword"]; + } + } +} \ No newline at end of file diff --git a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor index 0f96c9ff..5dcc6423 100644 --- a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor +++ b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor @@ -4,7 +4,7 @@ @inject IStringLocalizer SharedLocalizer
- +
diff --git a/Oqtane.Client/Installer/Installer.razor b/Oqtane.Client/Installer/Installer.razor index c00a0d7e..5d2a487a 100644 --- a/Oqtane.Client/Installer/Installer.razor +++ b/Oqtane.Client/Installer/Installer.razor @@ -15,7 +15,7 @@
-
@SharedLocalizer["Version"] @Constants.Version (.NET 9)
+
@SharedLocalizer["Version"] @Constants.Version (.NET @Environment.Version.Major)
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor index 848ab8e5..1d359f66 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor @@ -45,7 +45,7 @@
- +
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor index 7dbc6a3f..f5453315 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor @@ -44,14 +44,12 @@ else private async Task GetJobLogs() { - _jobLogs = await JobLogService.GetJobLogsAsync(); - + var jobId = -1; if (PageState.QueryString.ContainsKey("id")) { - _jobLogs = _jobLogs.Where(item => item.JobId == Int32.Parse(PageState.QueryString["id"])).ToList(); + jobId = int.Parse(PageState.QueryString["id"]); } - - _jobLogs = _jobLogs.OrderByDescending(item => item.JobLogId).ToList(); + _jobLogs = await JobLogService.GetJobLogsAsync(jobId); } private string DisplayStatus(bool isExecuting, bool? succeeded) diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index 803f2437..ef8bbc95 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -73,7 +73,7 @@
- +
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index 89b10381..fcfe6114 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -13,32 +13,32 @@ } else { -
-
-
- - @((MarkupString)" ") - -
-
- -
-
-
- - +
+
+
+ + + +
+
+ +
+
+
+ +
    @@ -61,17 +61,17 @@ else @context.Name @context.Version - @if (context.IsEnabled) - { - @SharedLocalizer["Yes"] - } - else - { - @SharedLocalizer["No"] - } + @if (context.IsEnabled) + { + @SharedLocalizer["Yes"] + } + else + { + @SharedLocalizer["No"] + } - @if (context.AssemblyName == Constants.ClientId || _modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null) + @if (context.AssemblyName == Constants.ClientId || _modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null) { @SharedLocalizer["Yes"] } @@ -87,9 +87,9 @@ else @((MarkupString)PurchaseLink(context.PackageName)) - @{ - var version = UpgradeAvailable(context.PackageName, context.Version); - } + @{ + var version = UpgradeAvailable(context.PackageName, context.Version); + } @if (version != context.Version) { @@ -153,10 +153,10 @@ else link = "" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + ""; } } - } - } - return link; - } + } + } + return link; + } private string SupportLink(string packagename, string version) { @@ -172,52 +172,75 @@ else 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; - } - } - return version; - } + 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 version; + } - private async Task DownloadModule(string packagename, string version) - { - try - { - await PackageService.DownloadPackageAsync(packagename, version); - await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version); - AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", packagename, version, ex.Message); - AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); - } - } + private async Task DownloadModule(string packagename, string version) + { + try + { + await PackageService.DownloadPackageAsync(packagename, version); + await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version); + AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", packagename, version, ex.Message); + AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); + } + } - private async Task DeleteModule(ModuleDefinition moduleDefinition) - { - try - { - await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId); - AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success); - NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true)); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message); - AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error); - } - } + private async Task DeleteModule(ModuleDefinition moduleDefinition) + { + try + { + await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId); + AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success); + NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true)); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message); + AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error); + } + } - private async Task CategoryChanged(ChangeEventArgs e) - { - _category = (string)e.Value; + private async Task CategoryChanged(ChangeEventArgs e) + { + _category = (string)e.Value; await LoadModuleDefinitions(); - } + } + + private async Task Synchronize() + { + try + { + ShowProgressIndicator(); + foreach (var moduleDefinition in _moduleDefinitions) + { + if (!string.IsNullOrEmpty(moduleDefinition.PackageName) && !_packages.Any(item => item.PackageId == moduleDefinition.PackageName)) + { + var package = await PackageService.GetPackageAsync(moduleDefinition.PackageName, moduleDefinition.Version, false); + } + } + HideProgressIndicator(); + AddModuleMessage(Localizer["Success.Module.Synchronize"], MessageType.Success); + NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true)); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Synchronizing Modules {Error}", ex.Message); + AddModuleMessage(Localizer["Error.Module.Synchronize"], MessageType.Error); + } + } } diff --git a/Oqtane.Client/Modules/Admin/Themes/Edit.razor b/Oqtane.Client/Modules/Admin/Themes/Edit.razor index ed324ebf..125e2846 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Edit.razor @@ -55,7 +55,7 @@
- +
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index b6b25345..2d8f83a8 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -15,8 +15,8 @@ else { - @((MarkupString)" ") - + +
@@ -173,4 +173,27 @@ else AddModuleMessage(Localizer["Error.Theme.Delete"], MessageType.Error); } } + + private async Task Synchronize() + { + try + { + ShowProgressIndicator(); + foreach (var theme in _themes) + { + if (!string.IsNullOrEmpty(theme.PackageName) && !_packages.Any(item => item.PackageId == theme.PackageName)) + { + await PackageService.GetPackageAsync(theme.PackageName, theme.Version, false); + } + } + HideProgressIndicator(); + AddModuleMessage(Localizer["Success.Theme.Synchronize"], MessageType.Success); + NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true)); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Synchronizing Themes {Error}", ex.Message); + AddModuleMessage(Localizer["Error.Theme.Synchronize"], MessageType.Error); + } + } } \ No newline at end of file diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor index c43ae566..31fee382 100644 --- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor +++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor @@ -13,9 +13,21 @@ @if (_package != null && _upgradeavailable) { - +
+
+ +
+ +
+
+
+

+ } else { @@ -23,7 +35,6 @@ } -
@@ -31,8 +42,19 @@
+
+ +
+ +
+
+

+ } @@ -41,6 +63,7 @@ private bool _initialized = false; private Package _package; private bool _upgradeavailable = false; + private string _backup = "True"; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; @@ -86,7 +109,7 @@ ShowProgressIndicator(); var interop = new Interop(JSRuntime); await interop.RedirectBrowser(NavigateUrl(), 10); - await InstallationService.Upgrade(); + await InstallationService.Upgrade(bool.Parse(_backup)); } catch (Exception ex) { diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index e0d895c8..a73350f0 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -421,6 +421,18 @@ else + @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) + { +
+ +
+ +
+
+ } }
@@ -520,6 +532,7 @@ else private string _domainfilter; private string _createusers; private string _verifyusers; + private string _allowhostrole; private string _secret; private string _secrettype = "password"; @@ -602,6 +615,7 @@ else _domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", ""); _createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true"); _verifyusers = SettingService.GetSetting(settings, "ExternalLogin:VerifyUsers", "true"); + _allowhostrole = SettingService.GetSetting(settings, "ExternalLogin:AllowHostRole", "false"); } private async Task LoadUsersAsync(bool load) @@ -705,6 +719,7 @@ else settings = SettingService.SetSetting(settings, "ExternalLogin:DomainFilter", _domainfilter, true); settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true); settings = SettingService.SetSetting(settings, "ExternalLogin:VerifyUsers", _verifyusers, true); + settings = SettingService.SetSetting(settings, "ExternalLogin:AllowHostRole", _allowhostrole, true); settings = SettingService.SetSetting(settings, "JwtOptions:Secret", _secret, true); settings = SettingService.SetSetting(settings, "JwtOptions:Issuer", _issuer, true); diff --git a/Oqtane.Client/Modules/Admin/Visitors/Index.razor b/Oqtane.Client/Modules/Admin/Visitors/Index.razor index ea5510c0..1cb46d3e 100644 --- a/Oqtane.Client/Modules/Admin/Visitors/Index.razor +++ b/Oqtane.Client/Modules/Admin/Visitors/Index.razor @@ -100,6 +100,18 @@ else
+ +
+
+ +
+ +
+
+
+
+ + } @@ -113,6 +125,7 @@ else private string _filter = ""; private int _retention = 30; private string _correlation = "true"; + private string _robots = ""; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; @@ -139,7 +152,8 @@ else _filter = SettingService.GetSetting(settings, "VisitorFilter", Constants.DefaultVisitorFilter); _retention = int.Parse(SettingService.GetSetting(settings, "VisitorRetention", "30")); _correlation = SettingService.GetSetting(settings, "VisitorCorrelation", "true"); - } + _robots = SettingService.GetSetting(settings, "Robots", ""); + } private async void TypeChanged(ChangeEventArgs e) { @@ -191,6 +205,7 @@ else settings = SettingService.SetSetting(settings, "VisitorFilter", _filter, true); settings = SettingService.SetSetting(settings, "VisitorRetention", _retention.ToString(), true); settings = SettingService.SetSetting(settings, "VisitorCorrelation", _correlation, true); + settings = SettingService.SetSetting(settings, "Robots", _robots, true); await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId); AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success); diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor index 6a2b979d..1e5fa1c5 100644 --- a/Oqtane.Client/Modules/Controls/FileManager.razor +++ b/Oqtane.Client/Modules/Controls/FileManager.razor @@ -163,6 +163,13 @@ [Parameter] public EventCallback OnUpload { get; set; } // optional - executes a method in the calling component when a file is uploaded + [Parameter] + public EventCallback OnSelectFolder { get; set; } // optional - executes a method in the calling component when a folder is selected + + [Parameter] + public EventCallback OnSelectFile { get; set; } // optional - executes a method in the calling component when a file is selected + + [Obsolete("Use OnSelectFile instead.")] [Parameter] public EventCallback OnSelect { get; set; } // optional - executes a method in the calling component when a file is selected @@ -300,6 +307,8 @@ FileId = -1; _file = null; _image = string.Empty; + + await OnSelectFolder.InvokeAsync(FolderId); StateHasChanged(); } catch (Exception ex) @@ -315,7 +324,10 @@ _message = string.Empty; FileId = int.Parse((string)e.Value); await SetImage(); + #pragma warning disable CS0618 await OnSelect.InvokeAsync(FileId); + #pragma warning restore CS0618 + await OnSelectFile.InvokeAsync(FileId); StateHasChanged(); } @@ -438,7 +450,10 @@ { FileId = file.FileId; await SetImage(); +#pragma warning disable CS0618 await OnSelect.InvokeAsync(FileId); +#pragma warning restore CS0618 + await OnSelectFile.InvokeAsync(FileId); await OnUpload.InvokeAsync(FileId); } await GetFiles(); @@ -489,7 +504,10 @@ await GetFiles(); FileId = -1; await SetImage(); +#pragma warning disable CS0618 await OnSelect.InvokeAsync(FileId); +#pragma warning restore CS0618 + await OnSelectFile.InvokeAsync(FileId); StateHasChanged(); } catch (Exception ex) diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor index 6bd700bd..a1f6e094 100644 --- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor +++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor @@ -60,7 +60,7 @@ @foreach (User user in _users) { - @user.DisplayName + @user.DisplayName (@user.Username) @foreach (var permissionname in _permissionnames) { @@ -270,8 +270,8 @@ private async Task> GetUsers(string filter) { var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered); - return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase)) - .ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName); + return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase) || item.User.Username.Contains(filter, StringComparison.OrdinalIgnoreCase)) + .ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName + " (" + item.User.Username + ")"); } private async Task AddUser() diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index d8fca67b..c974f27a 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -4,7 +4,7 @@ net9.0 Exe Debug;Release - 6.1.1 + 6.1.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/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 https://github.com/oqtane/oqtane.framework Git Oqtane @@ -22,16 +22,22 @@ - - - - + + + + + + + true + + + false false diff --git a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx index 7909364d..6f249723 100644 --- a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx +++ b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx @@ -121,7 +121,7 @@ Server: - Enter the database server name. This might include a port number as well if you are using a cloud service (ie. servername.database.windows.net,1433) + Enter the database server name. This might include a port number as well if you are using a cloud service. Database: diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx index 186fdd65..4421b90a 100644 --- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx +++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx @@ -147,8 +147,8 @@ The owner or creator of the module - - The reference url of the module + + The url of the module The contact for the module @@ -171,8 +171,8 @@ Owner: - - Reference Url: + + Url: Contact: diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx index ce91ee3b..90ffbe18 100644 --- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx @@ -159,4 +159,13 @@ Enabled? + + Synchronize + + + Modules Have Been Successfully Synchronized With The Marketplace + + + Error Synchronizing Modules With The Marketplace + \ No newline at end of file diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Edit.resx index c18f9761..69f9bdd8 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Themes/Edit.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Edit.resx @@ -132,8 +132,8 @@ Owner: - - Reference Url: + + Url: Contact: @@ -153,8 +153,8 @@ The owner or creator of the theme - - The reference url of the theme + + The url of the theme The contact for the theme diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx index 7ff1b618..4edc516c 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx @@ -159,4 +159,13 @@ Assign + + Synchronize + + + Themes Have Been Successfully Synchronized With The Marketplace + + + Error Synchronizing Themes With The Marketplace + \ No newline at end of file diff --git a/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx index a833fa20..e609f42a 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx @@ -151,6 +151,12 @@ You Cannot Perform A System Update In A Development Environment - Please Note That The System Update Capability Is A Simplified Upgrade Process Intended For Small To Medium Sized Installations. For Larger Enterprise Installations You Will Want To Use A Manual Upgrade Process. Also Note That The System Update Capability Is Not Recommended When Using Microsoft Azure Due To Environmental Limitations. + Please Note That The System Update Capability Is A Simplified Upgrade Process Intended For Small To Medium Sized Installations. For Larger Enterprise Installations You Will Want To Use A Manual Upgrade Process. + + + Backup Files? + + + Specify if you want to backup files during the upgrade process. Disabling this option will result in a better experience in some environments. \ No newline at end of file diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx index 3b0bda17..a0a7c1f4 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx @@ -513,4 +513,10 @@ Do you want users to be logged out of every active session on any device, or only their current session? + + Allow Host Role? + + + Indicate if host roles are supported from the identity provider. Please use caution with this option as it allows the host user to administrate every site within your installation. + \ No newline at end of file diff --git a/Oqtane.Client/Resources/Modules/Admin/Visitors/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Visitors/Index.resx index 37599ccb..a6dab428 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Visitors/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Visitors/Index.resx @@ -198,4 +198,13 @@ Session Duration: + + Robots.txt + + + Instructions: + + + Specify your robots.txt instructions to provide bots with guidance on which parts of your site should be indexed + \ No newline at end of file diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs index f1fbd057..e0c388c8 100644 --- a/Oqtane.Client/Services/InstallationService.cs +++ b/Oqtane.Client/Services/InstallationService.cs @@ -47,9 +47,9 @@ namespace Oqtane.Services return await PostJsonAsync(ApiUrl, config); } - public async Task Upgrade() + public async Task Upgrade(bool backup) { - return await GetJsonAsync($"{ApiUrl}/upgrade"); + return await GetJsonAsync($"{ApiUrl}/upgrade/?backup={backup}"); } public async Task RestartAsync() diff --git a/Oqtane.Client/Services/Interfaces/IInstallationService.cs b/Oqtane.Client/Services/Interfaces/IInstallationService.cs index e8a433c7..1e2311ce 100644 --- a/Oqtane.Client/Services/Interfaces/IInstallationService.cs +++ b/Oqtane.Client/Services/Interfaces/IInstallationService.cs @@ -26,8 +26,9 @@ namespace Oqtane.Services /// /// Starts the upgrade process /// + /// indicates if files should be backed up during upgrade /// internal status/message object - Task Upgrade(); + Task Upgrade(bool backup); /// /// Restarts the installation diff --git a/Oqtane.Client/Services/Interfaces/IJobLogService.cs b/Oqtane.Client/Services/Interfaces/IJobLogService.cs index 3f56473b..e6a10a20 100644 --- a/Oqtane.Client/Services/Interfaces/IJobLogService.cs +++ b/Oqtane.Client/Services/Interfaces/IJobLogService.cs @@ -10,10 +10,11 @@ namespace Oqtane.Services public interface IJobLogService { /// - /// Return a list of all entries + /// Return a list of entries /// + /// /// - Task> GetJobLogsAsync(); + Task> GetJobLogsAsync(int jobId); /// /// Return a entry for the given Id diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs index 04c9c534..0d1d3359 100644 --- a/Oqtane.Client/Services/JobLogService.cs +++ b/Oqtane.Client/Services/JobLogService.cs @@ -15,10 +15,9 @@ namespace Oqtane.Services private string Apiurl => CreateApiUrl("JobLog"); - public async Task> GetJobLogsAsync() + public async Task> GetJobLogsAsync(int jobId) { - List joblogs = await GetJsonAsync>(Apiurl); - return joblogs.OrderBy(item => item.StartDate).ToList(); + return await GetJsonAsync>($"{Apiurl}?jobid={jobId}"); } public async Task GetJobLogAsync(int jobLogId) diff --git a/Oqtane.Client/Themes/Controls/Theme/CookieConsent.razor b/Oqtane.Client/Themes/Controls/Theme/CookieConsent.razor index db39b44f..66626cbc 100644 --- a/Oqtane.Client/Themes/Controls/Theme/CookieConsent.razor +++ b/Oqtane.Client/Themes/Controls/Theme/CookieConsent.razor @@ -6,8 +6,7 @@ @if (_enabled && !Hidden) { - -
+
@if (_showBanner) { diff --git a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor index b418a602..9c3802b4 100644 --- a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor +++ b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor @@ -2,19 +2,18 @@ @using System.Net @inherits ThemeControlBase @inject IStringLocalizer Localizer - @inject NavigationManager NavigationManager @if (PageState.User != null) { - @PageState.User.Username + @PageState.User.Username } else { @if (ShowRegister && PageState.Site.AllowRegistration) { - @Localizer["Register"] + @Localizer["Register"] } } @@ -23,23 +22,50 @@ [Parameter] public bool ShowRegister { get; set; } + [Parameter] public string CssClass { get; set; } = "btn btn-primary"; + [Parameter] + public string RegisterUrl { get; set; } // optional parameter to specify a custom registration url + + [Parameter] + public string ProfileUrl { get; set; } // optional parameter to specify a custom user profile url + + private string _registerurl = ""; + private string _profileurl = ""; private string _returnurl = ""; protected override void OnParametersSet() - { - if (!PageState.QueryString.ContainsKey("returnurl")) - { - // remember current url - _returnurl = WebUtility.UrlEncode(PageState.Route.PathAndQuery); - } - else - { - // use existing value - _returnurl = PageState.QueryString["returnurl"]; - } + { + if (!PageState.QueryString.ContainsKey("returnurl")) + { + // remember current url + _returnurl = WebUtility.UrlEncode(PageState.Route.PathAndQuery); + } + else + { + // use existing value + _returnurl = PageState.QueryString["returnurl"]; + } + + if (!string.IsNullOrEmpty(RegisterUrl)) + { + _registerurl = RegisterUrl + "?returnurl=" + (RegisterUrl.Contains("://") ? WebUtility.UrlEncode(PageState.Route.RootUrl) + _returnurl : _returnurl); + } + else + { + _registerurl = NavigateUrl("register", "returnurl=" + _returnurl); + } + + if (!string.IsNullOrEmpty(ProfileUrl)) + { + _registerurl = ProfileUrl + "?returnurl=" + (ProfileUrl.Contains("://") ? WebUtility.UrlEncode(PageState.Route.RootUrl) + _returnurl : _returnurl); + } + else + { + _registerurl = NavigateUrl("profile", "returnurl=" + _returnurl); + } } } diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index 79ff5b42..048df3d7 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -623,7 +623,7 @@ } // ensure resource does not exist already - if (!pageresources.Exists(item => item.Url.ToLower() == resource.Url.ToLower())) + if (!pageresources.Exists(item => Utilities.GetUrlPath(item.Url).ToLower() == Utilities.GetUrlPath(resource.Url).ToLower())) { pageresources.Add(resource.Clone(level, name, fingerprint)); } diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj index 75b41b27..ec15691d 100644 --- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj +++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj @@ -2,7 +2,7 @@ net9.0 - 6.1.1 + 6.1.2 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 https://github.com/oqtane/oqtane.framework Git true @@ -42,7 +42,7 @@ - + diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj index c6b19d06..3e6f1890 100644 --- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj +++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj @@ -2,7 +2,7 @@ net9.0 - 6.1.1 + 6.1.2 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 https://github.com/oqtane/oqtane.framework Git true @@ -34,7 +34,7 @@ - + diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj index 35333476..cc1be87e 100644 --- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj +++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj @@ -2,7 +2,7 @@ net9.0 - 6.1.1 + 6.1.2 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 https://github.com/oqtane/oqtane.framework Git true @@ -33,7 +33,7 @@ - + diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj index fe2e5713..c10d12b1 100644 --- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj +++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj @@ -2,7 +2,7 @@ net9.0 - 6.1.1 + 6.1.2 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 https://github.com/oqtane/oqtane.framework Git true @@ -33,7 +33,7 @@ - + diff --git a/Oqtane.Maui/Oqtane.Maui.csproj b/Oqtane.Maui/Oqtane.Maui.csproj index ef62ef19..eed1f14c 100644 --- a/Oqtane.Maui/Oqtane.Maui.csproj +++ b/Oqtane.Maui/Oqtane.Maui.csproj @@ -6,7 +6,7 @@ Exe - 6.1.1 + 6.1.2 Oqtane Shaun Walker .NET Foundation @@ -14,7 +14,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 https://github.com/oqtane/oqtane.framework Git Oqtane.Maui @@ -30,7 +30,7 @@ com.oqtane.maui - 6.1.1 + 6.1.2 1 @@ -67,14 +67,14 @@ - - - - - - - - + + + + + + + + diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec index 3ace78bf..0d0217f8 100644 --- a/Oqtane.Package/Oqtane.Client.nuspec +++ b/Oqtane.Package/Oqtane.Client.nuspec @@ -2,7 +2,7 @@ Oqtane.Client - 6.1.1 + 6.1.2 Shaun Walker .NET Foundation Oqtane Framework @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 readme.md icon.png oqtane diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec index 0ab95f9b..0ebabcbb 100644 --- a/Oqtane.Package/Oqtane.Framework.nuspec +++ b/Oqtane.Package/Oqtane.Framework.nuspec @@ -2,7 +2,7 @@ Oqtane.Framework - 6.1.1 + 6.1.2 Shaun Walker .NET Foundation Oqtane Framework @@ -11,8 +11,8 @@ .NET Foundation false MIT - https://github.com/oqtane/oqtane.framework/releases/download/v6.1.1/Oqtane.Framework.6.1.1.Upgrade.zip - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/download/v6.1.2/Oqtane.Framework.6.1.2.Upgrade.zip + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 readme.md icon.png oqtane framework diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec index 9331b895..06dcf42c 100644 --- a/Oqtane.Package/Oqtane.Server.nuspec +++ b/Oqtane.Package/Oqtane.Server.nuspec @@ -2,7 +2,7 @@ Oqtane.Server - 6.1.1 + 6.1.2 Shaun Walker .NET Foundation Oqtane Framework @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 readme.md icon.png oqtane diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec index 937ac8bf..a240d6a2 100644 --- a/Oqtane.Package/Oqtane.Shared.nuspec +++ b/Oqtane.Package/Oqtane.Shared.nuspec @@ -2,7 +2,7 @@ Oqtane.Shared - 6.1.1 + 6.1.2 Shaun Walker .NET Foundation Oqtane Framework @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 readme.md icon.png oqtane diff --git a/Oqtane.Package/Oqtane.Updater.nuspec b/Oqtane.Package/Oqtane.Updater.nuspec index f55170f2..8ef6a84a 100644 --- a/Oqtane.Package/Oqtane.Updater.nuspec +++ b/Oqtane.Package/Oqtane.Updater.nuspec @@ -2,7 +2,7 @@ Oqtane.Updater - 6.1.1 + 6.1.2 Shaun Walker .NET Foundation Oqtane Framework @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 readme.md icon.png oqtane diff --git a/Oqtane.Package/install.ps1 b/Oqtane.Package/install.ps1 index 9f6f5f82..3f8d7188 100644 --- a/Oqtane.Package/install.ps1 +++ b/Oqtane.Package/install.ps1 @@ -1 +1 @@ -Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.1.Install.zip" -Force +Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.2.Install.zip" -Force diff --git a/Oqtane.Package/upgrade.ps1 b/Oqtane.Package/upgrade.ps1 index 70b816f3..9b53797a 100644 --- a/Oqtane.Package/upgrade.ps1 +++ b/Oqtane.Package/upgrade.ps1 @@ -1 +1 @@ -Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.1.Upgrade.zip" -Force +Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.2.Upgrade.zip" -Force diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor index 868755aa..ae7d1632 100644 --- a/Oqtane.Server/Components/App.razor +++ b/Oqtane.Server/Components/App.razor @@ -764,7 +764,7 @@ } // ensure resource does not exist already - if (!pageresources.Exists(item => item.Url.ToLower() == resource.Url.ToLower())) + if (!pageresources.Exists(item => Utilities.GetUrlPath(item.Url).ToLower() == Utilities.GetUrlPath(resource.Url).ToLower())) { pageresources.Add(resource.Clone(level, name, fingerprint)); } diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 4bdb8a90..7ead95d7 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -23,6 +23,7 @@ using System.IO.Compression; using Oqtane.Services; using Microsoft.Extensions.Primitives; using Microsoft.AspNetCore.Http.HttpResults; +using Microsoft.Net.Http.Headers; // ReSharper disable StringIndexOfIsCultureSpecific.1 @@ -735,6 +736,10 @@ namespace Oqtane.Controllers } if (!string.IsNullOrEmpty(imagepath)) { + if (!string.IsNullOrEmpty(file.Folder.CacheControl)) + { + HttpContext.Response.Headers.Append(HeaderNames.CacheControl, value: file.Folder.CacheControl); + } return PhysicalFile(imagepath, file.GetMimeType()); } else diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index 23d3db9b..62545760 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -280,9 +280,14 @@ namespace Oqtane.Controllers var folder = _folders.GetFolder(id, false); if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, folder.SiteId, EntityNames.Folder, id, PermissionNames.Edit)) { - if (Directory.Exists(_folders.GetFolderPath(folder))) + var folderPath = _folders.GetFolderPath(folder); + if (Directory.Exists(folderPath)) { - Directory.Delete(_folders.GetFolderPath(folder)); + foreach (var filePath in Directory.GetFiles(folderPath)) + { + System.IO.File.Delete(filePath); + } + Directory.Delete(folderPath); } _folders.DeleteFolder(id); _syncManager.AddSyncEvent(_alias, EntityNames.Folder, folder.FolderId, SyncEventActions.Delete); diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs index 0ad80eb8..534e05c3 100644 --- a/Oqtane.Server/Controllers/InstallationController.cs +++ b/Oqtane.Server/Controllers/InstallationController.cs @@ -88,10 +88,10 @@ namespace Oqtane.Controllers [HttpGet("upgrade")] [Authorize(Roles = RoleNames.Host)] - public Installation Upgrade() + public Installation Upgrade(string backup) { var installation = new Installation { Success = true, Message = "" }; - _installationManager.UpgradeFramework(); + _installationManager.UpgradeFramework(bool.Parse(backup)); return installation; } diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs index 5f711e4f..dac2db68 100644 --- a/Oqtane.Server/Controllers/JobLogController.cs +++ b/Oqtane.Server/Controllers/JobLogController.cs @@ -17,12 +17,12 @@ namespace Oqtane.Controllers _jobLogs = jobLogs; } - // GET: api/ + // GET: api/?jobid=x [HttpGet] [Authorize(Roles = RoleNames.Host)] - public IEnumerable Get() + public IEnumerable Get(string jobid) { - return _jobLogs.GetJobLogs(); + return _jobLogs.GetJobLogs(int.Parse(jobid)); } // GET api//5 diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs index c0b943bc..eb678a3b 100644 --- a/Oqtane.Server/Controllers/PackageController.cs +++ b/Oqtane.Server/Controllers/PackageController.cs @@ -90,33 +90,26 @@ namespace Oqtane.Controllers package = await GetJson(client, url + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}&download={download}&email={WebUtility.UrlEncode(GetPackageRegistryEmail())}"); } - if (package != null) + if (package != null && bool.Parse(install)) { - if (bool.Parse(install)) + using (var httpClient = new HttpClient()) { - using (var httpClient = new HttpClient()) + var folder = Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder); + var response = await httpClient.GetAsync(package.PackageUrl).ConfigureAwait(false); + if (response.IsSuccessStatusCode) { - var folder = Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder); - var response = await httpClient.GetAsync(package.PackageUrl).ConfigureAwait(false); - if (response.IsSuccessStatusCode) + string filename = packageid + "." + version + ".nupkg"; + using (var fileStream = new FileStream(Path.Combine(Constants.PackagesFolder, filename), FileMode.Create, FileAccess.Write, FileShare.None)) { - string filename = packageid + "." + version + ".nupkg"; - using (var fileStream = new FileStream(Path.Combine(Constants.PackagesFolder, filename), FileMode.Create, FileAccess.Write, FileShare.None)) - { - await response.Content.CopyToAsync(fileStream).ConfigureAwait(false); - } - } - else - { - _logger.Log(LogLevel.Error, this, LogFunction.Create, "Could Not Download {PackageUrl}", package.PackageUrl); + await response.Content.CopyToAsync(fileStream).ConfigureAwait(false); } } + else + { + _logger.Log(LogLevel.Error, this, LogFunction.Create, "Could Not Download {PackageUrl}", package.PackageUrl); + } } } - else - { - _logger.Log(LogLevel.Error, this, LogFunction.Create, "Package {PackageId}.{Version} Is Not Registered In The Marketplace", packageid, version); - } } return package; } diff --git a/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs b/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs index 0e58e4b6..e98a0afa 100644 --- a/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs @@ -532,8 +532,9 @@ namespace Oqtane.Extensions // external roles if (claimsPrincipal.Claims.Any(item => item.Type == httpContext.GetSiteSettings().GetValue("ExternalLogin:RoleClaimType", ""))) { - var _roles = httpContext.RequestServices.GetRequiredService(); - var roles = _roles.GetRoles(user.SiteId).ToList(); // global roles excluded ie. host users cannot be added/deleted + var _roles = httpContext.RequestServices.GetRequiredService(); + var allowhostrole = bool.Parse(httpContext.GetSiteSettings().GetValue("ExternalLogin:AllowHostRole", "false")); + var roles = _roles.GetRoles(user.SiteId, allowhostrole).ToList(); var mappings = httpContext.GetSiteSettings().GetValue("ExternalLogin:RoleClaimMappings", "").Split(','); foreach (var claim in claimsPrincipal.Claims.Where(item => item.Type == httpContext.GetSiteSettings().GetValue("ExternalLogin:RoleClaimType", ""))) @@ -583,8 +584,9 @@ namespace Oqtane.Extensions } } - var userrole = userRoles.FirstOrDefault(item => item.Role.Name == RoleNames.Registered); - if (!user.IsDeleted && userrole != null && Utilities.IsEffectiveAndNotExpired(userrole.EffectiveDate, userrole.ExpiryDate)) + var host = userRoles.FirstOrDefault(item => item.Role.Name == RoleNames.Host); + var registered = userRoles.FirstOrDefault(item => item.Role.Name == RoleNames.Registered); + if (!user.IsDeleted && (host != null || registered != null && Utilities.IsEffectiveAndNotExpired(registered.EffectiveDate, registered.ExpiryDate))) { // update user user.LastLoginOn = DateTime.UtcNow; diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 2273cded..1ee2a138 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -731,6 +731,7 @@ namespace Oqtane.Infrastructure { _configManager.AddOrUpdateSetting($"{SettingKeys.DatabaseSection}:{SettingKeys.DatabaseTypeKey}", Constants.DefaultDBType, true); } + if (!_configManager.GetSection(SettingKeys.AvailableDatabasesSection).Exists()) { string databases = "["; @@ -742,6 +743,19 @@ namespace Oqtane.Infrastructure databases += "]"; _configManager.AddOrUpdateSetting(SettingKeys.AvailableDatabasesSection, databases, true); } + var availabledatabases = _configManager.GetSection(SettingKeys.AvailableDatabasesSection).GetChildren(); + if (!availabledatabases.Any(item => item.GetSection("Name").Value == "Azure SQL")) + { + // Azure SQL added in 6.1.2 + string databases = "["; + foreach (var database in availabledatabases) + { + databases += "{ " + $"\"Name\": \"{database["Name"]}\", \"ControlType\": \"{database["ControlType"]}\", \"DBTYpe\": \"{database["DBType"]}\"" + " },"; + } + databases += "{ \"Name\": \"Azure SQL\", \"ControlType\": \"Oqtane.Installer.Controls.AzureSqlConfig, Oqtane.Client\", \"DBTYpe\": \"Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer\" }"; + databases += "]"; + _configManager.AddOrUpdateSetting(SettingKeys.AvailableDatabasesSection, databases, true); + } } } } diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index fdfca028..1591c150 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -380,7 +380,7 @@ namespace Oqtane.Infrastructure File.WriteAllText(assemblyLogPath, JsonSerializer.Serialize(assemblies, new JsonSerializerOptions { WriteIndented = true })); } - public async Task UpgradeFramework() + public async Task UpgradeFramework(bool backup) { string folder = Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder); if (Directory.Exists(folder)) @@ -448,14 +448,14 @@ namespace Oqtane.Infrastructure // install Oqtane.Upgrade zip package if (File.Exists(upgradepackage)) { - FinishUpgrade(); + FinishUpgrade(backup); } } } } } - private void FinishUpgrade() + private void FinishUpgrade(bool backup) { // check if updater application exists string Updater = Constants.UpdaterPackageId + ".dll"; @@ -469,7 +469,7 @@ namespace Oqtane.Infrastructure { WorkingDirectory = folder, FileName = "dotnet", - Arguments = Path.Combine(folder, Updater) + " \"" + _environment.ContentRootPath + "\" \"" + _environment.WebRootPath + "\"", + Arguments = Path.Combine(folder, Updater) + " \"" + _environment.ContentRootPath + "\" \"" + _environment.WebRootPath + "\" \"" + backup.ToString() + "\"", UseShellExecute = false, ErrorDialog = false, CreateNoWindow = true, diff --git a/Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs b/Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs index 0e5bcc6d..1d1648c7 100644 --- a/Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs +++ b/Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs @@ -7,7 +7,7 @@ namespace Oqtane.Infrastructure void InstallPackages(); bool UninstallPackage(string PackageName); int RegisterAssemblies(); - Task UpgradeFramework(); + Task UpgradeFramework(bool backup); void RestartApplication(); } } diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs index 5c8fc04f..655c7b20 100644 --- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs +++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs @@ -46,6 +46,8 @@ namespace Oqtane.Infrastructure protected async Task ExecuteAsync(CancellationToken stoppingToken) { + await Task.Yield(); // required so that this method does not block startup + while (!stoppingToken.IsCancellationRequested) { using (var scope = _serviceScopeFactory.CreateScope()) @@ -170,8 +172,7 @@ namespace Oqtane.Infrastructure jobs.UpdateJob(job); // trim the job log - List logs = jobLogs.GetJobLogs().Where(item => item.JobId == job.JobId) - .OrderByDescending(item => item.JobLogId).ToList(); + List logs = jobLogs.GetJobLogs(job.JobId).ToList(); for (int i = logs.Count; i > job.RetentionHistory; i--) { jobLogs.DeleteJobLog(logs[i - 1].JobLogId); diff --git a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs index ab9cc058..d65acb0a 100644 --- a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs +++ b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs @@ -130,7 +130,12 @@ namespace Oqtane.Infrastructure mailMessage.Subject = notification.Subject; //body - mailMessage.Body = notification.Body.Replace("\n", "
"); + mailMessage.Body = notification.Body; + if (!mailMessage.Body.Contains("<") || !mailMessage.Body.Contains(">")) + { + // plain text messages should convert line breaks to HTML tags to preserve formatting + mailMessage.Body = mailMessage.Body.Replace("\n", "
"); + } // encoding mailMessage.SubjectEncoding = System.Text.Encoding.UTF8; diff --git a/Oqtane.Server/Infrastructure/Middleware/TenantMiddleware.cs b/Oqtane.Server/Infrastructure/Middleware/TenantMiddleware.cs index 4af3d6c2..1c2ec3c9 100644 --- a/Oqtane.Server/Infrastructure/Middleware/TenantMiddleware.cs +++ b/Oqtane.Server/Infrastructure/Middleware/TenantMiddleware.cs @@ -74,8 +74,21 @@ namespace Oqtane.Infrastructure // handle robots.txt root request (does not support subfolder aliases) if (context.Request.Path.StartsWithSegments("/robots.txt") && string.IsNullOrEmpty(alias.Path)) { - // allow all user agents and specify site map - var robots = $"User-agent: *\n\nSitemap: {context.Request.Scheme}://{alias.Name}/sitemap.xml"; + string robots = ""; + if (sitesettings.ContainsKey("Robots") && !string.IsNullOrEmpty(sitesettings["Robots"])) + { + robots = sitesettings["Robots"]; + } + else + { + // allow all user agents by default + robots = $"User-agent: *"; + } + if (!robots.ToLower().Contains("Sitemap:")) + { + // add sitemap if not specified + robots += $"\n\nSitemap: {context.Request.Scheme}://{alias.Name}/sitemap.xml"; + } context.Response.ContentType = "text/plain"; await context.Response.WriteAsync(robots); return; diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/AdminSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/AdminSiteTemplate.cs index 7727e9aa..ddd1e784 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/AdminSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/AdminSiteTemplate.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Microsoft.Extensions.Localization; using Oqtane.Documentation; -using Oqtane.Infrastructure; using Oqtane.Models; using Oqtane.Shared; @@ -182,6 +181,7 @@ namespace Oqtane.Infrastructure.SiteTemplates Name = "Privacy", Parent = "", Path = "privacy", + Order = seed + 11, Icon = Icons.Eye, IsNavigation = false, IsPersonalizable = false, @@ -212,6 +212,7 @@ namespace Oqtane.Infrastructure.SiteTemplates Name = "Terms", Parent = "", Path = "terms", + Order = seed + 13, Icon = Icons.List, IsNavigation = false, IsPersonalizable = false, @@ -242,7 +243,7 @@ namespace Oqtane.Infrastructure.SiteTemplates Name = "Not Found", Parent = "", Path = "404", - Order = seed + 11, + Order = seed + 15, Icon = Icons.X, IsNavigation = false, IsPersonalizable = false, diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index 00498def..9521469c 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using Microsoft.AspNetCore.Hosting; using Oqtane.Documentation; -using Oqtane.Infrastructure; using Oqtane.Models; using Oqtane.Repository; using Oqtane.Shared; diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs index 7cc0eb07..f35f1ab2 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using Oqtane.Documentation; -using Oqtane.Infrastructure; using Oqtane.Models; using Oqtane.Shared; diff --git a/Oqtane.Server/Infrastructure/UpgradeManager.cs b/Oqtane.Server/Infrastructure/UpgradeManager.cs index 409ab59c..421be775 100644 --- a/Oqtane.Server/Infrastructure/UpgradeManager.cs +++ b/Oqtane.Server/Infrastructure/UpgradeManager.cs @@ -473,6 +473,7 @@ namespace Oqtane.Infrastructure Name = "Privacy", Parent = "", Path = "privacy", + Order = 1011, Icon = Icons.Eye, IsNavigation = false, IsPersonalizable = false, @@ -502,6 +503,7 @@ namespace Oqtane.Infrastructure Name = "Terms", Parent = "", Path = "terms", + Order = 1013, Icon = Icons.List, IsNavigation = false, IsPersonalizable = false, diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index a7205ca8..1ae9c302 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -3,7 +3,7 @@ net9.0 Debug;Release - 6.1.1 + 6.1.2 Oqtane Shaun Walker .NET Foundation @@ -11,7 +11,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 https://github.com/oqtane/oqtane.framework Git Oqtane @@ -34,21 +34,21 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + - + diff --git a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs index d5858da5..2c092e7a 100644 --- a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Oqtane.Models; namespace Oqtane.Repository @@ -6,6 +6,7 @@ namespace Oqtane.Repository public interface IJobLogRepository { IEnumerable GetJobLogs(); + IEnumerable GetJobLogs(int jobId); JobLog AddJobLog(JobLog jobLog); JobLog UpdateJobLog(JobLog jobLog); JobLog GetJobLog(int jobLogId); diff --git a/Oqtane.Server/Repository/JobLogRepository.cs b/Oqtane.Server/Repository/JobLogRepository.cs index 440a483d..ee234c27 100644 --- a/Oqtane.Server/Repository/JobLogRepository.cs +++ b/Oqtane.Server/Repository/JobLogRepository.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; @@ -15,9 +15,17 @@ namespace Oqtane.Repository } public IEnumerable GetJobLogs() + { + return GetJobLogs(-1); + } + + public IEnumerable GetJobLogs(int jobId) { return _db.JobLog + .AsNoTracking() + .Where(item => item.JobId == jobId || jobId == -1) .Include(item => item.Job) // eager load jobs + .OrderByDescending(item => item.JobLogId) .ToList(); } diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs index 8af62274..6956a20d 100644 --- a/Oqtane.Server/Repository/UserRoleRepository.cs +++ b/Oqtane.Server/Repository/UserRoleRepository.cs @@ -61,6 +61,9 @@ namespace Oqtane.Repository public UserRole AddUserRole(UserRole userRole) { + userRole.EffectiveDate = userRole.EffectiveDate.HasValue ? DateTime.SpecifyKind(userRole.EffectiveDate.Value, DateTimeKind.Utc) : userRole.EffectiveDate; + userRole.ExpiryDate = userRole.ExpiryDate.HasValue ? DateTime.SpecifyKind(userRole.ExpiryDate.Value, DateTimeKind.Utc) : userRole.ExpiryDate; + using var db = _dbContextFactory.CreateDbContext(); db.UserRole.Add(userRole); db.SaveChanges(); @@ -84,6 +87,9 @@ namespace Oqtane.Repository public UserRole UpdateUserRole(UserRole userRole) { + userRole.EffectiveDate = userRole.EffectiveDate.HasValue ? DateTime.SpecifyKind(userRole.EffectiveDate.Value, DateTimeKind.Utc) : userRole.EffectiveDate; + userRole.ExpiryDate = userRole.ExpiryDate.HasValue ? DateTime.SpecifyKind(userRole.ExpiryDate.Value, DateTimeKind.Utc) : userRole.ExpiryDate; + using var db = _dbContextFactory.CreateDbContext(); db.Entry(userRole).State = EntityState.Modified; db.SaveChanges(); diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs index 319d1471..8c99ef7f 100644 --- a/Oqtane.Server/Startup.cs +++ b/Oqtane.Server/Startup.cs @@ -70,7 +70,6 @@ namespace Oqtane services.AddLocalization(options => options.ResourcesPath = "Resources"); services.AddOptions>().Bind(Configuration.GetSection(SettingKeys.AvailableDatabasesSection)); - services.Configure(opts => opts.ShutdownTimeout = TimeSpan.FromSeconds(10)); // increase from default of 5 seconds // register scoped core services services.AddScoped() diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj index 5c41d71c..f4e222ee 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj index 41a11759..3844f51a 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg deleted file mode 100644 index 63028fb6..00000000 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg and /dev/null differ diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg deleted file mode 100644 index 2b6babc0..00000000 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg and /dev/null differ diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg deleted file mode 100644 index dad4f9b6..00000000 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg and /dev/null differ diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg deleted file mode 100644 index 77495a18..00000000 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg and /dev/null differ diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj index facf7f31..a454ee59 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/release.cmd b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/release.cmd index 08f5286c..1785fa66 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/release.cmd +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/release.cmd @@ -4,4 +4,4 @@ set ProjectName=%2 del "*.nupkg" "..\..\[RootFolder]\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName% -XCOPY "*.nupkg" "..\..\[RootFolder]\Oqtane.Server\wwwroot\Packages\" /Y \ No newline at end of file +XCOPY "*.nupkg" "..\..\[RootFolder]\Oqtane.Server\Packages\" /Y \ No newline at end of file diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj index a3a0fe81..c991ee17 100644 --- a/Oqtane.Shared/Oqtane.Shared.csproj +++ b/Oqtane.Shared/Oqtane.Shared.csproj @@ -3,7 +3,7 @@ net9.0 Debug;Release - 6.1.1 + 6.1.2 Oqtane Shaun Walker .NET Foundation @@ -11,7 +11,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 https://github.com/oqtane/oqtane.framework Git Oqtane @@ -19,11 +19,11 @@ - - - + + + - + diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 0519de73..23c17245 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -4,8 +4,8 @@ namespace Oqtane.Shared { public class Constants { - public static readonly string Version = "6.1.1"; - public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5,4.0.6,5.0.0,5.0.1,5.0.2,5.0.3,5.1.0,5.1.1,5.1.2,5.2.0,5.2.1,5.2.2,5.2.3,5.2.4,6.0.0,6.0.1,6.1.0,6.1.1"; + public static readonly string Version = "6.1.2"; + public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5,4.0.6,5.0.0,5.0.1,5.0.2,5.0.3,5.1.0,5.1.1,5.1.2,5.2.0,5.2.1,5.2.2,5.2.3,5.2.4,6.0.0,6.0.1,6.1.0,6.1.1,6.1.2"; public const string PackageId = "Oqtane.Framework"; public const string ClientId = "Oqtane.Client"; public const string UpdaterPackageId = "Oqtane.Updater"; diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs index 826fac70..95ae2cd1 100644 --- a/Oqtane.Shared/Shared/Utilities.cs +++ b/Oqtane.Shared/Shared/Utilities.cs @@ -121,6 +121,17 @@ namespace Oqtane.Shared return $"{alias?.BaseUrl}{url}{Constants.ImageUrl}{fileId}/{width}/{height}/{mode}/{position}/{background}/{rotate}/{recreate}"; } + public static string ImageUrl(Alias alias, string folderpath, string filename, int width, int height, string mode, string position, string background, int rotate, string format, bool recreate) + { + var aliasUrl = (alias != null && !string.IsNullOrEmpty(alias.Path)) ? "/" + alias.Path : ""; + mode = string.IsNullOrEmpty(mode) ? "crop" : mode; + position = string.IsNullOrEmpty(position) ? "center" : position; + background = string.IsNullOrEmpty(background) ? "transparent" : background; + format = string.IsNullOrEmpty(format) ? "png" : format; + var querystring = $"?width={width}&height={height}&mode={mode}&position={position}&background={background}&rotate={rotate}&format={format}&recreate={recreate}"; + return $"{alias?.BaseUrl}{aliasUrl}{Constants.FileUrl}{folderpath.Replace("\\", "/")}{filename}{querystring}"; + } + public static string TenantUrl(Alias alias, string url) { url = (!url.StartsWith("/")) ? "/" + url : url; @@ -480,6 +491,15 @@ namespace Oqtane.Shared return querystring; } + public static string GetUrlPath(string url) + { + if (url.Contains("?")) + { + url = url.Substring(0, url.IndexOf("?")); + } + return url; + } + public static string LogMessage(object @class, string message) { return $"[{@class.GetType()}] {message}"; diff --git a/Oqtane.Updater/Oqtane.Updater.csproj b/Oqtane.Updater/Oqtane.Updater.csproj index 4343cf9b..0efc8228 100644 --- a/Oqtane.Updater/Oqtane.Updater.csproj +++ b/Oqtane.Updater/Oqtane.Updater.csproj @@ -3,7 +3,7 @@ net9.0 Exe - 6.1.1 + 6.1.2 Oqtane Shaun Walker .NET Foundation @@ -11,7 +11,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1 + https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2 https://github.com/oqtane/oqtane.framework Git Oqtane diff --git a/Oqtane.Updater/Program.cs b/Oqtane.Updater/Program.cs index cd8f8359..5cac25f6 100644 --- a/Oqtane.Updater/Program.cs +++ b/Oqtane.Updater/Program.cs @@ -15,17 +15,19 @@ namespace Oqtane.Updater /// static void Main(string[] args) { - // requires 2 arguments - the ContentRootPath and the WebRootPath of the site + // requires 3 arguments - the ContentRootPath, the WebRootPath of the site, and a backup flag // for testing purposes you can uncomment and modify the logic below - //Array.Resize(ref args, 2); + //Array.Resize(ref args, 3); //args[0] = @"C:\yourpath\oqtane.framework\Oqtane.Server"; //args[1] = @"C:\yourpath\oqtane.framework\Oqtane.Server\wwwroot"; + //args[2] = @"true"; - if (args.Length == 2) + if (args.Length == 3) { string contentrootfolder = args[0]; string webrootfolder = args[1]; + bool backup = bool.Parse(args[2]); string deployfolder = Path.Combine(contentrootfolder, "Packages"); string backupfolder = Path.Combine(contentrootfolder, "Backup"); @@ -49,6 +51,7 @@ namespace Oqtane.Updater WriteLog(logFilePath, "Upgrade Process Started: " + DateTime.UtcNow.ToString() + Environment.NewLine); WriteLog(logFilePath, "ContentRootPath: " + contentrootfolder + Environment.NewLine); WriteLog(logFilePath, "WebRootPath: " + webrootfolder + Environment.NewLine); + if (packagename != "" && File.Exists(Path.Combine(webrootfolder, "app_offline.bak"))) { WriteLog(logFilePath, "Located Upgrade Package: " + packagename + Environment.NewLine); @@ -74,12 +77,12 @@ namespace Oqtane.Updater } bool success = true; - // ensure files are not locked - if (CanAccessFiles(files)) + + if (backup) { UpdateOfflineContent(offlineFilePath, offlineTemplate, 10, "Preparing Backup Folder"); WriteLog(logFilePath, "Preparing Backup Folder: " + backupfolder + Environment.NewLine); - + try { // clear out backup folder @@ -112,8 +115,28 @@ namespace Oqtane.Updater { Directory.CreateDirectory(Path.GetDirectoryName(filename)); } - File.Copy(file, filename); - WriteLog(logFilePath, "Copy File: " + filename + Environment.NewLine); + + try + { + // try optimistically to backup the file + File.Copy(file, filename); + WriteLog(logFilePath, "Copy File: " + filename + Environment.NewLine); + } + catch + { + // if the file is locked, wait until it is unlocked + if (CanAccessFile(file)) + { + File.Copy(file, filename); + WriteLog(logFilePath, "Copy File: " + filename + Environment.NewLine); + } + else + { + // file could not be backed up, upgrade unsuccessful + success = false; + WriteLog(logFilePath, "Error Backing Up Files" + Environment.NewLine); + } + } } } catch (Exception ex) @@ -125,17 +148,20 @@ namespace Oqtane.Updater } } } + } - // extract files - if (success) + // extract files + if (success) + { + UpdateOfflineContent(offlineFilePath, offlineTemplate, 50, "Extracting Files From Upgrade Package"); + WriteLog(logFilePath, "Extracting Files From Upgrade Package..." + Environment.NewLine); + try { - UpdateOfflineContent(offlineFilePath, offlineTemplate, 50, "Extracting Files From Upgrade Package"); - WriteLog(logFilePath, "Extracting Files From Upgrade Package..." + Environment.NewLine); - try + using (ZipArchive archive = ZipFile.OpenRead(packagename)) { - using (ZipArchive archive = ZipFile.OpenRead(packagename)) + foreach (ZipArchiveEntry entry in archive.Entries) { - foreach (ZipArchiveEntry entry in archive.Entries) + if (success) { if (!string.IsNullOrEmpty(entry.Name)) { @@ -144,20 +170,42 @@ namespace Oqtane.Updater { Directory.CreateDirectory(Path.GetDirectoryName(filename)); } - entry.ExtractToFile(filename, true); - WriteLog(logFilePath, "Exact File: " + filename + Environment.NewLine); + + try + { + // try optimistically to extract the file + entry.ExtractToFile(filename, true); + WriteLog(logFilePath, "Exact File: " + filename + Environment.NewLine); + } + catch + { + // if the file is locked, wait until it is unlocked + if (CanAccessFile(filename)) + { + entry.ExtractToFile(filename, true); + WriteLog(logFilePath, "Exact File: " + filename + Environment.NewLine); + } + else + { + // file could not be extracted, upgrade unsuccessful + success = false; + WriteLog(logFilePath, "Error Extracting Files From Upgrade Package" + Environment.NewLine); + } + } } } } } - catch (Exception ex) - { - success = false; - UpdateOfflineContent(offlineFilePath, offlineTemplate, 95, "Error Extracting Files From Upgrade Package", "bg-danger"); - WriteLog(logFilePath, "Error Extracting Files From Upgrade Package: " + ex.Message + Environment.NewLine); - } + } + catch (Exception ex) + { + success = false; + WriteLog(logFilePath, "Error Extracting Files From Upgrade Package: " + ex.Message + Environment.NewLine); + } - if (success) + if (success) + { + if (backup) { UpdateOfflineContent(offlineFilePath, offlineTemplate, 90, "Removing Backup Folder"); WriteLog(logFilePath, "Removing Backup Folder..." + Environment.NewLine); @@ -174,7 +222,12 @@ namespace Oqtane.Updater WriteLog(logFilePath, "Error Removing Backup Folder: " + ex.Message + Environment.NewLine); } } - else + } + else + { + UpdateOfflineContent(offlineFilePath, offlineTemplate, 95, "Error Extracting Files From Upgrade Package", "bg-danger"); + + if (backup) { UpdateOfflineContent(offlineFilePath, offlineTemplate, 50, "Upgrade Failed, Restoring Files From Backup Folder", "bg-warning"); WriteLog(logFilePath, "Restoring Files From Backup Folder..." + Environment.NewLine); @@ -201,18 +254,14 @@ namespace Oqtane.Updater } } } - else - { - UpdateOfflineContent(offlineFilePath, offlineTemplate, 95, "Upgrade Failed: Could Not Backup Files", "bg-danger"); - WriteLog(logFilePath, "Upgrade Failed: Could Not Backup Files" + Environment.NewLine); - } } else { - UpdateOfflineContent(offlineFilePath, offlineTemplate, 95, "Upgrade Failed: Some Files Are Locked By The Hosting Environment", "bg-danger"); - WriteLog(logFilePath, "Upgrade Failed: Some Files Are Locked By The Hosting Environment" + Environment.NewLine); + UpdateOfflineContent(offlineFilePath, offlineTemplate, 95, "Upgrade Failed: Could Not Backup Files", "bg-danger"); + WriteLog(logFilePath, "Upgrade Failed: Could Not Backup Files" + Environment.NewLine); } + UpdateOfflineContent(offlineFilePath, offlineTemplate, 100, "Upgrade Process Finished, Reloading", success ? "" : "bg-danger"); Thread.Sleep(3000); //wait for 3 seconds to complete the upgrade process. // bring the app back online @@ -240,55 +289,45 @@ namespace Oqtane.Updater } } - private static bool CanAccessFiles(List files) + private static bool CanAccessFile(string filepath) { - // ensure files are not locked by another process - // the IIS ShutdownTimeLimit defines the duration for app shutdown (default is 90 seconds) - // websockets can delay application shutdown (ie. Blazor Server) + // ensure file is not locked by another process int retries = 60; int sleep = 2; - - bool canAccess = true; + int attempts = 0; FileStream stream = null; - int i = 0; - while (i < (files.Count - 1) && canAccess) - { - string filepath = files[i]; - int attempts = 0; - bool locked = true; - while (attempts < retries && locked) + bool locked = true; + while (attempts < retries && locked) + { + try { - try + if (File.Exists(filepath)) { - if (File.Exists(filepath)) - { - stream = File.Open(filepath, FileMode.Open, FileAccess.Read, FileShare.None); - locked = false; - } - else - { - locked = false; - } + stream = File.Open(filepath, FileMode.Open, FileAccess.Read, FileShare.None); + locked = false; } - catch // file is locked by another process + else { - Thread.Sleep(sleep * 1000); // wait + locked = false; } - finally - { - stream?.Close(); - } - attempts += 1; } - if (locked) + catch // file is locked by another process { - canAccess = false; - Console.WriteLine("File Locked: " + filepath); + Thread.Sleep(sleep * 1000); // wait } - i += 1; + finally + { + stream?.Close(); + } + attempts += 1; } - return canAccess; + if (locked) + { + Console.WriteLine("File Locked: " + filepath); + } + + return !locked; } private static void UpdateOfflineContent(string filePath, string contentTemplate, int progress, string status, string progressClass = "") diff --git a/README.md b/README.md index 22858202..4a0fc61e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Oqtane is being developed based on some fundamental principles which are outline # Latest Release -[6.1.0](https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0) was released on February 11, 2025 and is a minor release including 95 pull requests by 9 different contributors, pushing the total number of project commits all-time to over 6300. The Oqtane framework continues to evolve at a rapid pace to meet the needs of .NET developers. +[6.1.1](https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1) was released on March 12, 2025 and is a maintenance release including 46 pull requests by 4 different contributors, pushing the total number of project commits all-time to over 6400. The Oqtane framework continues to evolve at a rapid pace to meet the needs of .NET developers. # Try It Now! @@ -22,11 +22,11 @@ Microsoft's Public Cloud (requires an Azure account) A free ASP.NET hosting account. No hidden fees. No credit card required. [![Deploy to MonsterASP.NET](https://www.oqtane.org/files/Public/MonsterASPNET.png)](https://www.monsterasp.net/) -# Getting Started (Version 6.x) +# Getting Started (Version 6.1.1) **Installing using source code from the Dev/Master branch:** -- Install **[.NET 9.0.2 SDK](https://dotnet.microsoft.com/download/dotnet/9.0)**. +- Install **[.NET 9.0.3 SDK](https://dotnet.microsoft.com/download/dotnet/9.0)**. - Install the latest edition (v17.12 or higher) of [Visual Studio 2022](https://visualstudio.microsoft.com/downloads) with the **ASP.NET and web development** workload enabled. Oqtane works with ALL editions of Visual Studio from Community to Enterprise. If you wish to use LocalDB for development ( not a requirement as Oqtane supports SQLite, mySQL, and PostgreSQL ) you must also install the **Data storage and processing**. @@ -92,6 +92,10 @@ Connect with other developers, get support, and share ideas by joining the Oqtan # Roadmap This project is open source, and therefore is a work in progress... +[6.1.1](https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.1) (Mar 12, 2025) +- [x] Stabilization improvements +- [x] Cookie Consent Banner & Privacy/Terms + [6.1.0](https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0) (Feb 11, 2025) - [x] Static Asset / Folder Asset Caching - [x] JavaScript improvements in Blazor Static Server Rendering (SSR) diff --git a/azuredeploy.json b/azuredeploy.json index 123ee8e2..461130fc 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -2,6 +2,24 @@ "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", "contentVersion": "1.0.0.2", "parameters": { + "sqlServerName": { + "type": "string", + "metadata": { + "description": "The SQL Server name (must be unique). If you have an existing SQL Server in your resource group, you can specify its name and include its login credentials below." + } + }, + "sqlAdministratorLogin": { + "type": "string", + "metadata": { + "description": "The Administrator login username for the SQL Server specified above" + } + }, + "sqlAdministratorLoginPassword": { + "type": "securestring", + "metadata": { + "description": "The Administrator login password for the SQL Server specified above" + } + }, "sqlDatabaseEditionTierDtuCapacity": { "type": "string", "defaultValue": "Basic-Basic-5-2", @@ -26,37 +44,19 @@ "GeneralPurpose-GP_S_Gen5_2-2-250" ], "metadata": { - "description": "Describes the database Edition, Tier, Dtu, Gigabytes (Edition-Tier-Dtu-Gigabytes)" - } - }, - "sqlServerName": { - "type": "string", - "metadata": { - "description": "The name of the sql server. It has to be unique." + "description": "The SQL Database Configuration (Edition-Tier-DTU-Capacity)" } }, "sqlDatabaseName": { "type": "string", "metadata": { - "description": "The name of the sql database. It has to be unique." - } - }, - "sqlAdministratorLogin": { - "type": "string", - "metadata": { - "description": "The admin user of the SQL Server." - } - }, - "sqlAdministratorLoginPassword": { - "type": "securestring", - "metadata": { - "description": "The password of the admin user of the SQL Server." + "description": "The SQL Database name (must be unique)" } }, "BlazorWebsiteName": { "type": "string", "metadata": { - "description": "The name of the website. It has to be unique." + "description": "The App Service name for the Blazor Website (must be unique). If you use the same name as the SQL Database specified above, it will make it easier to associate the resources later." } }, "BlazorSKU": { @@ -77,28 +77,12 @@ ], "defaultValue": "B1", "metadata": { - "description": "The SKU for the App Service Plan" - } - }, - "BlazorSKUCapacity": { - "type": "int", - "defaultValue": 1, - "maxValue": 3, - "minValue": 1, - "metadata": { - "description": "Describes plan's instance count" - } - }, - "location": { - "type": "string", - "defaultValue": "[resourceGroup().location]", - "metadata": { - "description": "Location for all resources." + "description": "The App Service SKU for the Blazor Website" } } }, "variables": { - "hostingPlanName": "[concat('Oqtane-hostingplan-', uniqueString(resourceGroup().id))]", + "hostingPlanName": "[concat('Oqtane-HostingPlan-', uniqueString(resourceGroup().id))]", "databaseCollation": "SQL_Latin1_General_CP1_CI_AS", "databaseEditionTierDtuCapacity": "[split(parameters('sqlDatabaseEditionTierDtuCapacity'),'-')]", "databaseEdition": "[variables('databaseEditionTierDtuCapacity')[0]]", @@ -115,9 +99,9 @@ // ------------------------------------------------------ { "type": "Microsoft.Sql/servers", - "apiVersion": "2022-05-01-preview", // Updated API version + "apiVersion": "2022-05-01-preview", "name": "[parameters('sqlServerName')]", - "location": "[parameters('location')]", + "location": "[resourceGroup().location]", "tags": { "displayName": "SQL Server" }, @@ -132,9 +116,9 @@ // ------------------------------------------------------ { "type": "Microsoft.Sql/servers/databases", - "apiVersion": "2022-05-01-preview", // Updated API version + "apiVersion": "2022-05-01-preview", "name": "[format('{0}/{1}', parameters('sqlServerName'), parameters('sqlDatabaseName'))]", - "location": "[parameters('location')]", + "location": "[resourceGroup().location]", "tags": { "displayName": "Database" }, @@ -169,11 +153,11 @@ ] }, // ------------------------------------------------------ - // Firewall Rule (renamed to 'AllowAllMicrosoftAzureIps') + // Firewall Rule // ------------------------------------------------------ { "type": "Microsoft.Sql/servers/firewallRules", - "apiVersion": "2022-05-01-preview", // Updated API version + "apiVersion": "2022-05-01-preview", "name": "[format('{0}/{1}', parameters('sqlServerName'), 'AllowAllMicrosoftAzureIps')]", "properties": { "endIpAddress": "0.0.0.0", @@ -188,16 +172,15 @@ // ------------------------------------------------------ { "type": "Microsoft.Web/serverfarms", - "apiVersion": "2022-03-01", // Updated API version + "apiVersion": "2022-03-01", "name": "[variables('hostingPlanName')]", - "location": "[parameters('location')]", + "location": "[resourceGroup().location]", "tags": { "displayName": "Blazor" }, "sku": { "name": "[parameters('BlazorSKU')]", - // If you want to auto-map to certain "tier" strings, you can do so. Here we just set the capacity: - "capacity": "[parameters('BlazorSKUCapacity')]" + "capacity": "1" }, "properties": { "name": "[variables('hostingPlanName')]", @@ -209,13 +192,11 @@ // Web App // ------------------------------------------------------ { - "apiVersion": "2022-03-01", // Updated API version - "name": "[parameters('BlazorWebsiteName')]", "type": "Microsoft.Web/sites", - "location": "[parameters('location')]", - "dependsOn": [ - "[variables('hostingPlanName')]" - ], + "apiVersion": "2022-03-01", + "name": "[parameters('BlazorWebsiteName')]", + "kind": "app", + "location": "[resourceGroup().location]", "tags": { "[concat('hidden-related:', resourceId('Microsoft.Web/serverfarms', variables('hostingPlanName')))]": "empty", "displayName": "Website" @@ -224,44 +205,26 @@ "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('hostingPlanName'))]", "siteConfig": { "webSocketsEnabled": true, - // Updated .NET version "v9.0" from second snippet "netFrameworkVersion": "v9.0" } }, + "dependsOn": [ + "[variables('hostingPlanName')]" + ], "resources": [ // -------------------------------------------------- - // Source Control for your Web App + // ZIP Deploy // -------------------------------------------------- { - "type": "sourcecontrols", - "apiVersion": "2022-03-01", - "name": "web", - "location": "[parameters('location')]", + "type": "Microsoft.Web/sites/extensions", + "apiVersion": "2024-04-01", + "name": "[concat(parameters('BlazorWebsiteName'), '/ZipDeploy')]", + "properties": { + "packageUri": "https://github.com/oqtane/oqtane.framework/releases/download/v6.1.1/Oqtane.Framework.6.1.1.Install.zip" + }, "dependsOn": [ "[resourceId('Microsoft.Web/sites', parameters('BlazorWebsiteName'))]" - ], - "properties": { - "repoUrl": "https://github.com/oqtane/oqtane.framework.git", - "branch": "master", - "isManualIntegration": true - } - }, - // -------------------------------------------------- - // Connection Strings (to use FQDN) - // -------------------------------------------------- - { - "type": "config", - "apiVersion": "2022-03-01", - "name": "connectionstrings", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('BlazorWebsiteName'))]" - ], - "properties": { - "DefaultConnection": { - "value": "[concat('Data Source=tcp:', reference(resourceId('Microsoft.Sql/servers', parameters('sqlServerName'))).fullyQualifiedDomainName, ',1433;Initial Catalog=', parameters('sqlDatabaseName'), ';User Id=', parameters('sqlAdministratorLogin'), '@', reference(resourceId('Microsoft.Sql/servers', parameters('sqlServerName'))).fullyQualifiedDomainName, ';Password=', parameters('sqlAdministratorLoginPassword'), ';')]", - "type": "SQLAzure" - } - } + ] } ] }