Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

Update IdentityModel to v7.0.0 #93

Merged
merged 5 commits into from
Apr 19, 2024
Merged

Update IdentityModel to v7.0.0 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6bdb76c
Use IdentityModel 7.0.0
josephdecock Apr 19, 2024
c415178
Add vscode startup config
josephdecock Apr 19, 2024
1d07147
Change samples to use IOptionsMonitor
josephdecock Apr 19, 2024
896793a
Improve console output in samples
josephdecock Apr 19, 2024
35edb17
Switch sample default back to demo.duendesoftware.com
josephdecock Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ docs/_build/
tools/

# Visual Studio Code workspace options
.vscode
.vscode/settings.json

# IdentityServer temp files
identityserver4_log.txt
Expand Down
74 changes: 74 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}

]
}
77 changes: 77 additions & 0 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
14 changes: 7 additions & 7 deletions samples/BlazorServer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 2 additions & 7 deletions samples/Web/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions samples/Web/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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/" :
Expand Down
3 changes: 0 additions & 3 deletions samples/WebJarJwt/ClientAssertionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ namespace WebJarJwt;

public class ClientAssertionService : IClientAssertionService
{
private readonly IOptionsSnapshot<ClientCredentialsClient> _options;
private readonly IOpenIdConnectConfigurationService _configurationService;

private static string RsaKey =
Expand All @@ -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;
}

Expand Down
11 changes: 4 additions & 7 deletions samples/WebJarJwt/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions samples/Worker/ClientAssertionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace WorkerService;

public class ClientAssertionService : IClientAssertionService
{
private readonly IOptionsSnapshot<ClientCredentialsClient> _options;
private readonly IOptionsMonitor<ClientCredentialsClient> _options;

private static string RsaKey =
"""
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions samples/WorkerDI/ClientAssertionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace WorkerService;

public class ClientAssertionService : IClientAssertionService
{
private readonly IOptionsSnapshot<ClientCredentialsClient> _options;
private readonly IOptionsMonitor<ClientCredentialsClient> _options;

private static string RsaKey =
"""
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading