Merge pull request 'Enabled api audience verification' (#86 ) from payments into master

Reviewed-on: #86
Enabled api audience verification
2026-06-06 23:54:13 +02:00 · 2026-06-06 23:53:19 +02:00 · 2026-06-06 21:50:48 +02:00 · 2026-06-06 21:49:32 +02:00 · 2026-06-06 16:44:52 +02:00 · 2026-06-06 16:44:22 +02:00
9 changed files with 59 additions and 68 deletions
@@ -11,7 +11,7 @@
  <!-- Quartz Scheduler-->
  <ItemGroup>
    <PackageReference Include="Bogus" Version="35.6.5" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.101">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@@ -116,8 +116,8 @@

  <!-- Amazon S3 SDK -->
  <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />

    <!-- global Usings -->
@@ -32,7 +32,7 @@
  <!-- Quartz Scheduler-->
  <ItemGroup>
    <PackageReference Include="Humanizer" Version="3.0.10" />
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.101">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@@ -136,8 +136,8 @@

  <!-- Amazon S3 SDK -->
  <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />

    <!-- global Usings -->
@@ -136,8 +136,8 @@

  <!-- Amazon S3 SDK -->
  <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />

    <!-- global Usings -->
@@ -1,6 +1,6 @@
 ### Authentik Token Request (Service Account Explicit)
-POST {{authority}}
+POST {{authority}}/connect/token
 Content-Type: application/x-www-form-urlencoded
 Accept-Encoding: identity

-grant_type={{grantType}}&client_id={{clientId}}&username={{username}}&password={{password}}&scope={{scope}}
+grant_type={{grantType}}&client_id={{clientId}}&client_secret={{clientSecret}}&scope={{scope}}
@@ -0,0 +1,9 @@
+{
+  "uat": {
+    "authority": "https://sts.security.khongisa.co.za",
+    "grantType": "client_credentials",
+    "clientId": "midrandbooks-api-scaler-uat",
+    "clientSecret": "secret_0a8dc1f99061590a52b1272db3a1871d2761c79fbd058b2a968911029e4b208a",
+    "scope": "midrandbooks-api"
+  }
+}
@@ -1,22 +0,0 @@
-namespace LiteCharms.Features.Api.Configuration;
-
-public sealed class AuthentikSettings
-{
-    public string? Authority { get; set; }
-
-    public string? IntrospectionEndpoint { get; set; }
-
-    public string? MetadataEndpoint { get; set; }
-
-    public string? RevokationEndpoint { get; set; }
-
-    public string? ClientId { get; set; }
-
-    public string? ClientSecret { get; set; }
-
-    public string? RequiredClaimName { get; set; }
-
-    public string? RequiredClaimNameValue { get; set; }
-
-    public bool RequireHttpsMetadata { get; set; }
-}
@@ -0,0 +1,12 @@
+namespace LiteCharms.Features.Api.Configuration;
+
+public sealed class LiteCharmsSettings
+{
+    public string? Authority { get; set; }
+
+    public string? ClientId { get; set; }
+
+    public string? ClientSecret { get; set; }
+
+    public string? Audience { get; set; }
+}
@@ -1,6 +1,7 @@
 using LiteCharms.Features.Abstractions;
 using LiteCharms.Features.Api;
 using LiteCharms.Features.Api.Configuration;
+using Microsoft.AspNetCore.Authentication.JwtBearer;

 namespace LiteCharms.Features.Extensions;

@@ -9,14 +10,14 @@ public static class Api
    public const string Books = nameof(Books);
    public const string Payments = nameof(Payments);

-    public static IServiceCollection AddAuthentikUiSecurity(this IServiceCollection services, IConfiguration configuration)
+    public static IServiceCollection AddLiteCharmsUiSecurity(this IServiceCollection services, IConfiguration configuration)
    {
-        var configSection = configuration.GetSection(nameof(AuthentikSettings));
+        var configSection = configuration.GetSection(nameof(LiteCharmsSettings));

-        var authOptions = new AuthentikSettings();
+        var authOptions = new LiteCharmsSettings();
        configSection.Bind(authOptions);

-        services.Configure<AuthentikSettings>(configSection);
+        services.Configure<LiteCharmsSettings>(configSection);

        services.AddAuthentication(options =>
        {
@@ -26,8 +27,7 @@ public static class Api
        .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme)
        .AddOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, options =>
        {
-            options.Authority = authOptions.Authority;
-            options.MetadataAddress = authOptions.MetadataEndpoint;
+            options.Authority = authOptions.Authority;           

            options.ClientId = authOptions.ClientId;
            options.ClientSecret = authOptions.ClientSecret;
@@ -54,37 +54,29 @@ public static class Api
        return services;
    }

-    public static IServiceCollection AddAuthentikApiSecurity(this IServiceCollection services, IConfiguration configuration)
+    public static IServiceCollection AddLiteCharmsApiSecurity(this IServiceCollection services, IConfiguration configuration)
    {
-        var configSection = configuration.GetSection(nameof(AuthentikSettings));
+        var configSection = configuration.GetSection(nameof(LiteCharmsSettings));

-        var authOptions = new AuthentikSettings();
+        var authOptions = new LiteCharmsSettings();
        configSection.Bind(authOptions);

-        services.Configure<AuthentikSettings>(configSection);
+        services.Configure<LiteCharmsSettings>(configSection);

-        services.AddAuthentication(OAuth2IntrospectionDefaults.AuthenticationScheme)
-            .AddOAuth2Introspection(OAuth2IntrospectionDefaults.AuthenticationScheme, options =>
+        services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+            .AddJwtBearer(options =>
            {
                options.Authority = authOptions.Authority;
-                options.IntrospectionEndpoint = authOptions.IntrospectionEndpoint;
-                options.ClientId = authOptions.ClientId;
-                options.ClientSecret = authOptions.ClientSecret;
-
-                options.NameClaimType = "sub";
-                options.DiscoveryPolicy.RequireHttps = authOptions.RequireHttpsMetadata;
-                options.DiscoveryPolicy.ValidateEndpoints = false;
-                options.EnableCaching = false;
+                options.Audience = authOptions.Audience;
+                options.TokenValidationParameters = new TokenValidationParameters
+                {
+                    ValidIssuer = authOptions.Authority,
+                    ValidateAudience = true,
+                    ValidateIssuer = true,
+                };
            });

-        if (!string.IsNullOrWhiteSpace(authOptions.RequiredClaimName) && !string.IsNullOrWhiteSpace(authOptions.RequiredClaimNameValue))
-        {
-            services.AddAuthorizationBuilder()
-                .AddPolicy("RequiredScope", policy =>
-                    policy.RequireClaim(authOptions.RequiredClaimName, authOptions.RequiredClaimNameValue));
-        }
-        else
-            services.AddAuthorization();
+        services.AddAuthorization();

        return services;
    }
@@ -99,7 +91,7 @@ public static class Api
            });
        });

-        app.MapGet("/logout", async (HttpContext context, IHttpClientFactory httpClientFactory, IOptions<AuthentikSettings> settings) =>
+        app.MapGet("/logout", async (HttpContext context, IHttpClientFactory httpClientFactory, IOptions<LiteCharmsSettings> settings) =>
        {
            await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);

@@ -38,10 +38,10 @@
    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="10.0.8" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />

-    <Using Include="Microsoft.AspNetCore.Authentication"/>
-    <Using Include="Microsoft.AspNetCore.Authentication.OpenIdConnect"/>
-    <Using Include="Microsoft.AspNetCore.Authentication.Cookies"/>
-    <Using Include="IdentityModel.AspNetCore.OAuth2Introspection"/>
+    <Using Include="Microsoft.AspNetCore.Authentication" />
+    <Using Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+    <Using Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Using Include="IdentityModel.AspNetCore.OAuth2Introspection" />
  </ItemGroup>

  <!-- API Versioning -->
@@ -67,7 +67,7 @@
  <!-- Quartz Scheduler-->
  <ItemGroup>    
    <PackageReference Include="Hashids.net" Version="1.7.0" />    
-    <PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
+    <PackageReference Include="Meziantou.Analyzer" Version="3.0.101">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>    
@@ -171,8 +171,8 @@
  
  <!-- Amazon S3 SDK -->
  <ItemGroup>
-    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
-    <PackageReference Include="AWSSDK.S3" Version="4.0.24" />
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
    
    <!-- global Usings -->
    <Using Include="Amazon.S3" />
Author	SHA1	Message	Date
khwezi	31254932ae	Merge pull request 'Enabled api audience verification' (#86 ) from payments into master Reviewed-on: #86	2026-06-06 23:54:13 +02:00
Khwezi Mngoma	c53434a578	Enabled api audience verification continuous-integration/drone/pr Build is passing Details	2026-06-06 23:53:19 +02:00
khwezi	5a0aae8182	Merge pull request 'Disabled audience verification on jwt tokens' (#85 ) from payments into master Reviewed-on: #85	2026-06-06 21:50:48 +02:00
Khwezi Mngoma	3f3e0dbe88	Disabled audience verification on jwt tokens continuous-integration/drone/pr Build is passing Details	2026-06-06 21:49:32 +02:00
khwezi	8d8ebffabf	Merge pull request 'Removed required scope policy, no longer needed, audience covers the intent' (#84 ) from payments into master Reviewed-on: #84	2026-06-06 16:44:52 +02:00
Khwezi Mngoma	dc4addb43a	Removed required scope policy, no longer needed, audience covers the intent continuous-integration/drone/pr Build is passing Details	2026-06-06 16:44:22 +02:00
khwezi	e2d29261da	Merge pull request 'Updated API to use LiteCharms Security' (#83 ) from payments into master Reviewed-on: #83	2026-06-06 16:27:16 +02:00
Khwezi Mngoma	5d5b59d610	Updated API to use LiteCharms Security continuous-integration/drone/pr Build is passing Details	2026-06-06 16:26:27 +02:00