chore(deps): rename IdentityModel to Duende.IdentityModel

Author: cnblogs-dudu

samples/Clients/Directory.Build.targets

@@ -1,17 +1,17 @@
 <Project>
 
-  <PropertyGroup>
-    <AspNetVersion>3.1.0</AspNetVersion>    
-  </PropertyGroup>
+    <PropertyGroup>
+        <AspNetVersion>3.1.0</AspNetVersion>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Update="IdentityModel" Version="4.3.0" />
-    
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetVersion)" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetVersion)" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetVersion)" />     
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(AspNetVersion)"/>
-    
-    <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Update="Duende.IdentityModel" Version="4.3.0" />
+
+        <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetVersion)" />
+        <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetVersion)" />
+        <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetVersion)" />
+        <PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(AspNetVersion)" />
+
+        <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
+    </ItemGroup>
 </Project>

samples/Clients/old/MvcHybrid/Startup.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using System.IdentityModel.Tokens.Jwt;
-using IdentityModel;
+using Duende.IdentityModel;
 using Clients;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.AspNetCore.Authentication.Cookies;

samples/Clients/old/MvcHybridAutomaticRefresh/Startup.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using System.IdentityModel.Tokens.Jwt;
-using IdentityModel;
+using Duende.IdentityModel;
 using Clients;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.AspNetCore.Authentication.Cookies;
@@ -50,7 +50,7 @@ public void ConfigureServices(IServiceCollection services)
                     options.Scope.Add("email");
                     options.Scope.Add("api1");
                     options.Scope.Add("offline_access");
-                    
+
                     options.ClaimActions.MapAllExcept("iss", "nbf", "exp", "aud", "nonce", "iat", "c_hash");
 
                     options.GetClaimsFromUserInfoEndpoint = true;

samples/Clients/old/MvcImplicit/Startup.cs

@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;

samples/Clients/old/MvcImplicitJwtRequest/Startup.cs

@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;

samples/Clients/old/MvcManual/Controllers/HomeController.cs

@@ -6,7 +6,7 @@
 using System.Linq;
 using Microsoft.IdentityModel.Tokens;
 using System.Collections.Generic;
-using IdentityModel;
+using Duende.IdentityModel;
 using System.Security.Cryptography;
 using System.IdentityModel.Tokens.Jwt;
 using Clients;
@@ -32,7 +32,7 @@ public async Task<IActionResult> Secure()
             return await StartAuthentication();
         }
 
-        public async Task <IActionResult> Logout()
+        public async Task<IActionResult> Logout()
         {
             await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
 

samples/Clients/src/ConsoleDeviceFlow/Program.cs

@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using IdentityModel.Client;
 using Newtonsoft.Json.Linq;
 using System;

samples/Clients/src/ConsoleEphemeralMtlsClient/Program.cs

@@ -5,7 +5,7 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using IdentityModel.Client;
 using Newtonsoft.Json.Linq;
 
@@ -14,18 +14,18 @@ namespace ConsoleEphemeralMtlsClient
     class Program
     {
         private static X509Certificate2 ClientCertificate;
-        
+
         static async Task Main(string[] args)
         {
             ClientCertificate = CreateClientCertificate("client");
-            
+
             var response = await RequestTokenAsync();
             response.Show();
 
             Console.ReadLine();
             await CallServiceAsync(response.AccessToken);
         }
-        
+
         static async Task<TokenResponse> RequestTokenAsync()
         {
             var client = new HttpClient(GetHandler(ClientCertificate));
@@ -37,7 +37,7 @@ static async Task<TokenResponse> RequestTokenAsync()
                 .TryGetValue(OidcConstants.Discovery.MtlsEndpointAliases)
                 .Value<string>(OidcConstants.Discovery.TokenEndpoint)
                 .ToString();
-            
+
             var response = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
             {
                 Address = endpoint,
@@ -64,17 +64,17 @@ static async Task CallServiceAsync(string token)
             "\n\nService claims:".ConsoleGreen();
             Console.WriteLine(JArray.Parse(response));
         }
-        
+
         static X509Certificate2 CreateClientCertificate(string name)
         {
             X500DistinguishedName distinguishedName = new X500DistinguishedName($"CN={name}");
 
             using (var rsa = RSA.Create(2048))
             {
-                var request = new CertificateRequest(distinguishedName, rsa, HashAlgorithmName.SHA256,RSASignaturePadding.Pkcs1);
+                var request = new CertificateRequest(distinguishedName, rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
 
                 request.CertificateExtensions.Add(
-                    new X509KeyUsageExtension(X509KeyUsageFlags.DataEncipherment | X509KeyUsageFlags.KeyEncipherment | X509KeyUsageFlags.DigitalSignature , false));
+                    new X509KeyUsageExtension(X509KeyUsageFlags.DataEncipherment | X509KeyUsageFlags.KeyEncipherment | X509KeyUsageFlags.DigitalSignature, false));
 
                 request.CertificateExtensions.Add(
                     new X509EnhancedKeyUsageExtension(
@@ -83,7 +83,7 @@ static X509Certificate2 CreateClientCertificate(string name)
                 return request.CreateSelfSigned(new DateTimeOffset(DateTime.UtcNow.AddDays(-1)), new DateTimeOffset(DateTime.UtcNow.AddDays(3650)));
             }
         }
-        
+
         static SocketsHttpHandler GetHandler(X509Certificate2 certificate)
         {
             var handler = new SocketsHttpHandler

samples/Clients/src/ConsoleMTLSClient/Program.cs

@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using IdentityModel.Client;
 using Newtonsoft.Json.Linq;
 using System;
@@ -34,7 +34,7 @@ static async Task<TokenResponse> RequestTokenAsync()
                     .TryGetValue(OidcConstants.Discovery.MtlsEndpointAliases)
                     .Value<string>(OidcConstants.Discovery.TokenEndpoint)
                     .ToString();
-            
+
             var response = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
             {
                 Address = endpoint,
@@ -64,7 +64,7 @@ static async Task CallServiceAsync(string token)
         static SocketsHttpHandler GetHandler()
         {
             var handler = new SocketsHttpHandler();
-            
+
             var cert = new X509Certificate2("client.p12", "changeit");
             handler.SslOptions.ClientCertificates = new X509CertificateCollection { cert };
 

samples/Clients/src/ConsolePrivateKeyJwtClient/Program.cs

@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using IdentityModel.Client;
 using Microsoft.IdentityModel.Tokens;
 using System;
@@ -16,7 +16,7 @@ namespace ConsolePrivateKeyJwtClient
     public class Program
     {
         private static string rsaKey = "{'d':'GmiaucNIzdvsEzGjZjd43SDToy1pz-Ph-shsOUXXh-dsYNGftITGerp8bO1iryXh_zUEo8oDK3r1y4klTonQ6bLsWw4ogjLPmL3yiqsoSjJa1G2Ymh_RY_sFZLLXAcrmpbzdWIAkgkHSZTaliL6g57vA7gxvd8L4s82wgGer_JmURI0ECbaCg98JVS0Srtf9GeTRHoX4foLWKc1Vq6NHthzqRMLZe-aRBNU9IMvXNd7kCcIbHCM3GTD_8cFj135nBPP2HOgC_ZXI1txsEf-djqJj8W5vaM7ViKU28IDv1gZGH3CatoysYx6jv1XJVvb2PH8RbFKbJmeyUm3Wvo-rgQ','dp':'YNjVBTCIwZD65WCht5ve06vnBLP_Po1NtL_4lkholmPzJ5jbLYBU8f5foNp8DVJBdFQW7wcLmx85-NC5Pl1ZeyA-Ecbw4fDraa5Z4wUKlF0LT6VV79rfOF19y8kwf6MigyrDqMLcH_CRnRGg5NfDsijlZXffINGuxg6wWzhiqqE','dq':'LfMDQbvTFNngkZjKkN2CBh5_MBG6Yrmfy4kWA8IC2HQqID5FtreiY2MTAwoDcoINfh3S5CItpuq94tlB2t-VUv8wunhbngHiB5xUprwGAAnwJ3DL39D2m43i_3YP-UO1TgZQUAOh7Jrd4foatpatTvBtY3F1DrCrUKE5Kkn770M','e':'AQAB','kid':'ZzAjSnraU3bkWGnnAqLapYGpTyNfLbjbzgAPbbW2GEA','kty':'RSA','n':'wWwQFtSzeRjjerpEM5Rmqz_DsNaZ9S1Bw6UbZkDLowuuTCjBWUax0vBMMxdy6XjEEK4Oq9lKMvx9JzjmeJf1knoqSNrox3Ka0rnxXpNAz6sATvme8p9mTXyp0cX4lF4U2J54xa2_S9NF5QWvpXvBeC4GAJx7QaSw4zrUkrc6XyaAiFnLhQEwKJCwUw4NOqIuYvYp_IXhw-5Ti_icDlZS-282PcccnBeOcX7vc21pozibIdmZJKqXNsL1Ibx5Nkx1F1jLnekJAmdaACDjYRLL_6n3W4wUp19UvzB1lGtXcJKLLkqB6YDiZNu16OSiSprfmrRXvYmvD8m6Fnl5aetgKw','p':'7enorp9Pm9XSHaCvQyENcvdU99WCPbnp8vc0KnY_0g9UdX4ZDH07JwKu6DQEwfmUA1qspC-e_KFWTl3x0-I2eJRnHjLOoLrTjrVSBRhBMGEH5PvtZTTThnIY2LReH-6EhceGvcsJ_MhNDUEZLykiH1OnKhmRuvSdhi8oiETqtPE','q':'0CBLGi_kRPLqI8yfVkpBbA9zkCAshgrWWn9hsq6a7Zl2LcLaLBRUxH0q1jWnXgeJh9o5v8sYGXwhbrmuypw7kJ0uA3OgEzSsNvX5Ay3R9sNel-3Mqm8Me5OfWWvmTEBOci8RwHstdR-7b9ZT13jk-dsZI7OlV_uBja1ny9Nz9ts','qi':'pG6J4dcUDrDndMxa-ee1yG4KjZqqyCQcmPAfqklI2LmnpRIjcK78scclvpboI3JQyg6RCEKVMwAhVtQM6cBcIO3JrHgqeYDblp5wXHjto70HVW6Z8kBruNx1AH9E8LzNvSRL-JVTFzBkJuNgzKQfD0G77tQRgJ-Ri7qu3_9o1M4'}";
-        
+
         public static async Task Main()
         {
             Console.Title = "Console Client Credentials Flow with JWT Assertion";
@@ -35,7 +35,7 @@ public static async Task Main()
             var jwk = new JsonWebKey(rsaKey);
             response = await RequestTokenAsync(new SigningCredentials(jwk, "RS256"));
             response.Show();
-            
+
             Console.ReadLine();
             await CallServiceAsync(response.AccessToken);
         }
@@ -47,7 +47,7 @@ static async Task<TokenResponse> RequestTokenAsync(SigningCredentials credential
             var disco = await client.GetDiscoveryDocumentAsync(Constants.Authority);
             if (disco.IsError) throw new Exception(disco.Error);
 
-            var clientToken = CreateClientToken(credential,"client.jwt", disco.TokenEndpoint);
+            var clientToken = CreateClientToken(credential, "client.jwt", disco.TokenEndpoint);
 
             var response = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
             {
@@ -83,7 +83,7 @@ static async Task CallServiceAsync(string token)
 
         private static string CreateClientToken(SigningCredentials credential, string clientId, string audience)
         {
-            
+
             var now = DateTime.UtcNow;
 
             var token = new JwtSecurityToken(