Revert JSON serialization refactoring (#901)

This reverts commit 67f41f9 from #890.
aspnet-contrib · Jun 13, 2024 · 4bee700 · 4bee700
1 parent 650716b
commit 4bee700
Show file tree

Hide file tree

Showing 85 changed files with 105 additions and 194 deletions.
diff --git a/src/AspNet.Security.OAuth.AdobeIO/AdobeIOAuthenticationHandler.cs b/src/AspNet.Security.OAuth.AdobeIO/AdobeIOAuthenticationHandler.cs
@@ -42,8 +42,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.Amazon/AmazonAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Amazon/AmazonAuthenticationHandler.cs
@@ -57,8 +57,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile from Amazon.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.AmoCrm/AmoCrmAuthenticationHandler.cs b/src/AspNet.Security.OAuth.AmoCrm/AmoCrmAuthenticationHandler.cs
@@ -51,8 +51,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile from amoCRM.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.ArcGIS/ArcGISAuthenticationHandler.cs b/src/AspNet.Security.OAuth.ArcGIS/ArcGISAuthenticationHandler.cs
@@ -43,8 +43,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
 
         // Request the token
         using var response = await Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        using var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync(Context.RequestAborted));
 
         // Note: error responses always return 200 status codes.
         if (payload.RootElement.TryGetProperty("error", out var error))

diff --git a/src/AspNet.Security.OAuth.Asana/AsanaAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Asana/AsanaAuthenticationHandler.cs
@@ -39,8 +39,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.Autodesk/AutodeskAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Autodesk/AutodeskAuthenticationHandler.cs
@@ -40,8 +40,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.Baidu/BaiduAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Baidu/BaiduAuthenticationHandler.cs
@@ -41,8 +41,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.Basecamp/BasecampAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Basecamp/BasecampAuthenticationHandler.cs
@@ -39,8 +39,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.BattleNet/BattleNetAuthenticationHandler.cs b/src/AspNet.Security.OAuth.BattleNet/BattleNetAuthenticationHandler.cs
@@ -41,8 +41,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.Bitbucket/BitbucketAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Bitbucket/BitbucketAuthenticationHandler.cs
@@ -39,8 +39,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);
@@ -77,8 +76,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the email address associated to the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        using var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync(Context.RequestAborted));
 
         return (from address in payload.RootElement.GetProperty("values").EnumerateArray()
                 where address.GetProperty("is_primary").GetBoolean()

diff --git a/src/AspNet.Security.OAuth.Buffer/BufferAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Buffer/BufferAuthenticationHandler.cs
@@ -39,8 +39,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.CiscoSpark/CiscoSparkAuthenticationHandler.cs b/src/AspNet.Security.OAuth.CiscoSpark/CiscoSparkAuthenticationHandler.cs
@@ -39,8 +39,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.Coinbase/CoinbaseAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Coinbase/CoinbaseAuthenticationHandler.cs
@@ -39,8 +39,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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.GetProperty("data"));

diff --git a/src/AspNet.Security.OAuth.Deezer/DeezerAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Deezer/DeezerAuthenticationHandler.cs
@@ -55,8 +55,7 @@ protected override async Task<OAuthTokenResponse> ExchangeCodeAsync([NotNull] OA
             return OAuthTokenResponse.Failed(new Exception("An error occurred while retrieving an OAuth token."));
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync(Context.RequestAborted));
         return OAuthTokenResponse.Success(payload);
     }
 
@@ -77,8 +76,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationHandler.cs b/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationHandler.cs
@@ -39,8 +39,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.DigitalOcean/DigitalOceanAuthenticationHandler.cs b/src/AspNet.Security.OAuth.DigitalOcean/DigitalOceanAuthenticationHandler.cs
@@ -75,8 +75,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        using var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync(Context.RequestAborted));
 
         var account = payload.RootElement.GetProperty("account");
 

diff --git a/src/AspNet.Security.OAuth.Discord/DiscordAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Discord/DiscordAuthenticationHandler.cs
@@ -55,8 +55,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.Dropbox/DropboxAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Dropbox/DropboxAuthenticationHandler.cs
@@ -55,8 +55,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.Ebay/EbayAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Ebay/EbayAuthenticationHandler.cs
@@ -37,8 +37,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);
@@ -83,8 +82,7 @@ protected override async Task<OAuthTokenResponse> ExchangeCodeAsync([NotNull] OA
             return OAuthTokenResponse.Failed(new Exception("An error occurred while retrieving an access token."));
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync(Context.RequestAborted));
 
         return OAuthTokenResponse.Success(payload);
     }

diff --git a/src/AspNet.Security.OAuth.ExactOnline/ExactOnlineAuthenticationHandler.cs b/src/AspNet.Security.OAuth.ExactOnline/ExactOnlineAuthenticationHandler.cs
@@ -40,8 +40,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        using var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync(Context.RequestAborted));
         var user = payload.RootElement
             .GetProperty("d")
             .GetProperty("results")

diff --git a/src/AspNet.Security.OAuth.Feishu/FeishuAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Feishu/FeishuAuthenticationHandler.cs
@@ -39,8 +39,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);

diff --git a/src/AspNet.Security.OAuth.Fitbit/FitbitAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Fitbit/FitbitAuthenticationHandler.cs
@@ -40,8 +40,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);
@@ -80,8 +79,7 @@ protected override async Task<OAuthTokenResponse> ExchangeCodeAsync([NotNull] OA
             return OAuthTokenResponse.Failed(new Exception("An error occurred while retrieving an access token."));
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync(Context.RequestAborted));
 
         return OAuthTokenResponse.Success(payload);
     }

diff --git a/src/AspNet.Security.OAuth.Foursquare/FoursquareAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Foursquare/FoursquareAuthenticationHandler.cs
@@ -48,8 +48,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             throw new HttpRequestException("An error occurred while retrieving the user profile.");
         }
 
-        using var stream = await response.Content.ReadAsStreamAsync(Context.RequestAborted);
-        using var payload = await JsonDocument.ParseAsync(stream, cancellationToken: Context.RequestAborted);
+        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);