OSOE-751: Upgrade to Orchard Core 1.8

Lombiq.Hosting.Tenants.Admin.Login/Controllers/TenantLoginController.cs

@@ -9,7 +9,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Settings;
 using OrchardCore.Users;
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using static Lombiq.Hosting.Tenants.Admin.Login.Constants.FeatureNames;
@@ -18,45 +17,29 @@
 namespace Lombiq.Hosting.Tenants.Admin.Login.Controllers;
 
 [Feature(SubTenant)]
-public class TenantLoginController : Controller
+public class TenantLoginController(
+    ISiteService siteService,
+    SignInManager<IUser> userSignInManager,
+    IShellHost shellHost,
+    ShellSettings shellSettings,
+    ILogger<TenantLoginController> logger,
+    INotifier notifier,
+    IHtmlLocalizer<TenantLoginController> htmlLocalizer) : Controller
 {
-    private readonly ISiteService _siteService;
-    private readonly SignInManager<IUser> _userSignInManager;
-    private readonly IShellHost _shellHost;
-    private readonly ShellSettings _shellSettings;
-    private readonly ILogger _logger;
-    private readonly INotifier _notifier;
-    private readonly IHtmlLocalizer H;
-
-    public TenantLoginController(
-        ISiteService siteService,
-        SignInManager<IUser> userSignInManager,
-        IShellHost shellHost,
-        ShellSettings shellSettings,
-        ILogger<TenantLoginController> logger,
-        INotifier notifier,
-        IHtmlLocalizer<TenantLoginController> htmlLocalizer)
-    {
-        _siteService = siteService;
-        _userSignInManager = userSignInManager;
-        _shellHost = shellHost;
-        _shellSettings = shellSettings;
-        _logger = logger;
-        _notifier = notifier;
-        H = htmlLocalizer;
-    }
+    private readonly ILogger _logger = logger;
+    private readonly IHtmlLocalizer H = htmlLocalizer;
 
     [HttpPost]
     // This is necessary because requests for this action will come from the Default tenant.
     [IgnoreAntiforgeryToken]
     public async Task<IActionResult> Index(string password)
     {
-        if (_shellSettings.Name.EqualsOrdinalIgnoreCase(ShellSettings.DefaultShellName))
+        if (shellSettings.Name.EqualsOrdinalIgnoreCase(ShellSettings.DefaultShellName))
         {
             return NotFound();
         }
 
-        var defaultShell = await _shellHost.GetScopeAsync(ShellSettings.DefaultShellName);
+        var defaultShell = await shellHost.GetScopeAsync(ShellSettings.DefaultShellName);
         var tenantLoginPasswordValidator = defaultShell?.ServiceProvider.GetService<ITenantLoginPasswordValidator>();
 
         if (defaultShell == null ||
@@ -66,17 +49,17 @@ public async Task<IActionResult> Index(string password)
             return NotFound();
         }
 
-        var sitesettings = await _siteService.LoadSiteSettingsAsync();
-        var adminUser = await _userSignInManager.UserManager.FindByIdAsync(sitesettings.SuperUser);
-        adminUser ??= (await _userSignInManager.UserManager.GetUsersInRoleAsync(Administrator)).FirstOrDefault();
+        var sitesettings = await siteService.LoadSiteSettingsAsync();
+        var adminUser = await userSignInManager.UserManager.FindByIdAsync(sitesettings.SuperUser);
+        adminUser ??= (await userSignInManager.UserManager.GetUsersInRoleAsync(Administrator)).FirstOrDefault();
 
         if (adminUser == null)
         {
-            await _notifier.ErrorAsync(H["No user with administrator role in this tenant."]);
+            await notifier.ErrorAsync(H["No user with administrator role in this tenant."]);
             return Redirect("~/");
         }
 
-        await _userSignInManager.SignInAsync(adminUser, isPersistent: false);
+        await userSignInManager.SignInAsync(adminUser, isPersistent: false);
         _logger.LogInformation(1, "An admin user logged in from the Default tenant.");
 
         return RedirectToAction("Index", "Admin", new { area = "OrchardCore.Admin" });

Lombiq.Hosting.Tenants.Admin.Login/Filters/TenantsIndexFilter.cs

@@ -7,35 +7,20 @@
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.Environment.Shell;
 using OrchardCore.Environment.Shell.Models;
+using OrchardCore.Modules;
 using OrchardCore.Mvc.Core.Utilities;
 using OrchardCore.Tenants.Controllers;
-using System;
 using System.Threading.Tasks;
 
 namespace Lombiq.Hosting.Tenants.Admin.Login.Filters;
 
-public class TenantsIndexFilter : IAsyncResultFilter
+public class TenantsIndexFilter(
+    ILayoutAccessor layoutAccessor,
+    IShapeFactory shapeFactory,
+    IShellHost shellHost,
+    IHttpContextAccessor hca,
+    IAuthorizationService authorizationService) : IAsyncResultFilter
 {
-    private readonly ILayoutAccessor _layoutAccessor;
-    private readonly IShapeFactory _shapeFactory;
-    private readonly IShellHost _shellHost;
-    private readonly IHttpContextAccessor _hca;
-    private readonly IAuthorizationService _authorizationService;
-
-    public TenantsIndexFilter(
-        ILayoutAccessor layoutAccessor,
-        IShapeFactory shapeFactory,
-        IShellHost shellHost,
-        IHttpContextAccessor hca,
-        IAuthorizationService authorizationService)
-    {
-        _layoutAccessor = layoutAccessor;
-        _shapeFactory = shapeFactory;
-        _shellHost = shellHost;
-        _hca = hca;
-        _authorizationService = authorizationService;
-    }
-
     public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
     {
         var actionRouteController = context.ActionDescriptor.RouteValues["Controller"];
@@ -46,20 +31,20 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
             actionRouteArea == $"{nameof(OrchardCore)}.{nameof(OrchardCore.Tenants)}" &&
             actionRouteValue is nameof(AdminController.Edit) &&
             context.Result is ViewResult &&
-            await _authorizationService.AuthorizeAsync(
-                _hca.HttpContext.User,
+            await authorizationService.AuthorizeAsync(
+                hca.HttpContext.User,
                 TenantAdminPermissions.LoginAsAdmin)
             )
         {
-            var shellSettings = _shellHost.GetSettings(context.RouteData.Values["Id"].ToString());
+            var shellSettings = shellHost.GetSettings(context.RouteData.Values["Id"].ToString());
             if (shellSettings != null &&
                 shellSettings.State == TenantState.Running &&
                 !shellSettings.Name.EqualsOrdinalIgnoreCase(ShellSettings.DefaultShellName))
             {
-                var layout = await _layoutAccessor.GetLayoutAsync();
+                var layout = await layoutAccessor.GetLayoutAsync();
                 var contentZone = layout.Zones["Content"];
                 await contentZone.AddAsync(
-                    await _shapeFactory.CreateAsync("TenantAdminShape", new
+                    await shapeFactory.CreateAsync("TenantAdminShape", new
                     {
                         shellSettings.RequestUrlHost,
                         shellSettings.RequestUrlPrefix,

Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**;Tests\**</DefaultItemExcludes>
   </PropertyGroup>
@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Tenants" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Users" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Tenants" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Users" Version="1.8.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">

Lombiq.Hosting.Tenants.Admin.Login/Manifest.cs

@@ -14,7 +14,7 @@
     Description = "Ability to log in as a tenant’s admin user.",
     Category = "Hosting",
     DefaultTenantOnly = true,
-    Dependencies = new[] { "OrchardCore.Tenants" }
+    Dependencies = ["OrchardCore.Tenants"]
 )]
 
 [assembly: Feature(

Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**</DefaultItemExcludes>
   </PropertyGroup>
 

Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/DashboardQuotaFilter.cs

@@ -7,22 +7,11 @@
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Filters;
 
-public class DashboardQuotaFilter : IAsyncResultFilter
+public class DashboardQuotaFilter(
+    IShapeFactory shapeFactory,
+    ILayoutAccessor layoutAccessor,
+    IEmailQuotaService emailQuotaService) : IAsyncResultFilter
 {
-    private readonly IShapeFactory _shapeFactory;
-    private readonly ILayoutAccessor _layoutAccessor;
-    private readonly IEmailQuotaService _emailQuotaService;
-
-    public DashboardQuotaFilter(
-        IShapeFactory shapeFactory,
-        ILayoutAccessor layoutAccessor,
-        IEmailQuotaService emailQuotaService)
-    {
-        _shapeFactory = shapeFactory;
-        _layoutAccessor = layoutAccessor;
-        _emailQuotaService = emailQuotaService;
-    }
-
     public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
     {
         if (!context.IsAdmin())
@@ -32,19 +21,19 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
         }
 
         if (context.Result is ViewResult &&
-            _emailQuotaService.ShouldLimitEmails())
+            emailQuotaService.ShouldLimitEmails())
         {
-            var currentEmailQuota = await _emailQuotaService.IsQuotaOverTheLimitAsync();
+            var currentEmailQuota = await emailQuotaService.IsQuotaOverTheLimitAsync();
 
             var currentUsagePercentage = currentEmailQuota.EmailQuota
-                .CurrentUsagePercentage(_emailQuotaService.GetEmailQuotaPerMonth());
+                .CurrentUsagePercentage(emailQuotaService.GetEmailQuotaPerMonth());
 
             if (currentUsagePercentage >= 80)
             {
-                var layout = await _layoutAccessor.GetLayoutAsync();
+                var layout = await layoutAccessor.GetLayoutAsync();
                 var contentZone = layout.Zones["Messages"];
                 await contentZone.AddAsync(
-                    await _shapeFactory.CreateAsync("DashboardQuotaMessage", new
+                    await shapeFactory.CreateAsync("DashboardQuotaMessage", new
                     {
                         currentEmailQuota.IsOverQuota,
                         UsagePercentage = currentUsagePercentage,

Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs

@@ -9,22 +9,11 @@
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Filters;
 
-public class EmailSettingsQuotaFilter : IAsyncResultFilter
+public class EmailSettingsQuotaFilter(
+    IShapeFactory shapeFactory,
+    ILayoutAccessor layoutAccessor,
+    IEmailQuotaService emailQuotaService) : IAsyncResultFilter
 {
-    private readonly IShapeFactory _shapeFactory;
-    private readonly ILayoutAccessor _layoutAccessor;
-    private readonly IEmailQuotaService _emailQuotaService;
-
-    public EmailSettingsQuotaFilter(
-        IShapeFactory shapeFactory,
-        ILayoutAccessor layoutAccessor,
-        IEmailQuotaService emailQuotaService)
-    {
-        _shapeFactory = shapeFactory;
-        _layoutAccessor = layoutAccessor;
-        _emailQuotaService = emailQuotaService;
-    }
-
     public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
     {
         if (!context.IsAdmin())
@@ -43,17 +32,17 @@ actionRouteValue is nameof(AdminController.Index) &&
             context.Result is ViewResult &&
             context.RouteData.Values.TryGetValue("GroupId", out var groupId) &&
             (string)groupId == "email" &&
-            _emailQuotaService.ShouldLimitEmails())
+            emailQuotaService.ShouldLimitEmails())
         {
-            var layout = await _layoutAccessor.GetLayoutAsync();
+            var layout = await layoutAccessor.GetLayoutAsync();
             var contentZone = layout.Zones["Content"];
 
-            var quota = await _emailQuotaService.GetOrCreateCurrentQuotaAsync();
+            var quota = await emailQuotaService.GetOrCreateCurrentQuotaAsync();
             await contentZone.AddAsync(
-                await _shapeFactory.CreateAsync("EmailSettingsQuotaMessage", new
+                await shapeFactory.CreateAsync("EmailSettingsQuotaMessage", new
                 {
                     quota.CurrentEmailUsageCount,
-                    EmailQuotaPerMonth = _emailQuotaService.GetEmailQuotaPerMonth(),
+                    EmailQuotaPerMonth = emailQuotaService.GetEmailQuotaPerMonth(),
                 }),
                 "0");
         }

Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**</DefaultItemExcludes>
   </PropertyGroup>
@@ -34,16 +34,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Admin" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Email.Core" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.AdminDashboard" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.7.0" />
-    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.7.0" />
+    <PackageReference Include="OrchardCore.Admin" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Email.Core" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.AdminDashboard" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Email.Abstractions" Version="1.8.2" />
+    <PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.2" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
-    <PackageReference Include="YesSql.Abstractions" Version="3.3.0" />
+    <PackageReference Include="YesSql.Abstractions" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">

Lombiq.Hosting.Tenants.EmailQuotaManagement/Manifest.cs

@@ -15,9 +15,9 @@
     Name = "Lombiq Hosting - Tenants Email Quota Management",
     Category = "Hosting",
     IsAlwaysEnabled = true,
-    Dependencies = new[]
-    {
+    Dependencies =
+    [
         "OrchardCore.Emails",
         "Lombiq.HelpfulExtensions.Emails",
-    }
+    ]
 )]

Lombiq.Hosting.Tenants.EmailQuotaManagement/Migrations/EmailQuotaMigrations.cs

@@ -1,4 +1,5 @@
 using OrchardCore.Data.Migration;
+using System.Threading.Tasks;
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Migrations;
 
@@ -14,19 +15,19 @@ public class EmailQuotaMigrations : DataMigration
 #pragma warning restore CA1822 // Mark members as static
 #pragma warning restore IDE0079 // Remove unnecessary suppression
 
-    public int UpdateFrom1()
+    public async Task<int> UpdateFrom1Async()
     {
-        SchemaBuilder.AlterTable("EmailQuotaIndex", table => table
+        await SchemaBuilder.AlterTableAsync("EmailQuotaIndex", table => table
             .AddColumn<int>("LastReminderPercentage")
         );
 
         return 2;
     }
 
-    public int UpdateFrom2()
+    public async Task<int> UpdateFrom2Async()
     {
         // Deleting index because it is not needed.
-        SchemaBuilder.DropTable("EmailQuotaIndex");
+        await SchemaBuilder.DropTableAsync("EmailQuotaIndex");
 
         return 3;
     }

Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/EmailQuotaResetTask.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.BackgroundTasks;
 using System;
 using System.Threading;
@@ -15,6 +15,6 @@ public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToke
     {
         var emailQuotaService = serviceProvider.GetRequiredService<IEmailQuotaService>();
         var currentQuota = await emailQuotaService.GetOrCreateCurrentQuotaAsync();
-        emailQuotaService.ResetQuota(currentQuota);
+        await emailQuotaService.ResetQuotaAsync(currentQuota);
     }
 }