Update sample apis to .NET 8

DuendeSoftware · Nov 30, 2023 · f1fa630 · f1fa630
1 parent e31c1eb
commit f1fa630
Show file tree

Hide file tree

Showing 20 changed files with 55 additions and 104 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -93,47 +93,6 @@
                 "order": 40
             }
         },
-        {
-            "name": "JS3",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build-js3",
-            "program": "${workspaceFolder}/samples/JS3/bin/Debug/net6.0/JS3.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/samples/JS3",
-            "env": {
-                "ASPNETCORE_ENVIRONMENT": "Development"
-            },
-            "serverReadyAction": {
-                "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
-            },
-            "presentation": {
-              "hidden": false,
-              "order": 10
-            }
-        },
-
-        {
-            "name": "JS5",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build-js5",
-            "program": "${workspaceFolder}/samples/JS5/bin/Debug/net6.0/JS5.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/samples/JS5",
-            "env": {
-                "ASPNETCORE_ENVIRONMENT": "Development"
-            },
-            "serverReadyAction": {
-                "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
-            },
-            "presentation": {
-              "hidden": false,
-              "order": 10
-            }
-        },
         {
             "name": "JS6",
             "type": "coreclr",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -61,30 +61,6 @@
         ],
         "problemMatcher": "$msCompile"
       },
-      {
-        "label": "build-js3",
-        "type": "process",
-        "command": "dotnet",
-        "args": [
-            "build",
-            "${workspaceFolder}/samples/JS3/JS3.csproj",
-            "/property:GenerateFullPaths=true",
-            "/consoleloggerparameters:NoSummary"
-        ],
-        "problemMatcher": "$msCompile"
-      },
-      {
-        "label": "build-js5",
-        "type": "process",
-        "command": "dotnet",
-        "args": [
-            "build",
-            "${workspaceFolder}/samples/JS5/JS5.csproj",
-            "/property:GenerateFullPaths=true",
-            "/consoleloggerparameters:NoSummary"
-        ],
-        "problemMatcher": "$msCompile"
-      },
       {
         "label": "build-js6",
         "type": "process",

diff --git a/migrations/UserSessionDb/Properties/launchSettings.json b/migrations/UserSessionDb/Properties/launchSettings.json
@@ -17,12 +17,12 @@
     },
     "UserSessionDb": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }
-}
+}
diff --git a/samples/Api.DPoP/Api.DPoP.csproj b/samples/Api.DPoP/Api.DPoP.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" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.9" />
-        <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
     </ItemGroup>
 </Project>
diff --git a/samples/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs b/samples/Api.DPoP/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/samples/Api.DPoP/DPoP/DPoPProofValidator.cs b/samples/Api.DPoP/DPoP/DPoPProofValidator.cs
@@ -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/samples/Api.DPoP/Properties/launchSettings.json b/samples/Api.DPoP/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Api": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": false,
       "applicationUrl": "https://localhost:5011",
       "environmentVariables": {

diff --git a/samples/Api.Isolated/Api.Isolated.csproj b/samples/Api.Isolated/Api.Isolated.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" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.9" />
-        <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
     </ItemGroup>
 </Project>
diff --git a/samples/Api.Isolated/Properties/launchSettings.json b/samples/Api.Isolated/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Api": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": false,
       "applicationUrl": "https://localhost:5012",
       "environmentVariables": {

diff --git a/samples/Api/Api.csproj b/samples/Api/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" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.9" />
-        <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
     </ItemGroup>
 </Project>
diff --git a/samples/Api/Properties/launchSettings.json b/samples/Api/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Api": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": false,
       "applicationUrl": "https://localhost:5010",
       "environmentVariables": {

diff --git a/samples/IdentityServer/Config.cs b/samples/IdentityServer/Config.cs
@@ -49,15 +49,32 @@ public static class Config
                     },
 
                     RedirectUris = { "https://localhost:5002/signin-oidc" },
-
-                    //FrontChannelLogoutUri = "https://localhost:5002/signout-oidc",
-                    BackChannelLogoutUri = "https://localhost:5002/bff/backchannel",
-
+                    FrontChannelLogoutUri = "https://localhost:5002/signout-oidc",
                     PostLogoutRedirectUris = { "https://localhost:5002/signout-callback-oidc" },
 
                     AllowOfflineAccess = true,
                     AllowedScopes = { "openid", "profile", "api", "scope-for-isolated-api" },
                 },
+
+                new Client
+                {
+                    ClientId = "backchannel-spa",
+                    ClientSecrets = { new Secret("secret".Sha256()) },
+
+                    AllowedGrantTypes = 
+                    { 
+                        GrantType.AuthorizationCode, 
+                        GrantType.ClientCredentials,
+                        OidcConstants.GrantTypes.TokenExchange 
+                    },
+
+                    RedirectUris = { "https://localhost:5003/signin-oidc" },
+                    BackChannelLogoutUri = "https://localhost:5003/bff/backchannel",
+                    PostLogoutRedirectUris = { "https://localhost:5003/signout-callback-oidc" },
+
+                    AllowOfflineAccess = true,
+                    AllowedScopes = { "openid", "profile", "api", "scope-for-isolated-api" },
+                },
             };
     }
 }
diff --git a/samples/JS.Yarp/Properties/launchSettings.json b/samples/JS.Yarp/Properties/launchSettings.json
@@ -2,12 +2,12 @@
   "profiles": {
     "Host5": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "applicationUrl": "https://localhost:5002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }
-}
+}
diff --git a/samples/JS6.DPoP/Properties/launchSettings.json b/samples/JS6.DPoP/Properties/launchSettings.json
@@ -2,12 +2,12 @@
   "profiles": {
     "Host6": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "applicationUrl": "https://localhost:5002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }
-}
+}
diff --git a/samples/JS6.EF/Properties/launchSettings.json b/samples/JS6.EF/Properties/launchSettings.json
@@ -2,12 +2,12 @@
   "profiles": {
     "Host5.EntityFramework": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "applicationUrl": "https://localhost:5002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }
-}
+}
diff --git a/samples/JS6.EF/Startup.cs b/samples/JS6.EF/Startup.cs
@@ -63,7 +63,7 @@ public void ConfigureServices(IServiceCollection services)
                     options.Authority = "https://localhost:5001";
 
                     // confidential client using code flow + PKCE
-                    options.ClientId = "spa";
+                    options.ClientId = "backchannel-spa";
                     options.ClientSecret = "secret";
                     options.ResponseType = "code";
                     options.ResponseMode = "query";

diff --git a/samples/JS6/Properties/launchSettings.json b/samples/JS6/Properties/launchSettings.json
@@ -2,12 +2,12 @@
   "profiles": {
     "Host6": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "applicationUrl": "https://localhost:5002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }
-}
+}
diff --git a/samples/JS8.DPoP/Properties/launchSettings.json b/samples/JS8.DPoP/Properties/launchSettings.json
@@ -2,12 +2,12 @@
   "profiles": {
     "Host6": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "applicationUrl": "https://localhost:5002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }
-}
+}
diff --git a/samples/JS8.EF/Properties/launchSettings.json b/samples/JS8.EF/Properties/launchSettings.json
@@ -2,9 +2,9 @@
   "profiles": {
     "Host8.EntityFramework": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5002",
+      "applicationUrl": "https://localhost:5003",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/samples/JS8.EF/Startup.cs b/samples/JS8.EF/Startup.cs
@@ -63,7 +63,7 @@ public void ConfigureServices(IServiceCollection services)
                     options.Authority = "https://localhost:5001";
 
                     // confidential client using code flow + PKCE
-                    options.ClientId = "spa";
+                    options.ClientId = "backchannel-spa";
                     options.ClientSecret = "secret";
                     options.ResponseType = "code";
                     options.ResponseMode = "query";