Pass through CancellationToken (#620)

Pass a CancellationToken through to more operations.

Author: martincostello

src/AspNet.Security.OAuth.Keycloak/KeycloakAuthenticationHandler.cs

@@ -61,12 +61,12 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
                                 "returned a {Status} response with the following payload: {Headers} {Body}.",
                                 /* Status: */ response.StatusCode,
                                 /* Headers: */ response.Headers.ToString(),
-                                /* Body: */ await response.Content.ReadAsStringAsync());
+                                /* Body: */ await response.Content.ReadAsStringAsync(Context.RequestAborted));
 
                 throw new HttpRequestException("An error occurred while retrieving the user profile from Keycloak.");
             }
 
-            using var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync());
+            using var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync(Context.RequestAborted));
             var principal = new ClaimsPrincipal(identity);
             var context = new OAuthCreatingTicketContext(principal, properties, Context, Scheme, Options, Backchannel, tokens, payload.RootElement);
             context.RunClaimActions();

src/AspNet.Security.OAuth.Notion/NotionAuthenticationHandler.cs

@@ -12,6 +12,7 @@
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Authentication;
@@ -65,11 +66,11 @@ protected override async Task<OAuthTokenResponse> ExchangeCodeAsync([NotNull] OA
             using var response = await Backchannel.SendAsync(requestMessage, Context.RequestAborted);
             if (response.IsSuccessStatusCode)
             {
-                var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync());
+                var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync(Context.RequestAborted));
                 return OAuthTokenResponse.Success(payload);
             }
 
-            var error = "OAuth token endpoint failure: " + await DisplayAsync(response);
+            var error = "OAuth token endpoint failure: " + await DisplayAsync(response, Context.RequestAborted);
             return OAuthTokenResponse.Failed(new Exception(error));
         }
 
@@ -94,12 +95,12 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             return new AuthenticationTicket(context.Principal!, context.Properties, Scheme.Name);
         }
 
-        private static async Task<string> DisplayAsync(HttpResponseMessage response)
+        private static async Task<string> DisplayAsync(HttpResponseMessage response, CancellationToken cancellationToken)
         {
             var output = new StringBuilder();
             output.Append("Status: ").Append(response.StatusCode).Append(';');
             output.Append("Headers: ").Append(response.Headers).Append(';');
-            output.Append("Body: ").Append(await response.Content.ReadAsStringAsync()).Append(';');
+            output.Append("Body: ").Append(await response.Content.ReadAsStringAsync(cancellationToken)).Append(';');
             return output.ToString();
         }
     }