DuendeSoftware · brockallen · Jan 17, 2024 · Nov 20, 2023 · Jan 16, 2024 · Jan 16, 2024
diff --git a/IdentityServer/v7/BFF/BlazorWasm/Client/BlazorWasm.Client.csproj b/IdentityServer/v7/BFF/BlazorWasm/Client/BlazorWasm.Client.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.1" />
 
     </ItemGroup>
 

diff --git a/IdentityServer/v7/BFF/BlazorWasm/Server/BlazorWasm.Server.csproj b/IdentityServer/v7/BFF/BlazorWasm/Server/BlazorWasm.Server.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
 
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
-    <PackageReference Include="Duende.BFF" Version="1.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.1" />
+    <PackageReference Include="Duende.BFF" Version="2.2.0" />
 
   </ItemGroup>
 

diff --git a/IdentityServer/v7/BFF/BlazorWasm/Shared/BlazorWasm.Shared.csproj b/IdentityServer/v7/BFF/BlazorWasm/Shared/BlazorWasm.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/IdentityServer/v7/BFF/DPoP/.vscode/launch.json b/IdentityServer/v7/BFF/DPoP/.vscode/launch.json
@@ -17,7 +17,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-api",
-            "program": "${workspaceFolder}/DPoP.Api/bin/Debug/net6.0/DPoP.Api.dll",
+            "program": "${workspaceFolder}/DPoP.Api/bin/Debug/net8.0/DPoP.Api.dll",
             "args": [],
             "cwd": "${workspaceFolder}/DPoP.Api",
             "env": {
@@ -30,7 +30,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-bff",
-            "program": "${workspaceFolder}/DPoP.Bff/bin/Debug/net6.0/DPoP.Bff.dll",
+            "program": "${workspaceFolder}/DPoP.Bff/bin/Debug/net8.0/DPoP.Bff.dll",
             "args": [],
             "cwd": "${workspaceFolder}/DPoP.Bff",
             "env": {

diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP.Api.csproj b/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP.Api.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="IdentityModel" version="6.1.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.9" />
-        <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+        <PackageReference Include="IdentityModel" version="6.2.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
     </ItemGroup>
 </Project>
diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP/DPoPJwtBearerEvents.cs b/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP/DPoPJwtBearerEvents.cs
@@ -1,5 +1,6 @@
 using IdentityModel;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
 using System.Text;
@@ -130,7 +131,7 @@ public override Task Challenge(JwtBearerChallengeContext context)
             }
         }
 
-        context.Response.Headers.Add(HeaderNames.WWWAuthenticate, sb.ToString());
+        context.Response.Headers.Append(HeaderNames.WWWAuthenticate, sb.ToString());
 
 
         if (context.HttpContext.Items.ContainsKey("DPoP-Nonce"))

diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP/DPoPProofValidator.cs b/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP/DPoPProofValidator.cs
@@ -130,7 +130,7 @@ protected virtual Task ValidateHeaderAsync(DPoPProofValidatonContext context, DP
             return Task.CompletedTask;
         }
 
-        if (!token.TryGetHeaderValue<IDictionary<string, object>>(JwtClaimTypes.JsonWebKey, out var jwkValues))
+        if (!token.TryGetHeaderValue<JsonElement>(JwtClaimTypes.JsonWebKey, out var jwkValues))
         {
             result.IsError = true;
             result.ErrorDescription = "Invalid 'jwk' value.";
@@ -169,7 +169,7 @@ protected virtual Task ValidateHeaderAsync(DPoPProofValidatonContext context, DP
     /// <summary>
     /// Validates the signature.
     /// </summary>
-    protected virtual Task ValidateSignatureAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
+    protected virtual async Task ValidateSignatureAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
     {
         TokenValidationResult tokenValidationResult;
 
@@ -185,27 +185,25 @@ protected virtual Task ValidateSignatureAsync(DPoPProofValidatonContext context,
             };
 
             var handler = new JsonWebTokenHandler();
-            tokenValidationResult = handler.ValidateToken(context.ProofToken, tvp);
+            tokenValidationResult = await handler.ValidateTokenAsync(context.ProofToken, tvp);
         }
         catch (Exception ex)
         {
             Logger.LogDebug("Error parsing DPoP token: {error}", ex.Message);
             result.IsError = true;
             result.ErrorDescription = "Invalid signature on DPoP token.";
-            return Task.CompletedTask;
+            return;
         }
 
         if (tokenValidationResult.Exception != null)
         {
             Logger.LogDebug("Error parsing DPoP token: {error}", tokenValidationResult.Exception.Message);
             result.IsError = true;
             result.ErrorDescription = "Invalid signature on DPoP token.";
-            return Task.CompletedTask;
+            return;
         }
 
         result.Payload = tokenValidationResult.Claims;
-
-        return Task.CompletedTask;
     }
 
     /// <summary>

diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/DPoP.Bff.csproj b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/DPoP.Bff.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Host6</RootNamespace>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.9" />    
-        <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
-        <PackageReference Include="Duende.Bff.Yarp" Version="2.1.0-preview.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.1" />    
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+        <PackageReference Include="Duende.Bff.Yarp" Version="2.2.0" />
     </ItemGroup>
 </Project>
diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs
@@ -204,7 +204,6 @@ private static void MapRemoteUrls(IEndpointRouteBuilder endpoints)
 
         // On this path, we require the user token
         endpoints.MapRemoteBffApiEndpoint("/api/user-token", "https://localhost:6001")
-        .WithUserAccessTokenParameter(new BffUserAccessTokenParameters(resource: "urn:example-api"))
             .RequireAccessToken(TokenType.User);
     }
 }
diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/wwwroot/index.html b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/wwwroot/index.html
@@ -11,7 +11,7 @@
 <body>
     <div class="container">
         <header class="page-header">
-            <h1>SPA (.NET 6 host)</h1>
+            <h1>SPA with BFF using DPoP</h1>
         </header>
 
         <div class="row">

diff --git a/IdentityServer/v7/BFF/JsBffSample/.vscode/launch.json b/IdentityServer/v7/BFF/JsBffSample/.vscode/launch.json
@@ -0,0 +1,46 @@
+{
+    "version": "0.2.0",
+    "compounds": [
+        {
+            "name": "Run All",
+            "configurations": ["BFF", "API"],
+            "presentation": {
+                "hidden": false,
+                "group": "",
+                "order": 1
+            }
+        }
+    ],
+    "configurations": [
+        {
+            "name": "API",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-api",
+            "program": "${workspaceFolder}/BackendApiHost/bin/Debug/net8.0/BackendApiHost.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/BackendApiHost",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "console": "externalTerminal",
+        },
+        {
+            "name": "BFF",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-bff",
+            "program": "${workspaceFolder}/FrontendHost/bin/Debug/net8.0/FrontendHost.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/FrontendHost",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "console": "externalTerminal",
+        }
+    ]
+}
diff --git a/IdentityServer/v7/BFF/JsBffSample/.vscode/tasks.json b/IdentityServer/v7/BFF/JsBffSample/.vscode/tasks.json
@@ -0,0 +1,43 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "label": "build",
+        "type": "process",
+        "command": "dotnet",
+        "args": [
+            "build",
+            "${workspaceFolder}/JsBffSample.sln",
+            "/property:GenerateFullPaths=true",
+            "/consoleloggerparameters:NoSummary"
+        ],
+        "problemMatcher": "$msCompile"
+      },
+      {
+        "label": "build-api",
+        "type": "process",
+        "command": "dotnet",
+        "args": [
+            "build",
+            "${workspaceFolder}\\BackendApiHost\\BackendApiHost.csproj",
+            "/property:GenerateFullPaths=true",
+            "/consoleloggerparameters:NoSummary"
+        ],
+        "problemMatcher": "$msCompile"
+      },
+      {
+        "label": "build-bff",
+        "type": "process",
+        "command": "dotnet",
+        "args": [
+            "build",
+            "${workspaceFolder}\\FrontendHost\\FrontendHost.csproj",
+
+            "/property:GenerateFullPaths=true",
+            "/consoleloggerparameters:NoSummary"
+        ],
+        "problemMatcher": "$msCompile"
+      }
+    ]
+
+}
diff --git a/IdentityServer/v7/BFF/JsBffSample/BackendApiHost/BackendApiHost.csproj b/IdentityServer/v7/BFF/JsBffSample/BackendApiHost/BackendApiHost.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/IdentityServer/v7/BFF/JsBffSample/FrontendHost/FrontendHost.csproj b/IdentityServer/v7/BFF/JsBffSample/FrontendHost/FrontendHost.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Duende.BFF" Version="1.1.0" />
-    <PackageReference Include="Duende.BFF.Yarp" Version="1.1.0" />
+    <PackageReference Include="Duende.BFF" Version="2.2.0" />
+    <PackageReference Include="Duende.BFF.Yarp" Version="2.2.0" />
 
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/IdentityServer/v7/BFF/JsBffSample/FrontendHost/Startup.cs b/IdentityServer/v7/BFF/JsBffSample/FrontendHost/Startup.cs
@@ -73,7 +73,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapBffManagementEndpoints();
-                
+
                 // if you want the TODOs API local
                 endpoints.MapControllers()
                     .RequireAuthorization()

diff --git a/IdentityServer/v7/BFF/JsBffSample/FrontendHost/wwwroot/StyleSheet.css b/IdentityServer/v7/BFF/JsBffSample/FrontendHost/wwwroot/StyleSheet.css
@@ -39,4 +39,12 @@ pre:empty {
 }
 .buttons{
     float:right;
+}
+
+table#session-info {
+    table-layout: fixed;
+}
+
+table#session-info td {
+    overflow: clip;
 }
diff --git a/IdentityServer/v7/BFF/JsBffSample/FrontendHost/wwwroot/index.html b/IdentityServer/v7/BFF/JsBffSample/FrontendHost/wwwroot/index.html
@@ -68,7 +68,7 @@ <h3>Add New</h3>
                         <h2 class="modal-title">Session Claims</h2>
                     </div>
                     <div class="modal-body">
-                        <table class="table table-sm table-striped">
+                        <table id="session-info" class="table table-sm table-striped">
                             <thead>
                                 <tr>
                                     <th>Claim Type</th>

diff --git a/IdentityServer/v7/BFF/JsBffYarpSample/.vscode/launch.json b/IdentityServer/v7/BFF/JsBffYarpSample/.vscode/launch.json
@@ -0,0 +1,46 @@
+{
+    "version": "0.2.0",
+    "compounds": [
+        {
+            "name": "Run All",
+            "configurations": ["BFF", "API"],
+            "presentation": {
+                "hidden": false,
+                "group": "",
+                "order": 1
+            }
+        }
+    ],
+    "configurations": [
+        {
+            "name": "API",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-api",
+            "program": "${workspaceFolder}/BackendApiHost/bin/Debug/net8.0/BackendApiHost.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/BackendApiHost",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "console": "externalTerminal",
+        },
+        {
+            "name": "BFF",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-bff",
+            "program": "${workspaceFolder}/FrontendHost/bin/Debug/net8.0/FrontendHost.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/FrontendHost",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "console": "externalTerminal",
+        }
+    ]
+}