Merge pull request #93 from DuendeSoftware/joe/identity-model

Update IdentityModel to v7.0.0
DuendeSoftware · Apr 19, 2024 · f460785 · f460785
2 parents 438c54d + 35edb17
commit f460785
Show file tree

Hide file tree

Showing 11 changed files with 172 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -201,7 +201,7 @@ docs/_build/
 tools/
 
 # Visual Studio Code workspace options
-.vscode
+.vscode/settings.json
 
 # IdentityServer temp files
 identityserver4_log.txt

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,74 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "BlazorServer",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-blazorServer",
+            "program": "${workspaceFolder}/samples/BlazorServer/bin/Debug/net8.0/BlazorServer.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/samples/BlazorServer",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "console": "externalTerminal"
+          },
+          {
+            "name": "Web",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-web",
+            "program": "${workspaceFolder}/samples/Web/bin/Debug/net8.0/Web.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/samples/Web",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "console": "externalTerminal"
+        },
+        {
+            "name": "WebJarJwt",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-webJarJwt",
+            "program": "${workspaceFolder}/samples/WebJarJwt/bin/Debug/net8.0/WebJarJwt.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/samples/WebJarJwt",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "console": "externalTerminal"
+        },
+        {
+            "name": "Worker",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-worker",
+            "program": "${workspaceFolder}/samples/Worker/bin/Debug/net8.0/Worker.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/samples/Worker",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "console": "externalTerminal"
+        },
+        {
+            "name": "WorkerDI",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-workerDI",
+            "program": "${workspaceFolder}/samples/WorkerDI/bin/Debug/net8.0/WorkerDI.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/samples/WorkerDI",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "console": "externalTerminal"
+        }
+
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,77 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+          "label": "build",
+          "type": "process",
+          "command": "dotnet",
+          "args": [
+              "build",
+              "${workspaceFolder}",
+              "/property:GenerateFullPaths=true",
+              "/consoleloggerparameters:NoSummary"
+          ],
+          "problemMatcher": "$msCompile"
+        },
+        {
+          "label": "build-web",
+          "type": "process",
+          "command": "dotnet",
+          "args": [
+              "build",
+              "${workspaceFolder}/samples/Web/Web.csproj",
+              "/property:GenerateFullPaths=true",
+              "/consoleloggerparameters:NoSummary"
+          ],
+          "problemMatcher": "$msCompile"
+        },
+        {
+          "label": "build-blazorServer",
+          "type": "process",
+          "command": "dotnet",
+          "args": [
+              "build",
+              "${workspaceFolder}/samples/BlazorServer/BlazorServer.csproj",
+              "/property:GenerateFullPaths=true",
+              "/consoleloggerparameters:NoSummary"
+          ],
+          "problemMatcher": "$msCompile"
+        },
+        {
+          "label": "build-webJarJwt",
+          "type": "process",
+          "command": "dotnet",
+          "args": [
+              "build",
+              "${workspaceFolder}/samples/WebJarJwt/WebJarJwt.csproj",
+              "/property:GenerateFullPaths=true",
+              "/consoleloggerparameters:NoSummary"
+          ],
+          "problemMatcher": "$msCompile"
+        },
+        {
+          "label": "build-worker",
+          "type": "process",
+          "command": "dotnet",
+          "args": [
+              "build",
+              "${workspaceFolder}/samples/Worker/Worker.csproj",
+              "/property:GenerateFullPaths=true",
+              "/consoleloggerparameters:NoSummary"
+          ],
+          "problemMatcher": "$msCompile"
+        },
+        {
+          "label": "build-workerDI",
+          "type": "process",
+          "command": "dotnet",
+          "args": [
+              "build",
+              "${workspaceFolder}/samples/WorkerDI/WorkerDI.csproj",
+              "/property:GenerateFullPaths=true",
+              "/consoleloggerparameters:NoSummary"
+          ],
+          "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/samples/BlazorServer/Program.cs b/samples/BlazorServer/Program.cs
@@ -1,25 +1,25 @@
 using BlazorServer;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.SystemConsole.Themes;
 
 Log.Logger = new LoggerConfiguration()
     .WriteTo.Console()
     .CreateBootstrapLogger();
 
 Log.Information("Starting up");
 
+Console.Title = "BlazorServer (Sample)";
+
 try
 {
     var builder = WebApplication.CreateBuilder(args);
-
     builder.Host.UseSerilog((ctx, lc) => lc
-        .MinimumLevel.Debug()
+        .WriteTo.Console(
+            outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}",
+            theme: AnsiConsoleTheme.Code)
+        .MinimumLevel.Information()
         .MinimumLevel.Override("Duende", LogEventLevel.Verbose)
-        .MinimumLevel.Override("System", LogEventLevel.Error)
-        .MinimumLevel.Override("Microsoft", LogEventLevel.Error)
-        .MinimumLevel.Override("System.Net.Http", LogEventLevel.Information)
-        .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
-        .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}")
         .Enrich.FromLogContext());
 
     var app = builder

diff --git a/samples/Web/Program.cs b/samples/Web/Program.cs
@@ -22,15 +22,10 @@
 
     builder.Host.UseSerilog((ctx, lc) => lc
         .WriteTo.Console(
-            outputTemplate:
-            "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}",
+            outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}",
             theme: AnsiConsoleTheme.Code)
-        .MinimumLevel.Debug()
+        .MinimumLevel.Information()
         .MinimumLevel.Override("Duende", LogEventLevel.Verbose)
-        .MinimumLevel.Override("System", LogEventLevel.Error)
-        .MinimumLevel.Override("Microsoft", LogEventLevel.Error)
-        .MinimumLevel.Override("System.Net.Http", LogEventLevel.Information)
-        .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
         .Enrich.FromLogContext());
 
     var app = builder

diff --git a/samples/Web/Startup.cs b/samples/Web/Startup.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Security.Cryptography;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Duende.AccessTokenManagement.OpenIdConnect;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
@@ -19,8 +18,8 @@ public static class Startup
 {
     public const bool UseDPoP = true;
 
-    public const string BaseUrl = "https://localhost:5001";
-    //public const string BaseUrl = "https://demo.duendesoftware.com";
+    // public const string BaseUrl = "https://localhost:5001";
+    public const string BaseUrl = "https://demo.duendesoftware.com";
 
     public const string ApiBaseUrl = UseDPoP ? 
         $"{BaseUrl}/api/dpop/" :

diff --git a/samples/WebJarJwt/ClientAssertionService.cs b/samples/WebJarJwt/ClientAssertionService.cs
@@ -17,7 +17,6 @@ namespace WebJarJwt;
 
 public class ClientAssertionService : IClientAssertionService
 {
-    private readonly IOptionsSnapshot<ClientCredentialsClient> _options;
     private readonly IOpenIdConnectConfigurationService _configurationService;
 
     private static string RsaKey =
@@ -39,10 +38,8 @@ public class ClientAssertionService : IClientAssertionService
     private static SigningCredentials Credential = new(new JsonWebKey(RsaKey), "RS256");
 
     public ClientAssertionService(
-        IOptionsSnapshot<ClientCredentialsClient> options,
         IOpenIdConnectConfigurationService configurationService)
     {
-        _options = options;
         _configurationService = configurationService;
     }
 

diff --git a/samples/WebJarJwt/Program.cs b/samples/WebJarJwt/Program.cs
@@ -14,21 +14,18 @@
 
 Log.Information("Host.Main Starting up");
 
+Console.Title = "WebJarJwt (Sample)";
+
 try
 {
     var builder = WebApplication.CreateBuilder(args);
 
     builder.Host.UseSerilog((ctx, lc) => lc
         .WriteTo.Console(
-            outputTemplate:
-            "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}",
+            outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}",
             theme: AnsiConsoleTheme.Code)
-        .MinimumLevel.Debug()
+        .MinimumLevel.Information()
         .MinimumLevel.Override("Duende", LogEventLevel.Verbose)
-        .MinimumLevel.Override("System", LogEventLevel.Error)
-        .MinimumLevel.Override("Microsoft", LogEventLevel.Error)
-        .MinimumLevel.Override("System.Net.Http", LogEventLevel.Information)
-        .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
         .Enrich.FromLogContext());
 
     var app = builder

diff --git a/samples/Worker/ClientAssertionService.cs b/samples/Worker/ClientAssertionService.cs
@@ -15,7 +15,7 @@ namespace WorkerService;
 
 public class ClientAssertionService : IClientAssertionService
 {
-    private readonly IOptionsSnapshot<ClientCredentialsClient> _options;
+    private readonly IOptionsMonitor<ClientCredentialsClient> _options;
 
     private static string RsaKey =
         """
@@ -35,7 +35,7 @@ public class ClientAssertionService : IClientAssertionService
 
     private static SigningCredentials Credential = new (new JsonWebKey(RsaKey), "RS256");
 
-    public ClientAssertionService(IOptionsSnapshot<ClientCredentialsClient> options)
+    public ClientAssertionService(IOptionsMonitor<ClientCredentialsClient> options)
     {
         _options = options;
     }

diff --git a/samples/WorkerDI/ClientAssertionService.cs b/samples/WorkerDI/ClientAssertionService.cs
@@ -15,7 +15,7 @@ namespace WorkerService;
 
 public class ClientAssertionService : IClientAssertionService
 {
-    private readonly IOptionsSnapshot<ClientCredentialsClient> _options;
+    private readonly IOptionsMonitor<ClientCredentialsClient> _options;
 
     private static string RsaKey =
         """
@@ -35,7 +35,7 @@ public class ClientAssertionService : IClientAssertionService
 
     private static SigningCredentials Credential = new (new JsonWebKey(RsaKey), "RS256");
 
-    public ClientAssertionService(IOptionsSnapshot<ClientCredentialsClient> options)
+    public ClientAssertionService(IOptionsMonitor<ClientCredentialsClient> options)
     {
         _options = options;
     }

diff --git a/src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj b/src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj
@@ -11,7 +11,7 @@
 
 
     <ItemGroup>
-        <PackageReference Include="IdentityModel" Version="6.2.0" />
+        <PackageReference Include="IdentityModel" Version="7.0.0" />
 
         <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />