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,7 +11,7 @@
   <!-- 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>
@@ -116,8 +116,8 @@
 
   <!-- Amazon S3 SDK -->
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.5" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.2" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.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/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.102">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
       <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.5" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.2" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
     <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
 
     <!-- global Usings -->

LiteCharms.Features.MidrandBooks/Orders/CartService.cs

@@ -1,128 +0,0 @@
-using LiteCharms.Features.Abstractions;
-using LiteCharms.Features.MidrandBooks.Orders.Models;
-using LiteCharms.Features.MidrandBooks.Products.Models;
-
-namespace LiteCharms.Features.MidrandBooks.Orders;
-
-public sealed class CartService : IService
-{
-    private Cart cart = new();
-
-    public Cart GetCart() => cart;
-
-    public void LoadCart(Cart savedCart) => cart = savedCart;
-
-    public void AddItem(ProductPrice productPrice)
-    {
-        var itemExists = false;
-
-        for (var i = 0; i < cart.Items.Count; i++)
-        {
-            if (cart.Items[i].Price!.Id == productPrice.Id)
-            {
-                cart.Items[i].Quantity++;
-                cart.Items[i].Amount += productPrice.Amount;
-
-                itemExists = true;
-
-                break;
-            }
-        }
-
-        if (!itemExists)
-            cart.Items.Add(new CartItem
-            {
-                Price = productPrice,
-                Amount = productPrice.Amount,
-                Quantity = 1,
-            });
-
-        CalculateTotalPrice();
-    }
-
-    public void UpdateQuantity(long productPriceId, int newQuantity)
-    {
-        if (newQuantity <= 0)
-        {
-            RemoveAllSameItem(productPriceId);
-
-            return;
-        }
-
-        for (var i = 0; i < cart.Items.Count; i++)
-        {
-            if (cart.Items[i].Price!.Id == productPriceId)
-            {
-                var oldQuantity = cart.Items[i].Quantity;
-                var pricePerUnit = cart.Items[i].Price!.Amount;
-
-                cart.Items[i].Quantity = newQuantity;
-                cart.Items[i].Amount = pricePerUnit * newQuantity;
-                break;
-            }
-        }
-
-        CalculateTotalPrice();
-    }
-
-    public void RemoveOneItem(long productPriceId)
-    {
-        for (var i = 0; i < cart.Items.Count; i++)
-        {
-            if (cart.Items[i].Price!.Id == productPriceId)
-            {
-                if (cart.Items[i].Quantity <= 1)
-                {
-                    cart.Items.RemoveAt(i);
-                }
-                else
-                {
-                    cart.Items[i].Quantity--;
-                    cart.Items[i].Amount -= cart.Items[i].Price!.Amount;
-                }
-
-                break;
-            }
-        }
-
-        CalculateTotalPrice();
-    }
-
-    public void RemoveAllSameItem(long productPriceId)
-    {
-        if (cart.Items.Count == 0) return;
-
-        var item = cart.Items.FirstOrDefault(i => i.Price?.Id == productPriceId);
-
-        if (item is not null) cart.Items.Remove(item);
-
-        CalculateTotalPrice();
-    }
-
-    public void Clear()
-    {
-        if(cart.CustomerId is not null || cart.OrderId is not null)
-        {
-            cart.TotalPrice = 0;
-            cart.TotalVat = 0;
-            cart.Items.Clear();
-
-            return;
-        }
-
-        cart = new Cart();
-    }
-
-    public decimal CalculateTotalPrice()
-    {
-        if (cart.Items.Count == 0) return 0;
-
-        var gross = cart.Items.Sum(i => i.Amount);
-
-        if (!cart.IsVatInclusive) cart.TotalVat = gross * cart.VatRate;
-
-        cart.TotalPrice = gross + cart.TotalVat;
-
-        return cart.TotalPrice;
-    }
-}

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

@@ -1,18 +0,0 @@
-namespace LiteCharms.Features.MidrandBooks.Orders.Models;
-
-public sealed class Cart
-{
-    public long? CustomerId { get; set; }
-
-    public long? OrderId { get; set; }
-
-    public decimal TotalPrice { 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/Orders/Models/CartItem.cs

@@ -1,12 +0,0 @@
-using LiteCharms.Features.MidrandBooks.Products.Models;
-
-namespace LiteCharms.Features.MidrandBooks.Orders.Models;
-
-public sealed class CartItem
-{
-    public ProductPrice? Price { get; set; }
-
-    public long Quantity { get; set; }
-
-    public decimal Amount { get; set; }
-}

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

@@ -1,6 +1,5 @@
 using LiteCharms.Features.Hasher;
 using LiteCharms.Features.Hasher.Configuration;
-using LiteCharms.Features.Mediator;
 using LiteCharms.Features.MidrandBooks.Orders;
 using LiteCharms.Features.MidrandBooks.Payments.Models;
 
@@ -13,9 +12,6 @@ public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvi
 
     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>();
@@ -27,7 +23,7 @@ public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvi
         var dict = payload.ToParamDictionary();
         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))
@@ -158,7 +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.TechShop/LiteCharms.Features.TechShop.csproj

@@ -136,8 +136,8 @@
 
   <!-- Amazon S3 SDK -->
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.5" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.2" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
     <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
 
     <!-- global Usings -->

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/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/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/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/Browser/LocalStorageService.cs

@@ -1,80 +0,0 @@
-using LiteCharms.Features.Abstractions;
-
-namespace LiteCharms.Features.Browser;
-
-public sealed class LocalStorageService(ProtectedLocalStorage storage) : IService
-{
-    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 Microsoft.AspNetCore.Authentication.JwtBearer;
 
 namespace LiteCharms.Features.Extensions;
 
@@ -10,166 +8,6 @@ public static class Api
     public const string Books = nameof(Books);
     public const string Payments = nameof(Payments);
 
-    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>>();
@@ -205,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,21 +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.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
-
-    <Using Include="Microsoft.AspNetCore.Authentication" />
-    <Using Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
-    <Using Include="Microsoft.AspNetCore.Authentication.Cookies" />
-    <Using Include="IdentityModel.AspNetCore.OAuth2Introspection" />
-  </ItemGroup>
-
   <!-- API Versioning -->
   <ItemGroup>
     <PackageReference Include="AccessTokenClient.Extensions" Version="5.1.0" />
@@ -67,7 +52,7 @@
   <!-- 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>    
@@ -171,8 +156,8 @@
   
   <!-- Amazon S3 SDK -->
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.5" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24.2" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
     
     <!-- global Usings -->
     <Using Include="Amazon.S3" />
@@ -182,7 +167,6 @@
 
   <!-- Shared Usings -->
   <ItemGroup>
-    <Using Include="Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage" />
     <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");
-        }
-        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;
-        }
+        Trace.WriteLine("Job published");
     }
 }

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;
     }