Fix format handling in signed URLs

Author: const-cloudinary

CloudinaryDotNet.Tests/Asset/SignatureTest.cs

@@ -222,40 +222,22 @@ public void TestSignedUrl()
             Assert.AreEqual(expected, actual);
         }
 
-        [Test]
-        public void TestSignedAnsiAndUnicodeUrl()
+        [TestCase("testFolder/%20Test Image_僅測試", "s--MIMNFCL4--/c_scale,h_200,w_300/v1/testFolder/%2520Test%20Image_%E5%83%85%E6%B8%AC%E8%A9%A6.jpg")]
+        [TestCase("testFolder/TestImage_僅測試", "s--FvJh0bXb--/c_scale,h_200,w_300/v1/testFolder/TestImage_%E5%83%85%E6%B8%AC%E8%A9%A6.jpg")]
+        [TestCase("testFolder/Test Image_僅測試", "s--_jfm-XyC--/c_scale,h_200,w_300/v1/testFolder/Test%20Image_%E5%83%85%E6%B8%AC%E8%A9%A6.jpg")]
+        [TestCase("testFolder/Test Image", "s--rmmMhYpj--/c_scale,h_200,w_300/v1/testFolder/Test%20Image.jpg")]
+        [TestCase("testFolder/TestImage", "s--lzoFcAJk--/c_scale,h_200,w_300/v1/testFolder/TestImage.jpg")]
+        [TestCase("testFolder/%20Test Image", "s--AlS6-LgU--/c_scale,h_200,w_300/v1/testFolder/%2520Test%20Image.jpg")]
+        [TestCase("testFolder/%20TestImage", "s--8xAbqJri--/c_scale,h_200,w_300/v1/testFolder/%2520TestImage.jpg")]
+        public void TestSignedAnsiAndUnicodeUrl(string publicId, string expectedPath)
         {
+            var urlBuilder = m_api.UrlImgUp.Action("authenticated")
+                .Transform(new Transformation().Crop("scale").Height(200).Width(300))
+                .Secure()
+                .Signed(true);
 
-            string[] sourcePublicIds = {
-                "testFolder/%20Test Image_僅測試.jpg",
-                "testFolder/TestImage_僅測試.jpg",
-                "testFolder/Test Image_僅測試.jpg",
-                "testFolder/Test Image.jpg",
-                "testFolder/TestImage.jpg",
-                "testFolder/%20Test Image.jpg",
-                "testFolder/%20TestImage.jpg"
-            };
-
-            string[] expectedSignedUrls = {
-                "https://res.cloudinary.com/testcloud/image/authenticated/s--MIMNFCL4--/c_scale,h_200,w_300/v1/testFolder/%2520Test%20Image_%E5%83%85%E6%B8%AC%E8%A9%A6.jpg",
-                "https://res.cloudinary.com/testcloud/image/authenticated/s--FvJh0bXb--/c_scale,h_200,w_300/v1/testFolder/TestImage_%E5%83%85%E6%B8%AC%E8%A9%A6.jpg",
-                "https://res.cloudinary.com/testcloud/image/authenticated/s--_jfm-XyC--/c_scale,h_200,w_300/v1/testFolder/Test%20Image_%E5%83%85%E6%B8%AC%E8%A9%A6.jpg",
-                "https://res.cloudinary.com/testcloud/image/authenticated/s--rmmMhYpj--/c_scale,h_200,w_300/v1/testFolder/Test%20Image.jpg",
-                "https://res.cloudinary.com/testcloud/image/authenticated/s--lzoFcAJk--/c_scale,h_200,w_300/v1/testFolder/TestImage.jpg",
-                "https://res.cloudinary.com/testcloud/image/authenticated/s--AlS6-LgU--/c_scale,h_200,w_300/v1/testFolder/%2520Test%20Image.jpg",
-                "https://res.cloudinary.com/testcloud/image/authenticated/s--8xAbqJri--/c_scale,h_200,w_300/v1/testFolder/%2520TestImage.jpg"
-            };
-
-            for (int x = 0; x < sourcePublicIds.Length; x++)
-            {
-                var actual = m_api.UrlImgUp.Action("authenticated")
-                    .Transform(new Transformation().Crop("scale").Height(200).Width(300))
-                    .Secure(true)
-                    .Signed(true)
-                    .BuildUrl(sourcePublicIds[x]);
-
-                Assert.AreEqual(expectedSignedUrls[x], actual);
-            }
+            Assert.IsTrue(urlBuilder.BuildUrl($"{publicId}.jpg").EndsWith(expectedPath));
+            Assert.IsTrue(urlBuilder.Format("jpg").BuildUrl(publicId).EndsWith(expectedPath));
         }
 
         [Test]

CloudinaryDotNet/Url.cs

@@ -856,18 +856,9 @@ public string BuildUrl(string source)
                 throw new ArgumentException("cloudName must be specified!");
             }
 
-            if (source == null)
-            {
-                source = m_source;
-            }
-
-            if (source == null)
-            {
-                source = string.Empty;
-            }
+            source ??= m_source ?? string.Empty;
 
-            if (Regex.IsMatch(source.ToLowerInvariant(), "^https?:/.*") &&
-                (m_action == "upload" || m_action == "asset"))
+            if (Regex.IsMatch(source.ToLowerInvariant(), "^https?:/.*") && m_action is "upload" or "asset")
             {
                 return source;
             }
@@ -878,12 +869,11 @@ public string BuildUrl(string source)
                 FormatValue = null;
             }
 
-            string transformationStr = Transformation.Generate();
+            var transformationStr = Transformation.Generate();
 
             var src = UpdateSource(source);
 
-            bool sharedDomain;
-            var prefix = GetPrefix(src.Source, out sharedDomain);
+            var prefix = GetPrefix(src.Source, out var sharedDomain);
 
             List<string> urlParts = new List<string>(new string[] { prefix });
             if (!string.IsNullOrEmpty(m_apiVersion))
@@ -1264,42 +1254,36 @@ private string FinalizePosterUrl(string source)
 
         private CSource UpdateSource(string source)
         {
-            CSource src = null;
-
-            var tmpSource = Regex.Replace(source, @"[^\u0000-\u007F]+", string.Empty);
-
-            bool isSignedAndUnicode = (m_signed && ((tmpSource != source) || tmpSource.Contains("%"))) ? true : false;
-
             if (Regex.IsMatch(source.ToLowerInvariant(), "^https?:/.*"))
             {
-                src = new CSource(Encode(source));
+               return new CSource(Encode(source));
             }
-            else
-            {
-                var targetSource = isSignedAndUnicode ? Utils.Encode(source) : source;
 
-                src = new CSource(Encode(Decode(targetSource)));
+            var isSignedAndUnicode = m_signed && (source.Any(c => c > 127) || source.Contains("%"));
 
-                if (!string.IsNullOrEmpty(m_suffix))
-                {
-                    if (Regex.IsMatch(m_suffix, "[\\./]"))
-                    {
-                        throw new ArgumentException("Suffix should not include . or /!");
-                    }
+            var targetSource = isSignedAndUnicode ? Utils.Encode(source) : source;
 
-                    src.Source += "/" + m_suffix;
-                }
+            var src = new CSource(Encode(Decode(targetSource)));
 
-                if (!string.IsNullOrEmpty(FormatValue))
-                {
-                    src += "." + FormatValue;
-                }
+            if (isSignedAndUnicode)
+            {
+                // Signature calculation to be in line with backend logic for mixed Ansii and Unicode publicID + authenticated
+                src.SourceToSign = Uri.UnescapeDataString(source);
+            }
 
-                if (isSignedAndUnicode)
+            if (!string.IsNullOrEmpty(m_suffix))
+            {
+                if (Regex.IsMatch(m_suffix, "[\\./]"))
                 {
-                    // Signature calculation to be in line with backend logic for mixed Ansii and Unicode publicID + authenticated
-                    src.SourceToSign = System.Uri.UnescapeDataString(source);
+                    throw new ArgumentException("Suffix should not include . or /!");
                 }
+
+                src.Source += "/" + m_suffix;
+            }
+
+            if (!string.IsNullOrEmpty(FormatValue))
+            {
+                src += "." + FormatValue;
             }
 
             return src;