DuendeSoftware · brockallen · Jan 30, 2024 · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024
diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj
@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <InvariantGlobalization>true</InvariantGlobalization>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3"/>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.13"/>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
   </ItemGroup>
-</Project>
+
+</Project>
diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Controllers/IdentityController.cs b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Controllers/IdentityController.cs
diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Program.cs b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Program.cs
@@ -1,42 +1,31 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-var builder = WebApplication.CreateBuilder(args);
 
-// Add services to the container.
+using System.Security.Claims;
+
+var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-builder.Services.AddAuthentication("Bearer")
+builder.Services.AddAuthentication()
     .AddJwtBearer(options =>
     {
         options.Authority = "https://localhost:5001";
         options.TokenValidationParameters.ValidateAudience = false;
     });
 builder.Services.AddAuthorization(options =>
+{
     options.AddPolicy("ApiScope", policy =>
     {
         policy.RequireAuthenticatedUser();
         policy.RequireClaim("scope", "api1");
-    })
-);
+    });
+});
 
 var app = builder.Build();
 
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
 app.UseHttpsRedirection();
 
-app.UseAuthentication();
-app.UseAuthorization();
-
-app.MapControllers().RequireAuthorization("ApiScope");
-
+app.MapGet("identity", (ClaimsPrincipal user) => user.Claims.Select(c => new { c.Type, c.Value }))
+    .RequireAuthorization("ApiScope");
+
 app.Run();
diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Properties/launchSettings.json b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Properties/launchSettings.json
@@ -1,27 +1,10 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:29615",
-      "sslPort": 44380
-    }
-  },
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
-    "Api": {
+    "https": {
       "commandName": "Project",
-      "launchUrl": "identity",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      "dotnetRunMessages": true,
       "applicationUrl": "https://localhost:6001",
-      "dotnetRunMessages": true
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Client/Client.csproj b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Client/Client.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityModel" Version="6.0.0" />
+    <PackageReference Include="IdentityModel" Version="6.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Client/Program.cs b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Client/Program.cs
@@ -7,7 +7,6 @@
 
 // discover endpoints from metadata
 var client = new HttpClient();
-
 var disco = await client.GetDiscoveryDocumentAsync("https://localhost:5001");
 if (disco.IsError)
 {
@@ -21,7 +20,6 @@
     Address = disco.TokenEndpoint,
     ClientId = "client",
     ClientSecret = "secret",
-
     Scope = "api1"
 });
 
@@ -32,12 +30,11 @@
     return;
 }
 
-Console.WriteLine(tokenResponse.Json);
-Console.WriteLine("\n\n");
+Console.WriteLine(tokenResponse.AccessToken);
 
 // call api
 var apiClient = new HttpClient();
-apiClient.SetBearerToken(tokenResponse.AccessToken);
+apiClient.SetBearerToken(tokenResponse.AccessToken!); // AccessToken is always non-null when IsError is false
 
 var response = await apiClient.GetAsync("https://localhost:6001/identity");
 if (!response.IsSuccessStatusCode)

diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/Config.cs b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/Config.cs
@@ -9,13 +9,13 @@ namespace IdentityServer;
 public static class Config
 {
     public static IEnumerable<ApiScope> ApiScopes =>
-        new List<ApiScope>
+        new ApiScope[]
         { 
-            new ApiScope("api1", "My API") 
+            new ApiScope(name: "api1", displayName: "My API")
         };
 
     public static IEnumerable<Client> Clients =>
-        new List<Client>
+        new Client[] 
         {
             new Client
             {

diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/HostingExtensions.cs b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/HostingExtensions.cs
@@ -9,8 +9,8 @@ internal static class HostingExtensions
 {
     public static WebApplication ConfigureServices(this WebApplicationBuilder builder)
     {
-        // uncomment, if you want to add an MVC-based UI
-        // builder.Services.AddRazorPages();
+        // uncomment if you want to add a UI
+        //builder.Services.AddRazorPages();
 
         builder.Services.AddIdentityServer()
             .AddInMemoryApiScopes(Config.ApiScopes)
@@ -21,18 +21,20 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
 
     public static WebApplication ConfigurePipeline(this WebApplication app)
     { 
-        // uncomment if you want to add a UI
-        //app.UseStaticFiles();
-        //app.UseRouting();
-
         app.UseSerilogRequestLogging();
+
         if (app.Environment.IsDevelopment())
         {
             app.UseDeveloperExceptionPage();
         }
+
+        // uncomment if you want to add a UI
+        //app.UseStaticFiles();
+        //app.UseRouting();
+
         app.UseIdentityServer();
 
-        // uncomment, if you want to add a UI
+        // uncomment if you want to add a UI
         //app.UseAuthorization();
         //app.MapRazorPages().RequireAuthorization();
 

diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj
@@ -1,12 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Duende.IdentityServer" Version="6.2.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
-  </ItemGroup>
-</Project>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Duende.IdentityServer" Version="7.0.0" />
+
+		<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+	</ItemGroup>
+</Project>
diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/Quickstart.sln b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/Quickstart.sln
@@ -1,26 +1,23 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{52FE7FA2-9648-4BB9-AFF4-64C0C9A97E44}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer", "src\IdentityServer\IdentityServer.csproj", "{CD3B4286-96ED-4840-BE39-0696D5E2529A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer", "src\IdentityServer\IdentityServer.csproj", "{CD3B4286-96ED-4840-BE39-0696D5E2529A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api", "src\Api\Api.csproj", "{F985371A-37BF-48DB-873A-5E20802564A4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "src\Api\Api.csproj", "{F985371A-37BF-48DB-873A-5E20802564A4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client\Client.csproj", "{1C77608B-A3F3-412D-8AE7-05549B80726F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "src\Client\Client.csproj", "{1C77608B-A3F3-412D-8AE7-05549B80726F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebClient", "src\WebClient\WebClient.csproj", "{DFB135E6-2E39-42E3-B613-58E5DE7718AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebClient", "src\WebClient\WebClient.csproj", "{AA2D5914-6773-45B3-B1FA-AE1648FA8BE5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{CD3B4286-96ED-4840-BE39-0696D5E2529A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CD3B4286-96ED-4840-BE39-0696D5E2529A}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -34,15 +31,21 @@ Global
 		{1C77608B-A3F3-412D-8AE7-05549B80726F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1C77608B-A3F3-412D-8AE7-05549B80726F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C77608B-A3F3-412D-8AE7-05549B80726F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFB135E6-2E39-42E3-B613-58E5DE7718AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFB135E6-2E39-42E3-B613-58E5DE7718AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFB135E6-2E39-42E3-B613-58E5DE7718AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFB135E6-2E39-42E3-B613-58E5DE7718AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA2D5914-6773-45B3-B1FA-AE1648FA8BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA2D5914-6773-45B3-B1FA-AE1648FA8BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA2D5914-6773-45B3-B1FA-AE1648FA8BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA2D5914-6773-45B3-B1FA-AE1648FA8BE5}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{CD3B4286-96ED-4840-BE39-0696D5E2529A} = {52FE7FA2-9648-4BB9-AFF4-64C0C9A97E44}
 		{F985371A-37BF-48DB-873A-5E20802564A4} = {52FE7FA2-9648-4BB9-AFF4-64C0C9A97E44}
 		{1C77608B-A3F3-412D-8AE7-05549B80726F} = {52FE7FA2-9648-4BB9-AFF4-64C0C9A97E44}
-		{DFB135E6-2E39-42E3-B613-58E5DE7718AE} = {52FE7FA2-9648-4BB9-AFF4-64C0C9A97E44}
+		{AA2D5914-6773-45B3-B1FA-AE1648FA8BE5} = {52FE7FA2-9648-4BB9-AFF4-64C0C9A97E44}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4A8B565B-B76C-44A4-AC85-EC8FCB8ABCE1}
 	EndGlobalSection
 EndGlobal
diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj
@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <InvariantGlobalization>true</InvariantGlobalization>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3"/>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.13"/>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
   </ItemGroup>
-</Project>
+
+</Project>
diff --git a/...tyServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Controllers/IdentityController.cs b/...tyServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Controllers/IdentityController.cs