Be less strict when parsing testData.json (#17)

No resason for us to choke on BOM, comments or trailing comma.
Altinn · Feb 27, 2023 · 64cb7b7 · 64cb7b7
1 parent 8a95fe3
commit 64cb7b7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/Helpers/StringExtensions.cs b/src/Helpers/StringExtensions.cs
@@ -45,5 +45,17 @@ public static string AsFileName(this string input, bool throwExceptionOnInvalidC
 
             return illegalFileNameCharacters.Aggregate(input, (current, c) => current.Replace(c, '-'));
         }
+
+        private static readonly byte[] _utf8bom = new byte[] { 0xEF, 0xBB, 0xBF };
+        internal static ReadOnlySpan<byte> RemoveBom(this byte[] bytes)
+        {
+            // Remove UTF8 BOM (if present)
+            if (bytes.AsSpan().StartsWith(_utf8bom))
+            {
+                return bytes.AsSpan().Slice(_utf8bom.Length);
+            }
+
+            return bytes;
+        }
     }
 }
diff --git a/src/Services/LocalApp/Implementation/LocalAppHttp.cs b/src/Services/LocalApp/Implementation/LocalAppHttp.cs
@@ -10,14 +10,18 @@
 using LocalTest.Configuration;
 using LocalTest.Services.LocalApp.Interface;
 using LocalTest.Services.TestData;
+using LocalTest.Helpers;
 
 namespace LocalTest.Services.LocalApp.Implementation
 {
     public class LocalAppHttp : ILocalApp
     {
         public static readonly JsonSerializerOptions JSON_OPTIONS = new JsonSerializerOptions(JsonSerializerDefaults.Web)
         {
-            Converters = { new System.Text.Json.Serialization.JsonStringEnumConverter() }
+            Converters = { new System.Text.Json.Serialization.JsonStringEnumConverter() },
+            AllowTrailingCommas = true,
+            ReadCommentHandling = JsonCommentHandling.Skip,
+            PropertyNameCaseInsensitive = false,
         };
         public const string XACML_CACHE_KEY = "/api/v1/meta/authorizationpolicy/";
         public const string APPLICATION_METADATA_CACHE_KEY = "/api/v1/applicationmetadata?checkOrgApp=false";
@@ -139,7 +143,8 @@ public async Task<Dictionary<string, Application>> GetApplications()
                     }
 
                     response.EnsureSuccessStatusCode();
-                    return JsonSerializer.Deserialize<AppTestDataModel>(await response.Content.ReadAsByteArrayAsync(), JSON_OPTIONS);
+                    var data = await response.Content.ReadAsByteArrayAsync();
+                    return JsonSerializer.Deserialize<AppTestDataModel>(data.RemoveBom(), JSON_OPTIONS);
                 }
                 catch (HttpRequestException e)
                 {