Thodor12 · pull · Jul 22, 2024 · Jul 20, 2024 · Jul 21, 2024 · Jul 21, 2024
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -129,6 +129,7 @@
 
   <PropertyGroup
     Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0'))) ">
+    <DefineConstants>$(DefineConstants);SUPPORTS_APPLICATION_CONFIGURATION_INITIALIZATION</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_DIRECT_JSON_ELEMENT_SERIALIZATION</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_JSON_NODES</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_RANDOM_NUMBER_GENERATOR_METHODS</DefineConstants>

diff --git a/sandbox/OpenIddict.Sandbox.WinForms.Client/App.config b/sandbox/OpenIddict.Sandbox.WinForms.Client/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <System.Windows.Forms.ApplicationConfigurationSection>
+    <add key="DpiAwareness" value="PerMonitorV2" />
+  </System.Windows.Forms.ApplicationConfigurationSection>
+</configuration>
diff --git a/sandbox/OpenIddict.Sandbox.WinForms.Client/OpenIddict.Sandbox.WinForms.Client.csproj b/sandbox/OpenIddict.Sandbox.WinForms.Client/OpenIddict.Sandbox.WinForms.Client.csproj
@@ -5,6 +5,8 @@
     <TargetFrameworks>net48</TargetFrameworks>
     <TargetFrameworks Condition=" '$(SupportsWindowsTargeting)' == 'true' ">$(TargetFrameworks);net8.0-windows7.0</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/sandbox/OpenIddict.Sandbox.WinForms.Client/Program.cs b/sandbox/OpenIddict.Sandbox.WinForms.Client/Program.cs
@@ -7,6 +7,10 @@
 using OpenIddict.Sandbox.WinForms.Client;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
+#if SUPPORTS_APPLICATION_CONFIGURATION_INITIALIZATION
+ApplicationConfiguration.Initialize();
+#endif
+
 var host = new HostBuilder()
     // Note: applications for which a single instance is preferred can reference
     // the Dapplo.Microsoft.Extensions.Hosting.AppServices package and call this

diff --git a/sandbox/OpenIddict.Sandbox.WinForms.Client/app.manifest b/sandbox/OpenIddict.Sandbox.WinForms.Client/app.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+
+</assembly>
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHttpListener.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHttpListener.cs
@@ -92,15 +92,15 @@ await Task.Run(cancellationToken: stoppingToken, function: async () =>
         }
 
         // Ignore exceptions indicating that the host is shutting down and return immediately.
-        catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
+        catch (OperationCanceledException exception) when (stoppingToken.IsCancellationRequested)
         {
-            _source.SetResult(result: null);
+            _source.TrySetException(exception);
             return;
         }
 
         catch (Exception exception) when (!OpenIddictHelpers.IsFatal(exception))
         {
-            _source.SetResult(result: null);
+            _source.TrySetException(exception);
             throw;
         }
 

diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpExtensions.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpExtensions.cs
@@ -37,7 +37,10 @@ public static OpenIddictClientSystemNetHttpBuilder UseSystemNetHttp(this OpenIdd
         builder.Services.TryAdd(OpenIddictClientSystemNetHttpHandlers.DefaultHandlers.Select(descriptor => descriptor.ServiceDescriptor));
 
         // Register the built-in filters used by the default OpenIddict System.Net.Http event handlers.
+#pragma warning disable CS0618
         builder.Services.TryAddSingleton<RequireHttpMetadataUri>();
+#pragma warning restore CS0618
+        builder.Services.TryAddSingleton<RequireHttpUri>();
 
         // Note: TryAddEnumerable() is used here to ensure the initializers are registered only once.
         builder.Services.TryAddEnumerable(

diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlerFilters.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlerFilters.cs
@@ -12,8 +12,9 @@ namespace OpenIddict.Client.SystemNetHttp;
 public static class OpenIddictClientSystemNetHttpHandlerFilters
 {
     /// <summary>
-    /// Represents a filter that excludes the associated handlers if the metadata URI of the issuer is not available.
+    /// Represents a filter that excludes the associated handlers if the URI is not an HTTP or HTTPS address.
     /// </summary>
+    [Obsolete("This filter is obsolete and will be removed in a future version.")]
     public sealed class RequireHttpMetadataUri : IOpenIddictClientHandlerFilter<BaseExternalContext>
     {
         /// <inheritdoc/>
@@ -25,7 +26,26 @@ public ValueTask<bool> IsActiveAsync(BaseExternalContext context)
             }
 
             return new(
-                string.Equals(context.RemoteUri?.Scheme, Uri.UriSchemeHttp, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(context.RemoteUri?.Scheme, Uri.UriSchemeHttp,  StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(context.RemoteUri?.Scheme, Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase));
+        }
+    }
+
+    /// <summary>
+    /// Represents a filter that excludes the associated handlers if the URI is not an HTTP or HTTPS address.
+    /// </summary>
+    public sealed class RequireHttpUri : IOpenIddictClientHandlerFilter<BaseExternalContext>
+    {
+        /// <inheritdoc/>
+        public ValueTask<bool> IsActiveAsync(BaseExternalContext context)
+        {
+            if (context is null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            return new(
+                string.Equals(context.RemoteUri?.Scheme, Uri.UriSchemeHttp,  StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(context.RemoteUri?.Scheme, Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase));
         }
     }

diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Device.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Device.cs
@@ -51,7 +51,7 @@ public sealed class AttachBasicAuthenticationCredentials : IOpenIddictClientHand
             /// </summary>
             public static OpenIddictClientHandlerDescriptor Descriptor { get; }
                 = OpenIddictClientHandlerDescriptor.CreateBuilder<PrepareDeviceAuthorizationRequestContext>()
-                    .AddFilter<RequireHttpMetadataUri>()
+                    .AddFilter<RequireHttpUri>()
                     .UseSingletonHandler<AttachBasicAuthenticationCredentials>()
                     .SetOrder(AttachHttpParameters<PrepareDeviceAuthorizationRequestContext>.Descriptor.Order - 500)
                     .SetType(OpenIddictClientHandlerType.BuiltIn)

diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs
@@ -51,7 +51,7 @@ public sealed class AttachBasicAuthenticationCredentials : IOpenIddictClientHand
             /// </summary>
             public static OpenIddictClientHandlerDescriptor Descriptor { get; }
                 = OpenIddictClientHandlerDescriptor.CreateBuilder<PrepareTokenRequestContext>()
-                    .AddFilter<RequireHttpMetadataUri>()
+                    .AddFilter<RequireHttpUri>()
                     .UseSingletonHandler<AttachBasicAuthenticationCredentials>()
                     .SetOrder(AttachHttpParameters<PrepareTokenRequestContext>.Descriptor.Order - 500)
                     .SetType(OpenIddictClientHandlerType.BuiltIn)

diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Introspection.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Introspection.cs
@@ -51,7 +51,7 @@ public sealed class AttachBasicAuthenticationCredentials : IOpenIddictClientHand
             /// </summary>
             public static OpenIddictClientHandlerDescriptor Descriptor { get; }
                 = OpenIddictClientHandlerDescriptor.CreateBuilder<PrepareIntrospectionRequestContext>()
-                    .AddFilter<RequireHttpMetadataUri>()
+                    .AddFilter<RequireHttpUri>()
                     .UseSingletonHandler<AttachBasicAuthenticationCredentials>()
                     .SetOrder(AttachHttpParameters<PrepareIntrospectionRequestContext>.Descriptor.Order - 500)
                     .SetType(OpenIddictClientHandlerType.BuiltIn)

diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Revocation.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Revocation.cs
@@ -52,7 +52,7 @@ public sealed class AttachBasicAuthenticationCredentials : IOpenIddictClientHand
             /// </summary>
             public static OpenIddictClientHandlerDescriptor Descriptor { get; }
                 = OpenIddictClientHandlerDescriptor.CreateBuilder<PrepareRevocationRequestContext>()
-                    .AddFilter<RequireHttpMetadataUri>()
+                    .AddFilter<RequireHttpUri>()
                     .UseSingletonHandler<AttachBasicAuthenticationCredentials>()
                     .SetOrder(AttachHttpParameters<PrepareRevocationRequestContext>.Descriptor.Order - 500)
                     .SetType(OpenIddictClientHandlerType.BuiltIn)

diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Userinfo.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Userinfo.cs
@@ -52,7 +52,7 @@ public sealed class AttachBearerAccessToken : IOpenIddictClientHandler<PrepareUs
             /// </summary>
             public static OpenIddictClientHandlerDescriptor Descriptor { get; }
                 = OpenIddictClientHandlerDescriptor.CreateBuilder<PrepareUserinfoRequestContext>()
-                    .AddFilter<RequireHttpMetadataUri>()
+                    .AddFilter<RequireHttpUri>()
                     .UseSingletonHandler<AttachBearerAccessToken>()
                     .SetOrder(AttachHttpParameters<PrepareUserinfoRequestContext>.Descriptor.Order - 500)
                     .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -93,7 +93,7 @@ public sealed class ExtractUserinfoTokenHttpResponse : IOpenIddictClientHandler<
             /// </summary>
             public static OpenIddictClientHandlerDescriptor Descriptor { get; }
                 = OpenIddictClientHandlerDescriptor.CreateBuilder<ExtractUserinfoResponseContext>()
-                    .AddFilter<RequireHttpMetadataUri>()
+                    .AddFilter<RequireHttpUri>()
                     .UseSingletonHandler<ExtractUserinfoTokenHttpResponse>()
                     .SetOrder(ExtractJsonHttpResponse<ExtractUserinfoResponseContext>.Descriptor.Order - 500)
                     .SetType(OpenIddictClientHandlerType.BuiltIn)

diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs
@@ -46,7 +46,7 @@ public CreateHttpClient(IHttpClientFactory factory)
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<CreateHttpClient<TContext>>()
                 .SetOrder(int.MinValue + 100_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -81,7 +81,7 @@ public sealed class PrepareGetHttpRequest<TContext> : IOpenIddictClientHandler<T
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<PrepareGetHttpRequest<TContext>>()
                 .SetOrder(CreateHttpClient<TContext>.Descriptor.Order + 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -113,7 +113,7 @@ public sealed class PreparePostHttpRequest<TContext> : IOpenIddictClientHandler<
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<PreparePostHttpRequest<TContext>>()
                 .SetOrder(PrepareGetHttpRequest<TContext>.Descriptor.Order + 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -145,7 +145,7 @@ public sealed class AttachHttpVersion<TContext> : IOpenIddictClientHandler<TCont
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<AttachHttpVersion<TContext>>()
                 .SetOrder(PreparePostHttpRequest<TContext>.Descriptor.Order + 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -193,7 +193,7 @@ public sealed class AttachJsonAcceptHeaders<TContext> : IOpenIddictClientHandler
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<AttachJsonAcceptHeaders<TContext>>()
                 .SetOrder(AttachHttpVersion<TContext>.Descriptor.Order + 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -238,7 +238,7 @@ public AttachUserAgentHeader(IOptionsMonitor<OpenIddictClientSystemNetHttpOption
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<AttachUserAgentHeader<TContext>>()
                 .SetOrder(AttachJsonAcceptHeaders<TContext>.Descriptor.Order + 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -292,7 +292,7 @@ public AttachFromHeader(IOptionsMonitor<OpenIddictClientSystemNetHttpOptions> op
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<AttachFromHeader<TContext>>()
                 .SetOrder(AttachUserAgentHeader<TContext>.Descriptor.Order + 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -328,7 +328,7 @@ public sealed class AttachHttpParameters<TContext> : IOpenIddictClientHandler<TC
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<AttachHttpParameters<TContext>>()
                 .SetOrder(int.MaxValue - 100_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -388,7 +388,7 @@ public sealed class SendHttpRequest<TContext> : IOpenIddictClientHandler<TContex
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<SendHttpRequest<TContext>>()
                 .SetOrder(DecompressResponseContent<TContext>.Descriptor.Order - 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -452,7 +452,7 @@ public sealed class DisposeHttpRequest<TContext> : IOpenIddictClientHandler<TCon
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<DisposeHttpRequest<TContext>>()
                 .SetOrder(int.MaxValue - 100_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -490,7 +490,7 @@ public sealed class DecompressResponseContent<TContext> : IOpenIddictClientHandl
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<DecompressResponseContent<TContext>>()
                 .SetOrder(ExtractJsonHttpResponse<TContext>.Descriptor.Order - 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -636,7 +636,7 @@ public sealed class ExtractJsonHttpResponse<TContext> : IOpenIddictClientHandler
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<ExtractJsonHttpResponse<TContext>>()
                 .SetOrder(ExtractWwwAuthenticateHeader<TContext>.Descriptor.Order - 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -715,7 +715,7 @@ public sealed class ExtractWwwAuthenticateHeader<TContext> : IOpenIddictClientHa
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<ExtractWwwAuthenticateHeader<TContext>>()
                 .SetOrder(ExtractEmptyHttpResponse<TContext>.Descriptor.Order - 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -798,7 +798,7 @@ public sealed class ExtractEmptyHttpResponse<TContext> : IOpenIddictClientHandle
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<ExtractEmptyHttpResponse<TContext>>()
                 .SetOrder(ValidateHttpResponse<TContext>.Descriptor.Order - 1_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -844,7 +844,7 @@ public sealed class ValidateHttpResponse<TContext> : IOpenIddictClientHandler<TC
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<ValidateHttpResponse<TContext>>()
                 .SetOrder(DisposeHttpResponse<TContext>.Descriptor.Order - 50_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)
@@ -914,7 +914,7 @@ public sealed class DisposeHttpResponse<TContext> : IOpenIddictClientHandler<TCo
         /// </summary>
         public static OpenIddictClientHandlerDescriptor Descriptor { get; }
             = OpenIddictClientHandlerDescriptor.CreateBuilder<TContext>()
-                .AddFilter<RequireHttpMetadataUri>()
+                .AddFilter<RequireHttpUri>()
                 .UseSingletonHandler<DisposeHttpResponse<TContext>>()
                 .SetOrder(int.MaxValue - 100_000)
                 .SetType(OpenIddictClientHandlerType.BuiltIn)