Merge pull request 'Refactored AddLiteCharmsWebSecurity to force a session recycling of keys on other pods' (#128) from dataprotection into master

Reviewed-on: #128

LiteCharms.Features.MidrandBooks.Seed/LiteCharms.Features.MidrandBooks.Seed.csproj

@@ -11,7 +11,7 @@
   <!-- Quartz Scheduler-->
   <ItemGroup>
     <PackageReference Include="Bogus" Version="35.6.5" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.104">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

LiteCharms.Features.MidrandBooks.Tests/LiteCharms.Features.MidrandBooks.Tests.csproj

@@ -13,6 +13,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">

LiteCharms.Features.MidrandBooks/LiteCharms.Features.MidrandBooks.csproj

@@ -32,7 +32,7 @@
   <!-- Quartz Scheduler-->
   <ItemGroup>
     <PackageReference Include="Humanizer" Version="3.0.10" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.104">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

LiteCharms.Features.MidrandBooks/Orders/OrderService.cs

@@ -43,7 +43,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
             if (!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
                 return Result.Fail<long>("Order not found.");
 
-            if (!await context.Books.AnyAsync(ab => ab.Id == request.AuthorBookId, cancellationToken))
+            if(!await context.Books.AnyAsync(ab => ab.Id == request.AuthorBookId, cancellationToken))
                 return Result.Fail<long>("Author book not found.");
 
             if (!await context.Prices.AnyAsync(pp => pp.Id == request.ProductPriceId, cancellationToken))
@@ -51,7 +51,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
 
             var existingItem = await context.OrderItems.FirstOrDefaultAsync(i => i.ProductPriceId == request.ProductPriceId && i.OrderId == orderId, cancellationToken);
 
-            if (existingItem is not null)
+            if(existingItem is not null)
             {
                 existingItem.Quantity += request.Quantity;
 
@@ -82,7 +82,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
     {
         try
         {
-            if (items.Length == 0)
+            if(items.Length == 0)
                 return Result.Fail("No items to add.");
 
             await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
@@ -203,33 +203,13 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
         }
     }
 
-    public async ValueTask<Result<OrderItem[]>> GetOrderItemsAsync(long orderId, CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var orderItems = await context.OrderItems
-                .Where(o => o.OrderId == orderId)
-                .ToListAsync(cancellationToken);
-
-            return orderItems.Count > 0
-                ? Result.Ok(orderItems.Select(i => i.ToModel()).ToArray())
-                : Result.Fail<OrderItem[]>($"Order items not found for order ID {orderId}");
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-
     public async ValueTask<Result<Order[]>> GetOrdersByCustomerAsync(long customerId, CancellationToken cancellationToken = default)
     {
         try
         {
             await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
-            if (!await context.Customers.AnyAsync(c => c.Id == customerId, cancellationToken))
+            if(!await context.Customers.AnyAsync(c => c.Id == customerId, cancellationToken))
                 return Result.Fail<Order[]>("Customer not found.");
 
             var orders = await context.Orders
@@ -296,16 +276,16 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
         {
             await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
-            if (!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
+            if(!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
                 return Result.Fail("Order not found.");
 
-            if (!await context.Addresses.AnyAsync(a => a.Id == request.AddressId, cancellationToken))
+            if(!await context.Addresses.AnyAsync(a => a.Id == request.AddressId, cancellationToken))
                 return Result.Fail("Address not found.");
 
-            if (!await context.ShippingProviders.AnyAsync(sp => sp.Id == request.ShippingProviderId && sp.Enabled, cancellationToken))
+            if(!await context.ShippingProviders.AnyAsync(sp => sp.Id == request.ShippingProviderId && sp.Enabled, cancellationToken))
                 return Result.Fail("Shipping provider not found or disabled.");
 
-            if (await context.Shippings.AnyAsync(s => s.OrderId == orderId, cancellationToken))
+            if(await context.Shippings.AnyAsync(s => s.OrderId == orderId, cancellationToken))
                 return Result.Fail("Shipping already exists for this order.");
 
             var shipping = context.Shippings.Add(new Entities.Shipping
@@ -418,7 +398,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
         {
             await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
-            if (await context.ShippingProviders.AnyAsync(sp => sp.Type == request.Type, cancellationToken))
+            if(await context.ShippingProviders.AnyAsync(sp => sp.Type == request.Type, cancellationToken))
                 return Result.Fail("Shipping provider with the same type already exists.");
 
             var shippingProvider = context.ShippingProviders.Add(new Entities.ShippingProvider

LiteCharms.Features.MidrandBooks/Payments/Entities/PaymentGateway.cs

@@ -1,4 +1,4 @@
 namespace LiteCharms.Features.MidrandBooks.Payments.Entities;
 
 [EntityTypeConfiguration<PaymentGatewayConfiguration, PaymentGateway>]
-public sealed class PaymentGateway : Models.PaymentGateway;
+public class PaymentGateway : Models.PaymentGateway;

LiteCharms.Features.MidrandBooks/Postgres/Migrations/20260529070104_Init.cs

@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
     /// <inheritdoc />
-    public sealed partial class Init : Migration
+    public partial class Init : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

LiteCharms.Features.MidrandBooks/Postgres/Migrations/20260530104851_AddedCategories.cs

@@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
     /// <inheritdoc />
-    public sealed partial class AddedCategories : Migration
+    public partial class AddedCategories : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

LiteCharms.Features.MidrandBooks/Postgres/Migrations/20260530125323_AddedProductCategories.cs

@@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
     /// <inheritdoc />
-    public sealed partial class AddedProductCategories : Migration
+    public partial class AddedProductCategories : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

LiteCharms.Features.MidrandBooks/Postgres/Migrations/20260531094401_AddedPaymentObjects.cs

@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
     /// <inheritdoc />
-    public sealed partial class AddedPaymentObjects : Migration
+    public partial class AddedPaymentObjects : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

LiteCharms.Features.MidrandBooks/Postgres/Migrations/20260601071804_RemovedPassphraseFromPaymentGateway.cs

@@ -5,7 +5,7 @@
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
     /// <inheritdoc />
-    public sealed partial class RemovedPassphraseFromPaymentGateway : Migration
+    public partial class RemovedPassphraseFromPaymentGateway : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

LiteCharms.Features.MidrandBooks/Postgres/Migrations/20260602202421_AddedPaymentGatewayLedger.cs

@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
     /// <inheritdoc />
-    public sealed partial class AddedPaymentGatewayLedger : Migration
+    public partial class AddedPaymentGatewayLedger : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

LiteCharms.Features.MidrandBooks/Postgres/Migrations/20260602205838_AddedPayfastPaymentIdToPaymentGatewayLedger.cs

@@ -5,7 +5,7 @@
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
     /// <inheritdoc />
-    public sealed partial class AddedPayfastPaymentIdToPaymentGatewayLedger : Migration
+    public partial class AddedPayfastPaymentIdToPaymentGatewayLedger : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

LiteCharms.Features.MidrandBooks/Postgres/Migrations/20260612210020_OnlyEmailIsMandatoryOnCustomer.cs

@@ -5,7 +5,7 @@
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
     /// <inheritdoc />
-    public sealed partial class OnlyEmailIsMandatoryOnCustomer : Migration
+    public partial class OnlyEmailIsMandatoryOnCustomer : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

LiteCharms.Features.Tests.Common/LiteCharms.Features.Tests.Common.csproj

@@ -25,6 +25,7 @@
 
   <!-- Mediator -->
   <ItemGroup>
+    <PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
     <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

LiteCharms.Features.Tests/LiteCharms.Features.Tests.csproj

@@ -13,6 +13,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">

LiteCharms.Features/CancellationTokenProvider.cs

@@ -1,16 +0,0 @@
-namespace LiteCharms.Features;
-
-public sealed class CancellationTokenProvider : IDisposable
-{
-    private readonly CancellationTokenSource source = new();
-
-    public CancellationToken Token => source.Token;
-
-    public void Dispose()
-    {
-        source.Cancel();
-        source.Dispose();
-
-        GC.SuppressFinalize(this);
-    }
-}

LiteCharms.Features/Extensions/Api.cs

@@ -54,13 +54,7 @@ public static class Api
 
     public static IServiceCollection AddLiteCharmsWebSecurity(this IServiceCollection services, IConfiguration configuration)
     {
-        var certString = configuration["DataProtection:Certificate"] ?? configuration["DataProtection__Certificate"];
+        var certificate = X509CertificateLoader.LoadPkcs12(Convert.FromBase64String(configuration["DataProtection:Certificate"]!), configuration["DataProtection:Password"]);
-        var certPassword = configuration["DataProtection:Password"] ?? configuration["DataProtection__Password"];
-
-        if (string.IsNullOrEmpty(certString))
-            throw new InvalidOperationException("Data Protection Certificate configuration is missing.");
-
-        var certificate = X509CertificateLoader.LoadPkcs12(Convert.FromBase64String(certString), certPassword);
 
         services.AddDataProtection().PersistKeysToDbContext<DataProtectionDbContext>()
             .ProtectKeysWithCertificate(certificate)
@@ -241,7 +235,7 @@ public static class Api
 
         if (!string.IsNullOrWhiteSpace(urls))
         {
-            string firstUrl = urls.Split(';').FirstOrDefault(s => s.Contains("http://", StringComparison.InvariantCultureIgnoreCase))!
+            string firstUrl = urls.Split(';').FirstOrDefault(s => s.Contains("http://"))!
                 .Replace("0.0.0.0", "localhost")
                 .Replace("*", "localhost")
                 .Replace("+", "localhost");

LiteCharms.Features/Extensions/S3.cs

@@ -19,7 +19,7 @@ public static class S3
                     AuthenticationRegion = configuration.GetSection($"{BookshopS3SettingsSection}:Region").Value,
                     ForcePathStyle = true,
                     EndpointDiscoveryEnabled = true,
-                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://", StringComparison.InvariantCultureIgnoreCase),
+                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://")
                 }));
 
             services.AddKeyedScoped<IS3Service, BookshopS3Service>(BookshopBucketName); 
@@ -36,7 +36,7 @@ public static class S3
                     AuthenticationRegion = configuration.GetSection($"{BookshopInvoicesS3SettingsSection}:Region").Value,
                     ForcePathStyle = true,
                     EndpointDiscoveryEnabled = true,
-                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://", StringComparison.InvariantCultureIgnoreCase),
+                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://")
                 }));
 
             services.AddKeyedScoped<IS3Service, BookshopInvoicesS3Service>(BookshopInvoicesBucketName);
@@ -53,7 +53,7 @@ public static class S3
                     AuthenticationRegion = configuration.GetSection($"{BookshopQuotesS3SettingsSection}:Region").Value,
                     ForcePathStyle = true,
                     EndpointDiscoveryEnabled = true,
-                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://", StringComparison.InvariantCultureIgnoreCase),
+                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://")
                 }));
 
             services.AddKeyedScoped<IS3Service, BookshopQuotesS3Service>(BookshopQuotesBucketName);

LiteCharms.Features/Extensions/TaskCancellation.cs

@@ -1,13 +0,0 @@
-namespace LiteCharms.Features.Extensions;
-
-public static class TaskCancellation
-{
-    public static IServiceCollection AddCancellationToken(this IServiceCollection services)
-    {
-        services.AddScoped<CancellationTokenProvider>();
-        services.AddScoped(typeof(CancellationToken),
-            provider => provider.GetRequiredService<CancellationTokenProvider>().Token);
-
-        return services;
-    }
-}

LiteCharms.Features/LiteCharms.Features.csproj

@@ -79,7 +79,7 @@
   <!-- Quartz Scheduler-->
   <ItemGroup>    
     <PackageReference Include="Hashids.net" Version="1.7.0" />    
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.104">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>    

LiteCharms.Features/Postgres/DataProtectionDbContext.cs

@@ -1,6 +1,6 @@
 namespace LiteCharms.Features.Postgres;
 
-public sealed class DataProtectionDbContext(DbContextOptions<DataProtectionDbContext> options) : DbContext(options), IDataProtectionKeyContext
+public class DataProtectionDbContext(DbContextOptions<DataProtectionDbContext> options) : DbContext(options), IDataProtectionKeyContext
 {
     public DbSet<DataProtectionKey> DataProtectionKeys { get; set; }
 

LiteCharms.Features/Postgres/DataProtectionDbContextFactory.cs

@@ -2,7 +2,7 @@
 
 namespace LiteCharms.Features.Postgres;
 
-public sealed class DataProtectionDbContextFactory : IDesignTimeDbContextFactory<DataProtectionDbContext>
+public class DataProtectionDbContextFactory : IDesignTimeDbContextFactory<DataProtectionDbContext>
 {
     public DataProtectionDbContext CreateDbContext(string[] args)
     {

LiteCharms.Features/Postgres/Migrations/20260614075149_Init.cs

@@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.Postgres.Migrations
 {
     /// <inheritdoc />
-    public sealed partial class Init : Migration
+    public partial class Init : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)