Merge pull request #732 from Adyen/hotfix-main

[PW-8004] Release 9.2.0
Adyen · Feb 2, 2023 · 75d10a9 · 75d10a9
2 parents e097e2e + a4a1c6e
commit 75d10a9
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 11 deletions.
diff --git a/Adyen.Test/Adyen.Test.csproj b/Adyen.Test/Adyen.Test.csproj
@@ -5,11 +5,11 @@
 
     <IsPackable>false</IsPackable>
 
-    <AssemblyVersion>9.1.0</AssemblyVersion>
+    <AssemblyVersion>9.2.0</AssemblyVersion>
 
-    <FileVersion>9.1.0</FileVersion>
+    <FileVersion>9.2.0</FileVersion>
 
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
 
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>

diff --git a/Adyen.Test/NotificationTest.cs b/Adyen.Test/NotificationTest.cs
@@ -15,12 +15,16 @@
 //  *
 //  * Adyen Dotnet API Library
 //  *
-//  * Copyright (c) 2020 Adyen B.V.
+//  * Copyright (c) 2023 Adyen B.V.
 //  * This file is open source and available under the MIT license.
 //  * See the LICENSE file for more info.
 //  */
 #endregion
 
+using System;
+using Adyen.ApiSerialization;
+using Adyen.Model.Nexo;
+
 namespace Adyen.Test
 {
     using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -120,6 +124,45 @@ public void TestRefundFail()
             Assert.IsFalse(notificationItem.Success);
             Assert.AreEqual("Insufficient balance on payment", notificationItem.Reason);
         }
+
+        [TestMethod]
+        public void TestPOSDisplayNotification()
+        {
+            var notification =
+                "{\"SaleToPOIRequest\":{\"DisplayRequest\":{\"DisplayOutput\":[{\"Device\": \"CashierDisplay\",\"InfoQualify\": \"Status\",\"OutputContent\": {\"OutputFormat\": \"MessageRef\",\"PredefinedContent\": {\"ReferenceID\": \"TransactionID=oLkO001517998574000&TimeStamp=2018-02-07T10%3a16%3a14.000Z&event=TENDER_CREATED\"}},\"ResponseRequiredFlag\": false}]},\"MessageHeader\":{\"SaleID\":\"POSSystemID12345\",\"ProtocolVersion\":\"3.0\",\"MessageType\":\"Request\",\"POIID\":\"V400m-324688179\",\"ServiceID\":\"0207111617\",\"MessageClass\":\"Device\",\"MessageCategory\":\"Display\",\"DeviceID\":\"1517998562\"}}}";
+            var serializer = new SaleToPoiMessageSerializer();
+            var saleToPoiRequest = serializer.DeserializeNotification(notification);
+            var displayRequest = (DisplayRequest)saleToPoiRequest.MessagePayload;
+            Assert.AreEqual(displayRequest.DisplayOutput[0].OutputContent.OutputFormat, OutputFormatType.MessageRef);
+            Assert.AreEqual(displayRequest.DisplayOutput[0].Device, DeviceType.CashierDisplay);
+        }
+
+        [TestMethod]
+        public void TestPOSEventNotification()
+        {
+            var notification = @"{
+                'SaleToPOIRequest':{
+                    'EventNotification':{
+                        'EventDetails':'newstate=IDLE&oldstate=START',
+                        'EventToNotify':'Shutdown',
+                        'TimeStamp':'2019-08-07T10:16:10.000Z'
+                        },
+                    'MessageHeader':{
+                        'SaleID':'POSSystemID12345',
+                        'ProtocolVersion':'3.0',
+                        'MessageType':'Notification',
+                        'POIID':'V400m-324688179',
+                        'MessageClass':'Event',
+                        'MessageCategory':'Event',
+                        'DeviceID':'1517998561'
+                        }
+                    }
+            }";
+            var serializer = new SaleToPoiMessageSerializer();
+            var saleToPoiRequest = serializer.DeserializeNotification(notification);
+            var eventNotification = (EventNotification)saleToPoiRequest.MessagePayload;
+            Assert.AreEqual(eventNotification.EventDetails, "newstate=IDLE&oldstate=START");
+            Assert.AreEqual(eventNotification.TimeStamp, new DateTime(2019, 8, 7, 10, 16, 10));
+        }
     }
 }
-
diff --git a/Adyen/Adyen.csproj b/Adyen/Adyen.csproj
@@ -4,15 +4,15 @@
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Copyright>Adyen</Copyright>
-    <Version>9.1.0</Version>
-    <AssemblyVersion>9.1.0</AssemblyVersion>
-    <FileVersion>9.1.0</FileVersion>
+    <Version>9.2.0</Version>
+    <AssemblyVersion>9.2.0</AssemblyVersion>
+    <FileVersion>9.2.0</FileVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>The Adyen API Library for .net core enables you to work with Adyen APIs, Hosted Payment Pages and terminal api with any .net application.</Description>
     <PackageProjectUrl>https://github.com/Adyen/adyen-dotnet-api-library</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Adyen/adyen-dotnet-api-library</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <PackageTags>9.1.0</PackageTags>
+    <PackageTags>9.2.0</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>Adyen</Authors>
     <Company>Adyen</Company>

diff --git a/Adyen/ApiSerialization/SaleToPoiMessageSerializer.cs b/Adyen/ApiSerialization/SaleToPoiMessageSerializer.cs
@@ -15,13 +15,15 @@
 //  *
 //  * Adyen Dotnet API Library
 //  *
-//  * Copyright (c) 2020 Adyen B.V.
+//  * Copyright (c) 2023 Adyen B.V.
 //  * This file is open source and available under the MIT license.
 //  * See the LICENSE file for more info.
 //  */
 #endregion
 
+using System;
 using Adyen.Model.Nexo;
+using Adyen.Model.Nexo.Message;
 using Adyen.Security;
 using Newtonsoft.Json.Linq;
 
@@ -64,6 +66,35 @@ public SaleToPOIResponse Deserialize(string saleToPoiMessageDto)
             return deserializedOutputMessage;
         }
 
+        public SaleToPOIRequest DeserializeNotification(string terminalNotificationJson)
+        {
+            // Parse JsonObject
+            var saleToPoiRequestJson = JObject.Parse(terminalNotificationJson);
+            var saleToPoiRequestItem = saleToPoiRequestJson.First;
+            var saleToPoiRequestType = saleToPoiRequestItem?.First;
+            var saleToPoiString = saleToPoiRequestType?.ToString() ?? throw new ArgumentNullException(nameof(terminalNotificationJson));
+
+            // Get Message Header
+            var messageHeader = DeserializeMessageHeader(saleToPoiRequestType);
+
+            // Get Payload and create new SaleToPOIRequest object
+            var notification = new SaleToPOIRequest
+            {
+                MessageHeader = messageHeader
+            };
+            if (saleToPoiString.Contains("DisplayRequest"))
+            {
+                notification.MessagePayload = saleToPoiRequestType["DisplayRequest"]?.ToObject<DisplayRequest>();
+            } else if (saleToPoiString.Contains("EventNotification"))
+            {
+                notification.MessagePayload = saleToPoiRequestType["EventNotification"]?.ToObject<EventNotification>();
+            } else
+            {
+                throw new Exception("Json input is not a terminal notification.");
+            }
+            return notification;
+        }
+
         private object DeserializeMessagePayload(MessageHeader messageHeader, JToken saleToPoiMessageWithoutRootJToken)
         {
             var messageCategory = messageHeader.MessageCategory;

diff --git a/Adyen/Constants/ClientConfig.cs b/Adyen/Constants/ClientConfig.cs
@@ -58,6 +58,6 @@ public class ClientConfig
         public static string BinLookupApiVersion = "v50";
 
         public static string LibName = "adyen-dotnet-api-library";
-        public static string LibVersion = "9.1.0";
+        public static string LibVersion = "9.2.0";
     }
 }
diff --git a/README.md b/README.md
@@ -85,6 +85,12 @@ var config = new Config
 var client = new Client(config);
 ~~~~
 
+To parse the terminal API notifications, please use the following custom deserializer. This method will throw an exception for non-notification requests.
+~~~~ csharp
+var serializer = new SaleToPoiMessageSerializer();
+var saleToPoiRequest = serializer.DeserializeNotification(your_terminal_notification);
+
+~~~~
 ## Contributing
 
 We encourage you to contribute to this repository, so everyone can benefit from new features, bug fixes, and any other improvements.