From 68c610ac56c851de5d17998996ea6b99b1f5acce Mon Sep 17 00:00:00 2001
From: Adam Humpherys <adam@adamh.us>
Date: Fri, 26 May 2023 10:24:36 -0600
Subject: [PATCH] fixing JSON parsing of webhook request

---
 PaymentGateway/Models/WebhookResponse.cs | 33 +++++++++++++++++++++++-
 PaymentGateway/PaymentGateway.csproj     |  2 +-
 PaymentGateway/WebhookParser.cs          |  2 +-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/PaymentGateway/Models/WebhookResponse.cs b/PaymentGateway/Models/WebhookResponse.cs
index e038880..0d0d628 100644
--- a/PaymentGateway/Models/WebhookResponse.cs
+++ b/PaymentGateway/Models/WebhookResponse.cs
@@ -11,6 +11,7 @@ public class Action
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("amount")]
         public string Amount { get; set; }
 
         /// <summary>
@@ -22,11 +23,13 @@ public class Action
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("date")]
         public string Date { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("success")]
         public string Success { get; set; }
 
         /// <summary>
@@ -38,6 +41,7 @@ public class Action
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("source")]
         public string Source { get; set; }
 
         /// <summary>
@@ -49,6 +53,7 @@ public class Action
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("username")]
         public string Username { get; set; }
 
         /// <summary>
@@ -126,16 +131,19 @@ public class Address
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("company")]
         public string Company { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("city")]
         public string City { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("state")]
         public string State { get; set; }
 
         /// <summary>
@@ -153,11 +161,13 @@ public class Address
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("email")]
         public string Email { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("phone")]
         public string Phone { get; set; }
 
         /// <summary>
@@ -169,6 +179,7 @@ public class Address
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("fax")]
         public string Fax { get; set; }
     }
 
@@ -188,10 +199,11 @@ public class Card
         /// </summary>
         [JsonPropertyName("cc_exp")]
         public string CCExp { get; set; }
-        
+
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("cavv")]
         public string CAVV { get; set; }
 
         /// <summary>
@@ -203,11 +215,13 @@ public class Card
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("xid")]
         public string XID { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("eci")]
         public string ECI { get; set; }
 
         /// <summary>
@@ -327,11 +341,13 @@ public class Event
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("merchant")]
         public Merchant Merchant { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("features")]
         public Features Features { get; set; }
 
         /// <summary>
@@ -349,6 +365,7 @@ public class Event
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("condition")]
         public string Condition { get; set; }
 
         /// <summary>
@@ -360,6 +377,7 @@ public class Event
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("ponumber")]
         public string PONumber { get; set; }
 
         /// <summary>
@@ -377,36 +395,43 @@ public class Event
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("customerid")]
         public string CustomerId { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("customertaxid")]
         public string CustomerTaxId { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("website")]
         public string Website { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("shipping")]
         public string Shipping { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("currency")]
         public string Currency { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("tax")]
         public string Tax { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("surcharge")]
         public string Surcharge { get; set; }
 
         /// <summary>
@@ -418,6 +443,7 @@ public class Event
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("tip")]
         public string Tip { get; set; }
 
         /// <summary>
@@ -549,11 +575,13 @@ public class Event
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("check")]
         public Check Check { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("card")]
         public Card Card { get; set; }
 
         /// <summary>
@@ -565,6 +593,7 @@ public class Event
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("action")]
         public Action Action { get; set; }
     }
 
@@ -588,11 +617,13 @@ public class Merchant
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("id")]
         public string Id { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("name")]
         public string Name { get; set; }
     }
 
diff --git a/PaymentGateway/PaymentGateway.csproj b/PaymentGateway/PaymentGateway.csproj
index 96dbb52..a0944b8 100644
--- a/PaymentGateway/PaymentGateway.csproj
+++ b/PaymentGateway/PaymentGateway.csproj
@@ -10,7 +10,7 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/ahwm/payment-gateway-client</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/ahwm/payment-gateway-client</RepositoryUrl>
-		<Version>0.0.4</Version>
+		<Version>0.0.4.1</Version>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<PackageReleaseNotes>Webhook parsing</PackageReleaseNotes>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
diff --git a/PaymentGateway/WebhookParser.cs b/PaymentGateway/WebhookParser.cs
index 1259ad1..cfd70fd 100644
--- a/PaymentGateway/WebhookParser.cs
+++ b/PaymentGateway/WebhookParser.cs
@@ -30,7 +30,7 @@ static public WebhookResponse ParseWebhookData(string body, string signingKey, s
             HMACSHA256 hmac = new HMACSHA256(Encoding.UTF8.GetBytes(signingKey));
             return new WebhookResponse
             {
-                Data = (WebhookData)JsonSerializer.Deserialize(body, typeof(WebhookData)),
+                Data = (WebhookData)JsonSerializer.Deserialize(body, typeof(WebhookData), new JsonSerializerOptions { IncludeFields = true }),
                 IsValid = signature == ByteToString(hmac.ComputeHash(Encoding.UTF8.GetBytes(nonce + "." + body)))
             };
         }