From ef4b0f3417e7bb5f07f2b5746bc6545a622c4b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Thu, 22 Jun 2023 18:19:56 +0200 Subject: [PATCH] Add explicit System.Net.Http usings --- Directory.Build.targets | 4 ++++ .../Controllers/HomeController.cs | 3 ++- .../OpenIddictClientSystemNetHttpBuilder.cs | 1 + .../OpenIddictClientSystemNetHttpConfiguration.cs | 1 + .../OpenIddictClientSystemNetHttpHandlers.Device.cs | 1 + .../OpenIddictClientSystemNetHttpHandlers.Exchange.cs | 1 + .../OpenIddictClientSystemNetHttpHandlers.Userinfo.cs | 1 + .../OpenIddictClientSystemNetHttpHandlers.cs | 1 + .../OpenIddictClientSystemNetHttpOptions.cs | 1 + .../OpenIddictClientWebIntegrationConfiguration.cs | 1 + .../OpenIddictClientWebIntegrationHandlers.Exchange.cs | 1 + .../OpenIddictClientWebIntegrationHandlers.Userinfo.cs | 1 + src/OpenIddict.Core/Managers/OpenIddictScopeManager.cs | 3 ++- .../OpenIddict.EntityFramework.Models.csproj | 4 ---- .../OpenIddict.EntityFrameworkCore.Models.csproj | 4 ---- .../OpenIddict.MongoDb.Models.csproj | 1 - .../OpenIddictValidationSystemNetHttpBuilder.cs | 1 + .../OpenIddictValidationSystemNetHttpConfiguration.cs | 1 + ...OpenIddictValidationSystemNetHttpHandlers.Introspection.cs | 1 + .../OpenIddictValidationSystemNetHttpHandlers.cs | 1 + .../OpenIddictValidationSystemNetHttpOptions.cs | 1 + .../OpenIddictServerIntegrationTestClient.cs | 1 + .../OpenIddictServerIntegrationTests.Authentication.cs | 1 + .../OpenIddictServerIntegrationTests.Device.cs | 1 + .../OpenIddictServerIntegrationTests.Discovery.cs | 1 + .../OpenIddictServerIntegrationTests.Exchange.cs | 1 + .../OpenIddictServerIntegrationTests.Introspection.cs | 1 + .../OpenIddictServerIntegrationTests.Revocation.cs | 1 + .../OpenIddictServerIntegrationTests.Session.cs | 1 + .../OpenIddictServerIntegrationTests.Userinfo.cs | 1 + .../OpenIddictValidationIntegrationTestClient.cs | 1 + 31 files changed, 33 insertions(+), 11 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index a79b954e..e521a1e2 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -150,4 +150,8 @@ Encoding="Unicode" /> + + + + diff --git a/sandbox/OpenIddict.Sandbox.AspNetCore.Client/Controllers/HomeController.cs b/sandbox/OpenIddict.Sandbox.AspNetCore.Client/Controllers/HomeController.cs index dc5474a2..ac867577 100644 --- a/sandbox/OpenIddict.Sandbox.AspNetCore.Client/Controllers/HomeController.cs +++ b/sandbox/OpenIddict.Sandbox.AspNetCore.Client/Controllers/HomeController.cs @@ -1,4 +1,5 @@ -using System.Net.Http.Headers; +using System.Net.Http; +using System.Net.Http.Headers; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authorization; diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpBuilder.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpBuilder.cs index 87448858..195df948 100644 --- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpBuilder.cs +++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpBuilder.cs @@ -5,6 +5,7 @@ */ using System.ComponentModel; +using System.Net.Http; using System.Net.Http.Headers; using System.Net.Mail; using System.Reflection; diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpConfiguration.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpConfiguration.cs index fb0989a1..b836f02c 100644 --- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpConfiguration.cs +++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpConfiguration.cs @@ -6,6 +6,7 @@ using System.ComponentModel; using System.Diagnostics.CodeAnalysis; +using System.Net.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Http; using Microsoft.Extensions.Options; diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Device.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Device.cs index 07e7ac5f..d13a2ca5 100644 --- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Device.cs +++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Device.cs @@ -6,6 +6,7 @@ using System.Collections.Immutable; using System.Diagnostics; +using System.Net.Http; using System.Net.Http.Headers; using System.Text; diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs index e4740290..0acbeae5 100644 --- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs +++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs @@ -6,6 +6,7 @@ using System.Collections.Immutable; using System.Diagnostics; +using System.Net.Http; using System.Net.Http.Headers; using System.Text; diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Userinfo.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Userinfo.cs index 7d505d79..b032e25e 100644 --- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Userinfo.cs +++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Userinfo.cs @@ -6,6 +6,7 @@ using System.Collections.Immutable; using System.Diagnostics; +using System.Net.Http; using System.Net.Http.Headers; using static OpenIddict.Client.SystemNetHttp.OpenIddictClientSystemNetHttpConstants; diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs index 1f783569..07dfff47 100644 --- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs +++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs @@ -8,6 +8,7 @@ using System.Collections.Immutable; using System.ComponentModel; using System.Diagnostics; using System.IO.Compression; +using System.Net.Http; using System.Net.Http.Headers; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpOptions.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpOptions.cs index 659ce3a4..b1a229af 100644 --- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpOptions.cs +++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpOptions.cs @@ -5,6 +5,7 @@ */ using System.Net; +using System.Net.Http; using System.Net.Http.Headers; using System.Net.Mail; using Polly; diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationConfiguration.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationConfiguration.cs index 64c025ce..4502a3a2 100644 --- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationConfiguration.cs +++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationConfiguration.cs @@ -5,6 +5,7 @@ */ using System.ComponentModel; +using System.Net.Http; using System.Security.Cryptography.X509Certificates; using Microsoft.Extensions.Http; using Microsoft.Extensions.Options; diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Exchange.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Exchange.cs index 6794dca8..89eb3dcf 100644 --- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Exchange.cs +++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Exchange.cs @@ -6,6 +6,7 @@ using System.Collections.Immutable; using System.Diagnostics; +using System.Net.Http; using System.Net.Http.Headers; using System.Net.Http.Json; using System.Text; diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs index 897f53ed..ade77d65 100644 --- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs +++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs @@ -6,6 +6,7 @@ using System.Collections.Immutable; using System.Diagnostics; +using System.Net.Http; using System.Net.Http.Headers; using static OpenIddict.Client.SystemNetHttp.OpenIddictClientSystemNetHttpConstants; using static OpenIddict.Client.SystemNetHttp.OpenIddictClientSystemNetHttpHandlerFilters; diff --git a/src/OpenIddict.Core/Managers/OpenIddictScopeManager.cs b/src/OpenIddict.Core/Managers/OpenIddictScopeManager.cs index 0c1573fb..9741b785 100644 --- a/src/OpenIddict.Core/Managers/OpenIddictScopeManager.cs +++ b/src/OpenIddict.Core/Managers/OpenIddictScopeManager.cs @@ -298,7 +298,8 @@ public class OpenIddictScopeManager : IOpenIddictScopeManager where TSco { await foreach (var scope in scopes) { - if (names.Contains(await Store.GetNameAsync(scope, cancellationToken), StringComparer.Ordinal)) + var name = await Store.GetNameAsync(scope, cancellationToken); + if (!string.IsNullOrEmpty(name) && names.Contains(name, StringComparer.Ordinal)) { yield return scope; } diff --git a/src/OpenIddict.EntityFramework.Models/OpenIddict.EntityFramework.Models.csproj b/src/OpenIddict.EntityFramework.Models/OpenIddict.EntityFramework.Models.csproj index d059ac8a..ee4e457e 100644 --- a/src/OpenIddict.EntityFramework.Models/OpenIddict.EntityFramework.Models.csproj +++ b/src/OpenIddict.EntityFramework.Models/OpenIddict.EntityFramework.Models.csproj @@ -13,8 +13,4 @@ $(PackageTags);entityframework;models - - - - diff --git a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddict.EntityFrameworkCore.Models.csproj b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddict.EntityFrameworkCore.Models.csproj index ad58ce5c..0265cff5 100644 --- a/src/OpenIddict.EntityFrameworkCore.Models/OpenIddict.EntityFrameworkCore.Models.csproj +++ b/src/OpenIddict.EntityFrameworkCore.Models/OpenIddict.EntityFrameworkCore.Models.csproj @@ -13,8 +13,4 @@ $(PackageTags);entityframeworkcore;models - - - - diff --git a/src/OpenIddict.MongoDb.Models/OpenIddict.MongoDb.Models.csproj b/src/OpenIddict.MongoDb.Models/OpenIddict.MongoDb.Models.csproj index eb28110b..675e5be3 100644 --- a/src/OpenIddict.MongoDb.Models/OpenIddict.MongoDb.Models.csproj +++ b/src/OpenIddict.MongoDb.Models/OpenIddict.MongoDb.Models.csproj @@ -20,7 +20,6 @@ - diff --git a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpBuilder.cs b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpBuilder.cs index d6a88253..4dd12524 100644 --- a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpBuilder.cs +++ b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpBuilder.cs @@ -5,6 +5,7 @@ */ using System.ComponentModel; +using System.Net.Http; using System.Net.Http.Headers; using System.Net.Mail; using System.Reflection; diff --git a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpConfiguration.cs b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpConfiguration.cs index 139ee8d2..cfbf83bc 100644 --- a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpConfiguration.cs +++ b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpConfiguration.cs @@ -5,6 +5,7 @@ */ using System.ComponentModel; +using System.Net.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Http; using Microsoft.Extensions.Options; diff --git a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.Introspection.cs b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.Introspection.cs index ef34ad61..83d17599 100644 --- a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.Introspection.cs +++ b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.Introspection.cs @@ -6,6 +6,7 @@ using System.Collections.Immutable; using System.Diagnostics; +using System.Net.Http; using System.Net.Http.Headers; using System.Text; diff --git a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.cs b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.cs index 2f69364e..7fff8104 100644 --- a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.cs +++ b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpHandlers.cs @@ -8,6 +8,7 @@ using System.Collections.Immutable; using System.ComponentModel; using System.Diagnostics; using System.IO.Compression; +using System.Net.Http; using System.Net.Http.Headers; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpOptions.cs b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpOptions.cs index a03ed869..aa2b3a12 100644 --- a/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpOptions.cs +++ b/src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpOptions.cs @@ -5,6 +5,7 @@ */ using System.Net; +using System.Net.Http; using System.Net.Http.Headers; using System.Net.Mail; using Polly; diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs index 819cb75c..06f90f64 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs @@ -4,6 +4,7 @@ * the license and the contributors participating to this project. */ +using System.Net.Http; using System.Net.Http.Json; using AngleSharp.Html.Parser; using Microsoft.Extensions.Primitives; diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Authentication.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Authentication.cs index 94efc146..da782657 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Authentication.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Authentication.cs @@ -5,6 +5,7 @@ */ using System.Collections.Immutable; +using System.Net.Http; using System.Security.Claims; using Microsoft.Extensions.DependencyInjection; using Moq; diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Device.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Device.cs index c7b58342..a756aa65 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Device.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Device.cs @@ -5,6 +5,7 @@ */ using System.Collections.Immutable; +using System.Net.Http; using System.Security.Claims; using Microsoft.Extensions.DependencyInjection; using Moq; diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Discovery.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Discovery.cs index eeafa39f..dd24a450 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Discovery.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Discovery.cs @@ -4,6 +4,7 @@ * the license and the contributors participating to this project. */ +using System.Net.Http; using System.Security.Cryptography; using System.Text.Json; using Microsoft.Extensions.DependencyInjection; diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Exchange.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Exchange.cs index afedea8e..9923ee07 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Exchange.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Exchange.cs @@ -5,6 +5,7 @@ */ using System.Collections.Immutable; +using System.Net.Http; using System.Security.Claims; using Microsoft.Extensions.DependencyInjection; using Moq; diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Introspection.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Introspection.cs index a26847cf..91b5ba24 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Introspection.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Introspection.cs @@ -4,6 +4,7 @@ * the license and the contributors participating to this project. */ +using System.Net.Http; using System.Security.Claims; using System.Text.Json; using Microsoft.Extensions.DependencyInjection; diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Revocation.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Revocation.cs index 90bbf8a4..968fe1d2 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Revocation.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Revocation.cs @@ -4,6 +4,7 @@ * the license and the contributors participating to this project. */ +using System.Net.Http; using System.Security.Claims; using Microsoft.Extensions.DependencyInjection; using Moq; diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Session.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Session.cs index 7466436e..6801373d 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Session.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Session.cs @@ -5,6 +5,7 @@ */ using System.Collections.Immutable; +using System.Net.Http; using System.Security.Claims; using Microsoft.Extensions.DependencyInjection; using Moq; diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Userinfo.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Userinfo.cs index 5eb05126..52791143 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Userinfo.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Userinfo.cs @@ -5,6 +5,7 @@ */ using System.Collections.Immutable; +using System.Net.Http; using System.Security.Claims; using Xunit; using static OpenIddict.Server.OpenIddictServerEvents; diff --git a/test/OpenIddict.Validation.IntegrationTests/OpenIddictValidationIntegrationTestClient.cs b/test/OpenIddict.Validation.IntegrationTests/OpenIddictValidationIntegrationTestClient.cs index 97a3aafd..b7ace6fb 100644 --- a/test/OpenIddict.Validation.IntegrationTests/OpenIddictValidationIntegrationTestClient.cs +++ b/test/OpenIddict.Validation.IntegrationTests/OpenIddictValidationIntegrationTestClient.cs @@ -4,6 +4,7 @@ * the license and the contributors participating to this project. */ +using System.Net.Http; using System.Net.Http.Json; using AngleSharp.Html.Parser; using Microsoft.Extensions.Primitives;