Merge pull request 'Passing token hint during signout' (#92 ) from payments into master

Reviewed-on: #92
Passing token hint during signout
2026-06-07 14:09:31 +02:00 · 2026-06-07 14:09:02 +02:00 · 2026-06-07 13:57:15 +02:00 · 2026-06-07 13:56:49 +02:00 · 2026-06-07 13:55:20 +02:00 · 2026-06-07 13:12:05 +02:00
7 changed files with 49 additions and 48 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 -->
@@ -2,8 +2,8 @@
  "uat": {
    "authority": "https://sts.security.khongisa.co.za",
    "grantType": "client_credentials",
-    "clientId": "midrandbooks-api-uat",
-    "clientSecret": "secret_5a36d0024980544c875447a4b052938becc3fbbb10b8b2c097310c1a53ba3c0a",
+    "clientId": "midrandbooks-api-scaler-uat",
+    "clientSecret": "secret_0a8dc1f99061590a52b1272db3a1871d2761c79fbd058b2a968911029e4b208a",
    "scope": "midrandbooks-api"
  }
 }
@@ -9,8 +9,4 @@ public sealed class LiteCharmsSettings
    public string? ClientSecret { get; set; }

    public string? Audience { get; set; }
-
-    public string? RequiredClaimName { get; set; }
-
-    public string? RequiredClaimNameValue { get; set; }
 }
@@ -10,7 +10,7 @@ public static class Api
    public const string Books = nameof(Books);
    public const string Payments = nameof(Payments);

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

@@ -27,13 +27,12 @@ public static class Api
        .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme)
        .AddOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, options =>
        {
-            options.Authority = authOptions.Authority;           
+            options.Authority = authOptions.Authority;

            options.ClientId = authOptions.ClientId;
            options.ClientSecret = authOptions.ClientSecret;
-            options.SignedOutCallbackPath = "/signout-callback-oidc";
-
            options.ResponseType = "code";
+
            options.SaveTokens = true;
            options.GetClaimsFromUserInfoEndpoint = true;

@@ -42,15 +41,27 @@ public static class Api
            options.Scope.Add("profile");
            options.Scope.Add("email");

-            options.CorrelationCookie.SecurePolicy = CookieSecurePolicy.Always;
-            options.CorrelationCookie.SameSite = SameSiteMode.None;
-            options.CorrelationCookie.HttpOnly = true;
+            options.Events = new OpenIdConnectEvents
+            {
+                OnRedirectToIdentityProviderForSignOut = context =>
+                {
+                    var idToken = context.ProtocolMessage.IdTokenHint;

-            options.NonceCookie.SecurePolicy = CookieSecurePolicy.Always;
-            options.NonceCookie.SameSite = SameSiteMode.None;
-            options.NonceCookie.HttpOnly = true;
+                    if (string.IsNullOrEmpty(idToken))
+                    {
+                        var tokens = context.Properties.GetTokens();
+                        var idTokenItem = tokens.FirstOrDefault(t => string.Equals(t.Name, "id_token", StringComparison.Ordinal));
+
+                        if (idTokenItem != null) context.ProtocolMessage.IdTokenHint = idTokenItem.Value;
+                    }
+
+                    return Task.CompletedTask;
+                },
+            };
        });

+        services.AddCascadingAuthenticationState();
+
        return services;
    }

@@ -76,14 +87,7 @@ public static class Api
                };
            });

-        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;
    }
@@ -94,20 +98,21 @@ public static class Api
        {
            await context.ChallengeAsync(OpenIdConnectDefaults.AuthenticationScheme, new AuthenticationProperties
            {
-                RedirectUri = redirectUri,                
+                RedirectUri = redirectUri,
            });
        });

-        app.MapGet("/logout", async (HttpContext context, IHttpClientFactory httpClientFactory, IOptions<LiteCharmsSettings> settings) =>
+        app.MapGet("/logout", async (HttpContext context) =>
        {
+            var idToken = await context.GetTokenAsync("id_token");
+
+            var authProperties = new AuthenticationProperties { RedirectUri = "/", };
+
+            if (!string.IsNullOrEmpty(idToken)) 
+                authProperties.Parameters.Add("id_token_hint", idToken);
+
+            await context.SignOutAsync(OpenIdConnectDefaults.AuthenticationScheme, authProperties);
            await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-
-            string currentBaseUrl = $"https://{context.Request.Host}{context.Request.PathBase}/";
-
-            await context.SignOutAsync(OpenIdConnectDefaults.AuthenticationScheme, new AuthenticationProperties
-            {
-                RedirectUri = currentBaseUrl
-            });
        });

        return app;
@@ -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	5140da2c6c	Merge pull request 'Passing token hint during signout' (#92 ) from payments into master Reviewed-on: #92	2026-06-07 14:09:31 +02:00
Khwezi Mngoma	02ff14ccc8	Passing token hint during signout continuous-integration/drone/pr Build is passing Details	2026-06-07 14:09:02 +02:00
khwezi	0ad410c64e	Merge pull request 'payments' (#91 ) from payments into master Reviewed-on: #91	2026-06-07 13:57:15 +02:00
Khwezi Mngoma	e193aa7c1c	Adopted standard logout flow continuous-integration/drone/pr Build is running Details	2026-06-07 13:56:49 +02:00
Khwezi Mngoma	840d4568e2	Refactored logout process	2026-06-07 13:55:20 +02:00
khwezi	6e580ecdf6	Merge pull request 'Added token hint to logout event' (#90 ) from payments into master Reviewed-on: #90	2026-06-07 13:12:05 +02:00
Khwezi Mngoma	60095057b7	Added token hint to logout event continuous-integration/drone/pr Build is passing Details	2026-06-07 13:11:33 +02:00
khwezi	4c194c1141	Merge pull request 'Added AddSecurityEndpoints login endpoint' (#89 ) from payments into master Reviewed-on: #89	2026-06-07 12:00:50 +02:00
Khwezi Mngoma	b41136e2c7	Added AddSecurityEndpoints login endpoint continuous-integration/drone/pr Build is passing Details	2026-06-07 12:00:07 +02:00
khwezi	41eb4daeb4	Merge pull request 'Refactored AddSecurityEndpoints' (#88 ) from payments into master Reviewed-on: #88	2026-06-07 11:09:02 +02:00
Khwezi Mngoma	c423f04b42	Refactored AddSecurityEndpoints continuous-integration/drone/pr Build is passing Details	2026-06-07 11:08:05 +02:00
khwezi	7fe5f7aef3	Merge pull request 'Refactored client auth method' (#87 ) from payments into master Reviewed-on: #87	2026-06-07 10:33:33 +02:00
Khwezi Mngoma	a567fc7cd7	Refactored client auth method continuous-integration/drone/pr Build is passing Details	2026-06-07 10:30:56 +02:00
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