Add null check for TokenEndpointRequest in code exchange callback

Erwinvandervalk · Erwinvandervalk · commit 4c2135ffe84e · 2026-03-03T09:07:14.000+01:00
diff --git a/access-token-management/src/AccessTokenManagement.OpenIdConnect/Internal/ConfigureOpenIdConnectOptions.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/Internal/ConfigureOpenIdConnectOptions.cs
@@ -122,9 +122,9 @@ async Task Callback(AuthorizationCodeReceivedContext context)
                 .GetClientAssertionAsync(ClientName, ct: context.HttpContext.RequestAborted)
                 .ConfigureAwait(false);
 
-            if (assertion != null)
+            if (assertion != null && context.TokenEndpointRequest != null)
             {
-                context.TokenEndpointRequest!.ClientAssertionType = assertion.Type;
+                context.TokenEndpointRequest.ClientAssertionType = assertion.Type;
                 context.TokenEndpointRequest.ClientAssertion = assertion.Value;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,9 @@ async Task Callback(AuthorizationCodeReceivedContext context)`
`122`	`122`	`.GetClientAssertionAsync(ClientName, ct: context.HttpContext.RequestAborted)`
`123`	`123`	`.ConfigureAwait(false);`
`124`	`124`
`125`		`- if (assertion != null)`
	`125`	`+ if (assertion != null && context.TokenEndpointRequest != null)`
`126`	`126`	`{`
`127`		`- context.TokenEndpointRequest!.ClientAssertionType = assertion.Type;`
	`127`	`+ context.TokenEndpointRequest.ClientAssertionType = assertion.Type;`
`128`	`128`	`context.TokenEndpointRequest.ClientAssertion = assertion.Value;`
`129`	`129`	`}`
`130`	`130`	`}`