cleanup for 6.1 release

Author: leastprivilege

README.md

@@ -1,6 +1,6 @@
 # IdentityModel.AspNetCore.OAuth2Introspection
 
-ASP.NET Core 2 authentication handler for OAuth 2.0 token introspection
+ASP.NET Core authentication handler for OAuth 2.0 token introspection
 
 https://tools.ietf.org/html/rfc7662
 

src/Context/RequestSendingContext.cs src/Context/SendingRequestContext.cssrc/Context/RequestSendingContext.cs renamed to src/Context/SendingRequestContext.cs

@@ -5,14 +5,14 @@
 namespace IdentityModel.AspNetCore.OAuth2Introspection
 {
     /// <summary>
-    /// Context for the RequestSending event
+    /// Context for the SendingRequest event
     /// </summary>
-    public class RequestSendingContext : BaseContext<OAuth2IntrospectionOptions>
+    public class SendingRequestContext : BaseContext<OAuth2IntrospectionOptions>
     {
         /// <summary>
         /// ctor
         /// </summary>
-        public RequestSendingContext(
+        public SendingRequestContext(
             HttpContext context,
             AuthenticationScheme scheme,
             OAuth2IntrospectionOptions options)

src/IdentityModel.AspNetCore.OAuth2Introspection.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
 
     <PackageId>IdentityModel.AspNetCore.OAuth2Introspection</PackageId>
     <Description>ASP.NET Core authentication handler for validating tokens using OAuth 2.0 introspection</Description>

src/OAuth2IntrospectionEvents.cs

@@ -29,7 +29,7 @@ public class OAuth2IntrospectionEvents
         /// <summary>
         /// Invoked when sending token introspection request.
         /// </summary>
-        public Func<RequestSendingContext, Task> OnRequestSending { get; set; } = context => Task.CompletedTask;
+        public Func<SendingRequestContext, Task> OnSendingRequest { get; set; } = context => Task.CompletedTask;
 
         /// <summary>
         /// Invoked if exceptions are thrown during request processing. The exceptions will be re-thrown after this event unless suppressed.
@@ -49,6 +49,6 @@ public class OAuth2IntrospectionEvents
         /// <summary>
         /// Invoked when sending token introspection request.
         /// </summary>
-        public virtual Task RequestSending(RequestSendingContext context) => OnRequestSending(context);
+        public virtual Task SendingRequest(SendingRequestContext context) => OnSendingRequest(context);
     }
 }

src/OAuth2IntrospectionHandler.cs

@@ -180,12 +180,12 @@ private static async Task<TokenIntrospectionResponse> LoadClaimsForToken(
             var introspectionClient = await options.IntrospectionClient.Value.ConfigureAwait(false);
             using var request = CreateTokenIntrospectionRequest(token, context, scheme, events, options);
 
-            var requestSendingContext = new RequestSendingContext(context, scheme, options)
+            var requestSendingContext = new SendingRequestContext(context, scheme, options)
             {
                 TokenIntrospectionRequest = request,
             };
 
-            await events.RequestSending(requestSendingContext);
+            await events.SendingRequest(requestSendingContext);
 
             return await introspectionClient.IntrospectTokenAsync(request).ConfigureAwait(false);
         }

test/Tests/Introspection.cs

@@ -403,7 +403,7 @@ public async Task ActiveToken_RequestSending_AdditionalParameter_with_inline_eve
             {
                 _options(o);
 
-                o.Events.OnRequestSending = e =>
+                o.Events.OnSendingRequest = e =>
                 {
                     e.TokenIntrospectionRequest.Parameters = Parameters.FromObject(new { additionalParameter = "42" });
                     return Task.CompletedTask;

test/Tests/Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Condition=" '$(NETCoreSdkPortableRuntimeIdentifier)' != 'osx-arm64' ">
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(NETCoreSdkPortableRuntimeIdentifier)' == 'osx-arm64' ">
@@ -26,11 +26,7 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0" />
-  </ItemGroup>
-
+  
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
   </ItemGroup>