Merge pull request #1621 from damianh/dh/duende-identitymodel-7

Using Duende.IdentityModel 7.0.0
DuendeSoftware · Nov 12, 2024 · 1fb40dd · 1fb40dd
2 parents 0850cda + 2b83e6b
commit 1fb40dd
Show file tree

Hide file tree

Showing 213 changed files with 300 additions and 297 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -15,7 +15,7 @@
 
     <ItemGroup>
         <!--our stuff -->
-        <PackageReference Update="IdentityModel" Version="6.2.0"/>
+        <PackageReference Update="Duende.IdentityModel" Version="7.0.0"/>
         <PackageReference Update="Duende.AccessTokenManagement" Version="2.1.0"/>
         <PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="2.1.0"/>
 

diff --git a/Duende.IdentityServer.v3.ncrunchsolution b/Duende.IdentityServer.v3.ncrunchsolution
@@ -0,0 +1,8 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <EnableRDI>True</EnableRDI>
+    <RdiConfigured>True</RdiConfigured>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
diff --git a/hosts/AspNetIdentity/Pages/Account/Logout/Index.cshtml.cs b/hosts/AspNetIdentity/Pages/Account/Logout/Index.cshtml.cs
@@ -4,7 +4,7 @@
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Extensions;
 using Duende.IdentityServer.Services;
-using IdentityModel;
+using Duende.IdentityModel;
 using IdentityServerHost.Models;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;

diff --git a/hosts/AspNetIdentity/Pages/Consent/Index.cshtml.cs b/hosts/AspNetIdentity/Pages/Consent/Index.cshtml.cs
@@ -6,7 +6,7 @@
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Validation;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;

diff --git a/hosts/AspNetIdentity/Pages/Diagnostics/ViewModel.cs b/hosts/AspNetIdentity/Pages/Diagnostics/ViewModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using System.Text;
 using System.Text.Json;

diff --git a/hosts/AspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs b/hosts/AspNetIdentity/Pages/ExternalLogin/Callback.cshtml.cs
@@ -5,7 +5,7 @@
 using Duende.IdentityServer;
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Services;
-using IdentityModel;
+using Duende.IdentityModel;
 using IdentityServerHost.Models;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;

diff --git a/hosts/Config/Resources.cs b/hosts/Config/Resources.cs
@@ -2,7 +2,7 @@
 // See LICENSE in the project root for license information.
 
 using System.Collections.Generic;
-using IdentityModel;
+using Duende.IdentityModel;
 using Duende.IdentityServer;
 using Duende.IdentityServer.Models;
 

diff --git a/hosts/Configuration/IdentityServerExtensions.cs b/hosts/Configuration/IdentityServerExtensions.cs
@@ -5,7 +5,7 @@
 using Duende.IdentityServer;
 using Duende.IdentityServer.Configuration;
 using Duende.IdentityServer.Configuration.RequestProcessing;
-using IdentityModel;
+using Duende.IdentityModel;
 using IdentityServerHost.Configuration;
 using IdentityServerHost.Extensions;
 using Microsoft.IdentityModel.Tokens;

diff --git a/hosts/Configuration/Pages/Account/Logout/Index.cshtml.cs b/hosts/Configuration/Pages/Account/Logout/Index.cshtml.cs
@@ -4,7 +4,7 @@
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Extensions;
 using Duende.IdentityServer.Services;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/hosts/Configuration/Pages/Consent/Index.cshtml.cs b/hosts/Configuration/Pages/Consent/Index.cshtml.cs
@@ -6,7 +6,7 @@
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Validation;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;

diff --git a/hosts/Configuration/Pages/Diagnostics/ViewModel.cs b/hosts/Configuration/Pages/Diagnostics/ViewModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using System.Text;
 using System.Text.Json;

diff --git a/hosts/Configuration/Pages/ExternalLogin/Callback.cshtml.cs b/hosts/Configuration/Pages/ExternalLogin/Callback.cshtml.cs
@@ -6,7 +6,7 @@
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Test;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/hosts/Configuration/Pages/TestUsers.cs b/hosts/Configuration/Pages/TestUsers.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using System.Security.Claims;
 using System.Text.Json;
 using Duende.IdentityServer;

diff --git a/hosts/EntityFramework/IdentityServerExtensions.cs b/hosts/EntityFramework/IdentityServerExtensions.cs
@@ -3,7 +3,7 @@
 
 using Duende.IdentityServer.Configuration;
 using Duende.IdentityServer.Configuration.EntityFramework;
-using IdentityModel;
+using Duende.IdentityModel;
 using IdentityServerHost.Extensions;
 using Microsoft.EntityFrameworkCore;
 

diff --git a/hosts/EntityFramework/Pages/Account/Logout/Index.cshtml.cs b/hosts/EntityFramework/Pages/Account/Logout/Index.cshtml.cs
@@ -4,7 +4,7 @@
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Extensions;
 using Duende.IdentityServer.Services;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/hosts/EntityFramework/Pages/Admin/Clients/New.cshtml.cs b/hosts/EntityFramework/Pages/Admin/Clients/New.cshtml.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;

diff --git a/hosts/EntityFramework/Pages/Consent/Index.cshtml.cs b/hosts/EntityFramework/Pages/Consent/Index.cshtml.cs
@@ -6,7 +6,7 @@
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Validation;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;

diff --git a/hosts/EntityFramework/Pages/Diagnostics/ViewModel.cs b/hosts/EntityFramework/Pages/Diagnostics/ViewModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using System.Text;
 using System.Text.Json;

diff --git a/hosts/EntityFramework/Pages/ExternalLogin/Callback.cshtml.cs b/hosts/EntityFramework/Pages/ExternalLogin/Callback.cshtml.cs
@@ -6,7 +6,7 @@
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Test;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/hosts/EntityFramework/Pages/TestUsers.cs b/hosts/EntityFramework/Pages/TestUsers.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using System.Security.Claims;
 using System.Text.Json;
 using Duende.IdentityServer;

diff --git a/hosts/main/IdentityServerExtensions.cs b/hosts/main/IdentityServerExtensions.cs
@@ -4,7 +4,7 @@
 using System.Security.Cryptography.X509Certificates;
 using Duende.IdentityServer;
 using Duende.IdentityServer.Configuration;
-using IdentityModel;
+using Duende.IdentityModel;
 using IdentityServerHost.Configuration;
 using IdentityServerHost.Extensions;
 using Microsoft.IdentityModel.Tokens;

diff --git a/hosts/main/Pages/Account/Logout/Index.cshtml.cs b/hosts/main/Pages/Account/Logout/Index.cshtml.cs
@@ -4,7 +4,7 @@
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Extensions;
 using Duende.IdentityServer.Services;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/hosts/main/Pages/Consent/Index.cshtml.cs b/hosts/main/Pages/Consent/Index.cshtml.cs
@@ -6,7 +6,7 @@
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Validation;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;

diff --git a/hosts/main/Pages/Diagnostics/ViewModel.cs b/hosts/main/Pages/Diagnostics/ViewModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using System.Text;
 using System.Text.Json;

diff --git a/hosts/main/Pages/ExternalLogin/Callback.cshtml.cs b/hosts/main/Pages/ExternalLogin/Callback.cshtml.cs
@@ -6,7 +6,7 @@
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Test;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/hosts/main/Pages/TestUsers.cs b/hosts/main/Pages/TestUsers.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 using System.Security.Claims;
 using System.Text.Json;
 using Duende.IdentityServer;

diff --git a/migrations/AspNetIdentityDb/SeedData.cs b/migrations/AspNetIdentityDb/SeedData.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Security.Claims;
 using IdentityServerHost.Data;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/src/AspNetIdentity/IdentityServerBuilderExtensions.cs b/src/AspNetIdentity/IdentityServerBuilderExtensions.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Linq;
 using Duende.IdentityServer;
-using IdentityModel;
+using Duende.IdentityModel;
 using Duende.IdentityServer.AspNetIdentity;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Identity;

diff --git a/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs b/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Duende Software. All rights reserved.
+// Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
 
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Validation;
-using static IdentityModel.OidcConstants;
+using static Duende.IdentityModel.OidcConstants;
 
 namespace Duende.IdentityServer.AspNetIdentity;
 

diff --git a/src/AspNetIdentity/UserClaimsFactory.cs b/src/AspNetIdentity/UserClaimsFactory.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using System.Security.Claims;
-using IdentityModel;
+using Duende.IdentityModel;
 
 namespace Duende.IdentityServer.AspNetIdentity;
 

diff --git a/src/Configuration/Duende.IdentityServer.Configuration.csproj b/src/Configuration/Duende.IdentityServer.Configuration.csproj
@@ -19,7 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="IdentityModel" />
+      <PackageReference Include="Duende.IdentityModel" />
       <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     </ItemGroup>
 

diff --git a/src/Configuration/Models/DynamicClientRegistration/DynamicClientRegistrationRequest.cs b/src/Configuration/Models/DynamicClientRegistration/DynamicClientRegistrationRequest.cs
@@ -3,7 +3,7 @@
 
 
 using System.Text.Json.Serialization;
-using IdentityModel;
+using Duende.IdentityModel;
 
 namespace Duende.IdentityServer.Configuration.Models.DynamicClientRegistration;
 

diff --git a/src/Configuration/Models/DynamicClientRegistration/DynamicClientRegistrationResponse.cs b/src/Configuration/Models/DynamicClientRegistration/DynamicClientRegistrationResponse.cs
@@ -4,7 +4,7 @@
 
 using System.Text.Json.Serialization;
 using Duende.IdentityServer.Models;
-using IdentityModel;
+using Duende.IdentityModel;
 
 namespace Duende.IdentityServer.Configuration.Models.DynamicClientRegistration;
 

diff --git a/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs b/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs
@@ -6,7 +6,7 @@
 using Duende.IdentityServer.Configuration.Models;
 using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration;
 using Duende.IdentityServer.Models;
-using IdentityModel;
+using Duende.IdentityModel;
 
 namespace Duende.IdentityServer.Configuration.RequestProcessing;
 

diff --git a/src/Configuration/Validation/DynamicClientRegistration/DynamicClientRegistrationValidator.cs b/src/Configuration/Validation/DynamicClientRegistration/DynamicClientRegistrationValidator.cs
@@ -7,7 +7,7 @@
 using Duende.IdentityServer.Configuration.Models;
 using Duende.IdentityServer.Configuration.Models.DynamicClientRegistration;
 using Duende.IdentityServer.Models;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.Extensions.Logging;
 
 namespace Duende.IdentityServer.Configuration.Validation.DynamicClientRegistration;

diff --git a/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs b/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using IdentityModel;
+using Duende.IdentityModel;
 using Duende.IdentityServer.EntityFramework.Entities;
 using Duende.IdentityServer.EntityFramework.Interfaces;
 using Duende.IdentityServer.Models;

diff --git a/src/IdentityServer/Configuration/CryptoHelper.cs b/src/IdentityServer/Configuration/CryptoHelper.cs
@@ -4,7 +4,7 @@
 
 #nullable enable
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.IdentityModel.Tokens;
 using System;
 using System.Linq;

diff --git a/src/IdentityServer/Configuration/DependencyInjection/Options/LoggingOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/LoggingOptions.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Http;
 
 namespace Duende.IdentityServer.Configuration;

diff --git a/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs b/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs
@@ -11,7 +11,7 @@
 using Duende.IdentityServer.Hosting;
 using Duende.IdentityServer.Hosting.DynamicProviders;
 using Duende.IdentityServer.Stores;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

diff --git a/src/IdentityServer/Constants.cs b/src/IdentityServer/Constants.cs
@@ -2,7 +2,7 @@
 // See LICENSE in the project root for license information.
 
 
-using IdentityModel;
+using Duende.IdentityModel;
 using Duende.IdentityServer.Models;
 using System;
 using System.Collections.Generic;

diff --git a/src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs b/src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs
@@ -17,7 +17,7 @@
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Stores;
 using Duende.IdentityServer.Validation;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 

diff --git a/src/IdentityServer/Endpoints/BackchannelAuthenticationEndpoint.cs b/src/IdentityServer/Endpoints/BackchannelAuthenticationEndpoint.cs
@@ -13,7 +13,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Duende.IdentityServer.Events;
-using IdentityModel;
+using Duende.IdentityModel;
 using System.IO;
 
 namespace Duende.IdentityServer.Endpoints;

diff --git a/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs b/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs
@@ -10,7 +10,7 @@
 using Duende.IdentityServer.ResponseHandling;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Validation;
-using IdentityModel;
+using Duende.IdentityModel;
 using Duende.IdentityServer.Extensions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;