Merge pull request 'Refactore the entire k8s manifest for pure https routing' (#79) from cart into main

Reviewed-on: #79

MidrandBooks.slnx

@@ -1,6 +1,7 @@
 <Solution>
   <Folder Name="/Solution Items/">
     <File Path=".drone.yml" />
+    <File Path=".editorconfig" />
     <File Path="Dockerfile" />
     <File Path="midrandbooks-uat.yml" />
     <File Path="README.md" />

MidrandBookshop/Components/BookCard.razor

@@ -50,15 +50,3 @@
 
     </div>
 </div>
-
-@code {
-    [Parameter] public long Id { get; set; }
-    [Parameter] public string Title { get; set; } = string.Empty;
-    [Parameter] public string Author { get; set; } = string.Empty;
-    [Parameter] public decimal Price { get; set; }
-    [Parameter] public string Category { get; set; } = string.Empty;
-    [Parameter] public bool IsNew { get; set; }
-    [Parameter] public string BookImageUrl { get; set; } = string.Empty;
-
-    [Parameter] public EventCallback OnCardClick { get; set; }
-}

MidrandBookshop/Components/BookCard.razor.cs

@@ -0,0 +1,14 @@
+namespace MidrandBookshop.Components;
+
+public partial class BookCard
+{
+    [Parameter] public long Id { get; set; }
+    [Parameter] public string Title { get; set; } = string.Empty;
+    [Parameter] public string Author { get; set; } = string.Empty;
+    [Parameter] public decimal Price { get; set; }
+    [Parameter] public string Category { get; set; } = string.Empty;
+    [Parameter] public bool IsNew { get; set; }
+    [Parameter] public string BookImageUrl { get; set; } = string.Empty;
+
+    [Parameter] public EventCallback OnCardClick { get; set; }
+}

MidrandBookshop/Components/Layout/MainLayout.razor.cs

@@ -1,5 +1,5 @@
-using MidrandBookshop.Services.ShoppingCart;
-using MidrandBookshop.Services.ShoppingCart.Models;
+using LiteCharms.Features.MidrandBooks.Payments;
+using LiteCharms.Features.MidrandBooks.Payments.Models;
 
 namespace MidrandBookshop.Components.Layout;
 

MidrandBookshop/Components/Pages/CartReview.razor.cs

@@ -1,11 +1,11 @@
-using MidrandBookshop.Services.ShoppingCart;
-using MidrandBookshop.Services.ShoppingCart.Models;
+using LiteCharms.Features.MidrandBooks.Payments;
+using LiteCharms.Features.MidrandBooks.Payments.Models;
 
 namespace MidrandBookshop.Components.Pages;
 
-public partial class Cart(CartService cartService)
+public partial class CartReview(CartService cartService)
 {
-    protected Services.ShoppingCart.Models.Cart ShoppingCart => cartService?.ShoppingCart!;
+    protected Cart ShoppingCart => cartService?.ShoppingCart!;
 
     protected async void IncreaseQty(CartItem item)
     {

MidrandBookshop/Components/Pages/Checkout.razor

@@ -59,8 +59,18 @@
                     <span class="fw-bold">Total Due</span>
                     <h4 class="fw-bold">R @($"{ShoppingCart.TotalAmount + ShoppingCart.TotalVat + ShippingCost:F2}")</h4>
                 </div>
-                <button class="btn btn-dark w-100 py-3 rounded-pill" @onclick="CompletePurchase">Complete Purchase</button>
+                <button class="btn btn-dark w-100 py-3 rounded-pill" @onclick="PayNow">Complete Purchase</button>
             </div>
         </div>
+
+        @if (IsProcessing == true && CheckoutPayload?.Count > 0)
+        {
+            <form id="payfastForm" action="@PayfastOptions.Value.CheckoutUrl" method="POST">
+                @foreach (var field in CheckoutPayload)
+                {
+                    <input type="hidden" name="@field.Key" value="@field.Value" />
+                }
+            </form>
+        }
     </div>
 </div>

MidrandBookshop/Components/Pages/Checkout.razor.cs

@@ -1,23 +1,39 @@
-using MidrandBookshop.Services.ShoppingCart;
-using MidrandBookshop.Services.ShoppingCart.Models;
+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;
 
-public partial class Checkout(CartService cartService)
+public partial class Checkout()
 {
-    [Inject]
-    private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
-
-    private Services.ShoppingCart.Models.Cart ShoppingCart => cartService.ShoppingCart;
+    [Inject] public HashService HashService { get; set; } = default!;
+    [Inject] public PaymentService PaymentService { get; set; } = default!;
+    [Inject] public OrderService OrderService { get; set; } = default!;
+    [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!;
 
+    private Cart ShoppingCart => CartService.ShoppingCart;
     private AuthenticationState? AuthState { get; set; }
-    private System.Security.Claims.ClaimsPrincipal? User { get; set; }
-    private bool IsAuthenticated => User?.Identity?.IsAuthenticated ?? false;
+    private ClaimsPrincipal? User { get; set; }
+    private bool IsProcessing { get; set; }
 
     private decimal ShippingCost = 0;
     private bool IsSameAddress = true;
 
-    private decimal OrderTotalAmount => ShoppingCart.TotalAmount + ShoppingCart.TotalVat + ShippingCost;
+    private Dictionary<string, string> CheckoutPayload { get; set; } = [];
 
     protected override async Task OnInitializedAsync()
     {
@@ -25,7 +41,7 @@ public partial class Checkout(CartService cartService)
         User = AuthState!.User;
 
         Navigation.LocationChanged += OnLocationChanged;
-        cartService.OnCartChanged += CartService_OnCartChanged;
+        CartService.OnCartChanged += CartService_OnCartChanged;
     }
 
     private async void CartService_OnCartChanged() => await InvokeAsync(StateHasChanged);
@@ -38,17 +54,106 @@ public partial class Checkout(CartService cartService)
 
         if (peekQuantity < 1) return;
 
-        cartService.UpdateQuantity(item.Price!.Id, delta);
+        CartService.UpdateQuantity(item.Price!.Id, delta);
 
-        await cartService.SaveCartToStorageAsync();
+        await CartService.SaveCartToStorageAsync();
     }
 
     private async void RemoveFromCart(CartItem item)
     {
-        cartService.RemoveOneItem(item.Price!.Id);
+        CartService.RemoveOneItem(item.Price!.Id);
 
-        await cartService.SaveCartToStorageAsync();
+        await CartService.SaveCartToStorageAsync();
     }
 
-    private void CompletePurchase(MouseEventArgs args) => Navigation.NavigateTo("/payment-confirmation");
+    private async Task PayNow(MouseEventArgs args)
+    {
+        if (IsProcessing) return;
+
+        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
+
+            var customerEmail = User?.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value!;
+
+            // 2. Create customer if ShoppingCart.CustomerId is null
+            if (ShoppingCart.CustomerId == null)
+            {
+                var existingCustomer = await CustomerService.GetCustomerAsync(customerEmail);
+
+                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 = [];
+
+            foreach (var item in ShoppingCart.Items)
+            {
+                var bookRequest = await BooksService.GetBookByProductIdAsync(item.Price!.Id);
+
+                if (bookRequest.IsSuccess)
+                {
+                    var orderItem = new CreateOrderItem(bookRequest.Value.Id, item.Price.Id, item.Quantity);
+                    orderItems.Add(orderItem);
+                }
+            }
+
+            var paymentGen = await PaymentService.CreatePaymentAsync(ShoppingCart.TotalAmount, order.Value, HashService.HashEncodeLongId(order.Value).Value);
+            var merchantPaymentId = HashService.HashEncodeLongId(order.Value).Value;
+
+            await PaymentService.WriteLedgerEntryAsync(new CreateLedgerEntry
+            {
+                OrderId = order.Value,
+                CustomerId = ShoppingCart.CustomerId.Value,
+                PaymentGatewayId = 1,
+                PaymentGatewayReference = merchantPaymentId,
+                PaymentId = paymentGen.Value,
+                Status = LiteCharms.Features.LedgerStatuses.Sent,
+            });
+
+            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>
+            {
+                { "merchant_id", PayfastOptions.Value.MerchantId! },
+                { "merchant_key", PayfastOptions.Value.MerchantKey! },
+                { "return_url", $"{hostAddress}/payment-success" },
+                { "cancel_url", $"{hostAddress}/payment-failed" },
+                { "notify_url", "https://api.uat.midrandbooks.co.za/v1/payments/payfast/confirm" },
+                { "email_address", customerEmail },
+                { "m_payment_id", merchantPaymentId },
+                { "amount", ShoppingCart.TotalAmount.ToString("F2", CultureInfo.InvariantCulture) },
+                { "item_name", "MidrandBooks Sale" },
+            };
+
+            var signature = PayfastService.GenerateSignature(CheckoutPayload!, PayfastOptions.Value.Passphrase).Value;
+            CheckoutPayload.Add("signature", signature);
+
+            StateHasChanged();
+
+            // 6. Execute programmatic submit directly into the sandbox
+            await JSRuntime.InvokeVoidAsync("eval", "document.getElementById('payfastForm').submit();");
+        }
+        catch
+        {
+            IsProcessing = false;
+            StateHasChanged();
+        }
+    }
 }

MidrandBookshop/Components/Pages/PaymentFailed.razor

@@ -0,0 +1,41 @@
+@page "/payment-failed"
+@rendermode InteractiveServer
+@attribute [Authorize]
+
+<div class="container py-5">
+    <div class="row justify-content-center">
+        <div class="col-md-8 col-lg-6 text-center">
+            <div class="mb-4">
+                <div class="d-inline-block p-4 rounded-circle bg-danger bg-opacity-10 text-danger mb-3">
+                    <svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                        <circle cx="12" cy="12" r="10"></circle>
+                        <line x1="12" y1="8" x2="12" y2="12"></line>
+                        <line x1="12" y1="16" x2="12.01" y2="16"></line>
+                    </svg>
+                </div>
+                <h1 class="fw-bold mb-3">Payment Failed</h1>
+                <p class="text-muted fs-5">We couldn't process your transaction. Don't worry, no money was deducted from your account, and your cart items are safe.</p>
+
+                <div class="bg-light p-3 rounded mt-4">
+                    <p class="mb-0 text-muted small text-uppercase fw-bold">Common Causes</p>
+                    <p class="mb-0 fs-6 text-dark mt-1">Insufficient funds, incorrect card details, or a temporary bank gateway timeout.</p>
+                </div>
+            </div>
+
+            <div class="d-grid gap-3 mt-5">
+                <a href="/checkout" class="btn btn-dark btn-lg rounded-pill py-3">Try Again</a>
+
+                <div class="row g-3">
+                    <div class="col-6">
+                        <a href="/" class="btn btn-outline-dark w-100 rounded-pill py-3">View Store</a>
+                    </div>
+                    <div class="col-6">
+                        <a href="/support" class="btn btn-outline-dark w-100 rounded-pill py-3">Get Help</a>
+                    </div>
+                </div>
+            </div>
+
+            <p class="mt-5 text-muted small">If you noticed a charge or have any order questions, please contact our support desk with your account email <strong>user@email.com</strong>.</p>
+        </div>
+    </div>
+</div>

MidrandBookshop/Components/Pages/PaymentSuccess.razor

@@ -1,4 +1,6 @@
-@page "/payment-confirmation"
+@page "/payment-success"
+@rendermode InteractiveServer
+@attribute [Authorize]
 
 <div class="container py-5">
     <div class="row justify-content-center">

MidrandBookshop/Components/Pages/ProductView.razor.cs

@@ -1,10 +1,10 @@
 using LiteCharms.Features;
 using LiteCharms.Features.MidrandBooks.Authors;
 using LiteCharms.Features.MidrandBooks.Authors.Models;
+using LiteCharms.Features.MidrandBooks.Payments;
+using LiteCharms.Features.MidrandBooks.Payments.Models;
 using LiteCharms.Features.MidrandBooks.Products;
 using LiteCharms.Features.MidrandBooks.Products.Models;
-using Microsoft.AspNetCore.Cors.Infrastructure;
-using MidrandBookshop.Services.ShoppingCart;
 
 namespace MidrandBookshop.Components.Pages;
 
@@ -17,7 +17,7 @@ public partial class ProductView : ComponentBase
     [Inject] private NavigationManager Navigation { get; set; } = default!;
     [Inject] private CartService CartService { get; set; } = default!;
 
-    protected Services.ShoppingCart.Models.Cart ShoppingCart => CartService?.ShoppingCart!;
+    protected Cart ShoppingCart => CartService?.ShoppingCart!;
 
     protected bool IsLoading { get; private set; } = true;
     protected Product? CurrentProduct { get; private set; }

MidrandBookshop/Components/RedirectToLogin.razor

@@ -31,12 +31,3 @@
         </div>
     </div>
 </div>
-
-@code {
-    protected override void OnInitialized()
-    {
-        var returnUrl = Navigation.ToBaseRelativePath(Navigation.Uri);
-
-        Navigation.NavigateTo($"/login?returnUrl={Uri.EscapeDataString(returnUrl)}", forceLoad: true);
-    }
-}

MidrandBookshop/Components/RedirectToLogin.razor.cs

@@ -0,0 +1,12 @@
+namespace MidrandBookshop.Components;
+
+public partial class RedirectToLogin
+{
+    protected override void OnInitialized()
+    {
+        var relativePath = Navigation.ToBaseRelativePath(Navigation.Uri);
+        var sanitizedRedirectPath = relativePath.StartsWith('/') ? relativePath : $"/{relativePath}";
+
+        Navigation.NavigateTo($"/login?redirectUri={Uri.EscapeDataString(sanitizedRedirectPath)}", forceLoad: true);
+    }
+}

MidrandBookshop/MidrandBookshop.csproj

@@ -18,13 +18,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.101.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.132.0" />
   </ItemGroup>
 
   <!-- UI -->
   <ItemGroup>
     <PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
-    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.101.0" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.132.0" />
     
     <!-- Global Usings -->
     <Using Include="Blazored.Toast.Services" />
@@ -51,6 +51,12 @@
   <!-- Shared Global Usings -->
   <ItemGroup>
     <Using Include="Blazored.Toast" />
+    <Using Include="Microsoft.JSInterop" />
+    <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" />

MidrandBookshop/Program.cs

@@ -1,36 +1,43 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Mediator;
 using LiteCharms.Features.MidrandBooks.Extensions;
-using Microsoft.AspNetCore.HttpOverrides;
+using LiteCharms.Features.MidrandBooks.Payments;
+using LiteCharms.Features.Postgres;
 using MidrandBookshop.Components;
-using MidrandBookshop.Services.ShoppingCart;
+using System.Security.Cryptography.X509Certificates;
 using static LiteCharms.Features.Extensions.Quartz;
 
 var builder = WebApplication.CreateBuilder(args);
 
+builder.Services.AddAntiforgery();
+
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents();
 
 builder.AddMonitoring();
 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.AddMediator();
 builder.Services.AddEmailServices(builder.Configuration);
 builder.Services.AddEmailServiceBus();
 
 builder.Services.AddHttpClient();
-builder.Services.AddShopServices();
 builder.Services.AddScoped<CartService>();
+builder.Services.AddShopServices(includeLocalStorage: true);
 builder.Services.AddHashServices(builder.Configuration);
+builder.Services.AddPayfastServices(builder.Configuration);
+
+builder.Services.AddDataProtectionDatabase(builder.Configuration);
 builder.Services.AddMidrandShopDatabase(builder.Configuration);
 
+builder.Services.AddSecurityApiSdk(builder.Configuration);
+builder.Services.AddLiteCharmsWebSecurity(builder.Configuration);
+
 builder.Services.AddMidrandShopPostgresHealthCheck();
 builder.Services.AddMidrandShopQuartzHealthCheck();
 builder.Services.AddHealthChecksSupport(builder.Configuration);
@@ -43,7 +50,35 @@ builder.Services.Configure<ForwardedHeadersOptions>(options =>
 
 var app = builder.Build();
 
+builder.WebHost.ConfigureKestrel(options =>
+{
+    var certBase64 = builder.Configuration["DataProtection:Certificate"];
+    var certPassword = builder.Configuration["DataProtection:Password"];
+
+    if (!string.IsNullOrWhiteSpace(certBase64))
+    {
+        var rawBytes = Convert.FromBase64String(certBase64);
+        var kestrelCert = X509CertificateLoader.LoadPkcs12(rawBytes, certPassword);
+
+        options.ListenAnyIP(8443, listenOptions =>
+        {
+            listenOptions.UseHttps(kestrelCert);
+        });
+    }
+    else
+        options.ListenAnyIP(8080);
+});
+
 app.UseForwardedHeaders();
+app.UseCookiePolicy();
+
+using var security = app.Services.CreateScope();
+{
+    var dataProtectionContext = security.ServiceProvider.GetRequiredService<DataProtectionDbContext>();
+
+    await dataProtectionContext.Database.MigrateAsync();
+}
+
 app.AddSecurityEndpoints();
 
 var schedulerFactory = app.Services.GetRequiredService<ISchedulerFactory>();

MidrandBookshop/Properties/launchSettings.json

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

MidrandBookshop/Services/ShoppingCart/CartService.cs

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

MidrandBookshop/Services/ShoppingCart/Models/Cart.cs

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

MidrandBookshop/Services/ShoppingCart/Models/CartItem.cs

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

MidrandBookshop/appsettings.json

@@ -1,7 +1,22 @@
 {
+  "PayfastSettings": {
+    "CheckoutUrl": "https://sandbox.payfast.co.za/eng/process",
+    "ValidHosts": [
+      "www.payfast.co.za",
+      "sandbox.payfast.co.za",
+      "ips.payfast.co.za",
+      "api.payfast.co.za",
+      "payment.payfast.io"
+    ]
+  },
   "LiteCharmsSettings": {
     "Authority": "https://sts.security.khongisa.co.za"
   },
+  "LiteCharmsClientSettings": {
+    "Authority": "https://sts.security.khongisa.co.za",
+    "GrantType": "client_credentials",
+    "Scope": "midrandbooks-api"
+  },
   "HasherSettings": {
     "MinHashLength": 11
   },

midrandbooks-uat.yml

@@ -10,8 +10,8 @@ metadata:
   name: midrandbooks-config
   namespace: midrandbooks-uat
 data:
-  ASPNETCORE_ENVIRONMENT: "Development"
-  ASPNETCORE_URLS: "http://0.0.0.0:8080"
+  ASPNETCORE_ENVIRONMENT: "Development"  
+  ASPNETCORE_URLS: "https://0.0.0.0:8443"
   Monitoring__Address: "http://aspire-dashboard-service.aspire.svc.cluster.local:18889"
   Monitoring__ServiceName: "MidrandBooks.Uat"
   HasherSettings__MinHashLength: "11"
@@ -19,16 +19,17 @@ data:
   BookshopS3Settings__Region: "garage"
   BookshopS3Settings__BucketName: "bookshop"
   BookshopS3Settings__CdnBaseUrl: "https://bookshop.cdn.khongisa.co.za"
-  ValidPayfastHosts__0: "www.payfast.co.za"
-  ValidPayfastHosts__1: "sandbox.payfast.co.za"
-  ValidPayfastHosts__2: "w1w.payfast.co.za"
-  ValidPayfastHosts__3: "w2w.payfast.co.za"
-  ValidPayfastHosts__4: "ips.payfast.co.za"
-  ValidPayfastHosts__5: "api.payfast.co.za"
-  ValidPayfastHosts__6: "payment.payfast.io"
+  PayfastSettings__CheckoutUrl: "https://sandbox.payfast.co.za/eng/process"
+  PayfastSettings__ValidHosts__0: "www.payfast.co.za"
+  PayfastSettings__ValidHosts__1: "sandbox.payfast.co.za"
+  PayfastSettings__ValidHosts__2: "ips.payfast.co.za"
+  PayfastSettings__ValidHosts__3: "api.payfast.co.za"
+  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
@@ -38,14 +39,21 @@ metadata:
 type: Opaque
 data:  
   connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ==
+  dataprotection-connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ==
   connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
   aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
-  hasher-salt: VEdsbmFIUWdRMmhoY20xekxDQk5hV1J5WVc1a1FtOXZhM01nYldGclpTQnNiM1J6SUc5bUlHMXZibVY1SUdGdVpDQmhjbVVnWVNCemRXTmpaWE56Wm5Wc0lIWnBjbUZzSUhOMGIzSjVJR2x1SUZOdmRYUm9JRUZtY21sallRPT0=
-  hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8=
+  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=
+  dataprotection-cert: TUlJS2dBSUJBekNDQ2pZR0NTcUdTSWIzRFFFSEFhQ0NDaWNFZ2dvak1JSUtIekNDQkZJR0NTcUdTSWIzRFFFSEJxQ0NCRU13Z2dRL0FnRUFNSUlFT0FZSktvWklodmNOQVFjQk1GY0dDU3FHU0liM0RRRUZEVEJLTUNrR0NTcUdTSWIzRFFFUkREUWEwZ0F3RUFBaUFCQURBTkJnbGdoa2dCWlFNRUFnRUZBQUFTb0VFS2Y2bE55USt1REU4ZjNCOWw5T3pGNG9mSmw5cUtkK3lKTTVBNXEy d0RBRUNIMXBPL2hVRXpsTkFnSUlBQT09
+  dataprotection-password: OWlIUSMmcl41eWZYRXc=
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -65,7 +73,7 @@ metadata:
   name: midrandbooks
   namespace: midrandbooks-uat
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: midrandbooks
@@ -93,11 +101,21 @@ spec:
               memory: "256Mi"
               cpu: "100m"
           ports:
-            - containerPort: 8080
+            - containerPort: 8443
           envFrom:
             - configMapRef:
                 name: midrandbooks-config
           env:
+            - name: DataProtection__Certificate
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: dataprotection-cert
+            - name: DataProtection__Password
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: dataprotection-password
             - name: LiteCharmsSettings__ClientId
               valueFrom:
                 secretKeyRef:
@@ -123,11 +141,31 @@ spec:
                 secretKeyRef:
                   name: midrandbooks-secrets
                   key: hasher-salt
-            - name: HasherSettings__PayfastPassphrase
+            - name: PayfastSettings__Passphrase
               valueFrom:
                 secretKeyRef:
                   name: midrandbooks-secrets
-                  key: hasher-payfastpassphrase
+                  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:
@@ -138,6 +176,11 @@ spec:
                 secretKeyRef:
                   name: midrandbooks-secrets
                   key: connection-string
+            - name: ConnectionStrings__PostgresDataProtection
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: dataprotection-connection-string
             - name: Monitoring__ApiKey
               valueFrom:
                 secretKeyRef:
@@ -146,23 +189,25 @@ spec:
           volumeMounts:
             - name: data
               mountPath: /app/wwwroot/content
-              resources:          
+              subPath: bookshop-content
           livenessProbe:
             httpGet:
               path: /health
-              port: 8080
+              port: 8443
+              scheme: HTTPS
             initialDelaySeconds: 5
             periodSeconds: 10
           readinessProbe:
             httpGet:
               path: /health
-              port: 8080
+              port: 8443
+              scheme: HTTPS
             initialDelaySeconds: 3
             periodSeconds: 5
       volumes:
         - name: data
           persistentVolumeClaim:
-            claimName: midrandbooks-pvc
+            claimName: midrandbooks-pvc        
 ---
 apiVersion: v1
 kind: Service
@@ -170,14 +215,20 @@ metadata:
   name: midrandbooks-service
   namespace: midrandbooks-uat
 spec:
-  type: ClusterIP
+  ports:
+    - name: https
+      port: 443
+      targetPort: 8443
   selector:
     app: midrandbooks
-  ports:
-    - name: http
-      protocol: TCP
-      port: 80
-      targetPort: 8080
+---
+apiVersion: traefik.io/v1alpha1
+kind: ServersTransport
+metadata:
+  name: midrandbooks-bypass-backend-validation
+  namespace: midrandbooks-uat
+spec:
+  insecureSkipVerify: true
 ---
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
@@ -192,10 +243,12 @@ spec:
       kind: Rule
       services:
         - name: midrandbooks-service
-          port: 80
+          port: 443
+          scheme: https
+          serversTransport: midrandbooks-bypass-backend-validation
           sticky:
             cookie:
               name: "lp-sticky-session"
               httpOnly: true
               secure: true
-  tls: {}
+  tls: {}