From 15a212574c83ebdf95769d2176f025123233b4e9 Mon Sep 17 00:00:00 2001
From: Havret <h4vret@gmail.com>
Date: Mon, 28 Mar 2022 16:22:21 +0200
Subject: [PATCH] Add TreatTimestampAsDateTime toggle

---
 .../JsonProtobufSerializerOptions.cs                   | 10 ++++++++++
 .../JsonSerializerOptionsExtensions.cs                 |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Protobuf.System.Text.Json/JsonProtobufSerializerOptions.cs b/src/Protobuf.System.Text.Json/JsonProtobufSerializerOptions.cs
index 4dc8ed5..6fe6797 100644
--- a/src/Protobuf.System.Text.Json/JsonProtobufSerializerOptions.cs
+++ b/src/Protobuf.System.Text.Json/JsonProtobufSerializerOptions.cs
@@ -19,4 +19,14 @@ public class JsonProtobufSerializerOptions
     /// The default value is true.
     /// </summary>
     public bool TreatDurationAsTimeSpan { get; set; } = true;
+
+    
+    /// <summary>
+    /// Controls how <see cref="Google.Protobuf.WellKnownTypes.Timestamp"/> fields are handled.
+    /// When set to true, <see cref="Google.Protobuf.WellKnownTypes.Timestamp"/> properties will
+    /// be converted to <see cref="DateTime"/> before serialization and will be expected in the
+    /// same format as <see cref="DateTime"/> during deserialization.
+    /// The default value is true.
+    /// </summary>
+    public bool TreatTimestampAsDateTime { get; set; } = true;
 }
\ No newline at end of file
diff --git a/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs b/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs
index de7909e..c36b0c4 100644
--- a/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs
+++ b/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs
@@ -19,8 +19,10 @@ public static void AddProtobufSupport(this JsonSerializerOptions options, Action
         {
             options.Converters.Add(new DurationConverter());
         }
-
-        options.Converters.Add(new TimestampConverter());
+        if (jsonProtobufSerializerOptions.TreatTimestampAsDateTime)
+        {
+            options.Converters.Add(new TimestampConverter());
+        }
         options.Converters.Add(new ProtobufJsonConverterFactory(jsonProtobufSerializerOptions));
     }