Merge pull request #30 from Biggo89/main

Encoding improvement to manage German characters

Author: karen-avetisyan-mc

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

@@ -114,7 +114,7 @@ private static JToken EncryptPayloadPath(JToken payloadToken, string jsonPathIn,
 
             // Encrypt data at the given JSON path
             var inJsonString = JsonUtils.SanitizeJson(inJsonToken.ToString());
-            var inJsonBytes = Encoding.ASCII.GetBytes(inJsonString);
+            var inJsonBytes = Encoding.UTF8.GetBytes(inJsonString);
             var encryptedValueBytes = EncryptBytes(parameters.GetSecretKeyBytes(), parameters.GetIvBytes(), inJsonBytes);
             var encryptedValue = EncodingUtils.EncodeBytes(encryptedValueBytes, config.ValueEncoding);
 

Mastercard.Developer.ClientEncryption.Tests/Tests/Encryption/FieldLevelEncryptionTest.cs

@@ -75,17 +75,11 @@ public void TestDecryptPayload_InteroperabilityTest()
             Assert.IsTrue(payload.Contains("account"));
         }
 
-        [TestMethod]
-        public void TestEncryptPayload_Nominal()
+         [DataTestMethod]
+        [DataRow("{\"data\":{\"field1\":\"field1\",\"field2\":\"value2\"}}")]
+        [DataRow("{\"data\":{\"field1\":\"Zürich\",\"field2\":\"value2\"}}")]
+        public void TestEncryptPayload_Nominal(string payload)
         {
-            // GIVEN
-            const string payload = "{" +
-                "    \"data\": {" +
-                "        \"field1\": \"value1\"," +
-                "        \"field2\": \"value2\"" +
-                "    }," +
-                "    \"encryptedData\": {}" +
-                "}";
             var config = TestUtils.GetTestFieldLevelEncryptionConfigBuilder()
                 .WithEncryptionPath("data", "encryptedData")
                 .WithDecryptionPath("encryptedData", "data")
@@ -107,7 +101,7 @@ public void TestEncryptPayload_Nominal()
             Assert.IsNotNull(encryptedDataToken["encryptedValue"]);
             Assert.IsNotNull(encryptedDataToken["encryptedKey"]);
             Assert.IsNotNull(encryptedDataToken["iv"]);
-            TestUtils.AssertDecryptedPayloadEquals("{\"data\":{\"field1\":\"value1\",\"field2\":\"value2\"}}", encryptedPayload, config);
+            TestUtils.AssertDecryptedPayloadEquals(payload, encryptedPayload, config);
         }
 
         [TestMethod]