Enhance check

saucelabs · Mar 18, 2024 · f02761b · f02761b
1 parent 8a6fdd6
commit f02761b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 21 deletions.
diff --git a/visual-dotnet/SauceLabs.Visual/Utils/StringUtils.cs b/visual-dotnet/SauceLabs.Visual/Utils/StringUtils.cs
diff --git a/visual-dotnet/SauceLabs.Visual/VisualApi.cs b/visual-dotnet/SauceLabs.Visual/VisualApi.cs
@@ -22,13 +22,13 @@ internal class VisualApi<T> : IDisposable where T : IHasCapabilities, IHasSessio
         public VisualApi(T webdriver, Region region, string username, string accessKey, HttpClient? httpClient = null)
         {
 
-            if (!StringUtils.HasContent(username) || !StringUtils.HasContent(accessKey))
+            if (string.IsNullOrEmpty(username?.Trim()) || string.IsNullOrEmpty(accessKey?.Trim()))
             {
                 throw new VisualClientException(
                     "Invalid SauceLabs credentials. Please check your SauceLabs username and access key at https://app.saucelabs.com/user-setting");
             }
-            _username = username.Trim();
-            _accessKey = accessKey.Trim();
+            _username = username!.Trim();
+            _accessKey = accessKey!.Trim();
 
             httpClient ??= new HttpClient();
 

diff --git a/visual-dotnet/SauceLabs.Visual/VisualClient.cs b/visual-dotnet/SauceLabs.Visual/VisualClient.cs
@@ -66,7 +66,7 @@ public VisualClient(WebDriver wd, Region region, CreateBuildOptions buildOptions
         /// <param name="buildOptions">the options of the build creation</param>
         public VisualClient(WebDriver wd, Region region, string? username, string? accessKey, CreateBuildOptions buildOptions)
         {
-            if (!StringUtils.HasContent(username) || !StringUtils.HasContent(accessKey))
+            if (string.IsNullOrEmpty(username?.Trim()) || string.IsNullOrEmpty(accessKey?.Trim()))
             {
                 throw new VisualClientException("Username or Access Key not set");
             }
@@ -155,14 +155,14 @@ private async Task<VisualBuild> FindBuildById(string buildId)
         /// <returns></returns>
         private async Task<VisualBuild?> GetEffectiveBuild(string? buildId, string? customId)
         {
-            if (StringUtils.HasContent(buildId))
+            if (string.IsNullOrEmpty(buildId?.Trim()))
             {
-                return await FindBuildById(buildId!);
+                return await FindBuildById(buildId!.Trim());
             }
 
-            if (StringUtils.HasContent(customId))
+            if (string.IsNullOrEmpty(customId?.Trim()))
             {
-                return await TryFindBuildByCustomId(customId!);
+                return await TryFindBuildByCustomId(customId!.Trim());
             }
             return null;
         }