Merge pull request #7 from DuendeSoftware/aspnet-extensions

Use Duende.AspNetCore extensions for DPoP

src/Api/TestController.cs

@@ -1,6 +1,6 @@
-using DPoPApi;
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using IdentityModel;
 
 namespace Duende.IdentityServer.Demo
 {
@@ -10,8 +10,8 @@ public class TestController : ControllerBase
         [Authorize(AuthenticationSchemes = IdentityServerConstants.LocalApi.AuthenticationScheme)]
         public IActionResult Get()
         {
-            var scheme = Request.GetAuthorizationScheme();
-            var proofToken = Request.GetDPoPProofToken();
+            var scheme = GetAuthorizationScheme(Request);
+            var proofToken = GetDPoPProofToken(Request);
 
             var claims = User.Claims.Select(c => new { c.Type, c.Value }).ToList();
 
@@ -28,14 +28,24 @@ public IActionResult Get()
         [Authorize(AuthenticationSchemes = "dpop")]
         public IActionResult GetDPoP()
         {
-            var scheme = Request.GetAuthorizationScheme();
-            var proofToken = Request.GetDPoPProofToken();
+            var scheme = GetAuthorizationScheme(Request);
+            var proofToken = GetDPoPProofToken(Request);
 
             var claims = User.Claims.Select(c => new { c.Type, c.Value }).ToList();
             claims.Add(new { Type = "authorization_scheme", Value = scheme });
             claims.Add(new { Type = "proof_token", Value = proofToken });
 
             return new JsonResult(claims);
         }
+
+        private static string GetAuthorizationScheme(HttpRequest request)
+        {
+            return request.Headers.Authorization.FirstOrDefault()?.Split(' ', StringSplitOptions.RemoveEmptyEntries)[0];
+        }
+
+        private static string GetDPoPProofToken(HttpRequest request)
+        {
+            return request.Headers[OidcConstants.HttpHeaders.DPoP].FirstOrDefault();
+        }
     }
 }