Merge pull request 'taskcancellation' (#131 ) from taskcancellation into master

Reviewed-on: #131
Refactored order item retrieval error message
2026-06-15 12:08:45 +02:00 · 2026-06-15 12:08:19 +02:00 · 2026-06-15 12:06:33 +02:00 · 2026-06-15 10:28:41 +02:00 · 2026-06-15 10:27:44 +02:00 · 2026-06-14 23:34:59 +02:00
33 changed files with 580 additions and 58 deletions
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <!-- Nuget Package Details -->
+  <PropertyGroup>
+    <PackageId>LiteCharms.Abstractions</PackageId>
+    <Version>1.0.20</Version>
+    <Authors>Khwezi Mngoma</Authors>
+    <Company>Lite Charms (PTY) Ltd</Company>
+    <Description>Shared abstractions for Lite Charms applications.</Description>
+    <PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
+    <RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageTags>utility;dotnet</PackageTags>
+    <PackageIcon>icon.png</PackageIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" PackagePath="\" />
+    <None Include="..\icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="FluentResults" Version="4.0.0" />
+    <PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
+
+    <Using Include="Mediator" />
+    <Using Include="FluentResults" />
+    <Using Include="System.Threading.Channels" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <!-- Nuget Package Details -->
+  <PropertyGroup>
+    <PackageId>LiteCharms.Entities</PackageId>
+    <Version>1.0.20</Version>
+    <Authors>Khwezi Mngoma</Authors>
+    <Company>Lite Charms (PTY) Ltd</Company>
+    <Description>Shared entities for Lite Charms applications.</Description>
+    <PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
+    <RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageTags>utility;dotnet</PackageTags>
+    <PackageIcon>icon.png</PackageIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" PackagePath="\"/>
+    <None Include="..\icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <!-- Database -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />    
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />    
+
+    <!-- Global Usings -->    
+    <Using Include="Microsoft.EntityFrameworkCore" />
+    <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LiteCharms.Models\LiteCharms.Models.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -11,7 +11,7 @@
  <!-- Quartz Scheduler-->
  <ItemGroup>
    <PackageReference Include="Bogus" Version="35.6.5" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.104">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@@ -12,11 +12,7 @@
    <PackageReference Include="coverlet.collector" Version="10.0.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    </PackageReference>    
    <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">
@@ -32,7 +32,7 @@
  <!-- Quartz Scheduler-->
  <ItemGroup>
    <PackageReference Include="Humanizer" Version="3.0.10" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.104">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@@ -43,7 +43,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
            if (!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
                return Result.Fail<long>("Order not found.");

-            if(!await context.Books.AnyAsync(ab => ab.Id == request.AuthorBookId, cancellationToken))
+            if (!await context.Books.AnyAsync(ab => ab.Id == request.AuthorBookId, cancellationToken))
                return Result.Fail<long>("Author book not found.");

            if (!await context.Prices.AnyAsync(pp => pp.Id == request.ProductPriceId, cancellationToken))
@@ -51,7 +51,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex

            var existingItem = await context.OrderItems.FirstOrDefaultAsync(i => i.ProductPriceId == request.ProductPriceId && i.OrderId == orderId, cancellationToken);

-            if(existingItem is not null)
+            if (existingItem is not null)
            {
                existingItem.Quantity += request.Quantity;

@@ -82,7 +82,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
    {
        try
        {
-            if(items.Length == 0)
+            if (items.Length == 0)
                return Result.Fail("No items to add.");

            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
@@ -203,13 +203,33 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
        }
    }

+    public async ValueTask<Result<OrderItem[]>> GetOrderItemsAsync(long orderId, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            var orderItems = await context.OrderItems
+                .Where(o => o.OrderId == orderId)
+                .ToListAsync(cancellationToken);
+
+            return orderItems.Count > 0
+                ? Result.Ok(orderItems.Select(i => i.ToModel()).ToArray())
+                : Result.Fail<OrderItem[]>($"Order items not found for order ID {orderId}");
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(new Error(ex.Message).CausedBy(ex));
+        }
+    }
+
    public async ValueTask<Result<Order[]>> GetOrdersByCustomerAsync(long customerId, CancellationToken cancellationToken = default)
    {
        try
        {
            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);

-            if(!await context.Customers.AnyAsync(c => c.Id == customerId, cancellationToken))
+            if (!await context.Customers.AnyAsync(c => c.Id == customerId, cancellationToken))
                return Result.Fail<Order[]>("Customer not found.");

            var orders = await context.Orders
@@ -276,16 +296,16 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
        {
            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);

-            if(!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
+            if (!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
                return Result.Fail("Order not found.");

-            if(!await context.Addresses.AnyAsync(a => a.Id == request.AddressId, cancellationToken))
+            if (!await context.Addresses.AnyAsync(a => a.Id == request.AddressId, cancellationToken))
                return Result.Fail("Address not found.");

-            if(!await context.ShippingProviders.AnyAsync(sp => sp.Id == request.ShippingProviderId && sp.Enabled, cancellationToken))
+            if (!await context.ShippingProviders.AnyAsync(sp => sp.Id == request.ShippingProviderId && sp.Enabled, cancellationToken))
                return Result.Fail("Shipping provider not found or disabled.");

-            if(await context.Shippings.AnyAsync(s => s.OrderId == orderId, cancellationToken))
+            if (await context.Shippings.AnyAsync(s => s.OrderId == orderId, cancellationToken))
                return Result.Fail("Shipping already exists for this order.");

            var shipping = context.Shippings.Add(new Entities.Shipping
@@ -355,7 +375,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
        try
        {
            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-                        
+
            var rowsDeleted = await context.Shippings
                .Where(s => s.Id == shippingId && s.OrderId == orderId)
                .ExecuteDeleteAsync(cancellationToken);
@@ -398,7 +418,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
        {
            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);

-            if(await context.ShippingProviders.AnyAsync(sp => sp.Type == request.Type, cancellationToken))
+            if (await context.ShippingProviders.AnyAsync(sp => sp.Type == request.Type, cancellationToken))
                return Result.Fail("Shipping provider with the same type already exists.");

            var shippingProvider = context.ShippingProviders.Add(new Entities.ShippingProvider
@@ -1,4 +1,4 @@
 namespace LiteCharms.Features.MidrandBooks.Payments.Entities;

 [EntityTypeConfiguration<PaymentGatewayConfiguration, PaymentGateway>]
-public class PaymentGateway : Models.PaymentGateway;
+public sealed class PaymentGateway : Models.PaymentGateway;
@@ -66,7 +66,7 @@ public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvi
            {
                OrderId = orderResult.Value.Id,
                PaymentId = paymentResult.Value.Id,
-                PaymentGatewayReference = payload.PaymentId!,
+                PaymentGatewayReference = payload.MerchantPaymentId!,
                Status = LedgerStatuses.Completed,
                CustomerId = orderResult.Value.CustomerId,
            }, cancellationToken);
@@ -91,7 +91,7 @@ public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvi
            {
                OrderId = orderResult.Value.Id,
                PaymentId = paymentResult.Value.Id,
-                PaymentGatewayReference = payload.PaymentId!,
+                PaymentGatewayReference = payload.MerchantPaymentId!,
                Status = ledgerStatus,
                CustomerId = orderResult.Value.CustomerId,
            }, cancellationToken);
@@ -123,8 +123,7 @@ public sealed class PaymentService(IDbContextFactory<MidrandBooksDbContext> cont
            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);

            var exists = await context.Ledger.AnyAsync(l =>
-                l.OrderId == orderId &&
-                l.PaymentId == paymentId, cancellationToken);
+                l.OrderId == orderId && l.PaymentId == paymentId && l.Status == LedgerStatuses.Completed, cancellationToken);

            return Result.Ok(exists);
        }
@@ -162,7 +161,8 @@ public sealed class PaymentService(IDbContextFactory<MidrandBooksDbContext> cont
                CustomerId = request.CustomerId,
                OrderId = request.OrderId,
                PaymentId = request.PaymentId,
-                Status = request.Status,
+                MerchantPaymentId = request.PaymentGatewayReference,
+                Status = request.Status,                
            });

            return await context.SaveChangesAsync(cancellationToken) > 0
@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
    /// <inheritdoc />
-    public partial class Init : Migration
+    public sealed partial class Init : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
@@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
    /// <inheritdoc />
-    public partial class AddedCategories : Migration
+    public sealed partial class AddedCategories : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
@@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
    /// <inheritdoc />
-    public partial class AddedProductCategories : Migration
+    public sealed partial class AddedProductCategories : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
    /// <inheritdoc />
-    public partial class AddedPaymentObjects : Migration
+    public sealed partial class AddedPaymentObjects : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
@@ -5,7 +5,7 @@
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
    /// <inheritdoc />
-    public partial class RemovedPassphraseFromPaymentGateway : Migration
+    public sealed partial class RemovedPassphraseFromPaymentGateway : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
    /// <inheritdoc />
-    public partial class AddedPaymentGatewayLedger : Migration
+    public sealed partial class AddedPaymentGatewayLedger : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
@@ -5,7 +5,7 @@
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
    /// <inheritdoc />
-    public partial class AddedPayfastPaymentIdToPaymentGatewayLedger : Migration
+    public sealed partial class AddedPayfastPaymentIdToPaymentGatewayLedger : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
@@ -5,7 +5,7 @@
 namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
 {
    /// <inheritdoc />
-    public partial class OnlyEmailIsMandatoryOnCustomer : Migration
+    public sealed partial class OnlyEmailIsMandatoryOnCustomer : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
@@ -25,7 +25,6 @@

  <!-- 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>
@@ -12,11 +12,7 @@
    <PackageReference Include="coverlet.collector" Version="10.0.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    </PackageReference>    
    <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">
@@ -0,0 +1,17 @@
+{
+  "payfast-local": {
+    "baseUrl": "https://localhost:7196",
+    "paymentId": "jdPB2zaKM3Z",
+    "signature": "6aeff59bb74f2448ff2c3d81b2ec95de",
+    "item_name": "System Architecture Book",
+    "amount": "350.00"
+  },
+  "payfast-uat": {
+    "baseUrl": "https://api.uat.midrandbooks.co.za",
+    "paymentId": "jdPB2zaKM3Z",
+    "signature": "6aeff59bb74f2448ff2c3d81b2ec95de",
+    "item_name": "System Architecture Book",
+    "amount": "350.00"
+  }
+}
+ 
@@ -0,0 +1,16 @@
+namespace LiteCharms.Features;
+
+public sealed class CancellationTokenProvider : IDisposable
+{
+    private readonly CancellationTokenSource source = new();
+
+    public CancellationToken Token => source.Token;
+
+    public void Dispose()
+    {
+        source.Cancel();
+        source.Dispose();
+
+        GC.SuppressFinalize(this);
+    }
+}
@@ -2,6 +2,7 @@
 using LiteCharms.Features.Api;
 using LiteCharms.Features.Api.Configuration;
 using LiteCharms.Features.Api.Sdk;
+using LiteCharms.Features.Postgres;

 namespace LiteCharms.Features.Extensions;

@@ -18,7 +19,7 @@ public static class Api

        return services;
    }
-    
+
    public static IServiceCollection AddSecurityApiSdk(this IServiceCollection services, IConfiguration configuration)
    {
        var configSection = configuration.GetSection(nameof(LiteCharmsClientSettings));
@@ -53,6 +54,22 @@ public static class Api

    public static IServiceCollection AddLiteCharmsWebSecurity(this IServiceCollection services, IConfiguration configuration)
    {
+        var certString = configuration["DataProtection:Certificate"] ?? configuration["DataProtection__Certificate"];
+        var certPassword = configuration["DataProtection:Password"] ?? configuration["DataProtection__Password"];
+
+        if (string.IsNullOrEmpty(certString))
+            throw new InvalidOperationException("Data Protection Certificate configuration is missing.");
+
+        var certificate = X509CertificateLoader.LoadPkcs12(Convert.FromBase64String(certString), certPassword);
+
+        services.AddDataProtection().PersistKeysToDbContext<DataProtectionDbContext>()
+            .ProtectKeysWithCertificate(certificate)
+            .SetApplicationName("LiteCharmsApp");
+
+        services.Configure<DataProtectionOptions>(options => options.ApplicationDiscriminator = "LiteCharmsApp");
+
+        services.ConfigureCookieOidcSameSiteSupport();
+
        var configSection = configuration.GetSection(nameof(LiteCharmsSettings));

        var authOptions = new LiteCharmsSettings();
@@ -65,37 +82,48 @@ public static class Api
            options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;
            options.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
        })
-        .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme)
+        .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme, options =>
+        {
+            options.Cookie.SecurePolicy = CookieSecurePolicy.Always;
+            options.Cookie.SameSite = SameSiteMode.Lax;
+            options.Cookie.Name = "LiteCharmsApp.Session";
+        })
        .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.GetClaimsFromUserInfoEndpoint = true;        
+            options.CorrelationCookie.SecurePolicy = CookieSecurePolicy.Always;
+            options.CorrelationCookie.SameSite = SameSiteMode.None;
+        
+            options.NonceCookie.SecurePolicy = CookieSecurePolicy.Always;
+            options.NonceCookie.SameSite = SameSiteMode.None;
+        
+            options.ForwardSignOut = CookieAuthenticationDefaults.AuthenticationScheme;
+        
            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;
                },
            };
@@ -106,6 +134,30 @@ public static class Api
        return services;
    }

+    private static void ConfigureCookieOidcSameSiteSupport(this IServiceCollection services) =>
+        services.Configure<CookiePolicyOptions>(options =>
+        {
+            options.MinimumSameSitePolicy = SameSiteMode.Unspecified;
+            options.OnAppendCookie = cookieContext => CheckSameSite(cookieContext.Context, cookieContext.CookieOptions);
+            options.OnDeleteCookie = cookieContext => CheckSameSite(cookieContext.Context, cookieContext.CookieOptions);
+        });
+
+    private static void CheckSameSite(HttpContext httpContext, CookieOptions options)
+    {
+        if (options.SameSite == SameSiteMode.None)
+        {
+            bool isSecure = httpContext.Request.IsHttps;
+
+            if (!isSecure && httpContext.Request.Headers.TryGetValue("X-Forwarded-Proto", out var proto))
+                isSecure = string.Equals(proto, "https", StringComparison.OrdinalIgnoreCase);
+
+            if (!isSecure && httpContext.Request.Headers.TryGetValue("Forwarded", out var forwarded))
+                isSecure = forwarded.ToString().Contains("proto=https", StringComparison.OrdinalIgnoreCase);
+                        
+            if (!isSecure) options.SameSite = SameSiteMode.Unspecified;
+        }
+    }
+
    public static IServiceCollection AddLiteCharmsApiSecurity(this IServiceCollection services, IConfiguration configuration)
    {
        var configSection = configuration.GetSection(nameof(LiteCharmsSettings));
@@ -143,17 +195,22 @@ public static class Api
            });
        });

-        app.MapGet("/logout", async (HttpContext context) =>
+        app.MapGet("/logout", async (HttpContext context, string? redirectUri = null) =>
        {
            var idToken = await context.GetTokenAsync("id_token");

-            var authProperties = new AuthenticationProperties { RedirectUri = "/", };
+            if (string.IsNullOrWhiteSpace(redirectUri))
+            {
+                var host = context.Request.Host.ToUriComponent();
+                redirectUri = $"https://{host}/";
+            }

-            if (!string.IsNullOrEmpty(idToken)) 
+            var authProperties = new AuthenticationProperties { RedirectUri = 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;
@@ -184,7 +241,7 @@ public static class Api

        if (!string.IsNullOrWhiteSpace(urls))
        {
-            string firstUrl = urls.Split(';').FirstOrDefault(s => s.Contains("http://"))!
+            string firstUrl = urls.Split(';').FirstOrDefault(s => s.Contains("http://", StringComparison.InvariantCultureIgnoreCase))!
                .Replace("0.0.0.0", "localhost")
                .Replace("*", "localhost")
                .Replace("+", "localhost");
@@ -1,6 +1,19 @@
-namespace LiteCharms.Features.Extensions;
+using LiteCharms.Features.Postgres;
+
+namespace LiteCharms.Features.Extensions;

 public static class Postgres
 {
-    public const string SchedulerDbConfigName = "PostgresScheduler";    
+    public const string SchedulerDbConfigName = "PostgresScheduler";
+    public const string DataProtectionDbConfigName = "PostgresDataProtection";
+
+    public static IServiceCollection AddDataProtectionDatabase(this IServiceCollection services, IConfiguration configuration)
+    {
+        var connectionString = configuration.GetConnectionString(DataProtectionDbConfigName);        
+
+        services.AddPooledDbContextFactory<DataProtectionDbContext>(options =>
+            options.UseNpgsql(connectionString));
+
+        return services;
+    }
 }
@@ -19,7 +19,7 @@ public static class S3
                    AuthenticationRegion = configuration.GetSection($"{BookshopS3SettingsSection}:Region").Value,
                    ForcePathStyle = true,
                    EndpointDiscoveryEnabled = true,
-                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://")
+                    UseHttp = configuration.GetSection($"{BookshopS3SettingsSection}:ServiceUrl").Value!.Contains("http://", StringComparison.InvariantCultureIgnoreCase),
                }));

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

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

            services.AddKeyedScoped<IS3Service, BookshopQuotesS3Service>(BookshopQuotesBucketName);
@@ -0,0 +1,13 @@
+namespace LiteCharms.Features.Extensions;
+
+public static class TaskCancellation
+{
+    public static IServiceCollection AddCancellationToken(this IServiceCollection services)
+    {
+        services.AddScoped<CancellationTokenProvider>();
+        services.AddScoped(typeof(CancellationToken),
+            provider => provider.GetRequiredService<CancellationTokenProvider>().Token);
+
+        return services;
+    }
+}
@@ -79,7 +79,7 @@
  <!-- Quartz Scheduler-->
  <ItemGroup>    
    <PackageReference Include="Hashids.net" Version="1.7.0" />    
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.103">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.104">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>    
@@ -153,9 +153,11 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.9" />

    <!-- Global Usings -->
    <Using Include="Npgsql" />
+    <Using Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" />
    <Using Include="Microsoft.EntityFrameworkCore" />
    <Using Include="Microsoft.EntityFrameworkCore.Design" />
    <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
@@ -194,6 +196,8 @@

  <!-- Shared Usings -->
  <ItemGroup>
+    <Using Include="Microsoft.AspNetCore.DataProtection" />
+    <Using Include="System.Security.Cryptography.X509Certificates" />
    <Using Include="Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage" />
    <Using Include="System.Text.Json.Serialization" />
    <Using Include="System.Reflection" />
@@ -0,0 +1,13 @@
+namespace LiteCharms.Features.Postgres;
+
+public sealed class DataProtectionDbContext(DbContextOptions<DataProtectionDbContext> options) : DbContext(options), IDataProtectionKeyContext
+{
+    public DbSet<DataProtectionKey> DataProtectionKeys { get; set; }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        modelBuilder.Entity<DataProtectionKey>(entity => entity.ToTable(nameof(DataProtectionKeys), schema: "security"));
+    }
+}
@@ -0,0 +1,20 @@
+using static LiteCharms.Features.Extensions.Postgres;
+
+namespace LiteCharms.Features.Postgres;
+
+public sealed class DataProtectionDbContextFactory : IDesignTimeDbContextFactory<DataProtectionDbContext>
+{
+    public DataProtectionDbContext CreateDbContext(string[] args)
+    {
+        var configuration = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddUserSecrets(typeof(DataProtectionDbContext).Assembly)
+            .AddEnvironmentVariables()
+            .Build();
+
+        var optionsBuilder = new DbContextOptionsBuilder<DataProtectionDbContext>();
+        optionsBuilder.UseNpgsql(configuration.GetConnectionString(DataProtectionDbConfigName));
+
+        return new DataProtectionDbContext(optionsBuilder.Options);
+    }
+}
@@ -0,0 +1,48 @@
+// <auto-generated />
+using LiteCharms.Features.Postgres;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace LiteCharms.Features.Postgres.Migrations
+{
+    [DbContext(typeof(DataProtectionDbContext))]
+    [Migration("20260614075149_Init")]
+    partial class Init
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys", "security");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
@@ -0,0 +1,41 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace LiteCharms.Features.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public sealed partial class Init : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.EnsureSchema(
+                name: "security");
+
+            migrationBuilder.CreateTable(
+                name: "DataProtectionKeys",
+                schema: "security",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    FriendlyName = table.Column<string>(type: "text", nullable: true),
+                    Xml = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DataProtectionKeys", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "DataProtectionKeys",
+                schema: "security");
+        }
+    }
+}
@@ -0,0 +1,45 @@
+// <auto-generated />
+using LiteCharms.Features.Postgres;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace LiteCharms.Features.Postgres.Migrations
+{
+    [DbContext(typeof(DataProtectionDbContext))]
+    partial class DataProtectionDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys", "security");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
@@ -0,0 +1,104 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <UserSecretsId>7770ab3b-72ee-4897-8e06-57d6613e050a</UserSecretsId>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <!-- Nuget Package Details -->
+  <PropertyGroup>
+    <PackageId>LiteCharms.Infrastructure</PackageId>
+    <Version>1.0.20</Version>
+    <Authors>Khwezi Mngoma</Authors>
+    <Company>Lite Charms (PTY) Ltd</Company>
+    <Description>Infrastructure components for Lite Charms applications.</Description>
+    <PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
+    <RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageIcon>icon.png</PackageIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" PackagePath="\" />
+    <None Include="..\icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <!-- Quartz Scheduler-->
+  <ItemGroup>        
+    <PackageReference Include="Quartz" Version="3.18.1" />    
+    <PackageReference Include="Quartz.Plugins" Version="3.18.1" />
+    <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
+    <PackageReference Include="Quartz.Serialization.SystemTextJson" Version="3.18.1" />
+
+    <!-- Global Usings -->
+    <Using Include="Quartz" />
+    <Using Include="Mediator" />
+    <Using Include="FluentResults" />
+  </ItemGroup>
+
+  <!-- Configuration -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.7" />    
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.7" />    
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.7" />    
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.7" />    
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.7" />
+    
+    <!-- Global Usings -->
+    <Using Include="Microsoft.Extensions.Configuration" />
+  </ItemGroup>
+  
+  <!-- Health Checks -->
+  <ItemGroup>    
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.7" />
+    
+    <!-- Global Usings -->
+    <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+  </ItemGroup>
+
+  <!-- Database -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
+
+    <!-- Global Usings -->
+    <Using Include="Npgsql" />
+    <Using Include="Microsoft.EntityFrameworkCore" />
+    <Using Include="Microsoft.EntityFrameworkCore.Design" />
+    <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="..\LiteCharms.Abstractions\LiteCharms.Abstractions.csproj" />
+    <ProjectReference Include="..\LiteCharms.Entities\LiteCharms.Entities.csproj" />
+    <ProjectReference Include="..\LiteCharms.Models\LiteCharms.Models.csproj" />
+  </ItemGroup>
+
+  <!-- Global Usings -->
+  <ItemGroup>
+    <Using Include="System.Text.Json" />
+    <Using Include="Microsoft.Extensions.Hosting" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <!-- Nuget Package Details -->
+  <PropertyGroup>
+    <PackageId>LiteCharms.Models</PackageId>
+    <Version>1.0.20</Version>
+    <Authors>Khwezi Mngoma</Authors>
+    <Company>Lite Charms (PTY) Ltd</Company>
+    <Description>Shared models for Lite Charms applications.</Description>
+    <PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
+    <RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageTags>utility;dotnet</PackageTags>
+    <PackageIcon>icon.png</PackageIcon>
+  </PropertyGroup>
+
+  <!-- Global Usings -->
+  <ItemGroup>
+    <Using Include="System.ComponentModel.DataAnnotations"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" PackagePath="\" />
+    <None Include="..\icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+</Project>
Author	SHA1	Message	Date
khwezi	db6c77ce6a	Merge pull request 'taskcancellation' (#131 ) from taskcancellation into master Reviewed-on: #131	2026-06-15 12:08:45 +02:00
Khwezi Mngoma	516062ed5d	Refactored order item retrieval error message continuous-integration/drone/pr Build is passing Details	2026-06-15 12:08:19 +02:00
Khwezi Mngoma	16832ec214	Added GetOrderItems to OrderService	2026-06-15 12:06:33 +02:00
khwezi	db431e1682	Merge pull request 'Ensure uninherited types are sealed' (#130 ) from taskcancellation into master Reviewed-on: #130	2026-06-15 10:28:41 +02:00
Khwezi Mngoma	cf439c5006	Ensure uninherited types are sealed continuous-integration/drone/pr Build is passing Details Resolved mediator source geenrator conflict with tests	2026-06-15 10:27:44 +02:00
khwezi	ad2ea48592	Merge pull request 'Hardened certificate loading' (#129 ) from dataprotection into master Reviewed-on: #129	2026-06-14 23:34:59 +02:00
Khwezi Mngoma	bf36bb6bbc	Hardened certificate loading continuous-integration/drone/pr Build is passing Details	2026-06-14 23:34:25 +02:00
khwezi	0a9a459892	Merge pull request 'Refactored AddLiteCharmsWebSecurity to force a session recycling of keys on other pods' (#128 ) from dataprotection into master Reviewed-on: #128	2026-06-14 23:10:42 +02:00
Khwezi Mngoma	00d43c8f10	Refactored AddLiteCharmsWebSecurity to force a session recycling of keys on other pods continuous-integration/drone/pr Build is passing Details	2026-06-14 23:10:09 +02:00
khwezi	f5a69de0a0	Merge pull request 'Refactored CheckSameSite' (#127 ) from dataprotection into master Reviewed-on: #127	2026-06-14 22:52:05 +02:00
Khwezi Mngoma	40a5f94941	Refactored CheckSameSite continuous-integration/drone/pr Build is passing Details	2026-06-14 22:50:31 +02:00
khwezi	fc4db32f20	Merge pull request 'dataprotection' (#126 ) from dataprotection into master Reviewed-on: #126	2026-06-14 13:12:20 +02:00
Khwezi Mngoma	9cb4b8264d	Refactored Api registration methods continuous-integration/drone/pr Build is passing Details	2026-06-14 13:11:40 +02:00
Khwezi Mngoma	ddd823afab	Configured AddLiteCharmsWebSecurity() to setup ConfigureCookieOidcSameSiteSupport()	2026-06-14 13:09:57 +02:00
khwezi	a9aa0a675a	Merge pull request 'Added cookie policies on AddLiteCharmsWebSecurity' (#125 ) from dataprotection into master Reviewed-on: #125	2026-06-14 12:51:25 +02:00
Khwezi Mngoma	6418d27f5a	Added cookie policies on AddLiteCharmsWebSecurity continuous-integration/drone/pr Build is passing Details	2026-06-14 12:50:13 +02:00
khwezi	a763e5e40e	Merge pull request 'Added certificate protected data protection keys' (#124 ) from dataprotection into master Reviewed-on: #124	2026-06-14 11:27:32 +02:00
Khwezi Mngoma	9b15e296df	Added certificate protected data protection keys continuous-integration/drone/pr Build is passing Details	2026-06-14 11:26:20 +02:00
khwezi	1ef5e52ed9	Merge pull request 'Refactored AddDataProtectionDatabase' (#123 ) from dataprotection into master Reviewed-on: #123	2026-06-14 10:12:08 +02:00
Khwezi Mngoma	f4a615277f	Refactored AddDataProtectionDatabase continuous-integration/drone/pr Build is passing Details	2026-06-14 10:11:25 +02:00
khwezi	c06cf13add	Merge pull request 'Added data protection database based support' (#122 ) from dataprotection into master Reviewed-on: #122	2026-06-14 09:58:17 +02:00
Khwezi Mngoma	4e9e428ab5	Added data protection database based support continuous-integration/drone/pr Build is passing Details	2026-06-14 09:57:24 +02:00
khwezi	92c60e6616	Merge pull request 'Refactored AddLiteCharmsWebSecurity to be OS aware when it handles data protection keys' (#121 ) from dataprotection into master Reviewed-on: #121	2026-06-13 23:41:30 +02:00
Khwezi Mngoma	9099610185	Refactored AddLiteCharmsWebSecurity to be OS aware when it handles data protection keys continuous-integration/drone/pr Build is passing Details	2026-06-13 23:41:02 +02:00
khwezi	21788c66a3	Merge pull request 'Added data protection keys to web iodc middleware regirtration method' (#120 ) from dataprotection into master Reviewed-on: #120	2026-06-13 23:34:35 +02:00
Khwezi Mngoma	dfaa62ea75	Added data protection keys to web iodc middleware regirtration method continuous-integration/drone/pr Build is passing Details	2026-06-13 23:34:07 +02:00
khwezi	54ef7a6e5f	Merge pull request 'Fixed cookie and header collision issue on signout' (#119 ) from logout-fix into master Reviewed-on: #119	2026-06-13 23:07:22 +02:00
Khwezi Mngoma	0ec7ef4861	Fixed cookie and header collision issue on signout continuous-integration/drone/pr Build is passing Details	2026-06-13 23:06:53 +02:00
khwezi	6594e0aecd	Merge pull request 'Fixed the redirect URI on logout so its passed by the caller' (#118 ) from logout-fix into master Reviewed-on: #118	2026-06-13 22:51:48 +02:00
Khwezi Mngoma	088e64f28f	Fixed the redirect URI on logout so its passed by the caller continuous-integration/drone/pr Build is passing Details	2026-06-13 22:51:07 +02:00
Khwezi Mngoma	3803ae2999	Merged incoming changes	2026-06-13 21:39:43 +02:00
Khwezi Mngoma	398a8d3827	Refactored service bus lifetiemes to singleton	2026-06-13 21:34:59 +02:00
khwezi	b09af460f1	Merge pull request 'Refactored usaged of merchant payment id usage' (#117 ) from payments into master Reviewed-on: #117	2026-06-13 21:21:21 +02:00
Khwezi Mngoma	7c5b5f1728	Refactored usaged of merchant payment id usage continuous-integration/drone/pr Build is passing Details	2026-06-13 21:20:30 +02:00
khwezi	50db61b3ee	Merge pull request 'Refactored idempotency check to observe completed status' (#116 ) from payments into master Reviewed-on: #116	2026-06-13 18:04:17 +02:00
Khwezi Mngoma	94b0084d75	Refactored idempotency check to observe completed status continuous-integration/drone/pr Build is passing Details	2026-06-13 18:03:40 +02:00
khwezi	f5ad8e2d50	Merge pull request 'Ensured the merchant payment id makes it to the ledger' (#115 ) from payments into master Reviewed-on: #115	2026-06-13 17:01:36 +02:00
Khwezi Mngoma	8e2942487d	Ensured the merchant payment id makes it to the ledger continuous-integration/drone/pr Build is passing Details	2026-06-13 17:00:08 +02:00