Merge pull request 'Audience validation achieved' (#16) from payments into master

Reviewed-on: #16

MidrandBooksApi/MidrandBooksApi.csproj

@@ -54,13 +54,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.82.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.92.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.92.0" />
 
     <!-- Global Usings -->
     <Using Include="Blazored.Toast.Services" />

MidrandBooksApi/Program.cs

@@ -12,7 +12,7 @@ builder.Services.AddEndpoints(Assembly.GetExecutingAssembly());
 builder.Services.AddApiServices(builder.Configuration);
 
 builder.Services.AddMediator();
-builder.Services.AddAuthentikApiSecurity(builder.Configuration);
+builder.Services.AddLiteCharmsApiSecurity(builder.Configuration);
 
 builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
 builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));

MidrandBooksApi/appsettings.json

@@ -1,10 +1,7 @@
 {
-  "AuthentikSettings": {
+  "LiteCharmsSettings": { 
-    "Authority": "https://id.khongisa.co.za/application/o/midrand-books-api-uat/",
+    "Authority": "https://sts.security.khongisa.co.za",
-    "IntrospectionEndpoint": "https://id.khongisa.co.za/application/o/introspect/",
+    "Audience": "midrandbooks-api"
-    "RequiredClaimName": "scope",
-    "RequiredClaimNameValue": "openid",
-    "RequireHttpsMetadata": true
   },
   "ValidPayfastHosts": [
     "www.payfast.co.za",

midrandbooksapi-uat.yml

@@ -26,11 +26,8 @@ data:
   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/"
+  LiteCharmsSettings__Authority: "https://sts.security.khongisa.co.za"
-  AuthentikSettings__IntrospectionEndpoint: "https://id.khongisa.co.za/application/o/introspect/"
+  LiteCharmsSettings__Audience: "midrandbooks-api"
-  AuthentikSettings__RequiredClaimName: "scope"
-  AuthentikSettings__RequiredClaimNameValue: "openid"
-  AuthentikSettings__RequireHttpsMetadata: "true"
 ---
 apiVersion: v1
 kind: Secret
@@ -46,8 +43,8 @@ data:
   hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8=
   bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
   bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
-  authentik-clientid: aTZ5Z3I4NEhsbmh4RllxTEpWSjJIaGRsVnJPWUU0UG51clQ1Y1BRVw==
+  litecharms-clientid: bWlkcmFuZGJvb2tzLWFwaQ==
-  authentik-clientsecret: dHZQVU0zVnFmazJzcmE5OXM5bE4zWWxpMHlsYUdUNnZiUUJxZkg3S3ZTSWJUZUo2ZFpHQjEyTlc0TXhxRERXSmV4UDd2WGZqVEFadFIzajNpdkQ2Y1RKcjV4UTlTNHJwRm5TZlk0Rmk2OVJOd1J2S0hqOGhWcmQzd29icTZPREc=
+  litecharms-clientsecret: c2VjcmV0X2YzZjA0YWNhYTMzNmVlOTEzZDRjNjdlYmQwOTE1ZWFlYzQ0NzdmYTkwOTdlYTJhYzkyZGE4ZDc0NjgzZTAyNTU=
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -100,16 +97,16 @@ spec:
             - configMapRef:
                 name: midrandbooksapi-config
           env:
-            - name: AuthentikSettings__ClientId
+            - name: LiteCharmsSettings__ClientId
               valueFrom:
                 secretKeyRef:
                   name: midrandbooksapi-secrets
-                  key: authentik-clientid
+                  key: litecharms-clientid
-            - name: AuthentikSettings__ClientSecret
+            - name: LiteCharmsSettings__ClientSecret
               valueFrom:
                 secretKeyRef:
                   name: midrandbooksapi-secrets
-                  key: authentik-clientsecret
+                  key: litecharms-clientsecret
             - name: BookshopS3Settings__AccessKey
               valueFrom:
                 secretKeyRef: