Add extensions methods for configuring DPoP

Author: leastprivilege

clients/ConsoleClientWithBrowserAndDPoP/Program.cs

@@ -38,9 +38,6 @@ private static async Task SignIn()
 
             var proofKey = GetProofKey();
 
-            var tokenDpopHandler = new ProofTokenMessageHandler(proofKey, new SocketsHttpHandler());
-            var apiDpopHandler = new ProofTokenMessageHandler(proofKey, new SocketsHttpHandler());
-
             var options = new OidcClientOptions
             {
                 Authority = Authority,
@@ -49,11 +46,10 @@ private static async Task SignIn()
                 Scope = "openid profile api offline_access",
                 FilterClaims = false,
                 Browser = browser,
-                
-                BackchannelHandler = tokenDpopHandler,
-                RefreshTokenInnerHttpHandler = apiDpopHandler
             };
 
+            options.ConfigureDPoP(proofKey); 
+            
             var serilog = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .Enrich.FromLogContext()
@@ -68,13 +64,7 @@ private static async Task SignIn()
             if (File.Exists("refresh_token"))
             {
                 var refreshToken = File.ReadAllText("refresh_token");
-
-                var handler = new RefreshTokenDelegatingHandler(
-                    _oidcClient, 
-                    null, 
-                    refreshToken, 
-                    "DPoP",
-                    apiDpopHandler);
+                var handler = _oidcClient.CreateDPoPHandler(proofKey, refreshToken);
 
                 _apiClient = new HttpClient(handler)
                 {

src/DPoP/DPoP.csproj

@@ -47,4 +47,8 @@
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\OidcClient\OidcClient.csproj" />
+    </ItemGroup>
+
 </Project>

src/DPoP/OidcClientExtensions.cs

@@ -0,0 +1,35 @@
+using System.Net.Http;
+
+namespace IdentityModel.OidcClient.DPoP;
+
+public static class OidcClientExtensions
+{
+    public static void ConfigureDPoP(this OidcClientOptions options, 
+        string proofKey,
+        HttpMessageHandler? tokenEndpointInnerHandler = null,
+        HttpMessageHandler? apiInnerHandler = null)
+    {
+        var tokenDpopHandler = new ProofTokenMessageHandler(proofKey, tokenEndpointInnerHandler ?? new HttpClientHandler());
+        var apiDpopHandler = new ProofTokenMessageHandler(proofKey, apiInnerHandler ?? new HttpClientHandler());
+        
+        options.BackchannelHandler = tokenDpopHandler;
+        options.RefreshTokenInnerHttpHandler = apiDpopHandler;
+    }
+
+    public static HttpMessageHandler CreateDPoPHandler(this OidcClient client, 
+        string proofKey, 
+        string refreshToken, 
+        HttpMessageHandler? apiInnerHandler = null)
+    {
+        var apiDpopHandler = new ProofTokenMessageHandler(proofKey, apiInnerHandler ?? new HttpClientHandler());
+        
+        var handler = new RefreshTokenDelegatingHandler(
+            client, 
+            null, 
+            refreshToken, 
+            "DPoP",
+            apiDpopHandler);
+
+        return handler;
+    }
+}