fix: Restore ability to connect Azure blob storage with SAS (#25)

Author: alexeyshibanov

src/VirtoCommerce.AzureBlobAssetsModule.Core/AzureBlobProvider.cs

@@ -564,14 +564,18 @@ private static string GetParentUrl(Uri baseUri, string blobPrefix)
         {
             var baseUriString = baseUri.GetLeftPart(UriPartial.Path);
             var baseUriQuery = baseUri.Query;
-            return GetParentUrl(baseUriString, blobPrefix, baseUriQuery);
+            var result = GetParentUrl(baseUriString, blobPrefix, baseUriQuery);
+
+            return result;
         }
 
         private static string GetParentUrl(string baseUri, string blobPrefix, string query = null)
         {
             var segments = GetOutlineFromUrl(blobPrefix);
             var parentPath = string.Join(Delimiter, segments.Take(segments.Length - 1));
-            return GetAbsoluteUri(new Uri(baseUri), parentPath, query).AbsoluteUri;
+            var result = GetAbsoluteUri(baseUri, parentPath, query).AbsoluteUri;
+
+            return result;
         }
 
         private string GetRelativeUrl(Uri absoluteUri)
@@ -591,35 +595,36 @@ private string GetRelativeUrl(Uri absoluteUri)
             return result;
         }
 
-        private static Uri GetAbsoluteUri(Uri baseUri, string inputUrl, string query)
+        public static Uri GetAbsoluteUri(Uri baseUri, string inputUrl)
+        {
+            ArgumentNullException.ThrowIfNull(baseUri);
+            ArgumentException.ThrowIfNullOrEmpty(inputUrl);
+
+            var baseUriString = baseUri.GetLeftPart(UriPartial.Path);
+            var baseUriQuery = baseUri.Query;
+            var result = GetAbsoluteUri(baseUriString, inputUrl, baseUriQuery);
+
+            return result;
+        }
+
+        private static Uri GetAbsoluteUri(string baseUri, string inputUrl, string query)
         {
             var result = GetAbsoluteUri(baseUri, inputUrl);
 
             if (!string.IsNullOrEmpty(query))
             {
-                if (string.IsNullOrEmpty(query))
-                {
-                    return result;
-                }
-
-                var builder = new UriBuilder(result)
-                {
-                    Query = query,
-                };
-                return builder.Uri;
+                result = new UriBuilder(result) { Query = query }.Uri;
             }
 
             return result;
         }
 
-        public static Uri GetAbsoluteUri(Uri baseUri, string inputUrl)
+        private static Uri GetAbsoluteUri(string baseUri, string inputUrl)
         {
-            ArgumentNullException.ThrowIfNull(nameof(inputUrl));
-
-            // base uri should be end with delimiter. see tests
-            if (!baseUri.AbsolutePath.EndsWith(Delimiter))
+            // base uri should be ended with delimiter. see tests
+            if (!baseUri.EndsWith(Delimiter))
             {
-                baseUri = new Uri(baseUri.AbsoluteUri + Delimiter);
+                baseUri += Delimiter;
             }
 
             // do trim lead slash to prevent transform it to absolute file path on linux.
@@ -638,9 +643,9 @@ public static Uri GetAbsoluteUri(Uri baseUri, string inputUrl)
                 inputUrl = "./" + inputUrl;
             }
 
-            if (Uri.TryCreate(baseUri, inputUrl, out resultUri))
+            // If the input URL is relative, combine it with the base URI
+            if (Uri.TryCreate(new Uri(baseUri), inputUrl, out resultUri))
             {
-                // If the input URL is relative, combine it with the base URI
                 return resultUri;
             }
 

tests/VirtoCommerce.Platform.Assets.AzureBlobStorage.Tests/AzureBlobStorageProviderTests.cs

@@ -143,6 +143,14 @@ public void GetAbsoluteUri_StaticMethod(string baseUrl, string inputUrl, string
         Assert.Equal(absoluteUrl, AzureBlobProvider.GetAbsoluteUri(new Uri(baseUrl), inputUrl).AbsoluteUri);
     }
 
+    [Theory]
+    [InlineData("https://qademovc3.core.windows.net/cms/test?sv=2022-11-02&ss=b&srt=co&sp", "Catalog/", "https://qademovc3.core.windows.net/cms/test/Catalog/?sv=2022-11-02&ss=b&srt=co&sp")]
+    [InlineData("https://qademovc3.core.windows.net/cms/test?sv=2022-11-02&ss=b&srt=co&sp", "/Catalog", "https://qademovc3.core.windows.net/cms/test/Catalog?sv=2022-11-02&ss=b&srt=co&sp")]
+    [InlineData("https://qademovc3.core.windows.net/cms/test?sv=2022-11-02&ss=b&srt=co&sp", "/Catalog/", "https://qademovc3.core.windows.net/cms/test/Catalog/?sv=2022-11-02&ss=b&srt=co&sp")]
+    public void GetAbsoluteUriWithParameters_StaticMethod(string baseUrl, string inputUrl, string absoluteUrl)
+    {
+        Assert.Equal(absoluteUrl, AzureBlobProvider.GetAbsoluteUri(new Uri(baseUrl), inputUrl).AbsoluteUri);
+    }
 
     private static void ValidateFailure<TOptions>(OptionsValidationException ex, string name = "", int count = 1, params string[] errorsToMatch)
     {