fix: Fixed issue with Authorization Scheme if it Bearer instead bearer.

Author: HavenDV

src/libs/AutoSDK/Models/Authorization.cs

@@ -24,19 +24,19 @@ public static Authorization FromOpenApiSecurityScheme(
     {
         scheme = scheme ?? throw new ArgumentNullException(nameof(scheme));
 
-        var friendlyName = (scheme.Type, scheme.Scheme, scheme.In) switch
+        var friendlyName = (scheme.Type, scheme.Scheme?.ToUpperInvariant(), scheme.In) switch
         {
-            (SecuritySchemeType.Http, "bearer", _) => "Bearer",
-            (SecuritySchemeType.Http, "basic", _) => "Basic",
+            (SecuritySchemeType.Http, "BEARER", _) => "Bearer",
+            (SecuritySchemeType.Http, "BASIC", _) => "Basic",
             (SecuritySchemeType.ApiKey, _, ParameterLocation.Header) => "ApiKeyInHeader",
             (SecuritySchemeType.ApiKey, _, ParameterLocation.Query) => "ApiKeyInQuery",
             (SecuritySchemeType.OAuth2, _, _) => "OAuth2",
             _ => scheme.Scheme?.ToPropertyName() ?? string.Empty,
         };
-        string[] parameters = (scheme.Type, scheme.Scheme, scheme.In) switch
+        string[] parameters = (scheme.Type, scheme.Scheme?.ToUpperInvariant(), scheme.In) switch
         {
-            (SecuritySchemeType.Http, "bearer", _) => ["apiKey"],
-            (SecuritySchemeType.Http, "basic", _) => ["username", "password"],
+            (SecuritySchemeType.Http, "BEARER", _) => ["apiKey"],
+            (SecuritySchemeType.Http, "BASIC", _) => ["username", "password"],
             (SecuritySchemeType.ApiKey, _, ParameterLocation.Header) => ["apiKey"],
             (SecuritySchemeType.ApiKey, _, ParameterLocation.Query) => ["apiKey"],
             _ => [],
@@ -45,9 +45,9 @@ public static Authorization FromOpenApiSecurityScheme(
         return new Authorization(
             FriendlyName: friendlyName,
             Type: scheme.Type,
-            In: (scheme.Type, scheme.Scheme) switch
+            In: (scheme.Type, scheme.Scheme?.ToUpperInvariant()) switch
             {
-                (SecuritySchemeType.Http, "bearer") => ParameterLocation.Header,
+                (SecuritySchemeType.Http, "BEARER") => ParameterLocation.Header,
                 (SecuritySchemeType.OAuth2, _) => ParameterLocation.Header,
                 _ => scheme.In,
             },

src/libs/AutoSDK/Sources/Sources.Authorizations.cs

@@ -15,10 +15,6 @@ public static string GenerateAuthorization(
         }
         if (authorization.Type is SecuritySchemeType.OAuth2)
         {
-            var jsonSerializerContext = !string.IsNullOrWhiteSpace(authorization.Settings.JsonSerializerContext)
-                ? $", global::{authorization.Settings.JsonSerializerContext}.Default.DictionaryStringString"
-                : string.Empty;
-
             return $@"
 #nullable enable
 
@@ -56,7 +52,9 @@ public sealed partial class {authorization.Settings.ClassName}
             response.EnsureSuccessStatusCode();
 
             var json = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            var dictionary = global::System.Text.Json.JsonSerializer.Deserialize<global::System.Collections.Generic.Dictionary<string, string>>(json{jsonSerializerContext}) ??
+            var dictionary = global::System.Text.Json.JsonSerializer.Deserialize<global::System.Collections.Generic.Dictionary<string, string>>(json{(!string.IsNullOrWhiteSpace(authorization.Settings.JsonSerializerContext)
+                            ? $", global::{authorization.Settings.JsonSerializerContext}.Default.DictionaryStringString"
+                            : string.Empty)}) ??
                              throw new global::System.InvalidOperationException(""Deserialization failed."");
 
             var accessToken = dictionary[""access_token""];
@@ -77,29 +75,6 @@ public sealed partial class {authorization.Settings.ClassName}
 }}".RemoveBlankLinesWhereOnlyWhitespaces();
         }
 
-        var name = (authorization.Type, authorization.Scheme, authorization.In) switch
-        {
-            (SecuritySchemeType.Http, "bearer", _) => "Bearer",
-            (SecuritySchemeType.Http, "basic", _) => "Basic",
-            (SecuritySchemeType.ApiKey, _, _) => authorization.Name,
-            _ => string.Empty,
-        };
-        var value = (authorization.Type, authorization.Scheme, authorization.In) switch
-        {
-            (SecuritySchemeType.Http, "bearer", _) => "apiKey",
-            (SecuritySchemeType.Http, "basic", _) => @"global::System.Convert.ToBase64String(
-                    global::System.Text.Encoding.UTF8.GetBytes($""{username}:{password}""))",
-            (SecuritySchemeType.ApiKey, _, _) => "apiKey",
-            _ => string.Empty,
-        };
-        var xmlDocs = (authorization.Type, authorization.Scheme, authorization.In) switch
-        {
-            (SecuritySchemeType.Http, "bearer", _) => "Authorize using bearer authentication.",
-            (SecuritySchemeType.Http, "basic", _) => "Authorize using basic authentication.",
-            (SecuritySchemeType.ApiKey, _, _) => "Authorize using ApiKey authentication.",
-            _ => string.Empty,
-        };
-        
         return $@"
 #nullable enable
 
@@ -108,7 +83,13 @@ namespace {authorization.Settings.Namespace}
     public sealed partial class {authorization.Settings.ClassName}
     {{
         /// <summary>
-        /// {xmlDocs}
+        /// {(authorization.Type, authorization.Scheme.ToUpperInvariant(), authorization.In) switch
+        {
+            (SecuritySchemeType.Http, "BEARER", _) => "Authorize using bearer authentication.",
+            (SecuritySchemeType.Http, "BASIC", _) => "Authorize using basic authentication.",
+            (SecuritySchemeType.ApiKey, _, _) => "Authorize using ApiKey authentication.",
+            _ => string.Empty,
+        }}
         /// </summary>
 {authorization.Parameters.Select(x => $@"
         /// <param name=""{x}""></param>").Inject()}
@@ -124,8 +105,21 @@ public sealed partial class {authorization.Settings.ClassName}
             {{
                 Type = ""{authorization.Type:G}"",
                 Location = ""{authorization.In:G}"",
-                Name = ""{name}"",
-                Value = {value},
+                Name = ""{(authorization.Type, authorization.Scheme.ToUpperInvariant(), authorization.In) switch
+                {
+                    (SecuritySchemeType.Http, "BEARER", _) => "Bearer",
+                    (SecuritySchemeType.Http, "BASIC", _) => "Basic",
+                    (SecuritySchemeType.ApiKey, _, _) => authorization.Name,
+                    _ => string.Empty,
+                }}"",
+                Value = {(authorization.Type, authorization.Scheme.ToUpperInvariant(), authorization.In) switch
+                {
+                    (SecuritySchemeType.Http, "BEARER", _) => "apiKey",
+                    (SecuritySchemeType.Http, "BASIC", _) => @"global::System.Convert.ToBase64String(
+                    global::System.Text.Encoding.UTF8.GetBytes($""{username}:{password}""))",
+                    (SecuritySchemeType.ApiKey, _, _) => "apiKey",
+                    _ => "\"\"",
+                }},
             }});
         }}
     }}