From 3c9469b86cbba7d270ac1fc467475bcbbc0640b4 Mon Sep 17 00:00:00 2001
From: RTLcoil <oleg@rtl.co.il>
Date: Wed, 2 Sep 2020 20:16:48 +0300
Subject: [PATCH] Generate url-safe base64 strings in remote custom functions

---
 lib-es5/utils/index.js       |  5 ++++-
 lib/utils/index.js           |  6 +++++-
 test/unit/cloudinary_spec.js | 17 +++++++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib-es5/utils/index.js b/lib-es5/utils/index.js
index f3fb014d..acad973a 100644
--- a/lib-es5/utils/index.js
+++ b/lib-es5/utils/index.js
@@ -171,7 +171,10 @@ function process_custom_function(customFunction) {
     return customFunction;
   }
   if (customFunction.function_type === "remote") {
-    return [customFunction.function_type, base64EncodeURL(customFunction.source)].join(":");
+    var encodedSource = base64EncodeURL(customFunction.source).replace(/\+/g, '-') // Convert '+' to '-'
+    .replace(/\//g, '_') // Convert '/' to '_'
+    .replace(/=+$/, ''); // Remove ending '='
+    return [customFunction.function_type, encodedSource].join(":");
   }
   return [customFunction.function_type, customFunction.source].join(":");
 }
diff --git a/lib/utils/index.js b/lib/utils/index.js
index ec90de4e..e6a8e307 100644
--- a/lib/utils/index.js
+++ b/lib/utils/index.js
@@ -154,7 +154,11 @@ function process_custom_function(customFunction) {
     return customFunction;
   }
   if (customFunction.function_type === "remote") {
-    return [customFunction.function_type, base64EncodeURL(customFunction.source)].join(":");
+    const encodedSource = base64EncodeURL(customFunction.source)
+      .replace(/\+/g, '-') // Convert '+' to '-'
+      .replace(/\//g, '_') // Convert '/' to '_'
+      .replace(/=+$/, ''); // Remove ending '='
+    return [customFunction.function_type, encodedSource].join(":");
   }
   return [customFunction.function_type, customFunction.source].join(":");
 }
diff --git a/test/unit/cloudinary_spec.js b/test/unit/cloudinary_spec.js
index 69edb5e1..f03b2565 100644
--- a/test/unit/cloudinary_spec.js
+++ b/test/unit/cloudinary_spec.js
@@ -545,7 +545,7 @@ describe("cloudinary", function () {
     };
     result = cloudinary.utils.url("test", options);
     expect(options).to.eql({});
-    expect(result).to.eql("http://res.cloudinary.com/test123/image/upload/fn_remote:aHR0cHM6Ly9kZjM0cmE0YS5leGVjdXRlLWFwaS51cy13ZXN0LTIuYW1hem9uYXdzLmNvbS9kZWZhdWx0L2Nsb3VkaW5hcnlGdW5jdGlvbg==/test");
+    expect(result).to.eql("http://res.cloudinary.com/test123/image/upload/fn_remote:aHR0cHM6Ly9kZjM0cmE0YS5leGVjdXRlLWFwaS51cy13ZXN0LTIuYW1hem9uYXdzLmNvbS9kZWZhdWx0L2Nsb3VkaW5hcnlGdW5jdGlvbg/test");
   });
   it('should should not include custom function with undefined value', function () {
     var options, result;
@@ -567,7 +567,20 @@ describe("cloudinary", function () {
     };
     result = cloudinary.utils.url("test", options);
     expect(options).to.eql({});
-    expect(result).to.eql("http://res.cloudinary.com/test123/image/upload/fn_pre:remote:aHR0cHM6Ly9kZjM0cmE0YS5leGVjdXRlLWFwaS51cy13ZXN0LTIuYW1hem9uYXdzLmNvbS9kZWZhdWx0L2Nsb3VkaW5hcnlGdW5jdGlvbg==/test");
+    expect(result).to.eql("http://res.cloudinary.com/test123/image/upload/fn_pre:remote:aHR0cHM6Ly9kZjM0cmE0YS5leGVjdXRlLWFwaS51cy13ZXN0LTIuYW1hem9uYXdzLmNvbS9kZWZhdWx0L2Nsb3VkaW5hcnlGdW5jdGlvbg/test");
+  });
+  it('should generate url safe base64 in remote custom pre function', function () {
+    var options, result;
+    options = {
+      custom_pre_function: {
+        function_type: 'remote',
+        source:
+          "https://opengraphimg.com/.netlify/functions/generate-opengraph?author=opengraphimg&title=Hey%20Chris%20this%20is%20working"
+      }
+    };
+    result = cloudinary.utils.url("test", options);
+    expect(options).to.eql({});
+    expect(result).to.eql("http://res.cloudinary.com/test123/image/upload/fn_pre:remote:aHR0cHM6Ly9vcGVuZ3JhcGhpbWcuY29tLy5uZXRsaWZ5L2Z1bmN0aW9ucy9nZW5lcmF0ZS1vcGVuZ3JhcGg_YXV0aG9yPW9wZW5ncmFwaGltZyZ0aXRsZT1IZXklMjBDaHJpcyUyMHRoaXMlMjBpcyUyMHdvcmtpbmc/test");
   });
   it('should support custom pre function with no function_type or source', function () {
     var options, result;