Merge pull request 'Excluded http environment from checkin' (#64) from payments into master

Reviewed-on: #64

.gitignore

@@ -363,4 +363,3 @@ MigrationBackup/
 FodyWeavers.xsd
 /LiteCharms.Features.Tests/http/http-client.env.json
 /LiteCharms.Features.Tests/http/midrandshop-api/http-client.env.json
-/LiteCharms.Features.Tests/http/authentik/http-client.env.json

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

@@ -11,12 +11,12 @@
   <!-- Quartz Scheduler-->
   <ItemGroup>
     <PackageReference Include="Bogus" Version="35.6.5" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.102">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.5.0" />
-    <PackageReference Include="OpenTelemetry" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.15.3" />
     <PackageReference Include="Quartz" Version="3.18.1" />
     <PackageReference Include="Quartz.Plugins" Version="3.18.1" />
     <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
@@ -30,11 +30,11 @@
 
   <!-- Configuration -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Configuration" />
@@ -47,9 +47,9 @@
     <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
@@ -58,12 +58,12 @@
 
   <!-- Open Telemetry -->
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
 
     <!-- Global Usings -->
     <Using Include="OpenTelemetry.Resources" />
@@ -75,13 +75,13 @@
 
   <!-- Database -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -116,8 +116,8 @@
 
   <!-- Amazon S3 SDK -->
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.6" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.3" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
     <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
 
     <!-- global Usings -->

LiteCharms.Features.MidrandBooks.Seed/appsettings.json

@@ -1,6 +1,6 @@
 {
   "FeatureManagement": {
-    "CategorySeederService": false,
+    "CategorySeederService": true,
     "CustomerSeederService": false,
     "ProductsSeederService": false
   },

LiteCharms.Features.MidrandBooks.Tests/AuthorServiceFeatureTests.cs

@@ -1,7 +1,7 @@
 using LiteCharms.Features.MidrandBooks.Authors;
 using LiteCharms.Features.MidrandBooks.Authors.Models;
+using LiteCharms.Features.MidrandBooks.Tests.Common;
 using LiteCharms.Features.Models;
-using LiteCharms.Features.Tests.Common;
 
 namespace LiteCharms.Features.MidrandBooks.Tests;
 

LiteCharms.Features.MidrandBooks.Tests/BooksServiceFeatureTests.cs

@@ -1,5 +1,5 @@
 using LiteCharms.Features.MidrandBooks.AuthorBooks;
-using LiteCharms.Features.Tests.Common;
+using LiteCharms.Features.MidrandBooks.Tests.Common;
 
 namespace LiteCharms.Features.MidrandBooks.Tests;
 

LiteCharms.Features.MidrandBooks.Tests/CategoryServiceFeatureTests.cs

@@ -1,5 +1,5 @@
 using LiteCharms.Features.MidrandBooks.Categories;
-using LiteCharms.Features.Tests.Common;
+using LiteCharms.Features.MidrandBooks.Tests.Common;
 
 namespace LiteCharms.Features.MidrandBooks.Tests;
 

LiteCharms.Features.MidrandBooks.Tests/Common/Fixture.cs

@@ -1,7 +1,7 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.MidrandBooks.Extensions;
 
-namespace LiteCharms.Features.Tests.Common;
+namespace LiteCharms.Features.MidrandBooks.Tests.Common;
 
 public class Fixture : IDisposable
 {
@@ -25,8 +25,9 @@ public class Fixture : IDisposable
             .Build();
 
         Services = new ServiceCollection()
-            .AddLogging()
+            .AddHttpClient()
             .AddMediator()
+            .AddLogging()
             .AddEmailServiceBus()
             .AddGarageS3(Configuration)
             .AddMidrandShopDatabase(Configuration)
@@ -34,10 +35,7 @@ public class Fixture : IDisposable
             .AddSingleton(Configuration)
             .AddShopServices()
             .AddHashServices(Configuration)
-            .AddLiteCharmsApiSecurity(Configuration)
+            .BuildServiceProvider();
-            .AddSecurityApiSdk(Configuration)
-            .AddPayfastServices(Configuration)
-            .BuildServiceProvider(); ;
 
         Mediator = Services.GetRequiredService<IMediator>();
     }

LiteCharms.Features.MidrandBooks.Tests/Common/IntegrationFactAttribute.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.Tests.Common;
+namespace LiteCharms.Features.MidrandBooks.Tests.Common;
 
 public class IntegrationFactAttribute : FactAttribute
 {

LiteCharms.Features.MidrandBooks.Tests/CustomerServiceFeatureTests.cs

@@ -1,6 +1,6 @@
 using LiteCharms.Features.MidrandBooks.Customers;
 using LiteCharms.Features.MidrandBooks.Customers.Models;
-using LiteCharms.Features.Tests.Common;
+using LiteCharms.Features.MidrandBooks.Tests.Common;
 
 namespace LiteCharms.Features.MidrandBooks.Tests;
 

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

@@ -35,7 +35,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\LiteCharms.Features.MidrandBooks\LiteCharms.Features.MidrandBooks.csproj" />
-    <ProjectReference Include="..\LiteCharms.Features.Tests.Common\LiteCharms.Features.Tests.Common.csproj" />
     <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
   </ItemGroup>
 
@@ -46,4 +45,10 @@
     <Using Include="Xunit" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

LiteCharms.Features.MidrandBooks.Tests/OrderServiceFeatureTests.cs

@@ -1,7 +1,7 @@
 using LiteCharms.Features.MidrandBooks.Orders;
 using LiteCharms.Features.MidrandBooks.Orders.Models;
+using LiteCharms.Features.MidrandBooks.Tests.Common;
 using LiteCharms.Features.Models;
-using LiteCharms.Features.Tests.Common;
 
 namespace LiteCharms.Features.MidrandBooks.Tests;
 

LiteCharms.Features.MidrandBooks.Tests/PageServiceFeatureTests.cs

@@ -1,5 +1,5 @@
 using LiteCharms.Features.MidrandBooks.Pages;
-using LiteCharms.Features.Tests.Common;
+using LiteCharms.Features.MidrandBooks.Tests.Common;
 
 namespace LiteCharms.Features.MidrandBooks.Tests;
 

LiteCharms.Features.MidrandBooks.Tests/PayfastServiceFeatureTests.cs

@@ -1,6 +1,6 @@
 using LiteCharms.Features.MidrandBooks.Payments;
 using LiteCharms.Features.MidrandBooks.Payments.Models;
-using LiteCharms.Features.Tests.Common;
+using LiteCharms.Features.MidrandBooks.Tests.Common;
 
 namespace LiteCharms.Features.MidrandBooks.Tests;
 

LiteCharms.Features.MidrandBooks.Tests/PaymentServiceFeatureTests.cs

@@ -1,6 +1,6 @@
 using LiteCharms.Features.MidrandBooks.Payments;
 using LiteCharms.Features.MidrandBooks.Payments.Models;
-using LiteCharms.Features.Tests.Common;
+using LiteCharms.Features.MidrandBooks.Tests.Common;
 
 namespace LiteCharms.Features.MidrandBooks.Tests;
 

LiteCharms.Features.MidrandBooks.Tests/ProductServiceFeatureTests.cs

@@ -1,7 +1,7 @@
 using LiteCharms.Features.MidrandBooks.Products;
 using LiteCharms.Features.MidrandBooks.Products.Models;
+using LiteCharms.Features.MidrandBooks.Tests.Common;
 using LiteCharms.Features.Models;
-using LiteCharms.Features.Tests.Common;
 
 namespace LiteCharms.Features.MidrandBooks.Tests;
 

LiteCharms.Features.MidrandBooks.Tests/appsettings.json

@@ -1,23 +1,13 @@
 {
-  "PayfastSettings": {
+  "ValidPayfastHosts": [
-    "CheckoutUrl": "https://sandbox.payfast.co.za/eng/process",
+    "www.payfast.co.za",
-    "ValidHosts": [
+    "sandbox.payfast.co.za",
-      "www.payfast.co.za",
+    "w1w.payfast.co.za",
-      "sandbox.payfast.co.za",
+    "w2w.payfast.co.za",
-      "ips.payfast.co.za",
+    "ips.payfast.co.za",
-      "api.payfast.co.za",
+    "api.payfast.co.za",
-      "payment.payfast.io"
+    "payment.payfast.io"
-    ]
+  ],
-  },
-  "LiteCharmsSettings": {
-    "Authority": "https://sts.security.khongisa.co.za",
-    "Audience": "midrandbooks-api"
-  },
-  "LiteCharmsClientSettings": {
-    "Authority": "https://sts.security.khongisa.co.za",
-    "GrantType": "client_credentials",
-    "Scope": "midrandbooks-api"
-  },
   "HasherSettings": {
     "MinHashLength": 11
   },
@@ -36,6 +26,7 @@
     "UseSsl": true
   },
   "Monitoring": {
+    "ApiKey": "",
     "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
     "ServiceName": "LiteCharms.LeadGenerator"
   },

LiteCharms.Features.MidrandBooks/Abstractions/IMidrandBooks.cs

@@ -1,3 +0,0 @@
-namespace LiteCharms.Features.MidrandBooks.Abstractions;
-
-public interface IMidrandBooks;

LiteCharms.Features.MidrandBooks/AuthorBooks/BooksService.cs

@@ -58,30 +58,6 @@ public sealed class BooksService(IDbContextFactory<MidrandBooksDbContext> contex
         }
     }
 
-    public async ValueTask<Result<AuthorBook>> GetBookByProductIdAsync(long productId, CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var book = await context.Books
-                .AsNoTracking()
-                .Include(b => b.Author)
-                .Include(b => b.Product)
-                    .ThenInclude(b => b!.Prices)
-                .Include(b => b.Pages)
-                .FirstOrDefaultAsync(b => b.ProductId == productId, cancellationToken);
-
-            return book is null
-                ? Result.Fail<AuthorBook>(new Error($"Book with product ID {productId} not found"))
-                : Result.Ok(book.ToModel());
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail<AuthorBook>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-
     public async ValueTask<Result<AuthorBook>> GetBookAsync(long bookId, CancellationToken cancellationToken = default)
     {
         try

LiteCharms.Features.MidrandBooks/Customers/CustomerService.cs

@@ -334,28 +334,6 @@ public sealed class CustomerService(IDbContextFactory<MidrandBooksDbContext> con
         }
     }
 
-    public async ValueTask<Result<Customer>> GetCustomerAsync(string email, CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var customer = await context.Customers
-                .AsNoTracking()
-                .Include(c => c.Contacts)
-                .Include(c => c.Addresses)
-                .FirstOrDefaultAsync(c => c.Email == email, cancellationToken);
-
-            return customer is not null
-                ? Result.Ok(customer.ToModel())
-                : Result.Fail<Customer>(new Error($"Customer with email '{email}' does not exist."));
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail<Customer>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-
     public async ValueTask<Result<Customer>> GetCustomerAsync(long customerId, CancellationToken cancellationToken = default)
     {
         try

LiteCharms.Features.MidrandBooks/Customers/Entities/CustomerConfiguration.cs

@@ -12,8 +12,8 @@ public sealed class CustomerConfiguration : IEntityTypeConfiguration<Customer>
         builder.Property(c => c.Company).IsRequired(false);
         builder.Property(c => c.VatNumber).IsRequired(false);
         builder.Property(c => c.Email).IsRequired();
-        builder.Property(c => c.Phone).IsRequired(false);
+        builder.Property(c => c.Phone).IsRequired();
-        builder.Property(c => c.Website).IsRequired(false);
+        builder.Property(c => c.Website).IsRequired();
         builder.Property(c => c.Enabled).HasDefaultValue(true);
 
         builder.OwnsMany(f => f.SocialMedia, b => { b.ToJson(); });

LiteCharms.Features.MidrandBooks/Extensions/Shop.cs

@@ -1,27 +1,18 @@
 using LiteCharms.Features.Abstractions;
-using LiteCharms.Features.Browser;
-using LiteCharms.Features.MidrandBooks.Abstractions;
 
 namespace LiteCharms.Features.MidrandBooks.Extensions;
 
 public static class Shop
 {
-    public static IServiceCollection AddShopServices(this IServiceCollection services, bool includeLocalStorage = false)
+    public static IServiceCollection AddShopServices(this IServiceCollection services)
     {
         var serviceType = typeof(IService);
 
-        var sharedImplementations = typeof(IFeatures).Assembly.GetTypes()
+        var implementations = Assembly.GetExecutingAssembly().GetTypes()
             .Where(t => serviceType.IsAssignableFrom(t) && t.IsClass && !t.IsAbstract);
 
-        foreach (var sharedImplementation in sharedImplementations) services.AddScoped(sharedImplementation);
+        foreach (var implementation in implementations) 
-
+            services.AddScoped(implementation);
-        var coreImplementations = typeof(IMidrandBooks).Assembly.GetTypes()
-            .Where(t => serviceType.IsAssignableFrom(t) && t.IsClass && !t.IsAbstract);
-
-        foreach (var coreImplementation in coreImplementations) services.AddScoped(coreImplementation);
-
-        if (includeLocalStorage)
-            services.AddScoped<LocalStorageService>();
 
         return services;
     }

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

@@ -32,11 +32,11 @@
   <!-- Quartz Scheduler-->
   <ItemGroup>
     <PackageReference Include="Humanizer" Version="3.0.10" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.102">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenTelemetry" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.15.3" />
     <PackageReference Include="Quartz" Version="3.18.1" />
     <PackageReference Include="Quartz.Plugins" Version="3.18.1" />
     <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
@@ -50,11 +50,11 @@
 
   <!-- Configuration -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Configuration" />
@@ -67,9 +67,9 @@
     <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
@@ -78,12 +78,12 @@
 
   <!-- Open Telemetry -->
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
 
     <!-- Global Usings -->
     <Using Include="OpenTelemetry.Resources" />
@@ -95,13 +95,13 @@
 
   <!-- Database -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -136,8 +136,8 @@
 
   <!-- Amazon S3 SDK -->
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.6" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.3" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
     <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
 
     <!-- global Usings -->
@@ -148,7 +148,6 @@
 
   <!-- Shared Usings -->
   <ItemGroup>
-    <Using Include="Microsoft.AspNetCore.Http" />
     <Using Include="System.Net.Sockets" />
     <Using Include="System.Text.RegularExpressions" />
     <Using Include="System.Web" />

LiteCharms.Features.MidrandBooks/Orders/OrderService.cs

@@ -164,27 +164,6 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
     public async ValueTask<Result> CancelOrderAsync(long orderId, CancellationToken cancellationToken = default) =>
         await UpdateOrderStatusAsync(orderId, OrderStatus.Cancelled, cancellationToken);
 
-    public async ValueTask<Result<Order>> GetPendingOrderAsync(long customerId, CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-
-            var order = await context.Orders.AsNoTracking()
-                .Where(o => o.Status == OrderStatus.Pending && o.CustomerId == customerId)
-                .OrderByDescending(o => o.Id)
-                .FirstOrDefaultAsync(cancellationToken);
-
-            return order is not null
-                ? Result.Ok(order.ToModel())
-                : Result.Fail<Order>("Order not found.");
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail<Order>(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-
     public async ValueTask<Result<Order>> GetOrderAsync(long orderId, CancellationToken cancellationToken = default)
     {
         try

LiteCharms.Features.MidrandBooks/Payments/CartService.cs

@@ -1,153 +0,0 @@
-using LiteCharms.Features.Browser;
-using LiteCharms.Features.Hasher;
-using LiteCharms.Features.MidrandBooks.Authors.Models;
-using LiteCharms.Features.MidrandBooks.Payments.Models;
-using LiteCharms.Features.MidrandBooks.Products.Models;
-
-namespace LiteCharms.Features.MidrandBooks.Payments;
-
-public sealed class CartService(LocalStorageService localStorage)
-{
-    private readonly string CartStorageKey = HashService.ToMd5Hash(nameof(Cart)).Value;
-
-    public Cart ShoppingCart { get; private set; } = new();
-
-    public event Action? OnCartChanged;
-
-    public static Func<Cart, long, int> GetCartItemQuantity = (shoppingCart, productPriceId) =>
-        shoppingCart.Items.FirstOrDefault(p => p.Price!.Id == productPriceId)?.Quantity ?? 1;
-
-    public Cart GetCart() => ShoppingCart;
-
-    public void NotifyStateChanged() => OnCartChanged?.Invoke();
-
-    public async Task LoadCartFromStorageAsync()
-    {
-        var loadResult = await localStorage.GetAsync<Cart>(CartStorageKey);
-
-        if (loadResult.IsFailed) await localStorage.SaveAsync(CartStorageKey, ShoppingCart);
-
-        if (loadResult.IsSuccess) ShoppingCart = loadResult.Value;
-
-        NotifyStateChanged();
-    }
-
-    public async Task SaveCartToStorageAsync() => await localStorage.SaveAsync(CartStorageKey, ShoppingCart);
-
-    public void AddItem(ProductPrice productPrice, Product product, Author author)
-    {
-        var itemExists = false;
-
-        for (var i = 0; i < ShoppingCart.Items.Count; i++)
-        {
-            if (ShoppingCart.Items[i].Price!.Id == productPrice.Id)
-            {
-                ShoppingCart.Items[i].Quantity++;
-                ShoppingCart.Items[i].Amount += productPrice.Amount;
-
-                itemExists = true;
-
-                break;
-            }
-        }
-
-        if (!itemExists)
-            ShoppingCart.Items.Add(new CartItem
-            {
-                Product = product,
-                Author = author,
-                Price = productPrice,
-                Amount = productPrice.Amount,
-                Quantity = 1,
-            });
-
-        CalculateTotalPrice();
-        NotifyStateChanged();
-    }
-
-    public void UpdateQuantity(long productPriceId, int delta)
-    {
-        for (var i = 0; i < ShoppingCart.Items.Count; i++)
-        {
-            if (ShoppingCart.Items[i].Price!.Id == productPriceId)
-            {
-                var oldQuantity = ShoppingCart.Items[i].Quantity;
-                var pricePerUnit = ShoppingCart.Items[i].Price!.Amount;
-
-                ShoppingCart.Items[i].Quantity += delta;
-                ShoppingCart.Items[i].Amount = pricePerUnit * ShoppingCart.Items[i].Quantity;
-                break;
-            }
-        }
-
-        CalculateTotalPrice();
-        NotifyStateChanged();
-    }
-
-    public void RemoveOneItem(long productPriceId)
-    {
-        for (var i = 0; i < ShoppingCart.Items.Count; i++)
-        {
-            if (ShoppingCart.Items[i].Price!.Id == productPriceId)
-            {
-                if (ShoppingCart.Items[i].Quantity <= 1)
-                {
-                    ShoppingCart.Items.Remove(ShoppingCart.Items[i]);
-
-                    break;
-                }
-                else
-                {
-                    ShoppingCart.Items[i].Quantity--;
-                    ShoppingCart.Items[i].Amount -= ShoppingCart.Items[i].Price!.Amount;
-                }
-
-                break;
-            }
-        }
-
-        CalculateTotalPrice();
-        NotifyStateChanged();
-    }
-
-    public void RemoveAllSameItem(long productPriceId)
-    {
-        if (ShoppingCart.Items.Count == 0) return;
-
-        var item = ShoppingCart.Items.FirstOrDefault(i => i.Price?.Id == productPriceId);
-
-        if (item is not null) ShoppingCart.Items.Remove(item);
-
-        CalculateTotalPrice();
-        NotifyStateChanged();
-    }
-
-    public void Clear()
-    {
-        if(ShoppingCart.CustomerId is not null || ShoppingCart.OrderId is not null)
-        {
-            ShoppingCart.TotalAmount = 0;
-            ShoppingCart.TotalVat = 0;
-            ShoppingCart.Items.Clear();
-
-            return;
-        }
-
-        ShoppingCart = new Cart();
-
-        NotifyStateChanged();
-    }
-
-    public decimal CalculateTotalPrice()
-    {
-        if (ShoppingCart.Items.Count == 0) return 0;
-
-        var gross = ShoppingCart.Items.Sum(i => i.Amount);
-
-        if (!ShoppingCart.IsVatInclusive) ShoppingCart.TotalVat = gross * ShoppingCart.VatRate;
-
-        ShoppingCart.TotalAmount = gross + ShoppingCart.TotalVat;
-
-        return ShoppingCart.TotalAmount;
-    }
-}

LiteCharms.Features.MidrandBooks/Payments/Events/Handlers/PayfastPaymentConfirmationReceivedEventHandler.cs

@@ -1,22 +1,17 @@
-using LiteCharms.Features.Api.Configuration;
+using LiteCharms.Features.Hasher;
-using LiteCharms.Features.Hasher;
+using LiteCharms.Features.Hasher.Configuration;
-using LiteCharms.Features.Mediator;
 using LiteCharms.Features.MidrandBooks.Orders;
 using LiteCharms.Features.MidrandBooks.Payments.Models;
 
 namespace LiteCharms.Features.MidrandBooks.Payments.Events.Handlers;
 
-public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvider services, 
+public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvider services, IOptions<HasherSettings> hasherOptions, ILogger<PayfastPaymentConfirmationReceivedEvent> logger) : 
-    IOptions<PayfastSettings> payfastOptions, ILogger<PayfastPaymentConfirmationReceivedEvent> logger) :
     INotificationHandler<PayfastPaymentConfirmationReceivedEvent>
 {
-    private readonly PayfastSettings pasfastSettings = payfastOptions.Value;
+    private readonly HasherSettings hasherSettings = hasherOptions.Value;
 
     public async ValueTask Handle(PayfastPaymentConfirmationReceivedEvent notification, CancellationToken cancellationToken)
     {
-        using var activity = MediatorTelemetry.Source.StartActivity($"Quartz: {typeof(PayfastPaymentConfirmationReceivedEvent).Name}");
-        activity?.SetTag("event.correlation_id", notification.CorrelationId);
-
         await using var scope = services.CreateAsyncScope();
         var hashService = scope.ServiceProvider.GetRequiredService<HashService>();
         var orderService = scope.ServiceProvider.GetRequiredService<OrderService>();
@@ -26,9 +21,9 @@ public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvi
         var payload = notification.Payload ?? throw new Exception("Payload metadata context context is null.");
 
         var dict = payload.ToParamDictionary();
-        var localSignature = PayfastService.GenerateSignature(dict, pasfastSettings.Passphrase);
+        var localSignature = PayfastService.GenerateSignature(dict, hasherSettings.PayfastPassphrase);
 
-        if (localSignature.IsFailed)
+        if(localSignature.IsFailed)
             throw new Exception("Failed to generate local signature for incoming webhook payload.");
 
         if (!string.Equals(localSignature.Value, payload.Signature, StringComparison.OrdinalIgnoreCase))
@@ -159,6 +154,5 @@ public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvi
 
             logger.LogInformation("Webhook validation pipeline passed checks successfully, logged entry to ledger with status: {Status}", status);
         }
-        activity?.SetStatus(ActivityStatusCode.Ok);
     }
 }

LiteCharms.Features.MidrandBooks/Payments/Models/Cart.cs

@@ -1,18 +0,0 @@
-namespace LiteCharms.Features.MidrandBooks.Payments.Models;
-
-public sealed class Cart
-{
-    public long? CustomerId { get; set; }
-
-    public long? OrderId { get; set; }
-
-    public decimal TotalAmount { get; set; }
-
-    public decimal TotalVat { get; set; }
-
-    public decimal VatRate { get; set; } = 0.15m;
-
-    public bool IsVatInclusive { get; set; } = true;
-
-    public IList<CartItem> Items { get; set; } = [];
-}

LiteCharms.Features.MidrandBooks/Payments/Models/CartItem.cs

@@ -1,17 +0,0 @@
-using LiteCharms.Features.MidrandBooks.Authors.Models;
-using LiteCharms.Features.MidrandBooks.Products.Models;
-
-namespace LiteCharms.Features.MidrandBooks.Payments.Models;
-
-public sealed class CartItem
-{
-    public Author? Author { get; set; }
-
-    public Product? Product { get; set; }
-
-    public ProductPrice? Price { get; set; }
-
-    public int Quantity { get; set; }
-
-    public decimal Amount { get; set; }
-}

LiteCharms.Features.MidrandBooks/Payments/PayfastService.cs

@@ -1,18 +1,18 @@
 using LiteCharms.Features.Abstractions;
-using LiteCharms.Features.Api.Configuration;
 using LiteCharms.Features.Hasher;
 using LiteCharms.Features.MidrandBooks.Payments.Models;
 using LiteCharms.Features.MidrandBooks.Postgres;
-using Microsoft.AspNetCore.Http;
 
 namespace LiteCharms.Features.MidrandBooks.Payments;
 
 public sealed partial class PayfastService(IDbContextFactory<MidrandBooksDbContext> contextFactory, 
-    IOptions<PayfastSettings> payfastOptions, ILogger<PayfastService> logger, IHttpClientFactory httpClientFactory) : IService
+    ILogger<PayfastService> logger, IHttpClientFactory httpClientFactory, IConfiguration configuration) : IService
 {
     [GeneratedRegex(@"%[0-9A-Fa-f]{2}", RegexOptions.None, matchTimeoutMilliseconds: 1000)]
     public static partial Regex PercentEncodingRegex { get; }
 
+    public readonly string[] ValidHosts = configuration.GetSection("ValidPayfastHosts").Get<string[]>() ?? [];
+
     public async ValueTask<Result<long>> WriteLedgerEntryAsync(CreateGatewayLedgerEntry request, CancellationToken cancellationToken = default)
     {
         try
@@ -49,40 +49,8 @@ public sealed partial class PayfastService(IDbContextFactory<MidrandBooksDbConte
         }
     }
 
-    public static bool VerifyIncomingSignature(HttpRequest request, string passphrase)
-    {
-        var formFields = request.Form.ToDictionary(x => x.Key, x => x.Value.ToString());
-
-        if (!formFields.TryGetValue("signature", out string? incomingSignature))
-            return false;
-
-        var stringBuilder = new StringBuilder();
-
-        foreach (var key in formFields.Keys)
-        {
-            if (key.Equals("signature", StringComparison.OrdinalIgnoreCase))
-                continue;
-
-            string encodedVal = HttpUtility.UrlEncode(formFields[key].Trim());
-            string cleanVal = PercentEncodingRegex.Replace(encodedVal,  m => m.Value.ToUpperInvariant());
-
-            stringBuilder.Append($"{key}={cleanVal}&");
-        }
-
-        string encodedPassphrase = HttpUtility.UrlEncode(passphrase.Trim());
-        string safePassphrase = PercentEncodingRegex.Replace(encodedPassphrase,  m => m.Value.ToUpperInvariant());
-
-        stringBuilder.Append($"passphrase={safePassphrase}");
-
-        string generatedSignature = HashService.ToMd5Hash(stringBuilder.ToString()).Value;
-        return incomingSignature.Equals(generatedSignature, StringComparison.OrdinalIgnoreCase);
-    }
-
     public async ValueTask<Result<bool>> ValidateReferrerIpAsync(string remoteIpAddress, bool allowLoopback = false, CancellationToken cancellationToken = default)
     {
-        if(payfastOptions.Value?.ValidHosts?.Length == 0)
-            return Result.Fail<bool>("Valid payfast hosts not configured.");
-
         if (string.IsNullOrWhiteSpace(remoteIpAddress)) 
             return Result.Fail<bool>("Remote IP address is null or whitespace.");
 
@@ -90,7 +58,7 @@ public sealed partial class PayfastService(IDbContextFactory<MidrandBooksDbConte
         {
             var validIps = new HashSet<IPAddress>();
 
-            foreach (var host in payfastOptions.Value!.ValidHosts!)
+            foreach (var host in ValidHosts)
             {
                 try
                 {
@@ -177,66 +145,33 @@ public sealed partial class PayfastService(IDbContextFactory<MidrandBooksDbConte
     {
         var pfOutput = new StringBuilder();
 
-        var mandatorySequence = GetPayfastMandatoryFieldSequence();
+        foreach (var kvp in data)
-
-        foreach (string key in mandatorySequence)
         {
-            if (data.TryGetValue(key, out string? rawValue) && !string.IsNullOrEmpty(rawValue))
+            if (string.IsNullOrEmpty(kvp.Value))
-            {
+                continue;
-                string encodedVal = HttpUtility.UrlEncode(rawValue.Trim());
-                string val = PercentEncodingRegex.Replace(encodedVal, m => m.Value.ToUpperInvariant());
 
-                pfOutput.Append($"{key}={val}&");
+            string key = kvp.Key;
-            }
+
+            string encodedVal = HttpUtility.UrlEncode(kvp.Value.Trim());
+
+            string val = PercentEncodingRegex.Replace(encodedVal, m => m.Value.ToLowerInvariant());
+
+            pfOutput.Append($"{key}={val}&");
         }
 
-        var getString = pfOutput.Length > 0
+        string getString = pfOutput.Length > 0
             ? pfOutput.ToString()[..^1]
             : string.Empty;
 
         if (!string.IsNullOrWhiteSpace(passPhrase))
         {
             string encodedPassphrase = HttpUtility.UrlEncode(passPhrase.Trim());
-            string safePassphrase = PercentEncodingRegex.Replace(encodedPassphrase, m => m.Value.ToUpperInvariant());
+
+            string safePassphrase = PercentEncodingRegex.Replace(encodedPassphrase, m => m.Value.ToLowerInvariant());
 
             getString += $"&passphrase={safePassphrase}";
         }
 
         return HashService.ToMd5Hash(getString);
     }    
-
-    private static string[] GetPayfastMandatoryFieldSequence() =>
-        [
-            "merchant_id",
-            "merchant_key",
-            "return_url",
-            "cancel_url",
-            "notify_url",
-            "name_first",
-            "name_last",
-            "email_address",
-            "cell_number",
-            "m_payment_id",
-            "amount",
-            "item_name",
-            "item_description",
-            "custom_int1",
-            "custom_int2",
-            "custom_int3",
-            "custom_int4",
-            "custom_int5",
-            "custom_str1",
-            "custom_str2",
-            "custom_str3",
-            "custom_str4",
-            "custom_str5",
-            "email_confirmation",
-            "confirmation_address",
-            "payment_method",
-            "subscription_type",
-            "billing_date",
-            "recurring_amount",
-            "frequency",
-            "cycles"
-        ];
 }

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

@@ -1,54 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
-{
-    /// <inheritdoc />
-    public partial class OnlyEmailIsMandatoryOnCustomer : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "Website",
-                table: "Customers",
-                type: "text",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "text");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Phone",
-                table: "Customers",
-                type: "text",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "text");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "Website",
-                table: "Customers",
-                type: "text",
-                nullable: false,
-                defaultValue: "",
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Phone",
-                table: "Customers",
-                type: "text",
-                nullable: false,
-                defaultValue: "",
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldNullable: true);
-        }
-    }
-}

LiteCharms.Features.MidrandBooks/Postgres/Migrations/MidrandBooksDbContextModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.9")
+                .HasAnnotation("ProductVersion", "10.0.8")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -309,6 +309,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
                         .HasDefaultValue(true);
 
                     b.Property<string>("Phone")
+                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<DateTime?>("UpdatedAt")
@@ -320,6 +321,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
                         .HasColumnType("text");
 
                     b.Property<string>("Website")
+                        .IsRequired()
                         .HasColumnType("text");
 
                     b.HasKey("Id");

LiteCharms.Features.TechShop/LiteCharms.Features.TechShop.csproj

@@ -36,7 +36,7 @@
 
   <!-- Quartz Scheduler-->
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.15.3" />
     <PackageReference Include="Quartz" Version="3.18.1" />
     <PackageReference Include="Quartz.Plugins" Version="3.18.1" />
     <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
@@ -50,11 +50,11 @@
 
   <!-- Configuration -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Configuration" />
@@ -67,9 +67,9 @@
     <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
@@ -78,12 +78,12 @@
 
   <!-- Open Telemetry -->
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
 
     <!-- Global Usings -->
     <Using Include="OpenTelemetry.Resources" />
@@ -95,13 +95,13 @@
 
   <!-- Database -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -136,8 +136,8 @@
 
   <!-- Amazon S3 SDK -->
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.6" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.3" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
     <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
 
     <!-- global Usings -->

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

@@ -1,76 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <UserSecretsId>0521f45a-eba0-457f-bb5e-c3680f65d8b1</UserSecretsId>
-  </PropertyGroup>
-
-  <!-- xUnit -->
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="10.0.1">
-      <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">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    
-    <Using Include="Xunit.Abstractions" />
-  </ItemGroup>
-
-  <!-- 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>
-    </PackageReference>
-
-    <Using Include="Mediator" />
-  </ItemGroup>
-  
-  <!-- Microsoft -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.9" />
-    
-    <Using Include="Microsoft.Extensions.DependencyInjection" />
-    <Using Include="Microsoft.Extensions.Configuration" />
-  </ItemGroup>
-
-  <!-- Shared Usings -->
-  <ItemGroup>
-    <Using Include="System.Net" />
-    <Using Include="System.Text.Json" />
-    <Using Include="System.Diagnostics" />
-    <Using Include="System.Reflection" />
-    <Using Include="Xunit" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LiteCharms.Features.MidrandBooks\LiteCharms.Features.MidrandBooks.csproj" />
-    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>

LiteCharms.Features.Tests/Fixture.cs

@@ -0,0 +1,36 @@
+using LiteCharms.Features.Extensions;
+
+namespace LiteCharms.Features.Tests;
+
+public class Fixture : IDisposable
+{
+    public IConfiguration Configuration { get; set; }
+
+    public IServiceProvider Services { get; set; }
+
+    public IMediator Mediator { get; set; }
+
+    public Fixture()
+    {
+        Configuration = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddUserSecrets<Fixture>()
+            .AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), "appsettings.json"), optional: true, reloadOnChange: true)
+            .AddEnvironmentVariables()
+            .Build();
+
+        Services = new ServiceCollection()            
+            .AddMediator()
+            .AddLogging()            
+            .AddEmailServiceBus()
+            .AddGarageS3(Configuration)
+            .AddEmailServices(Configuration)
+            .AddSingleton(Configuration)
+            .AddHashServices(Configuration)
+            .BuildServiceProvider();
+
+        Mediator = Services.GetRequiredService<IMediator>();
+    }
+
+    public void Dispose() { }
+}

LiteCharms.Features.Tests/HashServiceFeatureTests.cs

@@ -1,5 +1,4 @@
 using LiteCharms.Features.Hasher;
-using LiteCharms.Features.Tests.Common;
 
 namespace LiteCharms.Features.Tests;
 

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

@@ -31,13 +31,11 @@
     <Using Include="System.Text" />
     <Using Include="Mediator" />
     <Using Include="Xunit.Abstractions" />
-    <Using Include="Microsoft.Extensions.Options" />
     <Using Include="Microsoft.Extensions.DependencyInjection" />
     <Using Include="Microsoft.Extensions.Configuration" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\LiteCharms.Features.Tests.Common\LiteCharms.Features.Tests.Common.csproj" />
     <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
   </ItemGroup>
 
@@ -45,4 +43,10 @@
     <Using Include="Xunit" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

LiteCharms.Features.Tests/LiteCharmsApiFeatureTests.cs

@@ -1,19 +0,0 @@
-using LiteCharms.Features.Api;
-using LiteCharms.Features.Tests.Common;
-
-namespace LiteCharms.Features.Tests;
-
-public sealed class LiteCharmsApiFeatureTests(Fixture fixture) : IClassFixture<Fixture>
-{
-    private readonly TokenService tokenService = fixture.Services.GetRequiredService<TokenService>();
-
-    [IntegrationFact]
-    public async Task TokenService_GenerateTokenAsync_ShouldReturn_TokenInResult()
-    {
-        var result = await tokenService.GenerateAsync(fixture.CancellationToken);
-
-        Assert.True(result.IsSuccess);
-        Assert.NotNull(result.Value);
-        Assert.NotEmpty(result.Value.AccessToken!);
-    }
-}

LiteCharms.Features.Tests/PayfastFeatureTests.cs

@@ -1,18 +0,0 @@
-using LiteCharms.Features.Api.Configuration;
-using LiteCharms.Features.Tests.Common;
-
-namespace LiteCharms.Features.Tests;
-
-public sealed class PayfastFeatureTests(Fixture fixture) : IClassFixture<Fixture>
-{
-    private readonly PayfastSettings payfastSettings = fixture.Services.GetRequiredService<IOptions<PayfastSettings>>().Value;
-
-    [IntegrationFact]
-    public void PayfastSettings_ShouldFail_IfNotLoaded()
-    {
-        Assert.NotEmpty(payfastSettings.CheckoutUrl!);
-        Assert.NotEmpty(payfastSettings.MerchantId!);
-        Assert.NotEmpty(payfastSettings.MerchantKey!);
-        Assert.NotEmpty(payfastSettings.Passphrase!);
-    }
-}

LiteCharms.Features.Tests/S3ServiceFeatureTests.cs

@@ -1,5 +1,4 @@
 using LiteCharms.Features.S3.Abstractions;
-using LiteCharms.Features.Tests.Common;
 
 namespace LiteCharms.Features.Tests;
 

LiteCharms.Features.Tests/appsettings.json

@@ -0,0 +1,34 @@
+{
+  "BookshopS3Settings": {
+    "ServiceUrl": "http://192.168.1.177:30900",
+    "Region": "garage",
+    "BucketName": "bookshop",
+    "CdnBaseUrl": "https://bookshop.cdn.khongisa.co.za"
+  },
+  "BookshopQuotesS3Settings": {
+    "ServiceUrl": "http://192.168.1.177:30900",
+    "Region": "garage",
+    "BucketName": "bookshop.quotes",
+    "CdnBaseUrl": "https://bookshop.quotes.cdn.khongisa.co.za"
+  },
+  "Email": {
+    "Credentials": {
+      "Username": "shop@litecharms.co.za"
+    },
+    "Port": 465,
+    "Host": "mail.litecharms.co.za",
+    "UseSsl": true
+  },
+  "Monitoring": {
+    "ApiKey": "",
+    "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
+    "ServiceName": "LiteCharms.LeadGenerator"
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}

LiteCharms.Features.Tests/http/litecharms/app.http

@@ -1,6 +0,0 @@
-### Authentik Token Request (Service Account Explicit)
-POST {{authority}}/connect/token
-Content-Type: application/x-www-form-urlencoded
-Accept-Encoding: identity
-
-grant_type={{grantType}}&client_id={{clientId}}&client_secret={{clientSecret}}&scope={{scope}}

LiteCharms.Features.Tests/http/litecharms/http-client.env.json

@@ -1,9 +0,0 @@
-{
-  "uat": {
-    "authority": "https://sts.security.khongisa.co.za",
-    "grantType": "client_credentials",
-    "clientId": "midrandbooks-api-scaler-uat",
-    "clientSecret": "secret_0a8dc1f99061590a52b1272db3a1871d2761c79fbd058b2a968911029e4b208a",
-    "scope": "midrandbooks-api"
-  }
-}

LiteCharms.Features/Abstractions/IFeatures.cs

@@ -1,3 +0,0 @@
-namespace LiteCharms.Features.Abstractions;
-
-public interface IFeatures;

LiteCharms.Features/Abstractions/IJobOrchestrator.cs

@@ -1,12 +0,0 @@
-namespace LiteCharms.Features.Abstractions;
-
-public interface IJobOrchestrator
-{
-    ValueTask SendAsync<TNotification>(TNotification notification, CancellationToken cancellationToken = default)
-        where TNotification : IEvent;
-
-    ValueTask ScheduleAsync<TNotification>(TNotification notification, string cronExpression, CancellationToken cancellationToken = default) 
-        where TNotification : IEvent;
-
-    ValueTask<bool> InterruptAsync(string eventName, string? correlationId = null, CancellationToken cancellationToken = default);
-}

LiteCharms.Features/Api/Configuration/LiteCharmsClientSettings.cs

@@ -1,14 +0,0 @@
-namespace LiteCharms.Features.Api.Configuration;
-
-public sealed class LiteCharmsClientSettings
-{
-    public string? Authority { get; set; }
-
-    public string? GrantType { get; set; }
-
-    public string? ClientId { get; set; }
-
-    public string? ClientSecret { get; set; }
-
-    public string? Scope { get; set; }
-}

LiteCharms.Features/Api/Configuration/LiteCharmsSettings.cs

@@ -1,12 +0,0 @@
-namespace LiteCharms.Features.Api.Configuration;
-
-public sealed class LiteCharmsSettings
-{
-    public string? Authority { get; set; }
-
-    public string? ClientId { get; set; }
-
-    public string? ClientSecret { get; set; }
-
-    public string? Audience { get; set; }
-}

LiteCharms.Features/Api/Configuration/PayfastSettings.cs

@@ -1,14 +0,0 @@
-namespace LiteCharms.Features.Api.Configuration;
-
-public sealed class PayfastSettings
-{
-    public string? CheckoutUrl { get; set; }
-
-    public string? Passphrase { get; set; }
-
-    public string? MerchantId { get; set; }
-
-    public string? MerchantKey { get; set; }
-
-    public string[]? ValidHosts { get; set; }
-}

LiteCharms.Features/Api/Models/TokenErrorResponse.cs

@@ -1,13 +0,0 @@
-namespace LiteCharms.Features.Api.Models;
-
-public sealed class TokenErrorResponse
-{
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    [JsonPropertyName("error_description")]
-    public string? ErrorDescription { get; set; }
-
-    [JsonPropertyName("error_uri")]
-    public string? ErrorUri { get; set; }
-}

LiteCharms.Features/Api/Models/TokenRequest.cs

@@ -1,20 +0,0 @@
-namespace LiteCharms.Features.Api.Models;
-
-public sealed class TokenRequest
-{
-    [JsonPropertyName("grant_type")]
-    [AliasAs("grant_type")]
-    public string? GrantType { get; set; }
-
-    [JsonPropertyName("client_id")]
-    [AliasAs("client_id")]
-    public string? ClientId { get; set; }
-
-    [JsonPropertyName("client_secret")]
-    [AliasAs("client_secret")]
-    public string? ClientSecret { get; set; }
-
-    [JsonPropertyName("scope")]
-    [AliasAs("scope")]
-    public string? Scope { get; set; }
-}

LiteCharms.Features/Api/Models/TokenResponse.cs

@@ -1,17 +0,0 @@
-namespace LiteCharms.Features.Api.Models;
-
-public sealed class TokenResponse
-{
-    [JsonPropertyName("access_token")]
-    public string? AccessToken { get; set; }
-
-    [JsonPropertyName("expires_in")]
-    public int ExpiresIn { get; set; }
-
-    [JsonPropertyName("token_type")]
-    public string? TokenType { get; set; }
-
-    [JsonPropertyName("scope")]
-    public string? Scope { get; set; }
-}
-

LiteCharms.Features/Api/OpenApiBearerSecuritySchemeTransformer.cs

@@ -8,7 +8,7 @@ public sealed class OpenApiBearerSecuritySchemeTransformer : IOpenApiDocumentTra
         {
             Type = SecuritySchemeType.Http,
             Scheme = "bearer",
-            Description = "JWT Authorization header using the Bearer scheme",
+            Description = "JWT Authorization header using the Bearer scheme. Example: \"Bearer {token}\"",
         };
 
         document.AddComponent("Bearer", bearerScheme);

LiteCharms.Features/Api/Sdk/IConnectApi.cs

@@ -1,10 +0,0 @@
-using LiteCharms.Features.Api.Models;
-
-namespace LiteCharms.Features.Api.Sdk;
-
-public interface IConnectApi
-{
-    [Post("/connect/token")]
-    ValueTask<HttpResponseMessage> GetToken([Body(BodySerializationMethod.UrlEncoded)] TokenRequest request, 
-        CancellationToken cancellationToken = default);
-}

LiteCharms.Features/Api/TokenService.cs

@@ -1,66 +0,0 @@
-using LiteCharms.Features.Api.Configuration;
-using LiteCharms.Features.Api.Models;
-using LiteCharms.Features.Api.Sdk;
-
-namespace LiteCharms.Features.Api;
-
-public sealed class TokenService(IConnectApi connectApi, IOptions<LiteCharmsClientSettings> clientOptions)
-{
-    private readonly LiteCharmsClientSettings clientSettings = clientOptions.Value;
-
-    public async Task<Result<TokenResponse>> GenerateAsync(CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            var request = new TokenRequest
-            {
-                ClientId = clientSettings.ClientId,
-                ClientSecret = clientSettings.ClientSecret,
-                GrantType = clientSettings.GrantType,
-                Scope = clientSettings.Scope,
-            };
-
-            using var response = await connectApi.GetToken(request, cancellationToken);
-
-            var contentRaw = await response.Content.ReadAsStringAsync(cancellationToken);
-
-            if (string.IsNullOrWhiteSpace(contentRaw))
-                return Result.Fail(new Error($"The authentication endpoint returned an empty payload. Status code: {response.StatusCode}"));
-
-            if (response.IsSuccessStatusCode)
-            {
-                var tokenResponse = JsonSerializer.Deserialize<TokenResponse>(contentRaw);
-
-                return !string.IsNullOrWhiteSpace(tokenResponse?.AccessToken)
-                    ? Result.Ok(tokenResponse)
-                    : Result.Fail<TokenResponse>(new Error("Authentication succeeded, but no access token was found in the response payload."));
-            }
-
-            try
-            {
-                var errorResult = JsonSerializer.Deserialize<TokenErrorResponse>(contentRaw);
-
-                if (errorResult != null)
-                {
-                    string summary = $"{errorResult.Error}: {errorResult.ErrorDescription}";
-
-                    return Result.Fail(new Error(summary));
-                }
-            }
-            catch
-            {
-                return Result.Fail(new Error($"Authentication failed: {contentRaw}"));
-            }
-
-            return Result.Fail(new Error($"Authentication failed with status code: {response.StatusCode}"));
-        }
-        catch (OperationCanceledException ex)
-        {
-            return Result.Fail(new Error("The token generation request was canceled.").CausedBy(ex));
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Browser/LocalStorageService.cs

@@ -1,78 +0,0 @@
-namespace LiteCharms.Features.Browser;
-
-public sealed class LocalStorageService(ProtectedLocalStorage storage)
-{
-    public async ValueTask<Result> DeleteAsync(string key)
-    {
-        try
-        {
-            await storage.DeleteAsync(key);
-
-            return Result.Ok();
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-
-    public async ValueTask<Result> SaveAsync(string key, string value)
-    {
-        try
-        {
-            await storage.SetAsync(key, value);
-
-            return Result.Ok();
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-
-    public async ValueTask<Result> SaveAsync<TValue>(string key, TValue value) where TValue : class
-    {
-        try
-        {
-            await storage.SetAsync(key, value);
-
-            return Result.Ok();
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-
-    public async ValueTask<Result<string>> GetAsync(string key)
-    {
-        try
-        {
-            var retrieval = await storage.GetAsync<string>(key);
-
-            return retrieval.Success && !string.IsNullOrWhiteSpace(retrieval.Value)
-                ? Result.Ok(retrieval.Value)
-                : Result.Fail($"Could not find object by key {key}");
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-
-    public async ValueTask<Result<TValue>> GetAsync<TValue>(string key) where TValue : class
-    {
-        try
-        {
-            var retrieval = await storage.GetAsync<TValue>(key);
-
-            return retrieval.Success && retrieval.Value is not null
-                ? Result.Ok(retrieval.Value)
-                : Result.Fail($"Could not find object by key {key}");
-        }
-        catch (Exception ex)
-        {
-            return Result.Fail(new Error(ex.Message).CausedBy(ex));
-        }
-    }
-}

LiteCharms.Features/Extensions/Api.cs

@@ -1,7 +1,5 @@
 using LiteCharms.Features.Abstractions;
 using LiteCharms.Features.Api;
-using LiteCharms.Features.Api.Configuration;
-using LiteCharms.Features.Api.Sdk;
 
 namespace LiteCharms.Features.Extensions;
 
@@ -10,207 +8,6 @@ public static class Api
     public const string Books = nameof(Books);
     public const string Payments = nameof(Payments);
 
-    public static IServiceCollection AddPayfastServices(this IServiceCollection services, IConfiguration configuration)
-    {
-        var configSection = configuration.GetSection(nameof(PayfastSettings));
-
-        services.Configure<PayfastSettings>(configSection);
-
-        return services;
-    }
-    
-    public static IServiceCollection AddSecurityApiSdk(this IServiceCollection services, IConfiguration configuration)
-    {
-        var configSection = configuration.GetSection(nameof(LiteCharmsClientSettings));
-
-        var authOptions = new LiteCharmsClientSettings();
-        configSection.Bind(authOptions);
-
-        services.Configure<LiteCharmsClientSettings>(configSection);
-
-        if (string.IsNullOrWhiteSpace(authOptions.Authority))
-            return services;
-
-        if (!authOptions.Authority.EndsWith("/", StringComparison.Ordinal)) authOptions.Authority += "/";
-
-        services.AddRefitClient<IConnectApi>()
-            .ConfigureHttpClient(config =>
-            {
-                config.BaseAddress = new Uri(authOptions.Authority);
-                config.Timeout = TimeSpan.FromSeconds(15);
-            })
-            .AddStandardResilienceHandler(options =>
-            {
-                options.Retry.MaxRetryAttempts = 3;
-                options.Retry.Delay = TimeSpan.FromSeconds(1);
-                options.Retry.BackoffType = Polly.DelayBackoffType.Exponential;
-            });
-
-        services.AddScoped<TokenService>();
-
-        return services;
-    }
-
-    public static IServiceCollection AddLiteCharmsWebSecurity(this IServiceCollection services, IConfiguration configuration)
-    {
-        var configSection = configuration.GetSection(nameof(LiteCharmsSettings));
-
-        var authOptions = new LiteCharmsSettings();
-        configSection.Bind(authOptions);
-
-        services.Configure<LiteCharmsSettings>(configSection);
-
-        services.AddAuthentication(options =>
-        {
-            options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;
-            options.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
-        })
-        .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme)
-        .AddOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, options =>
-        {
-            options.Authority = authOptions.Authority;
-
-            options.ClientId = authOptions.ClientId;
-            options.ClientSecret = authOptions.ClientSecret;
-            options.ResponseType = "code";
-
-            options.SaveTokens = true;
-            options.GetClaimsFromUserInfoEndpoint = true;
-
-            options.Scope.Clear();
-            options.Scope.Add("openid");
-            options.Scope.Add("profile");
-            options.Scope.Add("email");
-
-            options.Events = new OpenIdConnectEvents
-            {
-                OnRedirectToIdentityProviderForSignOut = context =>
-                {
-                    var idToken = context.ProtocolMessage.IdTokenHint;
-
-                    if (string.IsNullOrEmpty(idToken))
-                    {
-                        var tokens = context.Properties.GetTokens();
-                        var idTokenItem = tokens.FirstOrDefault(t => string.Equals(t.Name, "id_token", StringComparison.Ordinal));
-
-                        if (idTokenItem != null) context.ProtocolMessage.IdTokenHint = idTokenItem.Value;
-                    }
-
-                    return Task.CompletedTask;
-                },
-            };
-        });
-
-        services.AddCascadingAuthenticationState();
-
-        return services;
-    }
-
-    public static IServiceCollection AddLiteCharmsApiSecurity(this IServiceCollection services, IConfiguration configuration)
-    {
-        var configSection = configuration.GetSection(nameof(LiteCharmsSettings));
-
-        var authOptions = new LiteCharmsSettings();
-        configSection.Bind(authOptions);
-
-        services.Configure<LiteCharmsSettings>(configSection);
-
-        services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
-            .AddJwtBearer(options =>
-            {
-                options.Authority = authOptions.Authority;
-                options.Audience = authOptions.Audience;
-                options.TokenValidationParameters = new TokenValidationParameters
-                {
-                    ValidIssuer = authOptions.Authority,
-                    ValidateAudience = true,
-                    ValidateIssuer = true,
-                };
-            });
-
-        services.AddAuthorization();
-
-        return services;
-    }
-
-    public static WebApplication AddSecurityEndpoints(this WebApplication app)
-    {
-        app.MapGet("/login", async (HttpContext context, string redirectUri = "/") =>
-        {
-            await context.ChallengeAsync(OpenIdConnectDefaults.AuthenticationScheme, new AuthenticationProperties
-            {
-                RedirectUri = redirectUri,
-            });
-        });
-
-        app.MapGet("/logout", async (HttpContext context) =>
-        {
-            var idToken = await context.GetTokenAsync("id_token");
-
-            var authProperties = new AuthenticationProperties { RedirectUri = "/", };
-
-            if (!string.IsNullOrEmpty(idToken)) 
-                authProperties.Parameters.Add("id_token_hint", idToken);
-
-            await context.SignOutAsync(OpenIdConnectDefaults.AuthenticationScheme, authProperties);
-            await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-        });
-
-        return app;
-    }
-
-    public static IServiceCollection AddApiServices(this IServiceCollection services, IConfiguration configuration)
-    {
-        services.AddHttpClient();
-
-        services.AddApiVersioning(options =>
-        {
-            options.DefaultApiVersion = new ApiVersion(1);
-            options.ReportApiVersions = true;
-            options.AssumeDefaultVersionWhenUnspecified = true;
-            options.ApiVersionReader = ApiVersionReader.Combine(new UrlSegmentApiVersionReader(),
-                new QueryStringApiVersionReader("version"),
-                new QueryStringApiVersionReader("version"),
-                new MediaTypeApiVersionReader("version"));
-        })
-        .AddApiExplorer(options =>
-        {
-            options.GroupNameFormat = "'v'VVV";
-            options.SubstituteApiVersionInUrl = true;
-        });
-
-        var urls = configuration["ASPNETCORE_URLS"] ?? configuration["Urls"];
-        var healthUrl = "http://localhost:8080/health";
-
-        if (!string.IsNullOrWhiteSpace(urls))
-        {
-            string firstUrl = urls.Split(';').FirstOrDefault(s => s.Contains("http://"))!
-                .Replace("0.0.0.0", "localhost")
-                .Replace("*", "localhost")
-                .Replace("+", "localhost");
-
-            healthUrl = $"{firstUrl.TrimEnd('/')}/health";
-        }
-
-        services.AddHealthChecksUI(setup =>
-        {
-            setup.SetNotifyUnHealthyOneTimeUntilChange();
-            setup.AddHealthCheckEndpoint("primary, heal", healthUrl);
-            setup.SetHeaderText("Midrand Books");
-        })
-        .AddInMemoryStorage();
-
-        services.AddOutputCache(options =>
-        {
-            options.AddBasePolicy(builder => builder.Cache());
-            options.DefaultExpirationTimeSpan = TimeSpan.FromSeconds(10);
-        });
-
-        services.AddOpenApi(options => options.AddDocumentTransformer<OpenApiBearerSecuritySchemeTransformer>());
-
-        return services;
-    }
-
     public static IApplicationBuilder MapEndpoints(this WebApplication app, IDictionary<int, RouteGroupBuilder> versionGroups)
     {
         var endpoints = app.Services.GetRequiredService<IEnumerable<IEndpoint>>();
@@ -246,4 +43,54 @@ public static class Api
 
     public static string ToEndpointName(this Type target, string? annotation = "") =>
         $"{target.Name.Replace("Endpoint", string.Empty)}{annotation}".ToLower(CultureInfo.CurrentCulture);
+
+    public static IServiceCollection AddApiServices(this IServiceCollection services, IConfiguration configuration)
+    {
+        services.AddHttpClient();
+
+        services.AddApiVersioning(options =>
+        {
+            options.DefaultApiVersion = new ApiVersion(1);
+            options.ReportApiVersions = true;
+            options.AssumeDefaultVersionWhenUnspecified = true;
+            options.ApiVersionReader = ApiVersionReader.Combine(new UrlSegmentApiVersionReader(),
+                new QueryStringApiVersionReader("version"),
+                new QueryStringApiVersionReader("version"),
+                new MediaTypeApiVersionReader("version"));
+        })
+        .AddApiExplorer(options =>
+        {
+            options.GroupNameFormat = "'v'VVV";
+            options.SubstituteApiVersionInUrl = true;
+        });
+
+        var urls = configuration["ASPNETCORE_URLS"] ?? configuration["Urls"];
+        var healthUrl = "http://localhost:8080/health";
+
+        if (!string.IsNullOrWhiteSpace(urls))
+        {
+            string firstUrl = urls.Split(';').FirstOrDefault(s => s.Contains("http://"))!
+                .Replace("*", "localhost").Replace("+", "localhost");
+
+            healthUrl = $"{firstUrl.TrimEnd('/')}/health";
+        }
+
+        services.AddHealthChecksUI(setup =>
+        {
+            setup.SetNotifyUnHealthyOneTimeUntilChange();
+            setup.AddHealthCheckEndpoint("primary, heal", healthUrl);
+            setup.SetHeaderText("Midrand Books");
+        })
+        .AddInMemoryStorage();
+
+        services.AddOutputCache(options =>
+        {
+            options.AddBasePolicy(builder => builder.Cache());
+            options.DefaultExpirationTimeSpan = TimeSpan.FromSeconds(10);
+        });
+
+        services.AddOpenApi(options => options.AddDocumentTransformer<OpenApiBearerSecuritySchemeTransformer>());
+
+        return services;
+    }
 }

LiteCharms.Features/Extensions/Quartz.cs

@@ -1,5 +1,5 @@
-using LiteCharms.Features.Abstractions;
+using LiteCharms.Features.Quartz;
-using LiteCharms.Features.Quartz;
+using LiteCharms.Features.Quartz.Abstractions;
 using static LiteCharms.Features.Extensions.Postgres;
 
 namespace LiteCharms.Features.Extensions;

LiteCharms.Features/Hasher/HashService.cs

@@ -4,7 +4,7 @@ namespace LiteCharms.Features.Hasher;
 
 public sealed partial class HashService(IHashids hasher) : IService
 {
-    [GeneratedRegex(@"\A\b[0-9a-fA-F]+\b\Z", RegexOptions.None, matchTimeoutMilliseconds: 100)]
+    [GeneratedRegex(@"\A\b[0-9a-fA-F]+\b\Z")]
     private static partial Regex HexHashRegex { get; }
 
     [GeneratedRegex(@"\A[0-9a-fA-F]{32}\Z", RegexOptions.None, matchTimeoutMilliseconds: 100)]

LiteCharms.Features/LiteCharms.Features.csproj

@@ -29,33 +29,6 @@
     <None Include="..\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <!-- Security (IODC)-->
-  <ItemGroup>
-    <PackageReference Include="IdentityModel.AspNetCore" Version="4.3.0" />
-    <PackageReference Include="IdentityModel.AspNetCore.OAuth2introspection" Version="6.2.0" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="IdentityModel" Version="6.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="10.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.7.0" />
-    <PackageReference Include="Polly" Version="8.7.0" />
-    <PackageReference Include="Polly.Extensions" Version="8.7.0" />
-
-    <Using Include="Microsoft.AspNetCore.Authentication" />
-    <Using Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
-    <Using Include="Microsoft.AspNetCore.Authentication.Cookies" />
-    <Using Include="IdentityModel.AspNetCore.OAuth2Introspection" />
-    <Using Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-  </ItemGroup>
-
-  <!-- API SDK Composer-->
-  <ItemGroup>
-    <PackageReference Include="Refit.HttpClientFactory" Version="11.0.1" />
-
-    <Using Include="Refit" />
-  </ItemGroup>
-
   <!-- API Versioning -->
   <ItemGroup>
     <PackageReference Include="AccessTokenClient.Extensions" Version="5.1.0" />
@@ -68,8 +41,8 @@
 
   <!-- API Documentation -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.8" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.16.3" />
+    <PackageReference Include="Scalar.AspNetCore" Version="2.14.14" />
 
     <Using Include="Scalar.AspNetCore" />
     <Using Include="Microsoft.OpenApi" />
@@ -79,11 +52,11 @@
   <!-- Quartz Scheduler-->
   <ItemGroup>    
     <PackageReference Include="Hashids.net" Version="1.7.0" />    
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.102">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>    
-    <PackageReference Include="OpenTelemetry" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.15.3" />
     <PackageReference Include="Quartz" Version="3.18.1" />
     <PackageReference Include="Quartz.Plugins" Version="3.18.1" />
     <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
@@ -97,11 +70,11 @@
 
   <!-- Configuration -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Configuration" />
@@ -114,9 +87,9 @@
     <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />    
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />    
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
@@ -125,12 +98,12 @@
 
   <!-- Open Telemetry -->
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
 
     <!-- Global Usings -->
     <Using Include="OpenTelemetry.Resources" />
@@ -142,13 +115,13 @@
 
   <!-- Database -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -183,8 +156,8 @@
   
   <!-- Amazon S3 SDK -->
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.6" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.3" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
     
     <!-- global Usings -->
     <Using Include="Amazon.S3" />
@@ -194,8 +167,6 @@
 
   <!-- Shared Usings -->
   <ItemGroup>
-    <Using Include="Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage" />
-    <Using Include="System.Text.Json.Serialization" />
     <Using Include="System.Reflection" />
     <Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
     <Using Include="Microsoft.AspNetCore.Routing" />

LiteCharms.Features/Quartz/Abstractions/IJobOrchestrator.cs

@@ -0,0 +1,12 @@
+using LiteCharms.Features.Abstractions;
+
+namespace LiteCharms.Features.Quartz.Abstractions;
+
+public interface IJobOrchestrator
+{
+    Task SendAsync<TNotification>(TNotification notification, CancellationToken cancellationToken = default)
+        where TNotification : IEvent;
+
+    Task ScheduleAsync<TNotification>(TNotification notification, string cronExpression, CancellationToken cancellationToken = default) 
+        where TNotification : IEvent;
+}

LiteCharms.Features/Quartz/JobOrchestrator.cs

@@ -1,10 +1,11 @@
 using LiteCharms.Features.Abstractions;
+using LiteCharms.Features.Quartz.Abstractions;
 
 namespace LiteCharms.Features.Quartz;
 
 public sealed class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOrchestrator
 {
-    public async ValueTask SendAsync<TNotification>(TNotification notification, CancellationToken cancellationToken = default)
+    public async Task SendAsync<TNotification>(TNotification notification, CancellationToken cancellationToken = default)
         where TNotification : IEvent
     {
         var chainedJobGroup = "onetime-jobs";
@@ -18,7 +19,6 @@ public sealed class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOr
             .WithDescription($"Correlation ID: {notification.CorrelationId}")
             .UsingJobData(new JobDataMap { ["Payload"] = JsonSerializer.Serialize(notification) })
             .DisallowConcurrentExecution()
-            .RequestRecovery()
             .Build();
 
         var trigger = global::Quartz.TriggerBuilder.Create()
@@ -29,7 +29,7 @@ public sealed class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOr
         await scheduler.ScheduleJob(job, new List<ITrigger> { trigger }.AsReadOnly(), replace: true, cancellationToken);
     }
 
-    public async ValueTask ScheduleAsync<TNotification>(TNotification notification, string cronExpression, CancellationToken cancellationToken = default)
+    public async Task ScheduleAsync<TNotification>(TNotification notification, string cronExpression, CancellationToken cancellationToken = default)
         where TNotification : IEvent
     {
         var chainedJobGroup = "scheduled-jobs";
@@ -63,25 +63,4 @@ public sealed class JobOrchestrator(ISchedulerFactory schedulerFactory) : IJobOr
         else
             await scheduler.ScheduleJob(job, new List<ITrigger> { trigger }.AsReadOnly(), replace: true, cancellationToken);
     }
-
-    public async ValueTask<bool> InterruptAsync(string eventName, string? correlationId = null, CancellationToken cancellationToken = default)
-    {
-        var scheduler = await schedulerFactory.GetScheduler(cancellationToken);
-
-        var jobKeyName = string.Empty;
-        var jobGroup = string.Empty;
-
-        if (!string.IsNullOrWhiteSpace(correlationId))
-        {
-            jobKeyName = $"{eventName.ToLower(CultureInfo.InvariantCulture)}-{correlationId.ToLower(CultureInfo.InvariantCulture)}";
-            jobGroup = "onetime-jobs";
-        }
-        else
-        {
-            jobKeyName = eventName.ToLower(CultureInfo.InvariantCulture);
-            jobGroup = "scheduled-jobs";
-        }
-
-        return await scheduler.Interrupt(JobKey.Create(jobKeyName, jobGroup), cancellationToken);
-    }
 }

LiteCharms.Features/Quartz/MediatorJob.cs

@@ -8,9 +8,6 @@ public sealed class MediatorJob<TNotification>(IMediator mediator) : IJob where
 {
     public async Task Execute(IJobExecutionContext context)
     {
-        if (context.Recovering)
-            Trace.WriteLine($"CRITICAL RECOVERY: Resurrecting job '{typeof(TNotification).Name}' after a previous cluster node crashed mid-execution.");
-
         var data = context.MergedJobDataMap["Payload"] as string;
 
         if (string.IsNullOrWhiteSpace(data))
@@ -24,28 +21,17 @@ public sealed class MediatorJob<TNotification>(IMediator mediator) : IJob where
 
         if (notification is null)
         {
-            Trace.WriteLine("Notification could not be Json converted from data string, job ended");
+            Trace.WriteLine("Notification could not be JSon converted from data string, job ended");
 
             return;
         }
                 
-        using var activity = MediatorTelemetry.Source.StartActivity(typeof(TNotification).Name);
+        using var activity = MediatorTelemetry.Source.StartActivity($"Quartz: {typeof(TNotification).Name}");
                 
         activity?.SetTag("event.correlation_id", notification.CorrelationId);
 
-        try
+        await mediator.Publish(notification, context.CancellationToken);
-        {
-            await mediator.Publish(notification, context.CancellationToken);
 
-            Trace.WriteLine("Job published successfully");
+        Trace.WriteLine("Job published");
-        }
-        catch (OperationCanceledException) when (context.CancellationToken.IsCancellationRequested)
-        {
-            Trace.WriteLine($"Job '{typeof(TNotification).Name}' was gracefully interrupted by the cluster control plane.");
-            
-            activity?.SetStatus(ActivityStatusCode.Ok);
-
-            return;
-        }
     }
 }

LiteCharms.Features/Quartz/RetryJobListener.cs

@@ -12,9 +12,6 @@ public sealed class RetryJobListener : IJobListener
 
     public async Task JobWasExecuted(IJobExecutionContext context, JobExecutionException? jobException, CancellationToken cancellationToken = default)
     {
-        if (context.CancellationToken.IsCancellationRequested)
-            return;
-
         if (jobException is not null && context.RefireCount < RetryCount)
             jobException.RefireImmediately = true;
     }

LiteCharmsShared.slnx

@@ -12,7 +12,6 @@
     <Project Path="LiteCharms.Features.MidrandBooks.Seed/LiteCharms.Features.MidrandBooks.Seed.csproj" Id="aa80643a-28dc-431f-b163-053a94e5c77c" />
     <Project Path="LiteCharms.Features.MidrandBooks.Tests/LiteCharms.Features.MidrandBooks.Tests.csproj" Id="cac2f738-dbb5-4538-8565-3c2bd6f65259" />
     <Project Path="LiteCharms.Features.TechShop.Tests/LiteCharms.Features.TechShop.Tests.csproj" Id="0e0967c2-7f28-4668-a387-2fc437ab066f" />
-    <Project Path="LiteCharms.Features.Tests.Common/LiteCharms.Features.Tests.Common.csproj" Id="d4ada579-b898-44ff-82f4-de3171c21600" />
     <Project Path="LiteCharms.Features.Tests/LiteCharms.Features.Tests.csproj" Id="0696323f-7148-4ab9-9145-68b7b5df5415" />
   </Folder>
 </Solution>