Fixing the date time configuration

Treating strings containing date time as strings

Author: karen-avetisyan-mc

Mastercard.Developer.ClientEncryption.Core/Encryption/FieldLevelEncryption.cs

@@ -33,7 +33,7 @@ public static string EncryptPayload(string payload, FieldLevelEncryptionConfig c
             try
             {
                 // Parse the given payload
-                var payloadToken = JToken.Parse(payload);
+                var payloadToken = JsonUtils.ParsePayload(payload);
 
                 // Perform encryption (if needed)
                 foreach (var jsonPathIn in config.EncryptionPaths.Keys)
@@ -71,7 +71,7 @@ public static string DecryptPayload(string payload, FieldLevelEncryptionConfig c
             try
             {
                 // Parse the given payload
-                var payloadToken = JToken.Parse(payload);
+                var payloadToken = JsonUtils.ParsePayload(payload);
 
                 // Perform decryption (if needed)
                 foreach (var jsonPathIn in config.DecryptionPaths.Keys)
@@ -199,7 +199,7 @@ private static JToken DecryptPayloadPath(JToken payloadToken, string jsonPathIn,
             if ("$".Equals(jsonPathOut))
             {
                 // The decrypted JSON is the new body
-                return JToken.Parse(decryptedValue);
+                return JsonUtils.ParsePayload(decryptedValue);
             }
             else
             {

Mastercard.Developer.ClientEncryption.Core/Encryption/JWE/JweEncryption.cs

@@ -17,7 +17,7 @@ public static string EncryptPayload(string payload, JweConfig config)
             try
             {
                 // Parse the given payload
-                var payloadToken = JToken.Parse(payload);
+                var payloadToken = JsonUtils.ParsePayload(payload);
 
                 // Encrypt
                 foreach (var entry in config.EncryptionPaths)
@@ -40,7 +40,7 @@ public static string DecryptPayload(string payload, JweConfig config)
             try
             {
                 // Parse the given payload
-                var payloadToken = JToken.Parse(payload);
+                var payloadToken = JsonUtils.ParsePayload(payload);
 
                 // Perform decryption
                 foreach (var entry in config.DecryptionPaths)
@@ -78,7 +78,7 @@ private static JToken DecryptPayloadPath(JToken payload, string jsonPathIn, stri
 
             if ("$".Equals(jsonPathOut))
             {
-                return JToken.Parse(decryptedValue);
+                return JsonUtils.ParsePayload(decryptedValue);
             }
 
             JsonUtils.CheckOrCreateOutObject(payload, jsonPathOut);

Mastercard.Developer.ClientEncryption.Core/Utils/JsonUtils.cs

@@ -1,6 +1,7 @@
 using System;
 using Newtonsoft.Json.Linq;
 using System.Text.RegularExpressions;
+using Newtonsoft.Json;
 
 namespace Mastercard.Developer.ClientEncryption.Core.Utils
 {
@@ -76,6 +77,18 @@ internal static bool IsPathDefinite(string path)
         {
             return !path.Contains("*") && !path.Contains("..") && !path.Contains("@") && !path.Contains(",");
         }
+        /// <summary>
+        /// Parses the Json payload with specified parameters
+        /// </summary>
+        /// <returns>payloadToken</returns>
+        internal static JToken ParsePayload(string payload)
+        {
+            var jsonReader = new JsonTextReader(new System.IO.StringReader(payload)) {
+                    DateParseHandling = DateParseHandling.None 
+                };
+                
+            return JToken.ReadFrom(jsonReader);
+        }
 
         internal static void CheckOrCreateOutObject(JToken payloadObject, string jsonPathOut)
         {

Mastercard.Developer.ClientEncryption.RestSharpV2/Interceptors/RestSharpEncryptionInterceptor.cs

@@ -1,13 +1,12 @@
 using System;
 using System.Linq;
 using System.Text.Json;
-using System.Reflection;
 using Mastercard.Developer.ClientEncryption.Core.Encryption;
 using Header = RestSharp.HeaderParameter;
 using RestSharp;
-using System.Collections.ObjectModel;
 using System.Collections.Generic;
 
+
 namespace Mastercard.Developer.ClientEncryption.RestSharpV2.Interceptors
 {
     /// <summary>

Mastercard.Developer.ClientEncryption.Tests/NetCore2/Test/TestUtils.cs

@@ -54,8 +54,8 @@ internal static void AssertDecryptedJweEquals(string expectedPayload, string enc
 
         internal static void AssertPayloadEquals(string expectedPayload, string payload)
         {
-            var expectedPayloadToken = JToken.Parse(expectedPayload);
-            var payloadToken = JToken.Parse(payload);
+            var expectedPayloadToken = JsonUtils.ParsePayload(expectedPayload);
+            var payloadToken = JsonUtils.ParsePayload(payload);
             Assert.AreEqual(expectedPayloadToken.ToString(), payloadToken.ToString());
         }
 

Mastercard.Developer.ClientEncryption.Tests/NetCore2/Utils/JsonUtilsTest.cs

@@ -1,6 +1,7 @@
 using System;
 using Mastercard.Developer.ClientEncryption.Core.Utils;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json.Linq;
 
 namespace Mastercard.Developer.ClientEncryption.Tests.NetCore.Utils
 {
@@ -131,5 +132,31 @@ public void TestGetJsonElementKey_ShouldThrowInvalidOperationException_WhenNoKey
                 throw;
             }
         }
+
+         [TestMethod]
+        public void TestParsePayload()
+        {
+            // GIVEN
+            const string payload = "{\"num\":123, timestamp:\"2024-02-12T00:00:00-05:00\"}";
+            JToken token = JsonUtils.ParsePayload(payload);
+
+            // WHEN
+            string num = token.SelectToken("num").ToString();
+            string timestamp = token.SelectToken("timestamp").ToString();
+            // THEN
+            Assert.AreEqual(num, "123");
+            Assert.AreEqual(timestamp, "2024-02-12T00:00:00-05:00");
+
+            // WHEN
+            var defaultToken = JToken.Parse(payload);
+            num = defaultToken.SelectToken("num").ToString();
+            timestamp = defaultToken.SelectToken("timestamp").ToString();
+
+            // THEN
+            Assert.AreEqual(num, "123");
+            Assert.AreNotEqual(timestamp, "2024-02-12T00:00:00-05:00");
+
+
+        }
     }
 }