From 7386f071c5c2d9464ac30edf36a4d61fa880f010 Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Mon, 20 Nov 2023 10:41:45 -0600 Subject: [PATCH 1/9] Update BFF/TokenExchange to .NET 8 --- IdentityServer/v7/BFF/TokenExchange/.vscode/launch.json | 6 +++--- .../TokenExchange.Api/TokenExchange.Api.csproj | 8 ++++---- .../TokenExchange.Bff/TokenExchange.Bff.csproj | 8 ++++---- .../TokenExchange.IdentityServer.csproj | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/IdentityServer/v7/BFF/TokenExchange/.vscode/launch.json b/IdentityServer/v7/BFF/TokenExchange/.vscode/launch.json index 7b39ed0a..554ff3d5 100644 --- a/IdentityServer/v7/BFF/TokenExchange/.vscode/launch.json +++ b/IdentityServer/v7/BFF/TokenExchange/.vscode/launch.json @@ -16,7 +16,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build-identityserver", - "program": "${workspaceFolder}/TokenExchange.IdentityServer/bin/Debug/net6.0/TokenExchange.IdentityServer.dll", + "program": "${workspaceFolder}/TokenExchange.IdentityServer/bin/Debug/net8.0/TokenExchange.IdentityServer.dll", "args": [], "cwd": "${workspaceFolder}/TokenExchange.IdentityServer", "env": { @@ -29,7 +29,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build-api", - "program": "${workspaceFolder}/TokenExchange.Api/bin/Debug/net6.0/TokenExchange.Api.dll", + "program": "${workspaceFolder}/TokenExchange.Api/bin/Debug/net8.0/TokenExchange.Api.dll", "args": [], "cwd": "${workspaceFolder}/TokenExchange.Api", "env": { @@ -42,7 +42,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build-bff", - "program": "${workspaceFolder}/TokenExchange.Bff/bin/Debug/net6.0/TokenExchange.Bff.dll", + "program": "${workspaceFolder}/TokenExchange.Bff/bin/Debug/net8.0/TokenExchange.Bff.dll", "args": [], "cwd": "${workspaceFolder}/TokenExchange.Bff", "env": { diff --git a/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Api/TokenExchange.Api.csproj b/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Api/TokenExchange.Api.csproj index 0df1fc8f..150e3691 100644 --- a/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Api/TokenExchange.Api.csproj +++ b/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Api/TokenExchange.Api.csproj @@ -1,12 +1,12 @@ - net6.0 + net8.0 - - - + + + diff --git a/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Bff/TokenExchange.Bff.csproj b/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Bff/TokenExchange.Bff.csproj index 02c5913e..6f61d3d7 100644 --- a/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Bff/TokenExchange.Bff.csproj +++ b/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Bff/TokenExchange.Bff.csproj @@ -1,15 +1,15 @@ - net6.0 + net8.0 Host6 enable - - - + + + diff --git a/IdentityServer/v7/BFF/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj b/IdentityServer/v7/BFF/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj index 67d1ca34..1d20deb5 100644 --- a/IdentityServer/v7/BFF/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj +++ b/IdentityServer/v7/BFF/TokenExchange/TokenExchange.IdentityServer/TokenExchange.IdentityServer.csproj @@ -1,13 +1,13 @@  - net6.0 + net8.0 true - - + + \ No newline at end of file From 15eeae2245b10edc7590c7d607962282276264ab Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Tue, 16 Jan 2024 10:38:08 -0600 Subject: [PATCH 2/9] Update BFF/JsBff to .NET 8 --- .../v7/BFF/JsBffSample/.vscode/launch.json | 46 +++++++++++++++++++ .../v7/BFF/JsBffSample/.vscode/tasks.json | 43 +++++++++++++++++ .../BackendApiHost/BackendApiHost.csproj | 4 +- .../FrontendHost/FrontendHost.csproj | 8 ++-- .../BFF/JsBffSample/FrontendHost/Startup.cs | 2 +- .../FrontendHost/wwwroot/StyleSheet.css | 8 ++++ .../FrontendHost/wwwroot/index.html | 2 +- 7 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 IdentityServer/v7/BFF/JsBffSample/.vscode/launch.json create mode 100644 IdentityServer/v7/BFF/JsBffSample/.vscode/tasks.json diff --git a/IdentityServer/v7/BFF/JsBffSample/.vscode/launch.json b/IdentityServer/v7/BFF/JsBffSample/.vscode/launch.json new file mode 100644 index 00000000..1c88912c --- /dev/null +++ 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", + } + ] +} \ No newline at end of file diff --git a/IdentityServer/v7/BFF/JsBffSample/.vscode/tasks.json b/IdentityServer/v7/BFF/JsBffSample/.vscode/tasks.json new file mode 100644 index 00000000..76fc570f --- /dev/null +++ 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" + } + ] + +} \ No newline at end of file diff --git a/IdentityServer/v7/BFF/JsBffSample/BackendApiHost/BackendApiHost.csproj b/IdentityServer/v7/BFF/JsBffSample/BackendApiHost/BackendApiHost.csproj index caaa4d17..d9ea4a9d 100755 --- a/IdentityServer/v7/BFF/JsBffSample/BackendApiHost/BackendApiHost.csproj +++ b/IdentityServer/v7/BFF/JsBffSample/BackendApiHost/BackendApiHost.csproj @@ -1,11 +1,11 @@ - net6.0 + net8.0 - + diff --git a/IdentityServer/v7/BFF/JsBffSample/FrontendHost/FrontendHost.csproj b/IdentityServer/v7/BFF/JsBffSample/FrontendHost/FrontendHost.csproj index 0384adfb..ec29ea05 100755 --- a/IdentityServer/v7/BFF/JsBffSample/FrontendHost/FrontendHost.csproj +++ b/IdentityServer/v7/BFF/JsBffSample/FrontendHost/FrontendHost.csproj @@ -1,14 +1,14 @@  - net6.0 + net8.0 - - + + - + diff --git a/IdentityServer/v7/BFF/JsBffSample/FrontendHost/Startup.cs b/IdentityServer/v7/BFF/JsBffSample/FrontendHost/Startup.cs index ee9b127b..91ae1953 100755 --- 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 index 70d4ba6a..e03c74af 100755 --- 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; } \ No newline at end of file diff --git a/IdentityServer/v7/BFF/JsBffSample/FrontendHost/wwwroot/index.html b/IdentityServer/v7/BFF/JsBffSample/FrontendHost/wwwroot/index.html index 4a823baf..d51ea3f5 100755 --- a/IdentityServer/v7/BFF/JsBffSample/FrontendHost/wwwroot/index.html +++ b/IdentityServer/v7/BFF/JsBffSample/FrontendHost/wwwroot/index.html @@ -68,7 +68,7 @@

Add New

Session Claims

- +
From 1a2afbc36dee39fefaf6a28941fa88d113f9e051 Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Tue, 16 Jan 2024 10:38:28 -0600 Subject: [PATCH 3/9] Update READMEs to v7 --- IdentityServer/v7/README.md | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/IdentityServer/v7/README.md b/IdentityServer/v7/README.md index e40a88b3..233917da 100755 --- a/IdentityServer/v7/README.md +++ b/IdentityServer/v7/README.md @@ -1,3 +1,3 @@ -# Samples for Duende IdentityServer v6.x +# Samples for Duende IdentityServer v7.x -See [here](https://docs.duendesoftware.com/identityserver/v6/samples) for an overview and descriptions \ No newline at end of file +See [here](https://docs.duendesoftware.com/identityserver/v7/samples) for an overview and descriptions \ No newline at end of file diff --git a/README.md b/README.md index 25f8b9c5..9700d767 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Samples for our Products -Descriptions of the samples are available on our [documentation site](https://docs.duendesoftware.com/identityserver/v6/samples/). +Descriptions of the samples are available on our [documentation site](https://docs.duendesoftware.com/identityserver/v7/samples/). From 96d10669146f5dc656fc8e1ce4bb915c4158b605 Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Wed, 17 Jan 2024 12:04:35 -0600 Subject: [PATCH 4/9] Update BFF/JsBffYarp to .NET 8 --- .../BFF/JsBffYarpSample/.vscode/launch.json | 46 +++++++++++++++++++ .../v7/BFF/JsBffYarpSample/.vscode/tasks.json | 43 +++++++++++++++++ .../BackendApiHost/BackendApiHost.csproj | 4 +- .../FrontendHost/FrontendHost.csproj | 8 ++-- .../FrontendHost/wwwroot/StyleSheet.css | 8 ++++ .../FrontendHost/wwwroot/index.html | 2 +- 6 files changed, 104 insertions(+), 7 deletions(-) create mode 100644 IdentityServer/v7/BFF/JsBffYarpSample/.vscode/launch.json create mode 100644 IdentityServer/v7/BFF/JsBffYarpSample/.vscode/tasks.json diff --git a/IdentityServer/v7/BFF/JsBffYarpSample/.vscode/launch.json b/IdentityServer/v7/BFF/JsBffYarpSample/.vscode/launch.json new file mode 100644 index 00000000..1c88912c --- /dev/null +++ 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", + } + ] +} \ No newline at end of file diff --git a/IdentityServer/v7/BFF/JsBffYarpSample/.vscode/tasks.json b/IdentityServer/v7/BFF/JsBffYarpSample/.vscode/tasks.json new file mode 100644 index 00000000..a9383a7d --- /dev/null +++ b/IdentityServer/v7/BFF/JsBffYarpSample/.vscode/tasks.json @@ -0,0 +1,43 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/JsBffYarpSample.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" + } + ] + +} \ No newline at end of file diff --git a/IdentityServer/v7/BFF/JsBffYarpSample/BackendApiHost/BackendApiHost.csproj b/IdentityServer/v7/BFF/JsBffYarpSample/BackendApiHost/BackendApiHost.csproj index caaa4d17..d9ea4a9d 100755 --- a/IdentityServer/v7/BFF/JsBffYarpSample/BackendApiHost/BackendApiHost.csproj +++ b/IdentityServer/v7/BFF/JsBffYarpSample/BackendApiHost/BackendApiHost.csproj @@ -1,11 +1,11 @@ - net6.0 + net8.0 - + diff --git a/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/FrontendHost.csproj b/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/FrontendHost.csproj index 0384adfb..ec29ea05 100755 --- a/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/FrontendHost.csproj +++ b/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/FrontendHost.csproj @@ -1,14 +1,14 @@  - net6.0 + net8.0 - - + + - + diff --git a/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/wwwroot/StyleSheet.css b/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/wwwroot/StyleSheet.css index 70d4ba6a..e03c74af 100755 --- a/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/wwwroot/StyleSheet.css +++ b/IdentityServer/v7/BFF/JsBffYarpSample/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; } \ No newline at end of file diff --git a/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/wwwroot/index.html b/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/wwwroot/index.html index 4a823baf..d51ea3f5 100755 --- a/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/wwwroot/index.html +++ b/IdentityServer/v7/BFF/JsBffYarpSample/FrontendHost/wwwroot/index.html @@ -68,7 +68,7 @@

Add New

Session Claims

-
Claim Type
+
From 05422ed00faf2f29fc8a456412f5d2ff816fa643 Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Wed, 17 Jan 2024 12:16:15 -0600 Subject: [PATCH 5/9] Update BFF/SplitHosts to .NET 8 --- .../v7/BFF/SplitHosts/.vscode/launch.json | 59 +++++++++++++++++++ .../v7/BFF/SplitHosts/.vscode/tasks.json | 56 ++++++++++++++++++ .../BackendApiHost/BackendApiHost.csproj | 4 +- .../SplitHosts/BackendHost/BackendHost.csproj | 8 +-- .../SplitHosts/BackendHost/ToDoController.cs | 6 +- .../FrontendHost/FrontendHost.csproj | 2 +- .../FrontendHost/wwwroot/StyleSheet.css | 7 +++ .../FrontendHost/wwwroot/index.html | 2 +- .../{JsBffSample.sln => SplitHosts.sln} | 0 9 files changed, 133 insertions(+), 11 deletions(-) create mode 100644 IdentityServer/v7/BFF/SplitHosts/.vscode/launch.json create mode 100644 IdentityServer/v7/BFF/SplitHosts/.vscode/tasks.json rename IdentityServer/v7/BFF/SplitHosts/{JsBffSample.sln => SplitHosts.sln} (100%) diff --git a/IdentityServer/v7/BFF/SplitHosts/.vscode/launch.json b/IdentityServer/v7/BFF/SplitHosts/.vscode/launch.json new file mode 100644 index 00000000..129b5934 --- /dev/null +++ b/IdentityServer/v7/BFF/SplitHosts/.vscode/launch.json @@ -0,0 +1,59 @@ +{ + "version": "0.2.0", + "compounds": [ + { + "name": "Run All", + "configurations": ["Frontend", "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}/BackendHost/bin/Debug/net8.0/BackendHost.dll", + "args": [], + "cwd": "${workspaceFolder}/BackendHost", + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "console": "externalTerminal", + }, + { + "name": "Frontend", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-frontend", + "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", + }, + ] +} \ No newline at end of file diff --git a/IdentityServer/v7/BFF/SplitHosts/.vscode/tasks.json b/IdentityServer/v7/BFF/SplitHosts/.vscode/tasks.json new file mode 100644 index 00000000..b2f30a0a --- /dev/null +++ b/IdentityServer/v7/BFF/SplitHosts/.vscode/tasks.json @@ -0,0 +1,56 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}/SplitHosts.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}\\BackendHost\\BackendHost.csproj", + + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "build-frontend", + "type": "process", + "command": "dotnet", + "args": [ + "build", + "${workspaceFolder}\\FrontendHost\\FrontendHost.csproj", + + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + } + ] + +} \ No newline at end of file diff --git a/IdentityServer/v7/BFF/SplitHosts/BackendApiHost/BackendApiHost.csproj b/IdentityServer/v7/BFF/SplitHosts/BackendApiHost/BackendApiHost.csproj index caaa4d17..d9ea4a9d 100644 --- a/IdentityServer/v7/BFF/SplitHosts/BackendApiHost/BackendApiHost.csproj +++ b/IdentityServer/v7/BFF/SplitHosts/BackendApiHost/BackendApiHost.csproj @@ -1,11 +1,11 @@ - net6.0 + net8.0 - + diff --git a/IdentityServer/v7/BFF/SplitHosts/BackendHost/BackendHost.csproj b/IdentityServer/v7/BFF/SplitHosts/BackendHost/BackendHost.csproj index 99cc5f4d..c5ae16ad 100644 --- a/IdentityServer/v7/BFF/SplitHosts/BackendHost/BackendHost.csproj +++ b/IdentityServer/v7/BFF/SplitHosts/BackendHost/BackendHost.csproj @@ -1,15 +1,15 @@ - net6.0 + net8.0 enable enable - - + + - + diff --git a/IdentityServer/v7/BFF/SplitHosts/BackendHost/ToDoController.cs b/IdentityServer/v7/BFF/SplitHosts/BackendHost/ToDoController.cs index 3edf5bc7..fa4231f8 100644 --- a/IdentityServer/v7/BFF/SplitHosts/BackendHost/ToDoController.cs +++ b/IdentityServer/v7/BFF/SplitHosts/BackendHost/ToDoController.cs @@ -47,7 +47,7 @@ public IActionResult Get(int id) public IActionResult Post([FromBody] ToDo model) { model.Id = ToDo.NewId(); - model.User = $"{User.FindFirst("sub").Value} ({User.FindFirst("name").Value})"; + model.User = $"{User.FindFirst("sub")?.Value} ({User.FindFirst("name")?.Value})"; __data.Add(model); _logger.LogInformation("Add {name}", model.Name); @@ -92,7 +92,7 @@ public static int NewId() public int Id { get; set; } public DateTimeOffset Date { get; set; } - public string Name { get; set; } - public string User { get; set; } + public string? Name { get; set; } + public string? User { get; set; } } } diff --git a/IdentityServer/v7/BFF/SplitHosts/FrontendHost/FrontendHost.csproj b/IdentityServer/v7/BFF/SplitHosts/FrontendHost/FrontendHost.csproj index 621981f9..c70916d3 100644 --- a/IdentityServer/v7/BFF/SplitHosts/FrontendHost/FrontendHost.csproj +++ b/IdentityServer/v7/BFF/SplitHosts/FrontendHost/FrontendHost.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 diff --git a/IdentityServer/v7/BFF/SplitHosts/FrontendHost/wwwroot/StyleSheet.css b/IdentityServer/v7/BFF/SplitHosts/FrontendHost/wwwroot/StyleSheet.css index 70d4ba6a..e54ec7ec 100644 --- a/IdentityServer/v7/BFF/SplitHosts/FrontendHost/wwwroot/StyleSheet.css +++ b/IdentityServer/v7/BFF/SplitHosts/FrontendHost/wwwroot/StyleSheet.css @@ -39,4 +39,11 @@ pre:empty { } .buttons{ float:right; +} +table#session-info { + table-layout: fixed; +} + +table#session-info td { + overflow: clip; } \ No newline at end of file diff --git a/IdentityServer/v7/BFF/SplitHosts/FrontendHost/wwwroot/index.html b/IdentityServer/v7/BFF/SplitHosts/FrontendHost/wwwroot/index.html index 2759f28b..fa9c7bc5 100644 --- a/IdentityServer/v7/BFF/SplitHosts/FrontendHost/wwwroot/index.html +++ b/IdentityServer/v7/BFF/SplitHosts/FrontendHost/wwwroot/index.html @@ -68,7 +68,7 @@

Add New

Session Claims

-
Claim Type
+
diff --git a/IdentityServer/v7/BFF/SplitHosts/JsBffSample.sln b/IdentityServer/v7/BFF/SplitHosts/SplitHosts.sln similarity index 100% rename from IdentityServer/v7/BFF/SplitHosts/JsBffSample.sln rename to IdentityServer/v7/BFF/SplitHosts/SplitHosts.sln From eb17170e27b864e6a7d9156a24639e48983909e2 Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Wed, 17 Jan 2024 12:40:00 -0600 Subject: [PATCH 6/9] Update BFF/BlazorWasm to .NET 8 --- .../v7/BFF/BlazorWasm/Client/BlazorWasm.Client.csproj | 10 +++++----- .../v7/BFF/BlazorWasm/Server/BlazorWasm.Server.csproj | 10 +++++----- .../v7/BFF/BlazorWasm/Shared/BlazorWasm.Shared.csproj | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/IdentityServer/v7/BFF/BlazorWasm/Client/BlazorWasm.Client.csproj b/IdentityServer/v7/BFF/BlazorWasm/Client/BlazorWasm.Client.csproj index 78fdb299..b2377182 100644 --- a/IdentityServer/v7/BFF/BlazorWasm/Client/BlazorWasm.Client.csproj +++ b/IdentityServer/v7/BFF/BlazorWasm/Client/BlazorWasm.Client.csproj @@ -1,16 +1,16 @@ - net6.0 + net8.0 enable enable - - - - + + + + diff --git a/IdentityServer/v7/BFF/BlazorWasm/Server/BlazorWasm.Server.csproj b/IdentityServer/v7/BFF/BlazorWasm/Server/BlazorWasm.Server.csproj index 56a26ebc..1187cb38 100644 --- a/IdentityServer/v7/BFF/BlazorWasm/Server/BlazorWasm.Server.csproj +++ b/IdentityServer/v7/BFF/BlazorWasm/Server/BlazorWasm.Server.csproj @@ -1,16 +1,16 @@ - + - net6.0 + net8.0 enable enable - + - - + + diff --git a/IdentityServer/v7/BFF/BlazorWasm/Shared/BlazorWasm.Shared.csproj b/IdentityServer/v7/BFF/BlazorWasm/Shared/BlazorWasm.Shared.csproj index a5b78ac4..9a938be4 100644 --- a/IdentityServer/v7/BFF/BlazorWasm/Shared/BlazorWasm.Shared.csproj +++ b/IdentityServer/v7/BFF/BlazorWasm/Shared/BlazorWasm.Shared.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable From f9f288be39a781500412355b04566b5a2c4532a8 Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Tue, 16 Jan 2024 12:57:35 -0600 Subject: [PATCH 7/9] Update BFF/DPoP to .NET 8 --- IdentityServer/v7/BFF/DPoP/.vscode/launch.json | 4 ++-- IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP.Api.csproj | 8 ++++---- .../v7/BFF/DPoP/DPoP.Api/DPoP/DPoPJwtBearerEvents.cs | 3 ++- .../v7/BFF/DPoP/DPoP.Api/DPoP/DPoPProofValidator.cs | 12 +++++------- IdentityServer/v7/BFF/DPoP/DPoP.Bff/DPoP.Bff.csproj | 8 ++++---- IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs | 5 ++--- .../v7/BFF/DPoP/DPoP.Bff/wwwroot/index.html | 2 +- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/IdentityServer/v7/BFF/DPoP/.vscode/launch.json b/IdentityServer/v7/BFF/DPoP/.vscode/launch.json index 71e82bc5..66034807 100644 --- 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 index 32a23fe2..55f79f8e 100644 --- a/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP.Api.csproj +++ b/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP.Api.csproj @@ -1,12 +1,12 @@ - net6.0 + net8.0 - - - + + + diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP/DPoPJwtBearerEvents.cs b/IdentityServer/v7/BFF/DPoP/DPoP.Api/DPoP/DPoPJwtBearerEvents.cs index 2b71a68b..3cec1290 100644 --- 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 index effb21e8..0d36ed3e 100644 --- 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>(JwtClaimTypes.JsonWebKey, out var jwkValues)) + if (!token.TryGetHeaderValue(JwtClaimTypes.JsonWebKey, out var jwkValues)) { result.IsError = true; result.ErrorDescription = "Invalid 'jwk' value."; @@ -169,7 +169,7 @@ protected virtual Task ValidateHeaderAsync(DPoPProofValidatonContext context, DP /// /// Validates the signature. /// - protected virtual Task ValidateSignatureAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result) + protected virtual async Task ValidateSignatureAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result) { TokenValidationResult tokenValidationResult; @@ -185,14 +185,14 @@ 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) @@ -200,12 +200,10 @@ protected virtual Task ValidateSignatureAsync(DPoPProofValidatonContext context, 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; } /// diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/DPoP.Bff.csproj b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/DPoP.Bff.csproj index 325eed12..a25aa7d5 100644 --- a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/DPoP.Bff.csproj +++ b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/DPoP.Bff.csproj @@ -1,14 +1,14 @@ - net6.0 + net8.0 Host6 enable - - - + + + diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs index 03e81659..595c2fc0 100644 --- a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs +++ b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs @@ -91,8 +91,8 @@ public void ConfigureServices(IServiceCollection services) var jwk = JsonSerializer.Serialize(jwkKey); options.DPoPJsonWebKey = jwk; }) - .AddRemoteApis() - .AddServerSideSessions(); + .AddRemoteApis(); + // .AddServerSideSessions(); // local APIs services.AddControllers(); @@ -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 index e0514de4..4eb6b324 100644 --- a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/wwwroot/index.html +++ b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/wwwroot/index.html @@ -11,7 +11,7 @@
-

SPA (.NET 6 host)

+

SPA with BFF using DPoP

From 840ce30cccd9446d63910bd7a0187ccf9e3b4fa1 Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Wed, 17 Jan 2024 12:46:57 -0600 Subject: [PATCH 8/9] Comment AddServerSideSessions back in --- IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs index 595c2fc0..edc022c5 100644 --- a/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs +++ b/IdentityServer/v7/BFF/DPoP/DPoP.Bff/Startup.cs @@ -91,8 +91,8 @@ public void ConfigureServices(IServiceCollection services) var jwk = JsonSerializer.Serialize(jwkKey); options.DPoPJsonWebKey = jwk; }) - .AddRemoteApis(); - // .AddServerSideSessions(); + .AddRemoteApis() + .AddServerSideSessions(); // local APIs services.AddControllers(); From 73ca50ad9da155ce2b1790ea8cb9e2bffb6ca6db Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Wed, 17 Jan 2024 12:50:01 -0600 Subject: [PATCH 9/9] Fix UI header in BFF\TokenExchange --- .../v7/BFF/TokenExchange/TokenExchange.Bff/wwwroot/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Bff/wwwroot/index.html b/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Bff/wwwroot/index.html index 33a97bc7..234d8dee 100644 --- a/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Bff/wwwroot/index.html +++ b/IdentityServer/v7/BFF/TokenExchange/TokenExchange.Bff/wwwroot/index.html @@ -11,7 +11,7 @@
-

SPA (.NET 6 host)

+

SPA with BFF supporting Token Exchange

Claim Type