Merge pull request #34 from DuendeSoftware/dh/atm-im7

Replace IdentityModel package references with Duende.IdentityModel
DuendeSoftware · Nov 12, 2024 · 3efe334 · 3efe334
2 parents 75ea566 + 8a396bf
commit 3efe334
Show file tree

Hide file tree

Showing 68 changed files with 118 additions and 119 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -33,9 +33,9 @@
     <PackageVersion Include="AngleSharp" Version="1.1.2" />
     <PackageVersion Include="BullsEye" Version="5.0.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="Duende.IdentityModel" Version="7.0.0" />
     <PackageVersion Include="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="IdentityModel" Version="7.0.0" />
     <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(FrameworkVersion)" />

diff --git a/access-token-management/samples/Web/Controllers/HomeController.cs b/access-token-management/samples/Web/Controllers/HomeController.cs
@@ -7,7 +7,7 @@
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Duende.AccessTokenManagement.OpenIdConnect;
 
 namespace Web.Controllers;

diff --git a/access-token-management/samples/WebJarJwt/ClientAssertionService.cs b/access-token-management/samples/WebJarJwt/ClientAssertionService.cs
@@ -6,8 +6,8 @@
 using System.Threading.Tasks;
 using Duende.AccessTokenManagement;
 using Duende.AccessTokenManagement.OpenIdConnect;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;

diff --git a/access-token-management/samples/WebJarJwt/Controllers/HomeController.cs b/access-token-management/samples/WebJarJwt/Controllers/HomeController.cs
@@ -7,7 +7,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Duende.AccessTokenManagement.OpenIdConnect;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication;
 
 namespace WebJarJwt.Controllers;

diff --git a/access-token-management/samples/Worker/ClientAssertionService.cs b/access-token-management/samples/Worker/ClientAssertionService.cs
@@ -5,8 +5,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Duende.AccessTokenManagement;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Tokens;

diff --git a/access-token-management/samples/Worker/WorkerManual.cs b/access-token-management/samples/Worker/WorkerManual.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace WorkerService;
 

diff --git a/access-token-management/samples/Worker/WorkerManualJwt.cs b/access-token-management/samples/Worker/WorkerManualJwt.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace WorkerService;
 

diff --git a/access-token-management/samples/WorkerDI/ClientAssertionService.cs b/access-token-management/samples/WorkerDI/ClientAssertionService.cs
@@ -5,8 +5,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Duende.AccessTokenManagement;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Tokens;

diff --git a/access-token-management/samples/WorkerDI/ClientCredentialsClientConfigureOptions.cs b/access-token-management/samples/WorkerDI/ClientCredentialsClientConfigureOptions.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Options;
 
 namespace WorkerService;

diff --git a/access-token-management/samples/WorkerDI/Program.cs b/access-token-management/samples/WorkerDI/Program.cs
@@ -6,7 +6,7 @@
 using Serilog;
 using System;
 using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Options;
 using Serilog.Sinks.SystemConsole.Themes;
 

diff --git a/access-token-management/samples/WorkerDI/WorkerManual.cs b/access-token-management/samples/WorkerDI/WorkerManual.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace WorkerService;
 

diff --git a/access-token-management/samples/WorkerDI/WorkerManualJwt.cs b/access-token-management/samples/WorkerDI/WorkerManualJwt.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace WorkerService;
 

diff --git a/...token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs b/...token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Http;

diff --git a/...n-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs b/...n-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.Extensions.Options;

diff --git a/...en-management/src/AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs b/...en-management/src/AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using System.Security.Claims;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 

diff --git a/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel.Client;
-using IdentityModel;
+using Duende.IdentityModel.Client;
+using Duende.IdentityModel;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 

diff --git a/...ss-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs b/...ss-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace Duende.AccessTokenManagement.OpenIdConnect;
 

diff --git a/access-token-management/src/AccessTokenManagement/AccessTokenHandler.cs b/access-token-management/src/AccessTokenManagement/AccessTokenHandler.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Logging;
-using static IdentityModel.OidcConstants;
+using static Duende.IdentityModel.OidcConstants;
 
 namespace Duende.AccessTokenManagement;
 

diff --git a/access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj b/access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj
@@ -8,7 +8,7 @@
     <IsTrimmable>false</IsTrimmable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="IdentityModel" />
+    <PackageReference Include="Duende.IdentityModel" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Http" />

diff --git a/access-token-management/src/AccessTokenManagement/ClientCredentialsClient.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsClient.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace Duende.AccessTokenManagement;
 

diff --git a/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenEndpointService.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenEndpointService.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 

diff --git a/access-token-management/src/AccessTokenManagement/DPoPExtensions.cs b/access-token-management/src/AccessTokenManagement/DPoPExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 
 namespace Duende.AccessTokenManagement;
 

diff --git a/access-token-management/src/AccessTokenManagement/DefaultClientAssertionService.cs b/access-token-management/src/AccessTokenManagement/DefaultClientAssertionService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace Duende.AccessTokenManagement;
 

diff --git a/access-token-management/src/AccessTokenManagement/DefaultDPoPProofService.cs b/access-token-management/src/AccessTokenManagement/DefaultDPoPProofService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.IdentityModel.Tokens;
 using System.Text;
 using System.Security.Cryptography;

diff --git a/access-token-management/src/AccessTokenManagement/Interfaces/IClientAssertionService.cs b/access-token-management/src/AccessTokenManagement/Interfaces/IClientAssertionService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace Duende.AccessTokenManagement;
 

diff --git a/access-token-management/src/AccessTokenManagement/TokenRequestParameters.cs b/access-token-management/src/AccessTokenManagement/TokenRequestParameters.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace Duende.AccessTokenManagement;
 

diff --git a/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs b/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using Duende.IdentityServer.Configuration;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;

diff --git a/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementTests.cs b/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementTests.cs
@@ -3,8 +3,8 @@
 
 using System.Net;
 using System.Text.Json;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.DependencyInjection;
 using RichardSzalay.MockHttp;
@@ -131,7 +131,7 @@ public async Task Token_request_and_response_should_have_expected_values(ClientC
             mockHttp.Expect("/connect/token")
                 .WithFormData(expectedRequestFormData)
                 .WithHeaders("Authorization",
-                    "Basic " + BasicAuthenticationOAuthHeaderValue.EncodeCredential("client_id", "client_secret"))
+                    "Basic " + Duende.IdentityModel.Client.BasicAuthenticationOAuthHeaderValue.EncodeCredential("client_id", "client_secret"))
                 .Respond("application/json", JsonSerializer.Serialize(response));
         }
 

diff --git a/access-token-management/test/AccessTokenManagement.Tests/Framework/AppHost.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/AppHost.cs
@@ -7,7 +7,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Net;
 using System.Web;
-using IdentityModel;
+using Duende.IdentityModel;
 using Duende.AccessTokenManagement.OpenIdConnect;
 using RichardSzalay.MockHttp;
 

diff --git a/access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs
@@ -3,7 +3,7 @@
 
 using Duende.AccessTokenManagement.OpenIdConnect;
 using Duende.IdentityServer.Models;
-using IdentityModel;
+using Duende.IdentityModel;
 using System.Security.Claims;
 
 namespace Duende.AccessTokenManagement.Tests;

diff --git a/...token-management/test/AccessTokenManagement.Tests/Framework/TestClientAssertionService.cs b/...token-management/test/AccessTokenManagement.Tests/Framework/TestClientAssertionService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace Duende.AccessTokenManagement.Tests;
 

diff --git a/access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementWithDPoPTests.cs b/access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementWithDPoPTests.cs
@@ -5,7 +5,7 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using Duende.AccessTokenManagement.OpenIdConnect;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.IdentityModel.Tokens;
 using RichardSzalay.MockHttp;
 

diff --git a/identity-model-oidc-client/clients/ConsoleClientWithBrowser/Program.cs b/identity-model-oidc-client/clients/ConsoleClientWithBrowser/Program.cs
@@ -13,9 +13,9 @@
 using System.Security.Claims;
 using Duende.IdentityModel.OidcClient;
 using Duende.IdentityModel.OidcClient.IdentityTokenValidator;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.IdentityModel.Tokens;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace ConsoleClientWithBrowser
 {

diff --git a/identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/DPoPExtensions.cs b/identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/DPoPExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 
 namespace Duende.IdentityModel.OidcClient.DPoP;
 

diff --git a/identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/DPoPProofPayload.cs b/identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/DPoPProofPayload.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using System.Text.Json.Serialization;
-using IdentityModel;
+using Duende.IdentityModel;
 
 namespace Duende.IdentityModel.OidcClient.DPoP;
 

diff --git a/...y-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/DPoPProofTokenFactory.cs b/...y-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/DPoPProofTokenFactory.cs
@@ -4,7 +4,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Tokens;
 

diff --git a/identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/JsonWebKeys.cs b/identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/JsonWebKeys.cs
@@ -3,7 +3,7 @@
 
 using System.Security.Cryptography;
 using System.Text.Json;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.IdentityModel.Tokens;
 
 namespace Duende.IdentityModel.OidcClient.DPoP;

diff --git a/...odel-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/ProofTokenMessageHandler.cs b/...odel-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/ProofTokenMessageHandler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 
 namespace Duende.IdentityModel.OidcClient.DPoP;
 

diff --git a/...client/src/IdentityModel.OidcClient.Extensions/IdentityModel.OidcClient.Extensions.csproj b/...client/src/IdentityModel.OidcClient.Extensions/IdentityModel.OidcClient.Extensions.csproj
@@ -8,7 +8,6 @@
     <Description>DPoP extensions for IdentityModel.OidcClient</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="IdentityModel" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
   </ItemGroup>

diff --git a/...ityModel.OidcClient.Extensions/IdentityTokenValidator/JwtHandlerIdentityTokenValidator.cs b/...ityModel.OidcClient.Extensions/IdentityTokenValidator/JwtHandlerIdentityTokenValidator.cs
@@ -4,7 +4,7 @@
 using System.Security.Claims;
 using System.Security.Cryptography;
 using Duende.IdentityModel.OidcClient.Results;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Tokens;

diff --git a/identity-model-oidc-client/src/IdentityModel.OidcClient/AuthorizeClient.cs b/identity-model-oidc-client/src/IdentityModel.OidcClient/AuthorizeClient.cs
@@ -4,8 +4,8 @@
 using Duende.IdentityModel.OidcClient.Browser;
 using Duende.IdentityModel.OidcClient.Infrastructure;
 using Duende.IdentityModel.OidcClient.Results;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Logging;
 
 namespace Duende.IdentityModel.OidcClient