Updated dependencies

- Drop support for dotnet 6,7
- Reference Duende.IdentityModel

Author: josephdecock

.github/workflows/ci.yml

@@ -25,8 +25,6 @@ jobs:
       uses: actions/setup-dotnet@v2
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
           8.0.x
 
     - run: dotnet --info
@@ -40,4 +38,4 @@ jobs:
         SignClientSecret: ${{ secrets.SIGNCLIENTSECRET }}
       run: |
         ./build.cmd sign
-        dotnet nuget push .\artifacts\*.nupkg -s https://www.myget.org/F/identity/api/v2/package -k ${{ secrets.MYGET }} 
+        dotnet nuget push .\artifacts\*.nupkg -s https://www.myget.org/F/identity/api/v2/package -k ${{ secrets.MYGET }} 

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

@@ -2,7 +2,7 @@
 // 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;
 
@@ -32,4 +32,4 @@ public UpdateClientAssertionContext(
         /// </summary>
         public DateTime ClientAssertionExpirationTime { get; set; }
     }
-}
+}

src/IdentityModel.AspNetCore.OAuth2Introspection.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
 
     <PackageId>IdentityModel.AspNetCore.OAuth2Introspection</PackageId>
     <Description>ASP.NET Core authentication handler for validating tokens using OAuth 2.0 introspection</Description>
@@ -27,8 +27,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityModel" Version="7.0.0" />
+    <PackageReference Include="Duende.IdentityModel" Version="7.1.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="minver" Version="5.0.0" PrivateAssets="All" />
+    <PackageReference Include="minver" Version="6.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>

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;

src/OAuth2IntrospectionExtensions.cs

@@ -56,4 +56,4 @@ public static AuthenticationBuilder AddOAuth2Introspection(this AuthenticationBu
             return builder.AddScheme<OAuth2IntrospectionOptions, OAuth2IntrospectionHandler>(authenticationScheme, configureOptions);
         }
     }
-}
+}

src/OAuth2IntrospectionHandler.cs

@@ -8,7 +8,7 @@
 using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Caching.Distributed;
@@ -28,27 +28,6 @@ public class OAuth2IntrospectionHandler : AuthenticationHandler<OAuth2Introspect
         private static readonly ConcurrentDictionary<string, Lazy<Task<TokenIntrospectionResponse>>> IntrospectionDictionary =
             new ConcurrentDictionary<string, Lazy<Task<TokenIntrospectionResponse>>>();
 
-#if NET6_0
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OAuth2IntrospectionHandler"/> class.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <param name="urlEncoder">The URL encoder.</param>
-        /// <param name="clock">The clock.</param>
-        /// <param name="loggerFactory">The logger factory.</param>
-        /// <param name="cache">The cache.</param>
-        public OAuth2IntrospectionHandler(
-            IOptionsMonitor<OAuth2IntrospectionOptions> options,
-            UrlEncoder urlEncoder,
-            ISystemClock clock,
-            ILoggerFactory loggerFactory,
-            IDistributedCache cache = null)
-            : base(options, loggerFactory, urlEncoder, clock)
-        {
-            _logger = loggerFactory.CreateLogger<OAuth2IntrospectionHandler>();
-            _cache = cache;
-        }
-#elif NET8_0_OR_GREATER
         /// <summary>
         /// Initializes a new instance of the <see cref="OAuth2IntrospectionHandler"/> class.
         /// </summary>
@@ -66,8 +45,6 @@ public OAuth2IntrospectionHandler(
             _logger = loggerFactory.CreateLogger<OAuth2IntrospectionHandler>();
             _cache = cache;
         }
-#endif
-
 
         /// <summary>
         /// The handler calls methods on the events which give the application control at certain points where processing is occurring.
@@ -292,4 +269,4 @@ private static async Task<AuthenticateResult> CreateTicket(
             return tokenValidatedContext.Result;
         }
     }
-}
+}

src/OAuth2IntrospectionOptions.cs

@@ -2,7 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using IdentityModel.AspNetCore.OAuth2Introspection.Infrastructure;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using System;

src/PostConfigureOAuth2IntrospectionOptions.cs

@@ -5,7 +5,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using IdentityModel.AspNetCore.OAuth2Introspection.Infrastructure;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 
@@ -70,4 +70,4 @@ private async Task<string> GetIntrospectionEndpointFromDiscoveryDocument(OAuth2I
             return disco.IntrospectionEndpoint;
         }
     }
-}
+}

test/Tests/Configuration.cs

@@ -3,7 +3,7 @@
 
 using FluentAssertions;
 using IdentityModel.AspNetCore.OAuth2Introspection;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Threading.Tasks;
 using Tests.Util;
@@ -125,4 +125,4 @@ public async Task Authority_Get_Introspection_Endpoint()
             ops.IntrospectionEndpoint.Should().Be("https://authority.com/introspection_endpoint");
         }
     }
-}
+}