Migrate to System.Text.Json . Format enum to string instead of number. Use ISO8601 format for datetime.

3 files changed, 38 insertions, 5 deletions

diff --git a/Timeline/Models/Converters/JsonDateTimeConverter.cs b/Timeline/Models/Converters/JsonDateTimeConverter.cs
new file mode 100644
index 00000000..551bbbaa
--- /dev/null
+++ b/Timeline/Models/Converters/JsonDateTimeConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Timeline.Models.Converters
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1062:Validate arguments of public methods")]
+    public class JsonDateTimeConverter : JsonConverter<DateTime>
+    {
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            Debug.Assert(typeToConvert == typeof(DateTime));
+            return DateTime.Parse(reader.GetString(), CultureInfo.InvariantCulture);
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value.ToUniversalTime().ToString("s", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/Timeline/Models/Http/Common.cs b/Timeline/Models/Http/Common.cs
index 2a88b3a3..d1e95397 100644
--- a/Timeline/Models/Http/Common.cs
+++ b/Timeline/Models/Http/Common.cs
@@ -72,6 +72,8 @@ namespace Timeline.Models.Http
     {

         public class ResponseData

         {

+            public ResponseData() { }

+

             public ResponseData(bool create)

             {

                 Create = create;

@@ -106,6 +108,8 @@ namespace Timeline.Models.Http
     {

         public class ResponseData

         {

+            public ResponseData() { }

+

             public ResponseData(bool delete)

             {

                 Delete = delete;

diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs
index b2e958f9..672e5f15 100644
--- a/Timeline/Startup.cs
+++ b/Timeline/Startup.cs
@@ -8,11 +8,13 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

 using System.Collections.Generic;

 using System.Globalization;

+using System.Text.Json.Serialization;

 using Timeline.Auth;

 using Timeline.Configs;

 using Timeline.Entities;

 using Timeline.Formatters;

 using Timeline.Helpers;

+using Timeline.Models.Converters;

 using Timeline.Services;

 

 namespace Timeline

@@ -36,11 +38,15 @@ namespace Timeline
             {

                 setup.InputFormatters.Add(new StringInputFormatter());

             })

-                .ConfigureApiBehaviorOptions(options =>

-                {

-                    options.InvalidModelStateResponseFactory = InvalidModelResponseFactory.Factory;

-                })

-                .AddNewtonsoftJson(); // TODO: Remove this.

+            .AddJsonOptions(options =>

+            {

+                options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());

+                options.JsonSerializerOptions.Converters.Add(new JsonDateTimeConverter());

+            })

+            .ConfigureApiBehaviorOptions(options =>

+            {

+                options.InvalidModelStateResponseFactory = InvalidModelResponseFactory.Factory;

+            });

 

             services.Configure<JwtConfig>(Configuration.GetSection(nameof(JwtConfig)));

             var jwtConfig = Configuration.GetSection(nameof(JwtConfig)).Get<JwtConfig>();