Merge remote-tracking branch 'upstream/dev' into dev

Oqtane.Application/Client/Oqtane.Application.Client.csproj

@@ -2,12 +2,14 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
+		<OutputType>Exe</OutputType>
 		<Version>1.0.0</Version>
 		<AssemblyName>Oqtane.Application.Client.Oqtane</AssemblyName>
-		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
+		<IsPackable>true</IsPackable>
 		<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
-		<BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
 		<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+		<PublishTrimmed>false</PublishTrimmed>
+		<BlazorEnableCompression>false</BlazorEnableCompression>
 	</PropertyGroup>
 
 	<ItemGroup>

Oqtane.Application/Server/Oqtane.Application.Server.csproj

@@ -4,6 +4,7 @@
 		<TargetFramework>net9.0</TargetFramework>
 		<Version>1.0.0</Version>
 		<AssemblyName>Oqtane.Application.Server.Oqtane</AssemblyName>
+		<IsPackable>true</IsPackable>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 		<SatelliteResourceLanguages>none</SatelliteResourceLanguages>
 		<CompressionEnabled>false</CompressionEnabled>

Oqtane.Application/Shared/Oqtane.Application.Shared.csproj

@@ -4,6 +4,7 @@
 		<TargetFramework>net9.0</TargetFramework>
 		<Version>1.0.0</Version>
 		<AssemblyName>Oqtane.Application.Shared.Oqtane</AssemblyName>
+		<IsPackable>true</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -56,6 +56,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<ILocalizationCookieService, LocalizationCookieService>();
             services.AddScoped<ICookieConsentService, CookieConsentService>();
             services.AddScoped<ITimeZoneService, TimeZoneService>();
+            services.AddScoped<IMigrationHistoryService, MigrationHistoryService>();
             services.AddScoped<IOutputCacheService, OutputCacheService>();
 
             // providers

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

@@ -2,9 +2,13 @@
 @inherits ModuleBase
 @inject ISystemService SystemService
 @inject IInstallationService InstallationService
+@inject IMigrationHistoryService MigrationHistoryService
+@inject ITenantService TenantService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
+@if (_initialized)
+{
     <TabStrip>
         <TabPanel Name="Info" Heading="Info" ResourceKey="Info">
             <div class="container">
@@ -170,12 +174,38 @@
             <br /><br />
             <button type="button" class="btn btn-danger" @onclick="ClearLog">@Localizer["Clear"]</button>
         </TabPanel>
+        <TabPanel Name="Migrations" Heading="Migrations" ResourceKey="Migrations">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="tenant" HelpText="The name of the current database. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database." ResourceKey="Tenant">Database: </Label>
+                    <div class="col-sm-9">
+                        <input id="tenant" class="form-control" @bind="@_tenant" readonly />
+                    </div>
+                </div>
+            </div>
+            <br />
+            <Pager Items="@_history" SearchProperties="MigrationId">
+                <Header>
+                    <th>@Localizer["Migration"]</th>
+                    <th>@Localizer["Date"]</th>
+                    <th>@Localizer["Version"]</th>
+                </Header>
+                <Row>
+                    <td>@context.MigrationId</td>
+                    <td>@UtcToLocal(context.AppliedDate)</td>
+                    <td>@context.AppliedVersion</td>
+                </Row>
+            </Pager>
+        </TabPanel>
     </TabStrip>
     <br /><br />
+}
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
+    private bool _initialized = false;
+
     private string _version = string.Empty;
     private string _clrversion = string.Empty;
     private string _osversion = string.Empty;
@@ -199,6 +229,9 @@
 
     private string _log = string.Empty;
 
+    private string _tenant = string.Empty;
+    private List<MigrationHistory> _history;
+
     protected override async Task OnInitializedAsync()
     {
         _version = Constants.Version;
@@ -236,6 +269,12 @@
         {
             _log = systeminfo["Log"].ToString();
         }
+
+        var tenants = await TenantService.GetTenantsAsync();
+        _tenant = tenants.Find(item => item.TenantId == PageState.Site.TenantId).Name;
+        _history = await MigrationHistoryService.GetMigrationHistoryAsync();
+
+        _initialized = true;
     }
 
 	private async Task SaveConfig()

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

@@ -309,4 +309,19 @@
   <data name="Endpoints" xml:space="preserve">
     <value>API Endpoints</value>
   </data>
+  <data name="Migration" xml:space="preserve">
+    <value>Migration</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Date</value>
+  </data>
+  <data name="Version" xml:space="preserve">
+    <value>Framework Version</value>
+  </data>
+  <data name="Tenant.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Tenant.HelpText" xml:space="preserve">
+    <value>The name of the current database. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database.</value>
+  </data>
 </root>

Oqtane.Client/Services/MigrationHistoryService.cs

@@ -0,0 +1,34 @@
+using Oqtane.Models;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Oqtane.Documentation;
+using Oqtane.Shared;
+
+namespace Oqtane.Services
+{
+    /// <summary>
+    /// Service to manage <see cref="MigrationHistory/>s on the Oqtane installation.
+    /// </summary>
+    public interface IMigrationHistoryService
+    {
+        /// <summary>
+        /// Get all <see cref="MigrationHistory"/>s
+        /// </summary>
+        /// <returns></returns>
+        Task<List<MigrationHistory>> GetMigrationHistoryAsync();
+    }
+
+    [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
+    public class MigrationHistoryService : ServiceBase, IMigrationHistoryService
+    {
+        public MigrationHistoryService(HttpClient http, SiteState siteState) : base(http, siteState) { }
+
+        private string Apiurl => CreateApiUrl("MigrationHistory");
+
+        public async Task<List<MigrationHistory>> GetMigrationHistoryAsync()
+        {
+            return await GetJsonAsync<List<MigrationHistory>>(Apiurl);
+        }
+    }
+}

Oqtane.Package/release.cmd

@@ -15,31 +15,8 @@ rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\runtimes\ios-arm64"
 rmdir /Q /S "..\Oqtane.Server\bin\Release\net9.0\publish\runtimes\iossimulator-arm64"
 rmdir /Q /S "..\Oqtane.Server\bin\Release\net9.0\publish\runtimes\iossimulator-x64"
 rmdir /Q /S "..\Oqtane.Server\bin\Release\net9.0\publish\runtimes\iossimulator-x86"
-setlocal ENABLEDELAYEDEXPANSION
+rmdir /Q /S "..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Modules\Templates"
-set retain=Radzen.Blazor
+rmdir /Q /S "..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Themes\Templates"
-for /D %%i in ("..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\_content\*") do (
-set /A found=0
-for %%j in (%retain%) do (
-if "%%~nxi" == "%%j" set /A found=1
-)
-if not !found! == 1 rmdir /Q/S "%%i"
-)
-set retain=Oqtane.Modules.Admin.Login,Oqtane.Modules.HtmlText
-for /D %%i in ("..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Modules\*") do (
-set /A found=0
-for %%j in (%retain%) do (
-if "%%~nxi" == "%%j" set /A found=1
-)
-if not !found! == 1 rmdir /Q/S "%%i"
-)
-set retain=Oqtane.Themes.BlazorTheme,Oqtane.Themes.OqtaneTheme
-for /D %%i in ("..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Themes\*") do (
-set /A found=0
-for %%j in (%retain%) do (
-if "%%~nxi" == "%%j" set /A found=1
-)
-if not !found! == 1 rmdir /Q/S "%%i"
-)
 del "..\Oqtane.Server\bin\Release\net9.0\publish\appsettings.json"
 ren "..\Oqtane.Server\bin\Release\net9.0\publish\appsettings.release.json" "appsettings.json"
 C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\install.ps1"

Oqtane.Server/Controllers/MigrationHistoryController.cs

@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Oqtane.Models;
+using System.Collections.Generic;
+using Oqtane.Shared;
+using Oqtane.Repository;
+
+namespace Oqtane.Controllers
+{
+    [Route(ControllerRoutes.ApiRoute)]
+    public class MigrationHistoryController : Controller
+    {
+        private readonly IMigrationHistoryRepository _history;
+
+        public MigrationHistoryController(IMigrationHistoryRepository history)
+        {
+            _history = history;
+        }
+
+        // GET: api/<controller>
+        [HttpGet]
+        [Authorize(Roles = RoleNames.Host)]
+        public IEnumerable<MigrationHistory> Get()
+        {
+            return _history.GetMigrationHistory();
+        }
+    }
+}

Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -228,6 +228,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<IImageService, ImageService>();
             services.AddScoped<ICookieConsentService, ServerCookieConsentService>();
             services.AddScoped<ITimeZoneService, TimeZoneService>();
+            services.AddScoped<IMigrationHistoryService, MigrationHistoryService>();
 
             // providers
             services.AddScoped<ITextEditor, Oqtane.Modules.Controls.QuillJSTextEditor>();
@@ -276,6 +277,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddTransient<IVisitorRepository, VisitorRepository>();
             services.AddTransient<IUrlMappingRepository, UrlMappingRepository>();
             services.AddTransient<ISearchContentRepository, SearchContentRepository>();
+            services.AddTransient<IMigrationHistoryRepository, MigrationHistoryRepository>();
 
             // managers
             services.AddTransient<IDBContextDependencies, DBContextDependencies>();

Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs

@@ -143,64 +143,85 @@ namespace Oqtane.Infrastructure
                             List<Notification> notifications = notificationRepository.GetNotifications(site.SiteId, -1, -1).ToList();
                             foreach (Notification notification in notifications)
                             {
-                                // get sender and receiver information from user object if not provided
+                                var fromEmail = notification.FromEmail ?? "";
-                                if ((string.IsNullOrEmpty(notification.FromEmail) || string.IsNullOrEmpty(notification.FromDisplayName)) && notification.FromUserId != null)
+                                var fromName = notification.FromDisplayName ?? "";
+                                var toEmail = notification.ToEmail ?? "";
+                                var toName = notification.ToDisplayName ?? "";
+
+                                // get sender and receiver information from user information if available
+                                if ((string.IsNullOrEmpty(fromEmail) || string.IsNullOrEmpty(fromName)) && notification.FromUserId != null)
                                 {
                                     var user = userRepository.GetUser(notification.FromUserId.Value);
                                     if (user != null)
                                     {
-                                        notification.FromEmail = (string.IsNullOrEmpty(notification.FromEmail)) ? user.Email : notification.FromEmail;
+                                        fromEmail = string.IsNullOrEmpty(fromEmail) ? user.Email ?? "" : fromEmail;
-                                        notification.FromDisplayName = (string.IsNullOrEmpty(notification.FromDisplayName)) ? user.DisplayName : notification.FromDisplayName;
+                                        fromName = string.IsNullOrEmpty(fromName) ? user.DisplayName ?? "" : fromName;
                                     }
                                 }
-                                if ((string.IsNullOrEmpty(notification.ToEmail) || string.IsNullOrEmpty(notification.ToDisplayName)) && notification.ToUserId != null)
+                                if ((string.IsNullOrEmpty(toEmail) || string.IsNullOrEmpty(toName)) && notification.ToUserId != null)
                                 {
                                     var user = userRepository.GetUser(notification.ToUserId.Value);
                                     if (user != null)
                                     {
-                                        notification.ToEmail = (string.IsNullOrEmpty(notification.ToEmail)) ? user.Email : notification.ToEmail;
+                                        toEmail = string.IsNullOrEmpty(toEmail) ? user.Email ?? "" : toEmail;
-                                        notification.ToDisplayName = (string.IsNullOrEmpty(notification.ToDisplayName)) ? user.DisplayName : notification.ToDisplayName;
+                                        toName = string.IsNullOrEmpty(toName) ? user.DisplayName ?? "" : toName;
                                     }
                                 }
 
-                                // validate recipient
+                                // create mailbox addresses
-                                if (string.IsNullOrEmpty(notification.ToEmail) || !MailboxAddress.TryParse(notification.ToEmail, out _))
+                                MailboxAddress to = null;
-                                {
+                                MailboxAddress from = null;
-                                    log += $"NotificationId: {notification.NotificationId} - Has Missing Or Invalid Recipient {notification.ToEmail}<br />";
+                                var mailboxAddressValidationError = "";
-                                    notification.IsDeleted = true;
-                                    notificationRepository.UpdateNotification(notification);
-                                }
-                                else
-                                {
-                                    MimeMessage mailMessage = new MimeMessage();
 
                                 // sender
-                                    if (settingRepository.GetSettingValue(settings, "SMTPRelay", "False") == "True" && !string.IsNullOrEmpty(notification.FromEmail))
+                                if (settingRepository.GetSettingValue(settings, "SMTPRelay", "False") != "True")
                                 {
-                                        if (!string.IsNullOrEmpty(notification.FromDisplayName))
+                                    fromEmail = settingRepository.GetSettingValue(settings, "SMTPSender", "");
-                                        {
+                                    fromName = string.IsNullOrEmpty(fromName) ? site.Name : fromName;
-                                            mailMessage.From.Add(new MailboxAddress(notification.FromDisplayName, notification.FromEmail));
                                 }
-                                        else
+                                try
                                 {
-                                            mailMessage.From.Add(new MailboxAddress("", notification.FromEmail));
+                                    // exception handler is necessary because of https://github.com/jstedfast/MimeKit/issues/1186
+                                    if (MailboxAddress.TryParse(fromEmail, out _))
+                                    {
+                                        from = new MailboxAddress(fromName, fromEmail);
                                     }
                                 }
-                                    else
+                                catch
                                 {
-                                        mailMessage.From.Add(new MailboxAddress((!string.IsNullOrEmpty(notification.FromDisplayName)) ? notification.FromDisplayName : site.Name,
+                                    // parse error creating sender mailbox address
-                                                                                settingRepository.GetSettingValue(settings, "SMTPSender", "")));
+                                }
+                                if (from == null)
+                                {
+
+                                    mailboxAddressValidationError += $" Invalid Sender: {fromName} &lt;{fromEmail}&gt;";
                                 }
 
                                 // recipient
-                                    if (!string.IsNullOrEmpty(notification.ToDisplayName))
+                                try
                                 {
-                                        mailMessage.To.Add(new MailboxAddress(notification.ToDisplayName, notification.ToEmail));
+                                    // exception handler is necessary because of https://github.com/jstedfast/MimeKit/issues/1186
-                                    }
+                                    if (MailboxAddress.TryParse(toEmail, out _))
-                                    else
                                     {
-                                        mailMessage.To.Add(new MailboxAddress("", notification.ToEmail));
+                                        to = new MailboxAddress(toName, toEmail);
                                     }
+                                }
+                                catch
+                                {
+                                    // parse error creating recipient mailbox address
+                                }
+                                if (to == null)
+                                {
+                                    mailboxAddressValidationError += $" Invalid Recipient: {toName} &lt;{toEmail}&gt;";
+                                }
+
+                                // if mailbox addresses are valid
+                                if (from != null && to != null)
+                                {
+                                    // create mail message
+                                    MimeMessage mailMessage = new MimeMessage();
+                                    mailMessage.From.Add(from);
+                                    mailMessage.To.Add(to);
 
                                     // subject
                                     mailMessage.Subject = notification.Subject;
@@ -230,14 +251,22 @@ namespace Oqtane.Infrastructure
                                     }
                                     catch (Exception ex)
                                     {
-                                        // error
+                                        log += $"Error Sending Notification Id: {notification.NotificationId} - {ex.Message}<br />";
-                                        log += $"NotificationId: {notification.NotificationId} - {ex.Message}<br />";
                                     }
                                 }
+                                else
+                                {
+                                    // invalid mailbox address
+                                    log += $"Notification Id: {notification.NotificationId} Has An {mailboxAddressValidationError} And Has Been Deleted<br />";
+                                    notification.IsDeleted = true;
+                                    notificationRepository.UpdateNotification(notification);
                                 }
-                            await client.DisconnectAsync(true);
+                            }
+
                             log += "Notifications Delivered: " + sent + "<br />";
                         }
+
+                        await client.DisconnectAsync(true);
                     }
                 }
                 else

Oqtane.Server/Repository/Context/TenantDBContext.cs

@@ -33,5 +33,6 @@ namespace Oqtane.Repository
         public virtual DbSet<SearchContentProperty> SearchContentProperty { get; set; }
         public virtual DbSet<SearchContentWord> SearchContentWord { get; set; }
         public virtual DbSet<SearchWord> SearchWord { get; set; }
+        public virtual DbSet<MigrationHistory> MigrationHistory { get; set; }
     }
 }

Oqtane.Server/Repository/MigrationHistoryRepository.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Oqtane.Models;
+
+namespace Oqtane.Repository
+{
+    public interface IMigrationHistoryRepository
+    {
+        IEnumerable<MigrationHistory> GetMigrationHistory();
+    }
+    public class MigrationHistoryRepository : IMigrationHistoryRepository
+    {
+        private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
+
+        public MigrationHistoryRepository(IDbContextFactory<TenantDBContext> dbContextFactory)
+        {
+            _dbContextFactory = dbContextFactory;
+        }
+
+        public IEnumerable<MigrationHistory> GetMigrationHistory()
+        {
+            using var db = _dbContextFactory.CreateDbContext();
+            return db.MigrationHistory.ToList();
+        }
+    }
+}

Oqtane.Server/Repository/NotificationRepository.cs

@@ -144,14 +144,14 @@ namespace Oqtane.Repository
             // delete notifications in batches of 100 records
             var count = 0;
             var purgedate = DateTime.UtcNow.AddDays(-age);
-            var notifications = db.Notification.Where(item => item.SiteId == siteId && item.FromUserId == null && item.IsDelivered && item.DeliveredOn < purgedate)
+            var notifications = db.Notification.Where(item => item.SiteId == siteId && item.FromUserId == null && (item.IsDeleted || item.IsDelivered && item.DeliveredOn < purgedate))
                 .OrderBy(item => item.DeliveredOn).Take(100).ToList();
             while (notifications.Count > 0)
             {
                 count += notifications.Count;
                 db.Notification.RemoveRange(notifications);
                 db.SaveChanges();
-                notifications = db.Notification.Where(item => item.SiteId == siteId && item.FromUserId == null && item.IsDelivered && item.DeliveredOn < purgedate)
+                notifications = db.Notification.Where(item => item.SiteId == siteId && item.FromUserId == null && (item.IsDeleted || item.IsDelivered && item.DeliveredOn < purgedate))
                 .OrderBy(item => item.DeliveredOn).Take(100).ToList();
             }
             return count;

Oqtane.Shared/Models/MigrationHistory.cs

@@ -0,0 +1,16 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+
+namespace Oqtane.Models
+{
+    [Table("__EFMigrationsHistory")]
+    [Keyless]
+    public class MigrationHistory
+    {
+        public string MigrationId { get; set; }
+        public string ProductVersion { get; set; }
+        public DateTime AppliedDate { get; set; }
+        public string AppliedVersion { get; set; }
+    }
+}