Merge pull request 'Ensured appsettings aligns with k8s config' (#36) from mock-data into main

Reviewed-on: #36

MidrandBookshop/Components/Layout/MainLayout.razor

@@ -167,7 +167,7 @@
                             <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2" />
                             <circle cx="12" cy="7" r="4" />
                         </svg>
-                        Account
+                        LogIn
                     </a>
 
                     <a href="/profile" class="btn btn-sm btn-dark rounded-circle d-inline-flex d-md-none align-items-center justify-content-center border-0 p-0 shadow-sm"

MidrandBookshop/Components/Pages/Profile.razor

@@ -1,11 +1,6 @@
 @page "/profile"
-@using Microsoft.AspNetCore.Components.Authorization
-@inject NavigationManager Navigation
-@rendermode InteractiveServer
 
-<AuthorizeView>
+<div class="container py-5">
-    <Authorized>
-        <div class="container py-5">
     <h2 class="fw-bold mb-5 tracking-tight">My Account</h2>
     <div class="row g-5">
         <div class="col-md-3">
@@ -14,7 +9,7 @@
                 <button class="nav-link text-start" data-bs-toggle="pill" data-bs-target="#shipping" role="tab">Shipping Address</button>
                 <button class="nav-link text-start" data-bs-toggle="pill" data-bs-target="#profile" role="tab">Profile Settings</button>
                 <hr />
-                        <button class="nav-link text-danger text-start" @onclick="TriggerLogout">Logout</button>
+                <button class="nav-link text-danger text-start">Logout</button>
             </div>
         </div>
 
@@ -197,13 +192,7 @@
             </div>
         </div>
     </div>
-        </div>
+</div>
-    </Authorized>
-    
-    <NotAuthorized>
-        <RedirectToLogin />
-    </NotAuthorized>
-</AuthorizeView>
 
 @code {
     private bool showAddForm = false;
@@ -227,8 +216,6 @@
         new AddressItem { Id = 3, Name = "Midrand Books Warehouse", Street = "Unit 8, Corporate Park North", City = "Randjespark", PostalCode = "1683", IsBilling = false, IsShipping = true, IsPrimary = false }
     };
 
-    private void TriggerLogout() => Navigation.NavigateTo("/logout", forceLoad: true);
-
     private void DownloadInvoice(string orderId)
     {
         // Handle invoice downloading logic here

MidrandBookshop/Components/RedirectToLogin.razor

@@ -1,10 +0,0 @@
-@inject NavigationManager Navigation
-
-@code {
-    protected override void OnInitialized()
-    {
-        var returnUrl = Navigation.ToBaseRelativePath(Navigation.Uri);
-
-        Navigation.NavigateTo($"/login?redirectUri={Uri.EscapeDataString(returnUrl)}", forceLoad: true);
-    }
-}

MidrandBookshop/Components/Routes.razor

@@ -1,14 +1,7 @@
-@using Microsoft.AspNetCore.Components.Authorization
+@using MidrandBookshop.Components.Pages
-@using MidrandBookshop.Components.Pages
+<Router AppAssembly="@typeof(Program).Assembly">
-
-<CascadingAuthenticationState>
-    <Router AppAssembly="@typeof(Program).Assembly">
     <Found Context="routeData">
-            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-                <NotAuthorized>                    
-                    <RedirectToLogin />
-                </NotAuthorized>
-            </AuthorizeRouteView>
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
     <NotFound>
@@ -16,5 +9,4 @@
             <NotFound />
         </LayoutView>
     </NotFound>
-    </Router>
+</Router>
-</CascadingAuthenticationState>

MidrandBookshop/MidrandBookshop.csproj

@@ -18,13 +18,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.82.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.59.0" />
   </ItemGroup>
 
   <!-- UI -->
   <ItemGroup>
     <PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
-    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.82.0" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.59.0" />
     
     <!-- Global Usings -->
     <Using Include="Blazored.Toast.Services" />

MidrandBookshop/Program.cs

@@ -1,12 +1,9 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Mediator;
 using LiteCharms.Features.MidrandBooks.Extensions;
-using Microsoft.AspNetCore.HttpOverrides;
 using MidrandBookshop.Components;
 using static LiteCharms.Features.Extensions.Quartz;
 
-AppContext.SetSwitch("Microsoft.IdentityModel.DisableTelemetry", true);
-
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddRazorComponents()
@@ -16,7 +13,6 @@ builder.AddMonitoring();
 builder.Services.AddEndpointsApiExplorer();
 
 builder.Services.AddMediator();
-builder.Services.AddAuthentikUiSecurity(builder.Configuration);
 
 builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
 builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
@@ -26,7 +22,6 @@ builder.Services.AddQuartzSchedulerClient(MidrandShopSchedulerName, builder.Conf
 builder.Services.AddEmailServices(builder.Configuration);
 builder.Services.AddEmailServiceBus();
 
-builder.Services.AddHttpClient();
 builder.Services.AddShopServices();
 builder.Services.AddHashServices(builder.Configuration);
 builder.Services.AddMidrandShopDatabase(builder.Configuration);
@@ -34,19 +29,9 @@ builder.Services.AddMidrandShopDatabase(builder.Configuration);
 builder.Services.AddMidrandShopPostgresHealthCheck();
 builder.Services.AddMidrandShopQuartzHealthCheck();
 builder.Services.AddHealthChecksSupport(builder.Configuration);
-builder.Services.AddCascadingAuthenticationState();
-
-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);
 

MidrandBookshop/appsettings.json

@@ -1,9 +1,4 @@
 {
-  "AuthentikSettings": {
-    "Authority": "https://id.khongisa.co.za/application/o/midrand-books-uat/",
-    "MetadataEndpoint": "https://id.khongisa.co.za/application/o/midrand-books-uat/.well-known/openid-configuration",
-    "RevokationEndpoint": "https://id.khongisa.co.za/application/o/revoke/"
-  },
   "HasherSettings": {    
     "MinHashLength": 11
   },

midrandbooks-uat.yml

@@ -19,16 +19,6 @@ 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"
-  AuthentikSettings__Authority: "https://id.khongisa.co.za/application/o/midrand-books-api-uat/"
-  AuthentikSettings__MetadataEndpoint: "https://id.khongisa.co.za/application/o/midrand-books-uat/.well-known/openid-configuration"
-  AuthentikSettings__RevokationEndpoint: "https://id.khongisa.co.za/application/o/revoke/"
 ---
 apiVersion: v1
 kind: Secret
@@ -44,8 +34,6 @@ data:
   hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8=
   bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
   bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
-  authentik-clientid: Nm9oZk1lSndQNWR0YWY1RFMzZU9MY2NNSHF6WXlma1YzRTNGeE5Tbw==
-  authentik-clientsecret: TXV2a0FLQklHR3BkdEsyaFlabVU1dFRaUmNuM2FhRzhoMWhlVE1nazFYOGVwczYyMzNCS0REWGdpNXo0T01RalVzMGZEUEFmakpmVVRNN1h3ZjllMU01MTQyVGlvOXRycUdmZTM1THhPaExEUnp6N2gxSm5jVkNLYXZXUllndmQ=
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -98,16 +86,6 @@ spec:
             - configMapRef:
                 name: midrandbooks-config
           env:
-            - name: AuthentikSettings__ClientId
-              valueFrom:
-                secretKeyRef:
-                  name: midrandbooksapi-secrets
-                  key: authentik-clientid
-            - name: AuthentikSettings__ClientSecret
-              valueFrom:
-                secretKeyRef:
-                  name: midrandbooksapi-secrets
-                  key: authentik-clientsecret
             - name: BookshopS3Settings__AccessKey
               valueFrom:
                 secretKeyRef: