Fix X-ShopId header check when header value is empty

Closes SHARP-995
nozzlegear · Jan 17, 2024 · 783bb30 · 783bb30
1 parent 54643df
commit 783bb30
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ShopifySharp/Utilities/ShopifyDomainUtility.cs b/ShopifySharp/Utilities/ShopifyDomainUtility.cs
@@ -59,10 +59,11 @@ public async Task<bool> IsValidShopDomainAsync(string shopDomain, CancellationTo
 
         try
         {
+            const string headerName = "X-ShopId";
             var response = await client.SendAsync(msg, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
-            var hasShopIdHeader = response.Headers.Any(h => h.Key.Equals("X-ShopId", StringComparison.OrdinalIgnoreCase));
+            var headerValues = response.Headers.FirstOrDefault(h => h.Key.Equals(headerName, StringComparison.OrdinalIgnoreCase)).Value;
 
-            return hasShopIdHeader;
+            return headerValues != null && headerValues.Any(v => !string.IsNullOrWhiteSpace(v));
         }
         catch (HttpRequestException)
         {