Merge branch 'release/3.209.0'

Author: vc-ci

Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.208.0</VersionPrefix>
+    <VersionPrefix>3.209.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

src/VirtoCommerce.AzureBlobAssetsModule.Core/AzureBlobProvider.cs

@@ -112,6 +112,14 @@ public virtual Stream OpenWrite(string blobUrl)
 
         public virtual async Task<Stream> OpenWriteAsync(string blobUrl)
         {
+            if (string.IsNullOrEmpty(blobUrl))
+            {
+                throw new ArgumentNullException(nameof(blobUrl));
+            }
+
+            // Normilize Url if blobUrl has wrong encoded, like contains space  
+            blobUrl = NormalizeUrl(blobUrl);
+
             var filePath = GetFilePathFromUrl(blobUrl);
             var fileName = Path.GetFileName(filePath);
 
@@ -149,12 +157,24 @@ public virtual async Task<Stream> OpenWriteAsync(string blobUrl)
             return new FlushLessStream(await blob.OpenWriteAsync(true, options));
         }
 
+        protected static string NormalizeUrl(string blobUrl)
+        {
+            try
+            {
+                return (new Uri(blobUrl)).AbsoluteUri;
+            }
+            catch (Exception)
+            {
+                return blobUrl;
+            }
+        }
+
         public virtual async Task RemoveAsync(string[] urls)
         {
             foreach (var url in urls.Where(x => !string.IsNullOrWhiteSpace(x)))
             {
                 var absoluteUri = url.IsAbsoluteUrl()
-                    ? new Uri(url).ToString()
+                    ? url
                     : UrlHelperExtensions.Combine(_blobServiceClient.Uri.ToString(), url);
                 var blobContainer = GetBlobContainer(GetContainerNameFromUrl(absoluteUri));
 
@@ -217,11 +237,15 @@ public virtual async Task<BlobEntrySearchResult> SearchAsync(string folderUrl, s
                                    .Split(new[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries)
                                    .Last();
 
-                                folder.Url = UrlHelperExtensions.Combine(baseUriEscaped, EscapeUri(blobhierarchyItem.Prefix));
+                                var folderUrlBuilder = new UriBuilder(new Uri(baseUriEscaped));
+                                folderUrlBuilder.Path += Delimiter + blobhierarchyItem.Prefix;
+                                folder.Url = folderUrlBuilder.ToString();
                                 folder.ParentUrl = GetParentUrl(baseUriEscaped, blobhierarchyItem.Prefix);
                                 folder.RelativeUrl = folder.Url.Replace(EscapeUri(_blobServiceClient.Uri.ToString()), string.Empty);
+
                                 folder.CreatedDate = containerProperties.Value.LastModified.UtcDateTime;
                                 folder.ModifiedDate = containerProperties.Value.LastModified.UtcDateTime;
+
                                 result.Results.Add(folder);
                             }
                             else
@@ -248,7 +272,11 @@ public virtual async Task<BlobEntrySearchResult> SearchAsync(string folderUrl, s
                     {
                         var folder = AbstractTypeFactory<BlobFolder>.TryCreateInstance();
                         folder.Name = item.Name.Split(Delimiter).Last();
-                        folder.Url = EscapeUri(UrlHelperExtensions.Combine(_blobServiceClient.Uri.ToString(), item.Name));
+
+                        var folderUrlBuilder = new UriBuilder(_blobServiceClient.Uri);
+                        folderUrlBuilder.Path += item.Name + Delimiter;
+                        folder.Url = folderUrlBuilder.ToString();
+
                         result.Results.Add(folder);
                     }
                 }
@@ -260,15 +288,20 @@ public virtual async Task<BlobEntrySearchResult> SearchAsync(string folderUrl, s
 
         public virtual async Task CreateFolderAsync(BlobFolder folder)
         {
-            var path = folder.ParentUrl == null ?
-                        folder.Name :
-                        UrlHelperExtensions.Combine(folder.ParentUrl, folder.Name);
+            var newFolderUrl = folder.Name;
 
-            var containerName = GetContainerNameFromUrl(path);
+            if (folder.ParentUrl != null)
+            {
+                var newFolderUriBuilder = new UriBuilder(new Uri(folder.ParentUrl));
+                newFolderUriBuilder.Path += Delimiter + folder.Name;
+                newFolderUrl = newFolderUriBuilder.ToString();
+            }
+
+            var containerName = GetContainerNameFromUrl(newFolderUrl);
             var container = _blobServiceClient.GetBlobContainerClient(containerName);
             await container.CreateIfNotExistsAsync(PublicAccessType.Blob);
 
-            var directoryPath = GetDirectoryPathFromUrl(path);
+            var directoryPath = GetDirectoryPathFromUrl(newFolderUrl);
             if (!string.IsNullOrEmpty(directoryPath))
             {
                 // Need to upload an empty '.keep' blob because Azure Blob Storage does not support direct directory creation
@@ -406,6 +439,7 @@ public virtual string GetAbsoluteUrl(string blobKey)
         private string[] GetOutlineFromUrl(string url)
         {
             var relativeUrl = url;
+
             if (url.IsAbsoluteUrl())
             {
                 relativeUrl = Uri.UnescapeDataString(new Uri(url).AbsolutePath);
@@ -423,13 +457,13 @@ private string GetContainerNameFromUrl(string url)
         private string GetDirectoryPathFromUrl(string url)
         {
             var result = string.Join(Delimiter, GetOutlineFromUrl(url).Skip(1).ToArray());
-            return !string.IsNullOrEmpty(result) ? result + Delimiter : null;
+            return !string.IsNullOrEmpty(result) ? Uri.UnescapeDataString(result) + Delimiter : null;
         }
 
         private string GetFilePathFromUrl(string url)
         {
             var result = string.Join(Delimiter, GetOutlineFromUrl(url).Skip(1).ToArray());
-            return !string.IsNullOrEmpty(result) ? result : null;
+            return !string.IsNullOrEmpty(result) ? Uri.UnescapeDataString(result) : null;
         }
 
         private string GetParentUrl(string baseUri, string blobPrefix)
@@ -483,9 +517,13 @@ private BlobInfo ConvertBlobToBlobInfo(BlobClient blob, BlobProperties props)
 
         private BlobInfo ConvertBlobToBlobInfo(BlobItem blob, string baseUri)
         {
-            var fileName = Path.GetFileName(blob.Name);
-            var absoluteUrl = UrlHelperExtensions.Combine(baseUri, EscapeUri(blob.Name));
+            var fileUrlBuilder = new UriBuilder(new Uri(baseUri));
+            fileUrlBuilder.Path = fileUrlBuilder.Path + "/" + blob.Name;
+            var absoluteUrl = fileUrlBuilder.ToString();
+
             var relativeUrl = absoluteUrl.Replace(EscapeUri(_blobServiceClient.Uri.ToString()), string.Empty);
+
+            var fileName = Path.GetFileName(blob.Name);
             var contentType = MimeTypeResolver.ResolveContentType(fileName);
 
             return new BlobInfo

src/VirtoCommerce.AzureBlobAssetsModule.Web/module.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.AzureBlobAssets</id>
-  <version>3.208.0</version>
+  <version>3.209.0</version>
   <version-tag />
   <platformVersion>3.200.0</platformVersion>
   <title>Azure blob assets module</title>