Add feature to allow override on timestamp and signature (#295)

* Add feature to allow override on timestamp and signature

Author: leptians

lib-es5/utils/index.js

@@ -364,7 +364,7 @@ function build_upload_params(options) {
     quality_analysis: utils.as_safe_bool(options.quality_analysis),
     responsive_breakpoints: utils.generate_responsive_breakpoints_string(options.responsive_breakpoints),
     return_delete_token: utils.as_safe_bool(options.return_delete_token),
-    timestamp: exports.timestamp(),
+    timestamp: options.timestamp || exports.timestamp(),
     transformation: utils.generate_transformation_string(clone(options)),
     type: options.type,
     unique_filename: utils.as_safe_bool(options.unique_filename),
@@ -1074,6 +1074,8 @@ function process_request_params(params, options) {
   if (options.unsigned != null && options.unsigned) {
     params = exports.clear_blank(params);
     delete params.timestamp;
+  } else if (options.signature) {
+    params = exports.clear_blank(options);
   } else {
     params = exports.sign_request(params, options);
   }
@@ -1084,7 +1086,7 @@ function private_download_url(public_id, format) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
   var params = exports.sign_request({
-    timestamp: exports.timestamp(),
+    timestamp: options.timestamp || exports.timestamp(),
     public_id: public_id,
     format: format,
     type: options.type,
@@ -1103,7 +1105,7 @@ function zip_download_url(tag) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
   var params = exports.sign_request({
-    timestamp: exports.timestamp(),
+    timestamp: options.timestamp || exports.timestamp(),
     tag: tag,
     transformation: utils.generate_transformation_string(options)
   }, options);
@@ -1346,7 +1348,7 @@ function archive_params() {
     target_format: options.target_format,
     target_public_id: options.target_public_id,
     target_tags: options.target_tags && exports.build_array(options.target_tags),
-    timestamp: options.timestamp ? options.timestamp : exports.timestamp(),
+    timestamp: options.timestamp || exports.timestamp(),
     transformations: utils.build_eager(options.transformations),
     type: options.type,
     use_original_filename: exports.as_safe_bool(options.use_original_filename)
@@ -1539,4 +1541,4 @@ exports.build_streaming_profiles_param = build_streaming_profiles_param;
 exports.hashToParameters = hashToParameters;
 exports.present = present;
 exports.only = only;
-exports.jsonArrayParam = jsonArrayParam;
+exports.jsonArrayParam = jsonArrayParam;

lib/utils/index.js

@@ -356,7 +356,7 @@ function build_upload_params(options) {
     quality_analysis: utils.as_safe_bool(options.quality_analysis),
     responsive_breakpoints: utils.generate_responsive_breakpoints_string(options.responsive_breakpoints),
     return_delete_token: utils.as_safe_bool(options.return_delete_token),
-    timestamp: exports.timestamp(),
+    timestamp: options.timestamp || exports.timestamp(),
     transformation: utils.generate_transformation_string(clone(options)),
     type: options.type,
     unique_filename: utils.as_safe_bool(options.unique_filename),
@@ -1058,6 +1058,8 @@ function process_request_params(params, options) {
   if ((options.unsigned != null) && options.unsigned) {
     params = exports.clear_blank(params);
     delete params.timestamp;
+  } else if (options.signature ) {
+    params = exports.clear_blank(options);
   } else {
     params = exports.sign_request(params, options);
   }
@@ -1066,7 +1068,7 @@ function process_request_params(params, options) {
 
 function private_download_url(public_id, format, options = {}) {
   let params = exports.sign_request({
-    timestamp: exports.timestamp(),
+    timestamp: options.timestamp || exports.timestamp(),
     public_id: public_id,
     format: format,
     type: options.type,
@@ -1083,7 +1085,7 @@ function private_download_url(public_id, format, options = {}) {
 
 function zip_download_url(tag, options = {}) {
   let params = exports.sign_request({
-    timestamp: exports.timestamp(),
+    timestamp: options.timestamp || exports.timestamp(),
     tag: tag,
     transformation: utils.generate_transformation_string(options),
   }, options);
@@ -1309,7 +1311,7 @@ function archive_params(options = {}) {
     target_format: options.target_format,
     target_public_id: options.target_public_id,
     target_tags: options.target_tags && exports.build_array(options.target_tags),
-    timestamp: options.timestamp ? options.timestamp : exports.timestamp(),
+    timestamp: options.timestamp || exports.timestamp(),
     transformations: utils.build_eager(options.transformations),
     type: options.type,
     use_original_filename: exports.as_safe_bool(options.use_original_filename),

test/uploader_spec.js

@@ -936,4 +936,32 @@ describe("uploader", function () {
       });
     });
   });
+
+  describe("sign requests", function () {
+    var configBck2 = void 0;
+    var writeSpy;
+    writeSpy = void 0;
+    beforeEach(function () {
+      writeSpy = sinon.spy(ClientRequest.prototype, 'write');
+      configBck2 = cloudinary.config();
+      cloudinary.config({
+        api_key: "1234",
+        api_secret: "",
+      });
+    });
+    afterEach(function () {
+      cloudinary.config(configBck2);
+      writeSpy.restore();
+    });
+    it("should allow a signature and timestamp parameter on uploads", function () {
+      cloudinary.v2.uploader.upload(IMAGE_FILE, {
+        public_id: 'folder/file',
+        version: '1234',
+        timestamp: 1569707219,
+        signature: 'b77fc0b0dffbf7e74bdad36b615225fb6daff81e',
+      });
+      sinon.assert.calledWith(writeSpy, sinon.match(helper.uploadParamMatcher('signature', "b77fc0b0dffbf7e74bdad36b615225fb6daff81e")));
+      sinon.assert.calledWith(writeSpy, sinon.match(helper.uploadParamMatcher('timestamp', '1569707219')));
+    });
+  });
 });

test/utils_spec.js

@@ -1399,6 +1399,20 @@ describe("utils", function () {
         sign_url: true,
       }, "http://res.cloudinary.com/test123/image/fetch/s--hH_YcbiS--/v1234/http://google.com/path/to/image.png", {});
     });
+  });
+  context("sign requests", function () {
+    var configBck = void 0;
+    before(function () {
+      configBck = cloudinary.config();
+      cloudinary.config({
+        cloud_name: 'test123',
+        api_key: "1234",
+        api_secret: "b",
+      });
+    });
+    after(function () {
+      cloudinary.config(configBck);
+    });
     it("should correctly sign_request", function () {
       var params = utils.sign_request({
         public_id: "folder/file",