Add default and required scopes before enforcing null checks

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

@@ -433,6 +433,26 @@ public partial class OpenIddictClientWebIntegrationConfiguration
             {{~ end ~}}
             {{~ end ~}}
 
+            {{~ for environment in provider.environments ~}}
+            if (options.Environment is OpenIddictClientWebIntegrationConstants.{{ provider.name }}.Environments.{{ environment.name }})
+            {
+                if (options.Scopes.Count is 0)
+                {
+                    {{~ for scope in environment.scopes ~}}
+                    {{~ if scope.default && !scope.required ~}}
+                    options.Scopes.Add(""{{ scope.name }}"");
+                    {{~ end ~}}
+                    {{~ end ~}}
+                }
+
+                {{~ for scope in environment.scopes ~}}
+                {{~ if scope.required ~}}
+                options.Scopes.Add(""{{ scope.name }}"");
+                {{~ end ~}}
+                {{~ end ~}}
+            }
+            {{~ end ~}}
+
             if (string.IsNullOrEmpty(options.ClientId))
             {
                 throw new InvalidOperationException(SR.FormatID0332(nameof(options.ClientId), Providers.{{ provider.name }}));
@@ -455,26 +475,6 @@ public partial class OpenIddictClientWebIntegrationConfiguration
             }
             {{~ end ~}}
             {{~ end ~}}
-
-            {{~ for environment in provider.environments ~}}
-            if (options.Environment is OpenIddictClientWebIntegrationConstants.{{ provider.name }}.Environments.{{ environment.name }})
-            {
-                if (options.Scopes.Count is 0)
-                {
-                    {{~ for scope in environment.scopes ~}}
-                    {{~ if scope.default && !scope.required ~}}
-                    options.Scopes.Add(""{{ scope.name }}"");
-                    {{~ end ~}}
-                    {{~ end ~}}
-                }
-
-                {{~ for scope in environment.scopes ~}}
-                {{~ if scope.required ~}}
-                options.Scopes.Add(""{{ scope.name }}"");
-                {{~ end ~}}
-                {{~ end ~}}
-            }
-            {{~ end ~}}
         }
 
         /// <summary>

src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs

@@ -103,7 +103,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers
                 context.Response = context.Registration.ProviderName switch
                 {
                     // Twitter uses a nested object.
-                    Providers.Twitter => (JsonElement?) context.Response["data"]
+                    Providers.Twitter => (JsonElement) context.Response["data"]
                         is { ValueKind: JsonValueKind.Object } element ?
                         new(element) : throw new InvalidOperationException(SR.FormatID0334("data")),