Upgrade IdentityServer v4 to latest version of v4 (#157)

Author: nickevansuk

.github/workflows/openactive-test-suite.yml

@@ -31,10 +31,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 2.1.808
-    - name: Setup .NET Core 3.0.103 for Authentication Authority Reference Implementation
+    - name: Setup .NET Core SDK 3.1.411 for Authentication Authority Reference Implementation
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.0.103
+        dotnet-version: 3.1.411
     - name: Setup Node.js 14.x
       uses: actions/setup-node@v1
       with:
@@ -154,10 +154,10 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 2.1.808
-      - name: Setup .NET Core 3.0.103 for Authentication Authority Reference Implementation
+      - name: Setup .NET Core SDK 3.1.411 for Authentication Authority Reference Implementation
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.0.103
+          dotnet-version: 3.1.411
       # Run dotnet build and publish
       - name: Install OpenActive.Server.NET dependencies
         run: dotnet restore

Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityServer4" Version="3.0.1" />
+    <PackageReference Include="IdentityServer4" Version="4.1.2" />
 
     <PackageReference Include="Serilog" Version="2.9.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.1.0" />

Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/ExternalController.cs

@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace src
+namespace IdentityServer
 {
     public class BookingPartnerViewModel
     {

…Custom/Grants/BookingPartnerViewModel.cs …okingPartners/BookingPartnerViewModel.csExamples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs renamed to Examples/BookingSystem.AspNetCore.IdentityServer/Custom/BookingPartners/BookingPartnerViewModel.cs Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs renamed to Examples/BookingSystem.AspNetCore.IdentityServer/Custom/BookingPartners/BookingPartnerViewModel.cs

@@ -10,9 +10,11 @@
 using IdentityServer4.Extensions;
 using OpenActive.FakeDatabase.NET;
 using System;
-using IdentityServer;
+using IdentityServerHost.Quickstart.UI;
+using IdentityServer4.Models;
+using System.Collections.Generic;
 
-namespace src
+namespace IdentityServer
 {
     /// <summary>
     /// This sample controller allows a user to revoke grants given to clients
@@ -144,16 +146,12 @@ public async Task<IActionResult> RegenerateKey([FromForm] string clientId)
         /// <summary>
         /// Handle postback to generate a registration key, and a new client secret
         /// </summary>
-        [HttpPost("regenerate-all-keys")]
+        [HttpPost("reset-client-credentials")]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> RegenerateAllKeys([FromForm] string clientId)
+        public async Task<IActionResult> ResetClientCredentials([FromForm] string clientId)
         {
             var bookingPartner = await BookingPartnerTable.GetByClientId(clientId);
-            await BookingPartnerTable.ResetKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
-
-            // TODO: Is this cached in memory, does it need updating??
-            //var client = await _clients.FindClientByIdAsync(clientId);
-            //client.ClientSecrets = new List<Secret>() { new Secret(clientSecret.Sha256()) };
+            await BookingPartnerTable.ResetCredentials(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
 
             return Redirect($"/booking-partners/edit/{clientId}");
         }

…stom/Grants/BookingPartnersController.cs …ingPartners/BookingPartnersController.csExamples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs renamed to Examples/BookingSystem.AspNetCore.IdentityServer/Custom/BookingPartners/BookingPartnersController.cs Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs renamed to Examples/BookingSystem.AspNetCore.IdentityServer/Custom/BookingPartners/BookingPartnersController.cs

@@ -28,7 +28,7 @@ private static Client ConvertToIs4Client(BookingPartnerTable bookingPartner)
                 AllowedGrantTypes = bookingPartner.GrantTypes == null ? new List<string>() : bookingPartner.GrantTypes.ToList(),
                 ClientSecrets = bookingPartner.ClientSecret == null ? new List<Secret>() : new List<Secret> { new Secret(bookingPartner.ClientSecret) },
                 AllowedScopes = bookingPartner.Scope == null ? new List<string>() : bookingPartner.Scope.Split(' ').ToList(),
-                Claims = bookingPartner.ClientId == null ? new List<System.Security.Claims.Claim>() : new List<System.Security.Claims.Claim>() { new System.Security.Claims.Claim("https://openactive.io/clientId", bookingPartner.ClientId) },
+                Claims = bookingPartner.ClientId == null ? new List<ClientClaim>() : new List<ClientClaim>() { new ClientClaim("https://openactive.io/clientId", bookingPartner.ClientId) },
                 ClientClaimsPrefix = "",
                 AlwaysSendClientClaims = true,
                 AlwaysIncludeUserClaimsInIdToken = true,