chore: Use ThrowIfNull for validating null objects.

microsoft · Oct 10, 2023 · 36189d1 · 36189d1
1 parent 687f1d3
commit 36189d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/lib/Helpers/ValidationHelpers.cs b/src/lib/Helpers/ValidationHelpers.cs
@@ -10,10 +10,9 @@ internal static void ValidateNullOrWhitespace(string parameterName, string? valu
                 throw new ArgumentNullException(parameterName, string.Format(ErrorMessage.FieldIsRequired, parameterName, parentName));
         }
 
-        internal static void ValidateNullObject(string parameterName, object? value, string parentName)
+        internal static void ValidateNullObject(string parameterName, object? value)
         {
-            if (value == null)
-                throw new ArgumentNullException(parameterName, string.Format(ErrorMessage.FieldIsRequired, parameterName, parentName));
+            ArgumentNullException.ThrowIfNull(value, parameterName);
         }
 
         internal static void ValidateLength(string parameterName, string? value, int maxLength)

diff --git a/src/lib/OpenAI/Authentication/ManifestUserHttpAuth.cs b/src/lib/OpenAI/Authentication/ManifestUserHttpAuth.cs
@@ -11,7 +11,8 @@ public class ManifestUserHttpAuth : BaseManifestAuth
     public string? AuthorizationType { get; set; }
     public ManifestUserHttpAuth(string? authorizationType)
     {
-        if (string.IsNullOrWhiteSpace(authorizationType) || (authorizationType != "basic" && authorizationType != "bearer"))
+        if (string.IsNullOrWhiteSpace(authorizationType) ||
+            (!string.Equals(authorizationType, "basic", StringComparison.OrdinalIgnoreCase) && !string.Equals(authorizationType, "bearer", StringComparison.OrdinalIgnoreCase)))
         {
             // Reference: https://platform.openai.com/docs/plugins/authentication/user-level
             throw new ArgumentException($"{nameof(authorizationType)} must be either 'basic' or 'bearer'.");

diff --git a/src/lib/OpenAI/OpenAIPluginManifest.cs b/src/lib/OpenAI/OpenAIPluginManifest.cs
@@ -137,8 +137,8 @@ private void Validate(OpenAIPluginManifest openAIPluginManifest)
         ValidationHelpers.ValidateLength(nameof(DescriptionForModel), openAIPluginManifest.DescriptionForModel, 8000);
 
         ValidationHelpers.ValidateNullOrWhitespace(nameof(SchemaVersion), openAIPluginManifest.SchemaVersion, nameof(OpenAIPluginManifest));
-        ValidationHelpers.ValidateNullObject(nameof(Auth), openAIPluginManifest.Auth, nameof(OpenAIPluginManifest));
-        ValidationHelpers.ValidateNullObject(nameof(Api), openAIPluginManifest.Api, nameof(OpenAIPluginManifest));
+        ValidationHelpers.ValidateNullObject(nameof(Auth), openAIPluginManifest.Auth);
+        ValidationHelpers.ValidateNullObject(nameof(Api), openAIPluginManifest.Api);
         ValidationHelpers.ValidateNullOrWhitespace(nameof(LogoUrl), openAIPluginManifest.LogoUrl, nameof(OpenAIPluginManifest));
         ValidationHelpers.ValidateEmail(nameof(ContactEmail), openAIPluginManifest.ContactEmail, nameof(OpenAIPluginManifest));
         ValidationHelpers.ValidateNullOrWhitespace(nameof(LegalInfoUrl), openAIPluginManifest.LegalInfoUrl, nameof(OpenAIPluginManifest));