Merge pull request 'cart' (#70) from cart into main

Reviewed-on: #70

.drone.yml

@@ -23,7 +23,7 @@ trigger:
 kind: pipeline
 type: docker
 name: package
- 
+
 steps:
   - name: docker-build
     image: plugins/docker
@@ -31,10 +31,6 @@ steps:
       registry: nexus.khongisa.co.za
       repo: nexus.khongisa.co.za/midrandbooks
       tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ]
-      use_cache: true
-      cache_from: nexus.khongisa.co.za/midrandbooks:latest
-      build_args:
-        - BUILDKIT_INLINE_CACHE=1
       custom_labels:
         - org.opencontainers.image.source=https://gitea.khongisa.co.za/litecharms/midrandbooks
         - org.opencontainers.image.version=1.${DRONE_BUILD_NUMBER}

MidrandBookshop/Components/Layout/MainLayout.razor.cs

@@ -27,11 +27,15 @@ public partial class MainLayout(CartService cartService) : IDisposable
         Navigation.LocationChanged += OnLocationChanged;
         cartService.OnCartChanged += CartService_OnCartChanged;
 
-        await cartService.LoadCartFromStorageAsync();
-
         SyncSearchQueryFromUrl();
     }
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender) 
+            await cartService.LoadCartFromStorageAsync();
+    }
+
     private async void CartService_OnCartChanged() => await InvokeAsync(StateHasChanged);
 
     private void OnLocationChanged(object? sender, LocationChangedEventArgs e)
@@ -100,7 +104,7 @@ public partial class MainLayout(CartService cartService) : IDisposable
 
     private void ToggleCart() => IsCartOpen = !IsCartOpen;
 
-    private async Task ChangeQuantity(CartItem item, int delta)
+    private async void ChangeQuantity(CartItem item, int delta)
     {
         var peekQuantity = item.Quantity + delta;
 
@@ -111,7 +115,7 @@ public partial class MainLayout(CartService cartService) : IDisposable
         await cartService.SaveCartToStorageAsync();
     }
 
-    private async Task RemoveFromCart(CartItem item)
+    private async void RemoveFromCart(CartItem item)
     {
         cartService.RemoveOneItem(item.Price!.Id);
 

MidrandBookshop/Components/Pages/Checkout.razor.cs

@@ -1,10 +1,13 @@
 using LiteCharms.Features.Api.Configuration;
 using LiteCharms.Features.Hasher;
 using LiteCharms.Features.MidrandBooks.AuthorBooks;
+using LiteCharms.Features.MidrandBooks.Customers;
+using LiteCharms.Features.MidrandBooks.Customers.Models;
 using LiteCharms.Features.MidrandBooks.Orders;
 using LiteCharms.Features.MidrandBooks.Orders.Models;
 using LiteCharms.Features.MidrandBooks.Payments;
 using LiteCharms.Features.MidrandBooks.Payments.Models;
+using LiteCharms.Features.MidrandBooks.Products;
 
 namespace MidrandBookshop.Components.Pages;
 
@@ -16,13 +19,14 @@ public partial class Checkout()
     [Inject] public BooksService BooksService { get; set; } = default!;
     [Inject] public CartService CartService { get; set; } = default!;
     [Inject] public PayfastService PayfastService { get; set; } = default!;
+    [Inject] public CustomerService CustomerService { get; set; } = default!;
+    [Inject] public ProductService ProductService { get; set; } = default!;
     [Inject] public IOptions<PayfastSettings> PayfastOptions { get; set; } = default!;
     [Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
     [Inject] public IJSRuntime JSRuntime { get; set; } = default!;
-    [Inject] private HydrationService HydrationService { get; set; } = default!;
-    [Inject] private CancellationToken CancellationToken { get; set; } = default!;
 
     private Cart ShoppingCart => CartService.ShoppingCart;
+    private AuthenticationState? AuthState { get; set; }
     private ClaimsPrincipal? User { get; set; }
     private bool IsProcessing { get; set; }
 
@@ -33,31 +37,18 @@ public partial class Checkout()
 
     protected override async Task OnInitializedAsync()
     {
-        var authState = await AuthStateProvider.GetAuthenticationStateAsync();
-        User = authState!.User;
+        AuthState = await AuthStateProvider.GetAuthenticationStateAsync();
+        User = AuthState!.User;
 
         Navigation.LocationChanged += OnLocationChanged;
         CartService.OnCartChanged += CartService_OnCartChanged;
-
-        await CartService.LoadCartFromStorageAsync();
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender == false && HydrationService.CartHydrated == false)
-        {
-            await HydrationService.EnsureCustomerExistsAsync(CancellationToken);
-            await HydrationService.RehydrateCartFromPendingOrderAsync(CancellationToken);
-
-            CartService.NotifyStateChanged();
-        }
     }
 
     private async void CartService_OnCartChanged() => await InvokeAsync(StateHasChanged);
 
     private void OnLocationChanged(object? sender, LocationChangedEventArgs e) => StateHasChanged();
 
-    private async Task ChangeQuantity(CartItem item, int delta)
+    private async void ChangeQuantity(CartItem item, int delta)
     {
         var peekQuantity = item.Quantity + delta;
 
@@ -68,7 +59,7 @@ public partial class Checkout()
         await CartService.SaveCartToStorageAsync();
     }
 
-    private async Task RemoveFromCart(CartItem item)
+    private async void RemoveFromCart(CartItem item)
     {
         CartService.RemoveOneItem(item.Price!.Id);
 
@@ -81,31 +72,37 @@ public partial class Checkout()
 
         try
         {
+            // 1. Instantly disable the button to prevent duplicate click submissions
             IsProcessing = true;
+            StateHasChanged(); // Force Blazor Server to push the disabled state over SignalR immediately
 
-            StateHasChanged();
+            var customerEmail = User?.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value!;
 
-            Result<long> orderResult;
-
-            var customerId = (long)ShoppingCart.CustomerId!;
-
-            if (!ShoppingCart.OrderId.HasValue)
+            // 2. Create customer if ShoppingCart.CustomerId is null
+            if (ShoppingCart.CustomerId == null)
             {
-                CreateOrder request = new(ShoppingCart.TotalAmount, null);
+                var existingCustomer = await CustomerService.GetCustomerAsync(customerEmail);
 
-                orderResult = await OrderService.CreateOrderAsync(customerId, request, CancellationToken);
-                ShoppingCart.OrderId = orderResult.Value;
+                if (existingCustomer.IsSuccess)
+                    ShoppingCart.CustomerId = existingCustomer.Value.Id;
+
+                if (existingCustomer.IsFailed)
+                {
+                    var customerCreate = await CustomerService.CreateCustomerAsync(new CreateCustomer { Email = customerEmail });
+
+                    if (customerCreate.IsSuccess)
+                        ShoppingCart.CustomerId = customerCreate.Value;
+                }
             }
 
+            // 3. Create order using shopping cart and assign the ShoppingCart.OrderId
+
+            var order = await OrderService.CreateOrderAsync(ShoppingCart.CustomerId!.Value, new CreateOrder(ShoppingCart.TotalAmount, null));
             List<CreateOrderItem> orderItems = [];
 
-            var orderId = (long)ShoppingCart.OrderId;
-
-            await OrderService.ClearOrderItemsAsync(orderId, CancellationToken);
-
             foreach (var item in ShoppingCart.Items)
             {
-                var bookRequest = await BooksService.GetBookByProductIdAsync(item.Price!.Id, CancellationToken);
+                var bookRequest = await BooksService.GetBookByProductIdAsync(item.Price!.Id);
 
                 if (bookRequest.IsSuccess)
                 {
@@ -114,21 +111,22 @@ public partial class Checkout()
                 }
             }
 
-            var orderHash = HashService.HashEncodeLongId(orderId).Value;
-            var paymentGen = await PaymentService.CreatePaymentAsync(ShoppingCart.TotalAmount, orderId, orderHash, CancellationToken);
+            var paymentGen = await PaymentService.CreatePaymentAsync(ShoppingCart.TotalAmount, order.Value, HashService.HashEncodeLongId(order.Value).Value);
+            var merchantPaymentId = HashService.HashEncodeLongId(order.Value).Value;
 
-            CreateLedgerEntry ledgerRequest = new()
+            await PaymentService.WriteLedgerEntryAsync(new CreateLedgerEntry
             {
-                OrderId = orderId,
-                CustomerId = customerId,
-                PaymentGatewayId = 1, // TODO: lookup value to match user selection
-                PaymentGatewayReference = orderHash,
+                OrderId = order.Value,
+                CustomerId = ShoppingCart.CustomerId.Value,
+                PaymentGatewayId = 1,
+                PaymentGatewayReference = merchantPaymentId,
                 PaymentId = paymentGen.Value,
                 Status = LiteCharms.Features.LedgerStatuses.Sent,
-            };
-            await PaymentService.WriteLedgerEntryAsync(ledgerRequest, CancellationToken);
+            });
 
-            var addItemsResult = await OrderService.AddItemsToOrderAsync(orderId, [.. orderItems], CancellationToken);
+            var addItemsResult = await OrderService.AddItemsToOrderAsync(order.Value, [.. orderItems]);
+
+            // 4. Generate the signed Payfast form payload using your backend service            
             var hostAddress = Navigation.BaseUri.TrimEnd('/');
 
             CheckoutPayload = new Dictionary<string, string>
@@ -138,8 +136,8 @@ public partial class Checkout()
                 { "return_url", $"{hostAddress}/payment-success" },
                 { "cancel_url", $"{hostAddress}/payment-failed" },
                 { "notify_url", "https://api.uat.midrandbooks.co.za/v1/payments/payfast/confirm" },
-                { "email_address", User?.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value! },
-                { "m_payment_id", orderHash },
+                { "email_address", customerEmail },
+                { "m_payment_id", merchantPaymentId },
                 { "amount", ShoppingCart.TotalAmount.ToString("F2", CultureInfo.InvariantCulture) },
                 { "item_name", "MidrandBooks Sale" },
             };
@@ -149,6 +147,7 @@ public partial class Checkout()
 
             StateHasChanged();
 
+            // 6. Execute programmatic submit directly into the sandbox
             await JSRuntime.InvokeVoidAsync("eval", "document.getElementById('payfastForm').submit();");
         }
         catch

MidrandBookshop/Components/Pages/Home.razor.cs

@@ -2,7 +2,6 @@
 using LiteCharms.Features.MidrandBooks.AuthorBooks;
 using LiteCharms.Features.MidrandBooks.Authors;
 using LiteCharms.Features.MidrandBooks.Categories;
-using LiteCharms.Features.MidrandBooks.Payments;
 using LiteCharms.Features.MidrandBooks.Products;
 using LiteCharms.Features.MidrandBooks.Products.Models;
 using LiteCharms.Features.Models;
@@ -16,9 +15,6 @@ public partial class Home : ComponentBase
     [Inject] private AuthorService AuthorService { get; set; } = default!;
     [Inject] private CategoryService CategoryService { get; set; } = default!;
     [Inject] private NavigationManager Navigation { get; set; } = default!;
-    [Inject] private HydrationService HydrationService { get; set; } = default!;
-    [Inject] private CancellationToken CancellationToken { get; set; } = default!;
-    [Inject] private CartService CartService { get; set; } = default!;
 
     [SupplyParameterFromQuery(Name = "q")] public string? SharedSearchQuery { get; set; }
     [SupplyParameterFromQuery] public long? AuthorId { get; set; }
@@ -99,17 +95,6 @@ public partial class Home : ComponentBase
 
     private bool HasMoreItems => FilteredData.Count() > VisibleCount;
 
-    protected override async Task OnInitializedAsync() => await CartService.LoadCartFromStorageAsync();
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender == false && HydrationService.CartHydrated == false)
-        {
-            await HydrationService.EnsureCustomerExistsAsync(CancellationToken);
-            await HydrationService.RehydrateCartFromPendingOrderAsync(CancellationToken);
-        }
-    }
-
     protected override async Task OnParametersSetAsync() => await LoadCatalogDataAsync();
 
     private async Task LoadCatalogDataAsync()

MidrandBookshop/HydrationService.cs

@@ -1,116 +0,0 @@
-using LiteCharms.Features.MidrandBooks.AuthorBooks;
-using LiteCharms.Features.MidrandBooks.Authors;
-using LiteCharms.Features.MidrandBooks.Customers;
-using LiteCharms.Features.MidrandBooks.Customers.Models;
-using LiteCharms.Features.MidrandBooks.Orders;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Payments.Models;
-using LiteCharms.Features.MidrandBooks.Products;
-
-namespace MidrandBookshop;
-
-public sealed class HydrationService(AuthenticationStateProvider authStateProvider, CustomerService customerService,
-    ProductService productService, OrderService orderService, BooksService booksService, AuthorService authorService, 
-    CartService cartService)
-{
-    private Cart ShoppingCart => cartService.ShoppingCart;
-
-    private AuthenticationState? AuthState { get; set; }
-    private ClaimsPrincipal? User { get; set; }
-
-    public bool CartHydrated { get; set; }
-
-    public async Task EnsureCustomerExistsAsync(CancellationToken cancellationToken = default)
-    {
-        if (ShoppingCart.CustomerId > 0) return;
-
-        AuthState = await authStateProvider.GetAuthenticationStateAsync();
-        User = AuthState!.User;
-
-        if (User?.Identity?.IsAuthenticated == false) return;
-
-        var email = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value!;
-
-        var existingCustomer = await customerService.GetCustomerAsync(email, cancellationToken);
-
-        if (existingCustomer.IsSuccess)
-            ShoppingCart.CustomerId = existingCustomer.Value.Id;
-
-        if (existingCustomer.IsFailed)
-        {
-            var name = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value ?? string.Empty;
-            var lastname = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Surname)?.Value ?? string.Empty;
-            var mobile = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.MobilePhone)?.Value ?? string.Empty;
-
-            var customerCreate = await customerService.CreateCustomerAsync(new CreateCustomer { Email = email }, cancellationToken);
-
-            if (customerCreate.IsSuccess && !string.IsNullOrWhiteSpace(name))
-            {
-                ShoppingCart.CustomerId = customerCreate.Value;
-
-                if (!string.IsNullOrWhiteSpace(name))
-                    await customerService.CreateCustomerContactAsync((long)ShoppingCart.CustomerId, new CreateCustomerContact
-                    {
-                        Email = email,
-                        Name = name,
-                        LastName = lastname,
-                        Phone = mobile,
-                        Type = LiteCharms.Features.ContactTypes.Personal
-                    }, cancellationToken);
-            }
-        }
-    }
-
-    public async Task RehydrateCartFromPendingOrderAsync(CancellationToken cancellationToken = default)
-    {
-        if (User?.Identity?.IsAuthenticated == false) return;
-
-        if (ShoppingCart.OrderId > 0 && ShoppingCart.CustomerId > 0)
-        {
-            cartService.CalculateTotalPrice();
-            CartHydrated = true;
-
-            return;
-        }
-
-        var orderResult = await orderService.GetPendingOrderAsync((long)ShoppingCart.CustomerId!, cancellationToken);
-
-        if (orderResult.IsFailed) return;
-
-        if(orderResult.Value.Id == ShoppingCart.OrderId)
-        {
-            cartService.CalculateTotalPrice();
-            CartHydrated = true;
-
-            return;
-        }
-
-        var orderItemsResult = await orderService.GetOrderItemsAsync((long)orderResult.Value.Id!, cancellationToken);
-
-        ShoppingCart.OrderId = orderResult.Value.Id;
-
-        if(orderItemsResult.IsFailed) return;
-
-        foreach (var item in orderItemsResult.Value)
-        {
-            var priceFetchResult = await productService.GetProductPriceAsync(item.ProductPriceId, cancellationToken);
-
-            if (priceFetchResult.IsFailed) continue;
-
-            var bookFetchResult = await booksService.GetBookByProductIdAsync(priceFetchResult.Value.ProductId, cancellationToken);
-
-            if (bookFetchResult.IsFailed) continue;
-
-            var authorFetchResult = await authorService.GetAuthorAsync(bookFetchResult.Value.AuthorId, cancellationToken);
-
-            if (authorFetchResult.IsFailed) continue;
-            
-            if(!ShoppingCart.Items.Any(i => i.Price!.Id == item.ProductPriceId))
-                cartService.AddItem(priceFetchResult.Value, bookFetchResult.Value.Product!, authorFetchResult.Value);
-        }
-
-        CartHydrated = true;
-
-        await cartService.SaveCartToStorageAsync();
-    }
-}

MidrandBookshop/MidrandBookshop.csproj

@@ -18,13 +18,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.137.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.125.0" />
   </ItemGroup>
 
   <!-- UI -->
   <ItemGroup>
     <PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
-    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.137.0" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.125.0" />
     
     <!-- Global Usings -->
     <Using Include="Blazored.Toast.Services" />
@@ -55,14 +55,11 @@
     <Using Include="System.Globalization" />
     <Using Include="System.Security.Claims" />
     <Using Include="Microsoft.Extensions.Options" />
-    <Using Include="Microsoft.EntityFrameworkCore" />
-    <Using Include="Microsoft.AspNetCore.HttpOverrides" />
     <Using Include="Microsoft.AspNetCore.Components.Authorization" />
     <Using Include="Microsoft.AspNetCore.Components.Routing" />
     <Using Include="Microsoft.AspNetCore.Components.Web" />
     <Using Include="Microsoft.AspNetCore.WebUtilities" />
     <Using Include="Microsoft.AspNetCore.Components" />
-    <Using Include="System.Security.Cryptography.X509Certificates" />
   </ItemGroup>
 
 </Project>

MidrandBookshop/Program.cs

@@ -1,51 +1,76 @@
 using LiteCharms.Features.Extensions;
-using LiteCharms.Features.Postgres;
-using MidrandBookshop;
+using LiteCharms.Features.Mediator;
+using LiteCharms.Features.MidrandBooks.Extensions;
+using LiteCharms.Features.MidrandBooks.Payments;
+using Microsoft.AspNetCore.HttpOverrides;
 using MidrandBookshop.Components;
 using static LiteCharms.Features.Extensions.Quartz;
 
 var builder = WebApplication.CreateBuilder(args);
 
+builder.Services.AddRazorComponents()
+    .AddInteractiveServerComponents();
+
 builder.AddMonitoring();
-builder.Services.RegisterServices(builder.Configuration);
+builder.Services.AddEndpointsApiExplorer();
+
+builder.Services.AddMediator();
+builder.Services.AddLiteCharmsWebSecurity(builder.Configuration);
+
+builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
+builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
+
+builder.Services.AddQuartzSchedulerClient(MidrandShopSchedulerName, builder.Configuration);
+
+builder.Services.AddEmailServices(builder.Configuration);
+builder.Services.AddEmailServiceBus();
+
+builder.Services.AddHttpClient();
+builder.Services.AddScoped<CartService>();
+builder.Services.AddShopServices(includeLocalStorage: true);
+builder.Services.AddHashServices(builder.Configuration);
+builder.Services.AddSecurityApiSdk(builder.Configuration);
+builder.Services.AddPayfastServices(builder.Configuration);
+builder.Services.AddMidrandShopDatabase(builder.Configuration);
+
+builder.Services.AddMidrandShopPostgresHealthCheck();
+builder.Services.AddMidrandShopQuartzHealthCheck();
+builder.Services.AddHealthChecksSupport(builder.Configuration);
+
+builder.Services.Configure<ForwardedHeadersOptions>(options =>
+{
+    options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+    options.KnownProxies.Clear();
+});
 
 var app = builder.Build();
 
+app.UseForwardedHeaders();
+app.AddSecurityEndpoints();
+
+var schedulerFactory = app.Services.GetRequiredService<ISchedulerFactory>();
+var scheduler = await schedulerFactory.GetScheduler(MidrandShopSchedulerName);
+
+if (!scheduler!.IsStarted)
+    await scheduler.Start();
+
 if (!app.Environment.IsDevelopment())
 {
     app.UseExceptionHandler("/Error", createScopeForErrors: true);
     app.UseHsts();
 }
 
-app.UseForwardedHeaders();
-app.UseHttpsRedirection();
-
-app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true);
 app.UseHealthChecks("/health", new HealthCheckOptions
 {
     ResponseWriter = HealthChecks.UI.Client.UIResponseWriter.WriteHealthCheckUIResponse
 });
 
-app.MapStaticAssets();
-app.UseCookiePolicy();
+app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true);
+app.UseHttpsRedirection();
 
-app.UseAuthentication();
-app.UseAuthorization();
 app.UseAntiforgery();
-app.AddSecurityEndpoints();
-
-using (var security = app.Services.CreateScope())
-{
-    var dataProtectionContext = security.ServiceProvider.GetRequiredService<DataProtectionDbContext>();
-
-    await dataProtectionContext.Database.MigrateAsync();
-}
-
-var schedulerFactory = app.Services.GetRequiredService<ISchedulerFactory>();
-var scheduler = await schedulerFactory.GetScheduler(MidrandShopSchedulerName);
-
-if (!scheduler!.IsStarted) await scheduler.Start();
 
+app.MapStaticAssets();
 app.MapRazorComponents<App>()
     .AddInteractiveServerRenderMode();
 

MidrandBookshop/Properties/launchSettings.json

@@ -14,7 +14,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": false,
-        "applicationUrl": "https://localhost:8443;http://localhost:8080",
+        "applicationUrl": "https://localhost:7021;http://localhost:5053",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }

MidrandBookshop/Setup.cs

@@ -1,60 +0,0 @@
-using LiteCharms.Features.Mediator;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.Extensions;
-using LiteCharms.Features.MidrandBooks.Extensions;
-using static LiteCharms.Features.Extensions.Quartz;
-
-namespace MidrandBookshop;
-
-public static class Setup
-{
-    public static IServiceCollection RegisterServices(this IServiceCollection services, IConfiguration configuration)
-    {
-        services.AddCancellationToken();
-        services.AddAntiforgery();
-
-        services.AddRazorComponents()
-            .AddInteractiveServerComponents();
-        
-        services.AddEndpointsApiExplorer();
-
-        services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
-        services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
-
-        services.AddQuartzSchedulerClient(MidrandShopSchedulerName, configuration);
-
-        services.AddMediator();
-        services.AddEmailServices(configuration);
-        services.AddEmailServiceBus();
-
-        services.AddHttpClient();
-        services.AddScoped<CartService>();
-        services.AddScoped<HydrationService>();
-        services.AddShopServices(includeLocalStorage: true);
-        services.AddHashServices(configuration);
-        services.AddPayfastServices(configuration);
-
-        services.AddDataProtectionDatabase(configuration);
-        services.AddMidrandShopDatabase(configuration);
-
-        services.AddSecurityApiSdk(configuration);
-        services.AddLiteCharmsWebSecurity(configuration);
-
-        services.AddMidrandShopPostgresHealthCheck();
-        services.AddMidrandShopQuartzHealthCheck();
-        services.AddHealthChecksSupport(configuration);
-
-        services.Configure<ForwardedHeadersOptions>(options =>
-        {
-            options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-
-            options.KnownProxies.Clear();
-            options.KnownIPNetworks.Clear();
-
-            options.ForwardLimit = null;
-            options.RequireHeaderSymmetry = false;
-        });
-
-        return services;
-    }
-}

midrandbooks-uat.yml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -9,8 +10,8 @@ metadata:
   name: midrandbooks-config
   namespace: midrandbooks-uat
 data:
-  ASPNETCORE_ENVIRONMENT: "Development"  
-  ASPNETCORE_URLS: "http://0.0.0.0:8443"
+  ASPNETCORE_ENVIRONMENT: "Development"
+  ASPNETCORE_URLS: "http://0.0.0.0:8080"
   Monitoring__Address: "http://aspire-dashboard-service.aspire.svc.cluster.local:18889"
   Monitoring__ServiceName: "MidrandBooks.Uat"
   HasherSettings__MinHashLength: "11"
@@ -26,11 +27,33 @@ data:
   PayfastSettings__ValidHosts__4: "payment.payfast.io"
   LiteCharmsSettings__Authority: "https://sts.security.khongisa.co.za"
   LiteCharmsSettings__Audience: "midrandbooks-api"
+  ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
   LiteCharmsClientSettings__Authority: "https://sts.security.khongisa.co.za"
   LiteCharmsClientSettings__GrantType: "client_credentials"
   LiteCharmsClientSettings__Scope: "midrandbooks-api"
 ---
 apiVersion: v1
+kind: Secret
+metadata:
+  name: midrandbooks-secrets
+  namespace: midrandbooks-uat
+type: Opaque
+data:  
+  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ==
+  connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
+  aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
+  hasher-salt: VEdsbmFIUWdRMmhoY20xekxDQk5hV1J5WVc1a1FtOXZhM01nYldGclpTQnNiM1J6SUc5bUlHMXZibVY1SUdGdVpDQmhjbVVnWVNCemRXTmpaWE56Wm5Wc0lIWnBjbUZzSUhOMGIzSjVJR2x1SUZOdmRYUm9JRUZtY21sallRPT0=  
+  bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
+  bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
+  litecharms-clientid: bWlkcmFuZGJvb2tzLXVhdA==
+  litecharms-clientsecret: c2VjcmV0Xzc3OGJkODM3NWFjNGE3Mzg2N2QxZDdhNjcwODJlZTJjNGU4NmUwODYwYmI0Y2ZlZWI5NDExOTQ5OTk2ZThhOGU=
+  payfast-passphrase: OUdBSVIwdFdwaFgwcU8=
+  payfast-merchantid: MTAwNDkzMDc=
+  payfast-merchantkey: anU2bmF2bjBqY2JmMA==
+  litecharms-client-clientid: bWlkcmFuZGJvb2tzLWFwaS1zY2FsZXItdWF0
+  litecharms-client-clientsecret: c2VjcmV0XzBhOGRjMWY5OTA2MTU5MGE1MmIxMjcyZGIzYTE4NzFkMjc2MWM3OWZiZDA1OGIyYTk2ODkxMTAyOWU0YjIwOGE=
+---
+apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: midrandbooks-pvc
@@ -49,7 +72,6 @@ metadata:
   namespace: midrandbooks-uat
 spec:
   replicas: 2
-  revisionHistoryLimit: 0
   selector:
     matchLabels:
       app: midrandbooks
@@ -77,60 +99,96 @@ spec:
               memory: "256Mi"
               cpu: "100m"
           ports:
-            - containerPort: 8443
+            - containerPort: 8080
           envFrom:
             - configMapRef:
                 name: midrandbooks-config
-            - secretRef:
-                name: midrandbooks-secrets          
           env:
-            - name: DataProtection__Certificate
+            - name: LiteCharmsSettings__ClientId
               valueFrom:
                 secretKeyRef:
-                  name: litecharms-certs
-                  key: litecharms.pfx
-            - name: DataProtection__Password
+                  name: midrandbooks-secrets
+                  key: litecharms-clientid
+            - name: LiteCharmsSettings__ClientSecret
               valueFrom:
                 secretKeyRef:
-                  name: litecharms-certs
-                  key: passphrase
+                  name: midrandbooks-secrets
+                  key: litecharms-clientsecret
+            - name: BookshopS3Settings__AccessKey
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: bookshop-s3-accesskey
+            - name: BookshopS3Settings__SecretKey
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: bookshop-s3-secretkey
+            - name: HasherSettings__Salt
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: hasher-salt
+            - name: PayfastSettings__Passphrase
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: payfast-passphrase
+            - name: PayfastSettings__MerchantId
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: payfast-merchantid
+            - name: PayfastSettings__MerchantKey
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: payfast-merchantkey
+            - name: LiteCharmsClientSettings__ClientId
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: litecharms-client-clientid
+            - name: LiteCharmsClientSettings__ClientSecret
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: litecharms-client-clientsecret
+            - name: ConnectionStrings__PostgresScheduler
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: connection-string-quartz
+            - name: ConnectionStrings__PostgresMidrandBooks
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: connection-string
+            - name: Monitoring__ApiKey
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: aspire-apikey
           volumeMounts:
-            - name: cluster-certs-volume
-              mountPath: /tmp/litecharms-raw-certs
-              readOnly: true
             - name: data
-              mountPath: /app/content
-              subPath: bookshop-content
-          lifecycle:
-            postStart:
-              exec:
-                command:
-                  - /bin/sh
-                  - -c
-                  - |
-                    cp /tmp/litecharms-raw-certs/litecharms.crt /usr/local/share/ca-certificates/litecharms.crt
-                    update-ca-certificates
+              mountPath: /app/wwwroot/content
+              resources:          
           livenessProbe:
             httpGet:
               path: /health
-              port: 8443
-              scheme: HTTP
+              port: 8080
             initialDelaySeconds: 5
             periodSeconds: 10
           readinessProbe:
             httpGet:
               path: /health
-              port: 8443
-              scheme: HTTP
+              port: 8080
             initialDelaySeconds: 3
             periodSeconds: 5
       volumes:
         - name: data
           persistentVolumeClaim:
             claimName: midrandbooks-pvc
-        - name: cluster-certs-volume
-          secret:
-            secretName: litecharms-certs
 ---
 apiVersion: v1
 kind: Service
@@ -138,12 +196,14 @@ metadata:
   name: midrandbooks-service
   namespace: midrandbooks-uat
 spec:
-  ports:
-    - name: https
-      port: 443
-      targetPort: 8443
+  type: ClusterIP
   selector:
     app: midrandbooks
+  ports:
+    - name: http
+      protocol: TCP
+      port: 80
+      targetPort: 8080
 ---
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
@@ -158,11 +218,10 @@ spec:
       kind: Rule
       services:
         - name: midrandbooks-service
-          port: 443
+          port: 80
           sticky:
             cookie:
               name: "lp-sticky-session"
               httpOnly: true
               secure: true
-          scheme: http
   tls: {}