VCST-1527: Incorrect absolute urls resolved by Azure blob assets module (#24)

fix: Incorrect absolute urls resolved by Azure blob assets module

Author: OlegoO

src/VirtoCommerce.AzureBlobAssetsModule.Core/AzureBlobProvider.cs

@@ -608,10 +608,16 @@ private static Uri GetAbsoluteUri(Uri baseUri, string inputUrl, string query)
             return result;
         }
 
-        private static Uri GetAbsoluteUri(Uri baseUri, string inputUrl)
+        public static Uri GetAbsoluteUri(Uri baseUri, string inputUrl)
         {
             ArgumentNullException.ThrowIfNull(nameof(inputUrl));
 
+            // base uri should be end with delimiter. see tests
+            if (!baseUri.AbsolutePath.EndsWith(Delimiter))
+            {
+                baseUri = new Uri(baseUri.AbsoluteUri + Delimiter);
+            }
+
             // do trim lead slash to prevent transform it to absolute file path on linux.
             if (Uri.TryCreate(inputUrl.TrimStart('/'), UriKind.Absolute, out var resultUri))
             {

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

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -130,6 +131,18 @@ public void GetAbsoluteUrlTestWithCdn(string blobKey, string absoluteUrl)
         Assert.Equal(absoluteUrl, blobUrlResolver.GetAbsoluteUrl(blobKey));
     }
 
+    [Theory]
+    [InlineData("https://qademovc3.core.windows.net/cms", "Themes/", "https://qademovc3.core.windows.net/cms/Themes/")]
+    [InlineData("https://qademovc3.core.windows.net/cms/", "Themes", "https://qademovc3.core.windows.net/cms/Themes")]
+    [InlineData("https://qademovc3.core.windows.net/cms/", "/Themes/", "https://qademovc3.core.windows.net/cms/Themes/")]
+    [InlineData("https://qademovc3.core.windows.net/cms", "/Themes", "https://qademovc3.core.windows.net/cms/Themes")]
+    [InlineData("https://qademovc3.core.windows.net/", "Themes/", "https://qademovc3.core.windows.net/Themes/")]
+    [InlineData("https://qademovc3.core.windows.net", "Themes/", "https://qademovc3.core.windows.net/Themes/")]
+    public void GetAbsoluteUri_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)
     {