Add support for Signature and Timestamp in UploadParams

Author: const-cloudinary

CloudinaryDotNet.Tests/UploadApi/UploadTest.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using CloudinaryDotNet.Actions;
+using NUnit.Framework;
+using SystemHttp = System.Net.Http;
+
+namespace CloudinaryDotNet.Tests.UploadApi
+{
+    public class UploadTest
+    {
+        [Test]
+        public void TestDefaultUploadTimestampAndSignature()
+        {
+            var cloudinary = new MockedCloudinary();
+
+
+            var iuParams = new ImageUploadParams()
+            {
+                File = new FileDescription(TestConstants.TestRemoteImg)
+            };
+
+            cloudinary.Upload(iuParams);
+
+            cloudinary.AssertHttpCall(SystemHttp.HttpMethod.Post, "image/upload");
+
+            foreach (var expected in new List<string>
+            {
+                "api_key",
+                "timestamp",
+                "signature",
+                TestConstants.TestRemoteImg
+            })
+            {
+                StringAssert.Contains(expected, cloudinary.HttpRequestContent);
+            }
+        }
+
+        [Test]
+        public void TestCustomUploadTimestampAndSignature()
+        {
+            var cloudinary = new MockedCloudinary();
+
+            var testDate = DateTime.Parse("2024-01-01 12:34:56Z", System.Globalization.CultureInfo.InvariantCulture)
+                .ToUniversalTime();
+            var timestamp = "1704112496";
+
+            var signature = "c8ec18c58c626d509ffa37e15329020e5c9158dc";
+
+            var iuParams = new ImageUploadParams()
+            {
+                File = new FileDescription(TestConstants.TestRemoteImg),
+                Timestamp = testDate,
+                Signature = signature
+            };
+
+            cloudinary.Upload(iuParams);
+
+            cloudinary.AssertHttpCall(SystemHttp.HttpMethod.Post, "image/upload");
+
+            foreach (var expected in new List<string>
+                     {
+                         "api_key",
+                         "key",
+                         "timestamp",
+                         timestamp,
+                         "signature",
+                         signature,
+                         "file",
+                         TestConstants.TestRemoteImg
+                     })
+            {
+                StringAssert.Contains(expected, cloudinary.HttpRequestContent);
+            }
+        }
+    }
+}

CloudinaryDotNet/Actions/AssetsUpload/BasicRawUploadParams.cs

@@ -48,6 +48,16 @@ public virtual ResourceType ResourceType
         /// </summary>
         public string FilenameOverride { get; set; }
 
+        /// <summary>
+        /// Gets or sets upload timestamp.
+        /// </summary>
+        public DateTime Timestamp { get; set; }
+
+        /// <summary>
+        /// Gets or sets upload signature.
+        /// </summary>
+        public string Signature { get; set; }
+
         /// <summary>
         /// Validate object model.
         /// </summary>
@@ -82,6 +92,12 @@ public override SortedDictionary<string, object> ToParamsDictionary()
             AddParam(dict, "public_id_prefix", PublicIdPrefix);
             AddParam(dict, "type", Type);
             AddParam(dict, "filename_override", FilenameOverride);
+            if (Timestamp != DateTime.MinValue)
+            {
+                AddParam(dict, "timestamp", Utils.ToUnixTimeSeconds(Timestamp));
+            }
+
+            AddParam(dict, "signature", Signature);
 
             if (Backup.HasValue)
             {

CloudinaryDotNet/ApiShared.Internal.cs

@@ -182,8 +182,16 @@ internal HttpRequestMessage PrepareRequestBody(
         /// <param name="parameters">Cloudinary upload parameters.</param>
         internal void FinalizeUploadParameters(IDictionary<string, object> parameters)
         {
-            parameters.Add("timestamp", Utils.UnixTimeNowSeconds());
-            parameters.Add("signature", SignParameters(parameters));
+            if (!parameters.ContainsKey("timestamp"))
+            {
+                parameters.Add("timestamp", Utils.UnixTimeNowSeconds());
+            }
+
+            if (!parameters.ContainsKey("signature"))
+            {
+                parameters.Add("signature", SignParameters(parameters));
+            }
+
             parameters.Add("api_key", Account.ApiKey);
         }