Add replacement for accented characters to language class (#333)

* Add replacement for accented characters to language class
Add unit test for handling accented characters.
Upgraded to version 1.0.0

* Encode the unicode characters as escaped chars

Author: SteveMaier-IRT

bindings/netstandard/ElectionGuard/ElectionGuard.Encryption.Tests/TestManifest.cs

@@ -154,5 +154,37 @@ public void Test_Can_Create_Manifest_With_Name()
             Assert.IsFalse(json.Contains("\"name\":{\"text\":null"));   // check to make sure the party name serialized correctly
         }
 
+        [Test]
+        public void Test_Unicode_CandidateNames()
+        {
+            var candidateName = new Language("Raúl", "en");
+            var candidate = new Candidate(
+                "candidate-1",
+                new InternationalizedText(new[] { candidateName }),
+                string.Empty,
+                string.Empty,
+                false);
+
+            List<Candidate> candidates = new List<Candidate>
+            {
+                candidate
+            };
+
+            var result = new Manifest(
+                "test-manifest",
+                ElectionType.general,
+                DateTime.Now,
+                DateTime.Now,
+                new GeopoliticalUnit[] { },
+                new Party[] { },
+                candidates.ToArray(),
+                new ContestDescription[] { },
+                new BallotStyle[] { },
+                new InternationalizedText(new Language[] { }),
+                new ContactInformation("na"));
+
+            var json = result.ToJson();
+            Assert.IsTrue(json.Contains("\"value\":\"Ra\\\\u00fal\""));
+        }
     }
 }

bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/ElectionGuard.Encryption.csproj

@@ -7,9 +7,9 @@
     <!-- Project -->
     <RootNamespace>ElectionGuard</RootNamespace>
     <AssemblyName>ElectionGuard.Encryption</AssemblyName>
-    <Version>0.1.18</Version>
-    <AssemblyVersion>0.1.18.0</AssemblyVersion>
-    <AssemblyFileVersion>0.1.18.0</AssemblyFileVersion>
+    <Version>1.0.1</Version>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <AssemblyFileVersion>1.0.1.0</AssemblyFileVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -19,7 +19,7 @@
     <Title>ElectionGuard Encryption</Title>
     <Description>Open source implementation of ElectionGuard's ballot encryption.</Description>
     <Authors>Microsoft</Authors>
-    <PackageVersion>0.1.18</PackageVersion>
+    <PackageVersion>1.0.1</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/microsoft/electionguard-cpp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/microsoft/electionguard-cpp</RepositoryUrl>

bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/Manifest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text;
 using System.Runtime.InteropServices;
 
 namespace ElectionGuard
@@ -177,13 +178,38 @@ unsafe internal Language(
         /// <param name="language">string with language info</param>
         public unsafe Language(string value, string language)
         {
-            var status = NativeInterface.Language.New(value, language, out Handle);
+            var data = EncodeNonAsciiCharacters(value);
+            var status = NativeInterface.Language.New(data, language, out Handle);
             if (status != Status.ELECTIONGUARD_STATUS_SUCCESS)
             {
                 throw new ElectionGuardException($"Language Error Status: {status}");
             }
         }
 
+        /// <summary>
+        /// Temp function for handling accented latin characters for v1.0
+        /// </summary>
+        /// <param name="value">string to convert</param>
+        /// <returns>string with replaced characters</returns>
+        public static string EncodeNonAsciiCharacters(string value)
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach (char c in value)
+            {
+                if (c > 127)
+                {
+                    // This character is too big for ASCII
+                    string encodedValue = "\\u" + ((int)c).ToString("x4");
+                    sb.Append(encodedValue);
+                }
+                else
+                {
+                    sb.Append(c);
+                }
+            }
+            return sb.ToString();
+        }
+
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
         protected override unsafe void DisposeUnmanaged()
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
@@ -2169,7 +2195,8 @@ unsafe internal Manifest(NativeManifest handle)
         /// <param name="json">string of json data describing the manifest</param>
         public unsafe Manifest(string json)
         {
-            var status = NativeInterface.Manifest.FromJson(json, out Handle);
+            var data = Language.EncodeNonAsciiCharacters(json);
+            var status = NativeInterface.Manifest.FromJson(data, out Handle);
             if (status != Status.ELECTIONGUARD_STATUS_SUCCESS)
             {
                 throw new ElectionGuardException($"Manifest Error Status: {status}");