Fix special characters encoding in fetch overlays

Author: const-cloudinary

cloudinary/utils.py

@@ -1289,7 +1289,7 @@ def process_layer(layer, layer_parameter):
             text = ''.join(encoded_text)
             components.append(text)
     elif type == "fetch":
-        b64 = base64_encode_url(fetch_url)
+        b64 = base64url_encode(fetch_url)
         components.append(b64)
     else:
         public_id = public_id.replace("/", ':')

test/test_utils.py

@@ -455,8 +455,18 @@ def test_fetch_overlay(self):
             expected_url=(
                     DEFAULT_UPLOAD_PATH +
                     "l_fetch:"
-                    "aHR0cHM6Ly91cGxvYWQud2lraW1lZGlhLm9yZy93aWtpcGVkaWEvY29"
-                    "tbW9ucy8yLzJiLyVFQSVCMyVBMCVFQyVCMCVCRCVFQSVCMCVBRiVFQiVCMiU4Qy5qcGc=/"
+                    "aHR0cHM6Ly91cGxvYWQud2lraW1lZGlhLm9yZy93aWtpcGVkaWEvY29tbW9ucy8yLzJiL-qzoOywveqwr-uyjC5qcGc=/"
+                    "test"))
+
+        self.__test_cloudinary_url(
+            options={
+                "overlay": {
+                    "url":
+                        "https://www.test.com/test/JE01118-YGP900_1_lar.jpg?version=432023"}},
+            expected_url=(
+                    DEFAULT_UPLOAD_PATH +
+                    "l_fetch:"
+                    "aHR0cHM6Ly93d3cudGVzdC5jb20vdGVzdC9KRTAxMTE4LVlHUDkwMF8xX2xhci5qcGc_dmVyc2lvbj00MzIwMjM=/"
                     "test"))
 
     def test_underlay(self):
@@ -960,8 +970,7 @@ def test_overlay_options(self):
               'font_family': "Arial", 'font_size': 40},
              "subtitles:Arial_40:sample_sub_he.srt"),
             ({'url': "https://upload.wikimedia.org/wikipedia/commons/2/2b/고창갯벌.jpg"},
-             "fetch:aHR0cHM6Ly91cGxvYWQud2lraW1lZGlhLm9yZy93aWtpcGVkaWEvY29"
-             "tbW9ucy8yLzJiLyVFQSVCMyVBMCVFQyVCMCVCRCVFQSVCMCVBRiVFQiVCMiU4Qy5qcGc="),
+             "fetch:aHR0cHM6Ly91cGxvYWQud2lraW1lZGlhLm9yZy93aWtpcGVkaWEvY29tbW9ucy8yLzJiL-qzoOywveqwr-uyjC5qcGc="),
             ({'url': FETCH_VIDEO_URL, "resource_type": "video"},
              "video:fetch:aHR0cHM6Ly9kZW1vLXJlcy5jbG91ZGluYXJ5LmNvbS92aWRlb3MvZG9nLm1wNA==")
         ]