From f1262d49ebb5b071d1917d55612539ec7b63702b Mon Sep 17 00:00:00 2001
From: Joe DeCock <josephdecock@gmail.com>
Date: Mon, 22 Jan 2024 16:16:01 -0600
Subject: [PATCH] DCR\Permissions - Use IdentityModel 7.0

---
 .../ConsoleDcrClient/ConsoleDcrClient.csproj    |  2 +-
 .../Permissions/ConsoleDcrClient/Program.cs     | 17 +++--------------
 .../IdentityServer/IdentityServer.csproj        |  2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/ConsoleDcrClient.csproj b/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/ConsoleDcrClient.csproj
index ffcf0104..83ab3e7d 100644
--- a/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/ConsoleDcrClient.csproj
+++ b/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/ConsoleDcrClient.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="IdentityModel" Version="6.1.0" />
+      <PackageReference Include="IdentityModel" Version="7.0.0-preview.1" />
     </ItemGroup>
 
 </Project>
diff --git a/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/Program.cs b/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/Program.cs
index 7fc36fee..871d993d 100644
--- a/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/Program.cs
+++ b/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/Program.cs
@@ -49,19 +49,6 @@ static async Task<DynamicClientRegistrationResponse> RegisterClient(string acces
     var client = new HttpClient();
     client.SetBearerToken(accessToken);
 
-    // var request = new DynamicClientRegistrationRequest
-    // {
-    //     Address = "https://localhost:5001/connect/dcr",
-    //     Document = JsonSerializer.Deserialize<DynamicClientRegistrationDocument>(
-    //     """
-    //     {
-    //         "grant_types": [ "client_credentials" ],
-    //         "scope": "SimpleApi",
-    //         "client_secret": "hunter2"
-    //     }
-    //     """)
-    // };
-
     var request = new DynamicClientRegistrationRequest
     {
         Address = "https://localhost:5002/connect/dcr",
@@ -73,7 +60,7 @@ static async Task<DynamicClientRegistrationResponse> RegisterClient(string acces
         }
     };
 
-    request.Document.Extensions.Add("client_secret", "hunter2");
+    request.Document.Extensions.Add("client_secret", AsJsonElement("hunter2"));
 
     var response = await client.RegisterClientAsync(request);
 
@@ -123,3 +110,5 @@ static async Task CallServiceAsync(string token)
     "\n\nService claims:".ConsoleGreen();
     Console.WriteLine(response.PrettyPrintJson());
 }
+
+static JsonElement AsJsonElement(string s) => JsonDocument.Parse($"\"{s}\"").RootElement;
\ No newline at end of file
diff --git a/IdentityServer/v7/Configuration/Permissions/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Configuration/Permissions/IdentityServer/IdentityServer.csproj
index 4200c589..3f7d5a5a 100644
--- a/IdentityServer/v7/Configuration/Permissions/IdentityServer/IdentityServer.csproj
+++ b/IdentityServer/v7/Configuration/Permissions/IdentityServer/IdentityServer.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.0.0-rc.2" />
+    <PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.1" />