Adjust nullable annotations

gen/OpenIddict.Client.WebIntegration.Generators/OpenIddictClientWebIntegrationGenerator.cs

@@ -456,7 +456,7 @@ public partial class OpenIddictClientWebIntegrationConfiguration
         /// </summary>
         /// <param name=""name"">The name of the options instance to configure, if applicable.</param>
         /// <param name=""options"">The options instance to initialize.</param>
-        public void PostConfigure(string name, OpenIddictClientWebIntegrationOptions.{{ provider.name }} options)
+        public void PostConfigure(string? name, OpenIddictClientWebIntegrationOptions.{{ provider.name }} options)
         {
             {{~ for setting in provider.settings ~}}
             {{~ if setting.default_value && setting.type == 'String' ~}} 

src/OpenIddict.Abstractions/Primitives/OpenIddictExtensions.cs

@@ -176,7 +176,7 @@ public static class OpenIddictExtensions
         }
 
         var segment = Trim(new StringSegment(request.ResponseType), Separators.Space);
-        if (segment.Length is 0)
+        if (!segment.HasValue || segment.Length is 0)
         {
             return false;
         }
@@ -203,7 +203,7 @@ public static class OpenIddictExtensions
         }
 
         var segment = Trim(new StringSegment(request.ResponseType), Separators.Space);
-        if (segment.Length is 0)
+        if (!segment.HasValue || segment.Length is 0)
         {
             return false;
         }
@@ -235,7 +235,7 @@ public static class OpenIddictExtensions
         foreach (var element in new StringTokenizer(request.ResponseType, Separators.Space))
         {
             var segment = Trim(element, Separators.Space);
-            if (segment.Length is 0)
+            if (!segment.HasValue || segment.Length is 0)
             {
                 continue;
             }
@@ -289,7 +289,7 @@ public static class OpenIddictExtensions
         foreach (var element in new StringTokenizer(request.ResponseType, Separators.Space))
         {
             var segment = Trim(element, Separators.Space);
-            if (segment.Length is 0)
+            if (!segment.HasValue || segment.Length is 0)
             {
                 continue;
             }
@@ -2922,7 +2922,7 @@ public static class OpenIddictExtensions
         foreach (var element in new StringTokenizer(source, separators))
         {
             var segment = Trim(element, separators);
-            if (segment.Length is 0)
+            if (!segment.HasValue || segment.Length is 0)
             {
                 continue;
             }
@@ -2951,7 +2951,7 @@ public static class OpenIddictExtensions
         foreach (var element in new StringTokenizer(source, separators))
         {
             var segment = Trim(element, separators);
-            if (segment.Length is 0)
+            if (!segment.HasValue || segment.Length is 0)
             {
                 continue;
             }
@@ -2969,6 +2969,11 @@ public static class OpenIddictExtensions
     {
         Debug.Assert(separators is { Length: > 0 }, SR.GetResourceString(SR.ID4001));
 
+        if (!segment.HasValue || segment.Length is 0)
+        {
+            return segment;
+        }
+
         var index = segment.Offset;
 
         while (index < segment.Offset + segment.Length)
@@ -2988,6 +2993,11 @@ public static class OpenIddictExtensions
     {
         Debug.Assert(separators is { Length: > 0 }, SR.GetResourceString(SR.ID4001));
 
+        if (!segment.HasValue || segment.Length is 0)
+        {
+            return segment;
+        }
+
         var index = segment.Offset + segment.Length - 1;
 
         while (index >= segment.Offset)

src/OpenIddict.Client.AspNetCore/OpenIddictClientAspNetCoreConfiguration.cs

@@ -53,7 +53,7 @@ public class OpenIddictClientAspNetCoreConfiguration : IConfigureOptions<Authent
     /// </summary>
     /// <param name="name">The authentication scheme associated with the handler instance.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, AuthenticationOptions options)
+    public void PostConfigure(string? name, AuthenticationOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Client.DataProtection/OpenIddictClientDataProtectionConfiguration.cs

@@ -41,7 +41,7 @@ public class OpenIddictClientDataProtectionConfiguration : IConfigureOptions<Ope
     /// </summary>
     /// <param name="name">The name of the options instance to configure, if applicable.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, OpenIddictClientDataProtectionOptions options)
+    public void PostConfigure(string? name, OpenIddictClientDataProtectionOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Client.Owin/OpenIddictClientOwinConfiguration.cs

@@ -25,7 +25,7 @@ public class OpenIddictClientOwinConfiguration : IConfigureOptions<OpenIddictCli
         options.Handlers.AddRange(OpenIddictClientOwinHandlers.DefaultHandlers);
     }
 
-    public void PostConfigure(string name, OpenIddictClientOwinOptions options)
+    public void PostConfigure(string? name, OpenIddictClientOwinOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpConfiguration.cs

@@ -36,7 +36,7 @@ public class OpenIddictClientSystemNetHttpConfiguration : IConfigureOptions<Open
 
     public void Configure(HttpClientFactoryOptions options) => Configure(Options.DefaultName, options);
 
-    public void Configure(string name, HttpClientFactoryOptions options)
+    public void Configure(string? name, HttpClientFactoryOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Client/OpenIddictClientConfiguration.cs

@@ -27,7 +27,7 @@ public class OpenIddictClientConfiguration : IPostConfigureOptions<OpenIddictCli
     /// </summary>
     /// <param name="name">The authentication scheme associated with the handler instance.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, OpenIddictClientOptions options)
+    public void PostConfigure(string? name, OpenIddictClientOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Server.AspNetCore/OpenIddictServerAspNetCoreConfiguration.cs

@@ -54,7 +54,7 @@ public class OpenIddictServerAspNetCoreConfiguration : IConfigureOptions<Authent
     /// </summary>
     /// <param name="name">The name of the options instance to configure, if applicable.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, AuthenticationOptions options)
+    public void PostConfigure(string? name, AuthenticationOptions options)
     {
         if (options is null)
         {
@@ -89,7 +89,7 @@ public class OpenIddictServerAspNetCoreConfiguration : IConfigureOptions<Authent
     /// </summary>
     /// <param name="name">The name of the options instance to configure, if applicable.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, OpenIddictServerAspNetCoreOptions options)
+    public void PostConfigure(string? name, OpenIddictServerAspNetCoreOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Server.AspNetCore/OpenIddictServerAspNetCoreHandlers.cs

@@ -737,7 +737,7 @@ public static partial class OpenIddictServerAspNetCoreHandlers
             var request = context.Transaction.GetHttpRequest() ??
                 throw new InvalidOperationException(SR.GetResourceString(SR.ID0114));
 
-            string header = request.Headers[HeaderNames.Authorization];
+            string? header = request.Headers[HeaderNames.Authorization];
             if (string.IsNullOrEmpty(header) || !header.StartsWith("Basic ", StringComparison.OrdinalIgnoreCase))
             {
                 return default;
@@ -836,7 +836,7 @@ public static partial class OpenIddictServerAspNetCoreHandlers
 
             Debug.Assert(context.Transaction.Request is not null, SR.GetResourceString(SR.ID4008));
 
-            string header = request.Headers[HeaderNames.Authorization];
+            string? header = request.Headers[HeaderNames.Authorization];
             if (string.IsNullOrEmpty(header) || !header.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
             {
                 return default;

src/OpenIddict.Server.DataProtection/OpenIddictServerDataProtectionConfiguration.cs

@@ -41,7 +41,7 @@ public class OpenIddictServerDataProtectionConfiguration : IConfigureOptions<Ope
     /// </summary>
     /// <param name="name">The name of the options instance to configure, if applicable.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, OpenIddictServerDataProtectionOptions options)
+    public void PostConfigure(string? name, OpenIddictServerDataProtectionOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Server.Owin/OpenIddictServerOwinConfiguration.cs

@@ -25,7 +25,7 @@ public class OpenIddictServerOwinConfiguration : IConfigureOptions<OpenIddictSer
         options.Handlers.AddRange(OpenIddictServerOwinHandlers.DefaultHandlers);
     }
 
-    public void PostConfigure(string name, OpenIddictServerOwinOptions options)
+    public void PostConfigure(string? name, OpenIddictServerOwinOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Server/OpenIddictServerConfiguration.cs

@@ -21,7 +21,7 @@ public class OpenIddictServerConfiguration : IPostConfigureOptions<OpenIddictSer
     /// </summary>
     /// <param name="name">The name of the options instance to configure, if applicable.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, OpenIddictServerOptions options)
+    public void PostConfigure(string? name, OpenIddictServerOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Validation.AspNetCore/OpenIddictValidationAspNetCoreConfiguration.cs

@@ -53,7 +53,7 @@ public class OpenIddictValidationAspNetCoreConfiguration : IConfigureOptions<Aut
     /// </summary>
     /// <param name="name">The name of the options instance to configure, if applicable.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, AuthenticationOptions options)
+    public void PostConfigure(string? name, AuthenticationOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Validation.AspNetCore/OpenIddictValidationAspNetCoreHandlers.cs

@@ -160,7 +160,7 @@ public static partial class OpenIddictValidationAspNetCoreHandlers
 
             // Resolve the access token from the standard Authorization header.
             // See https://tools.ietf.org/html/rfc6750#section-2.1 for more information.
-            string header = request.Headers[HeaderNames.Authorization];
+            string? header = request.Headers[HeaderNames.Authorization];
             if (!string.IsNullOrEmpty(header) && header.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
             {
                 context.AccessToken = header.Substring("Bearer ".Length);

src/OpenIddict.Validation.DataProtection/OpenIddictValidationDataProtectionConfiguration.cs

@@ -41,7 +41,7 @@ public class OpenIddictValidationDataProtectionConfiguration : IConfigureOptions
     /// </summary>
     /// <param name="name">The name of the options instance to configure, if applicable.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, OpenIddictValidationDataProtectionOptions options)
+    public void PostConfigure(string? name, OpenIddictValidationDataProtectionOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Validation.ServerIntegration/OpenIddictValidationServerIntegrationConfiguration.cs

@@ -62,7 +62,7 @@ public class OpenIddictValidationServerIntegrationConfiguration : IConfigureOpti
     /// </summary>
     /// <param name="name">The name of the options instance to configure, if applicable.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, OpenIddictValidationOptions options)
+    public void PostConfigure(string? name, OpenIddictValidationOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Validation.SystemNetHttp/OpenIddictValidationSystemNetHttpConfiguration.cs

@@ -36,7 +36,7 @@ public class OpenIddictValidationSystemNetHttpConfiguration : IConfigureOptions<
 
     public void Configure(HttpClientFactoryOptions options) => Configure(Options.DefaultName, options);
 
-    public void Configure(string name, HttpClientFactoryOptions options)
+    public void Configure(string? name, HttpClientFactoryOptions options)
     {
         if (options is null)
         {

src/OpenIddict.Validation/OpenIddictValidationConfiguration.cs

@@ -26,7 +26,7 @@ public class OpenIddictValidationConfiguration : IPostConfigureOptions<OpenIddic
     /// </summary>
     /// <param name="name">The name of the options instance to configure, if applicable.</param>
     /// <param name="options">The options instance to initialize.</param>
-    public void PostConfigure(string name, OpenIddictValidationOptions options)
+    public void PostConfigure(string? name, OpenIddictValidationOptions options)
     {
         if (options is null)
         {

test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs

@@ -380,7 +380,7 @@ public class OpenIddictServerIntegrationTestClient : IAsyncDisposable
             foreach (var element in new StringTokenizer(payload, Separators.Ampersand))
             {
                 var segment = element;
-                if (segment.Length is 0)
+                if (!segment.HasValue || segment.Length is 0)
                 {
                     continue;
                 }

test/OpenIddict.Validation.IntegrationTests/OpenIddictValidationIntegrationTestClient.cs

@@ -380,7 +380,7 @@ public class OpenIddictValidationIntegrationTestClient : IAsyncDisposable
             foreach (var element in new StringTokenizer(payload, Separators.Ampersand))
             {
                 var segment = element;
-                if (segment.Length is 0)
+                if (!segment.HasValue || segment.Length is 0)
                 {
                     continue;
                 }