Merge pull request #2 from cnblogs/replace-IdentityModel

refactor: replace IdentityModel with Duende.IdentityModel

Author: cnblogs-dudu

src/Context/SendingRequestContext.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;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 

src/Context/UpdateClientAssertionContext.cs

@@ -1,10 +1,10 @@
 // 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 System;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
+using System;
 
 namespace IdentityModel.AspNetCore.OAuth2Introspection
 {

src/IdentityModel.AspNetCore.OAuth2Introspection.csproj

@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityModel" Version="6.0.0" />
+    <PackageReference Include="Duende.IdentityModel" Version="7.0.0" />
 
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="minver" Version="6.0.0" PrivateAssets="All" />

src/Infrastructure/CacheExtensions.cs

@@ -1,6 +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 Duende.IdentityModel;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
 using System;
@@ -19,20 +20,20 @@ internal static class CacheExtensions
         private static readonly JsonSerializerOptions Options;
 
         static CacheExtensions()
-        {    
+        {
             Options = new JsonSerializerOptions
             {
                 IgnoreReadOnlyFields = true,
                 IgnoreReadOnlyProperties = true,
                 DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
             };
-   
+
             Options.Converters.Add(new ClaimConverter());
         }
 
         public static async Task<IEnumerable<Claim>> GetClaimsAsync(this IDistributedCache cache, OAuth2IntrospectionOptions options, string token)
         {
-            var cacheKey = options.CacheKeyGenerator(options,token);
+            var cacheKey = options.CacheKeyGenerator(options, token);
             var bytes = await cache.GetAsync(cacheKey).ConfigureAwait(false);
 
             if (bytes == null)

src/OAuth2IntrospectionHandler.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;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Caching.Distributed;

src/OAuth2IntrospectionOptions.cs

@@ -1,8 +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 Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using IdentityModel.AspNetCore.OAuth2Introspection.Infrastructure;
-using IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using System;
@@ -116,7 +117,7 @@ public OAuth2IntrospectionOptions()
         /// <summary>
         /// Specifies the method how to generate the cache key from the token
         /// </summary>
-        public Func<OAuth2IntrospectionOptions,string, string> CacheKeyGenerator { get; set; } = CacheUtils.CacheKeyFromToken();
+        public Func<OAuth2IntrospectionOptions, string, string> CacheKeyGenerator { get; set; } = CacheUtils.CacheKeyFromToken();
 
         /// <summary>
         /// Specifies the method how to retrieve the token from the HTTP request
@@ -133,7 +134,7 @@ public OAuth2IntrospectionOptions()
         }
 
         internal AsyncLazy<HttpClient> IntrospectionClient { get; set; }
-        
+
         /// <summary>
         /// Check that the options are valid. Should throw an exception if things are not ok.
         /// </summary>

src/PostConfigureOAuth2IntrospectionOptions.cs

@@ -1,13 +1,13 @@
 // 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 System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using Duende.IdentityModel.Client;
 using IdentityModel.AspNetCore.OAuth2Introspection.Infrastructure;
-using IdentityModel.Client;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace IdentityModel.AspNetCore.OAuth2Introspection
 {
@@ -30,7 +30,7 @@ public void PostConfigure(string name, OAuth2IntrospectionOptions options)
             {
                 throw new ArgumentException("Caching is enabled, but no IDistributedCache is found in the services collection", nameof(_cache));
             }
-            
+
             options.IntrospectionClient = new AsyncLazy<HttpClient>(() => InitializeIntrospectionClient(options));
         }
 
@@ -53,7 +53,7 @@ private async Task<string> GetIntrospectionEndpointFromDiscoveryDocument(OAuth2I
                 Address = options.Authority,
                 Policy = options?.DiscoveryPolicy ?? new DiscoveryPolicy()
             }).ConfigureAwait(false);
-            
+
             if (disco.IsError)
             {
                 switch (disco.ErrorType)

test/Tests/Configuration.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 Duende.IdentityModel.Client;
 using FluentAssertions;
 using IdentityModel.AspNetCore.OAuth2Introspection;
-using IdentityModel.Client;
 using System;
 using System.Threading.Tasks;
 using Tests.Util;

test/Tests/Introspection.cs

@@ -1,10 +1,10 @@
 // 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 Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using FluentAssertions;
-using IdentityModel;
 using IdentityModel.AspNetCore.OAuth2Introspection;
-using IdentityModel.Client;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.DependencyInjection;