Update GenericOAuthProvider.cs

localden · localden · commit 6601b79626cb · 2025-06-10T23:16:39.000-07:00
diff --git a/src/ModelContextProtocol.Core/Authentication/GenericOAuthProvider.cs b/src/ModelContextProtocol.Core/Authentication/GenericOAuthProvider.cs
@@ -334,8 +334,8 @@ private async Task<McpUnauthorizedResponseResult> PerformOAuthAuthorizationAsync
                 var response = await _httpClient.GetAsync(new Uri(baseUrl + path), cancellationToken);
                 if (response.IsSuccessStatusCode)
                 {
-                    var json = await response.Content.ReadAsStringAsync(cancellationToken);
-                    var metadata = JsonSerializer.Deserialize<AuthorizationServerMetadata>(json, McpJsonUtilities.JsonContext.Default.AuthorizationServerMetadata);
+                    using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
+                    var metadata = await JsonSerializer.DeserializeAsync<AuthorizationServerMetadata>(stream, McpJsonUtilities.JsonContext.Default.AuthorizationServerMetadata, cancellationToken);
                     
                     if (metadata != null)
                     {
@@ -382,8 +382,8 @@ private async Task<McpUnauthorizedResponseResult> PerformOAuthAuthorizationAsync
             var response = await _httpClient.SendAsync(request, cancellationToken);
             if (response.IsSuccessStatusCode)
             {
-                var json = await response.Content.ReadAsStringAsync(cancellationToken);
-                var tokenResponse = JsonSerializer.Deserialize<TokenContainer>(json, McpJsonUtilities.JsonContext.Default.TokenContainer);
+                using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
+                var tokenResponse = await JsonSerializer.DeserializeAsync<TokenContainer>(stream, McpJsonUtilities.JsonContext.Default.TokenContainer, cancellationToken);
                 
                 if (tokenResponse != null)
                 {
@@ -482,8 +482,8 @@ private Uri BuildAuthorizationUrl(AuthorizationServerMetadata authServerMetadata
             var response = await _httpClient.SendAsync(request, cancellationToken);
             if (response.IsSuccessStatusCode)
             {
-                var json = await response.Content.ReadAsStringAsync(cancellationToken);
-                var tokenResponse = JsonSerializer.Deserialize<TokenContainer>(json, McpJsonUtilities.JsonContext.Default.TokenContainer);
+                using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
+                var tokenResponse = await JsonSerializer.DeserializeAsync<TokenContainer>(stream, McpJsonUtilities.JsonContext.Default.TokenContainer, cancellationToken);
                 
                 if (tokenResponse != null)
                 {

Original file line number	Diff line number	Diff line change
`@@ -334,8 +334,8 @@ private async Task<McpUnauthorizedResponseResult> PerformOAuthAuthorizationAsync`
`334`	`334`	`var response = await _httpClient.GetAsync(new Uri(baseUrl + path), cancellationToken);`
`335`	`335`	`if (response.IsSuccessStatusCode)`
`336`	`336`	`{`
`337`		`- var json = await response.Content.ReadAsStringAsync(cancellationToken);`
`338`		`- var metadata = JsonSerializer.Deserialize<AuthorizationServerMetadata>(json, McpJsonUtilities.JsonContext.Default.AuthorizationServerMetadata);`
	`337`	`+ using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);`
	`338`	`+ var metadata = await JsonSerializer.DeserializeAsync<AuthorizationServerMetadata>(stream, McpJsonUtilities.JsonContext.Default.AuthorizationServerMetadata, cancellationToken);`
`339`	`339`
`340`	`340`	`if (metadata != null)`
`341`	`341`	`{`
`@@ -382,8 +382,8 @@ private async Task<McpUnauthorizedResponseResult> PerformOAuthAuthorizationAsync`
`382`	`382`	`var response = await _httpClient.SendAsync(request, cancellationToken);`
`383`	`383`	`if (response.IsSuccessStatusCode)`
`384`	`384`	`{`
`385`		`- var json = await response.Content.ReadAsStringAsync(cancellationToken);`
`386`		`- var tokenResponse = JsonSerializer.Deserialize<TokenContainer>(json, McpJsonUtilities.JsonContext.Default.TokenContainer);`
	`385`	`+ using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);`
	`386`	`+ var tokenResponse = await JsonSerializer.DeserializeAsync<TokenContainer>(stream, McpJsonUtilities.JsonContext.Default.TokenContainer, cancellationToken);`
`387`	`387`
`388`	`388`	`if (tokenResponse != null)`
`389`	`389`	`{`
`@@ -482,8 +482,8 @@ private Uri BuildAuthorizationUrl(AuthorizationServerMetadata authServerMetadata`
`482`	`482`	`var response = await _httpClient.SendAsync(request, cancellationToken);`
`483`	`483`	`if (response.IsSuccessStatusCode)`
`484`	`484`	`{`
`485`		`- var json = await response.Content.ReadAsStringAsync(cancellationToken);`
`486`		`- var tokenResponse = JsonSerializer.Deserialize<TokenContainer>(json, McpJsonUtilities.JsonContext.Default.TokenContainer);`
	`485`	`+ using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);`
	`486`	`+ var tokenResponse = await JsonSerializer.DeserializeAsync<TokenContainer>(stream, McpJsonUtilities.JsonContext.Default.TokenContainer, cancellationToken);`
`487`	`487`
`488`	`488`	`if (tokenResponse != null)`
`489`	`489`	`{`