- Refactor constsnts

- Use TryGet to avoid reference resolution errors
microsoft · Jan 20, 2025 · 759a7ad · 759a7ad
1 parent 673e08c
commit 759a7ad
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/Kiota.Builder/KiotaBuilder.cs b/src/Kiota.Builder/KiotaBuilder.cs
@@ -579,8 +579,10 @@ private void AddOperationSecurityRequirementToDOM(OpenApiOperation operation, Co
         {
             foreach (var scheme in securityRequirement.Keys)
             {
-                var securityScheme = securitySchemes[scheme.Reference.Id];
-                AddSecurity(codeClass, securityScheme);
+                if (securitySchemes.TryGetValue(scheme.Reference.Id, out var securityScheme))
+                {
+                    AddSecurity(codeClass, securityScheme);
+                }
             }
         }
     }

diff --git a/src/Kiota.Builder/Settings/VsCodeFileManagement.cs b/src/Kiota.Builder/Settings/VsCodeFileManagement.cs
@@ -18,6 +18,8 @@ public static class VsCodeSettingsManager
     public static async Task UpdateFileAsync(string fileUpdate, string fileUpdatePath, string fileUpdateKey, CancellationToken cancellationToken)
     {
         ArgumentException.ThrowIfNullOrEmpty(fileUpdate);
+        ArgumentException.ThrowIfNullOrEmpty(fileUpdatePath);
+        ArgumentException.ThrowIfNullOrEmpty(fileUpdateKey);
         Dictionary<string, object> settings = [];
 
         // Read existing settings or create new if file doesn't exist

diff --git a/src/Kiota.Builder/Writers/HTTP/CodeClassDeclarationWriter.cs b/src/Kiota.Builder/Writers/HTTP/CodeClassDeclarationWriter.cs
@@ -18,6 +18,14 @@ private static class Constants
         internal const string BearerAuth = "bearerAuth";
         internal const string HttpVersion = "HTTP/1.1";
         internal const string LocalHostUrl = "http://localhost/";
+
+        internal static Dictionary<string, string> SchemeTypeMapping = new()
+        {
+            { SecuritySchemeType.ApiKey.ToString().ToLowerInvariant(), ApiKeyAuth },
+            { SecuritySchemeType.Http.ToString().ToLowerInvariant(), BearerAuth },
+            { SecuritySchemeType.OAuth2.ToString().ToLowerInvariant(), BearerAuth },
+            { SecuritySchemeType.OpenIdConnect.ToString().ToLowerInvariant(), BearerAuth }
+        };
     }
 
     protected override void WriteTypeDeclaration(ClassDeclaration codeElement, LanguageWriter writer)
@@ -226,14 +234,7 @@ private static void WriteHttpMethods(
 
             if (authenticationMethod != null && Enum.TryParse(typeof(SecuritySchemeType), authenticationMethod.Type.Name, true, out var _))
             {
-                var schemeTypeMapping = new Dictionary<string, string>
-                {
-                    { SecuritySchemeType.ApiKey.ToString().ToLowerInvariant(), Constants.ApiKeyAuth },
-                    { SecuritySchemeType.Http.ToString().ToLowerInvariant(), Constants.BearerAuth },
-                    { SecuritySchemeType.OAuth2.ToString().ToLowerInvariant(), Constants.BearerAuth },
-                    { SecuritySchemeType.OpenIdConnect.ToString().ToLowerInvariant(), Constants.BearerAuth }
-                };
-                var schemeType = schemeTypeMapping[authenticationMethod.Type.Name.ToLowerInvariant()];
+                var schemeType = Constants.SchemeTypeMapping[authenticationMethod.Type.Name.ToLowerInvariant()];
                 writer.WriteLine($"Authorization: {{{{{schemeType}}}}}");
             }