Merge pull request #6 from fiskaltrust/user/tsc/cleanup-131

Add echo method, fix state in IDESSCD, and add ScuException

src/fiskaltrust.ifPOS/v1/Exceptions/ScuException.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace fiskaltrust.ifPOS.v1
+{
+    [Serializable]
+    public class ScuException : Exception
+    {
+        public ScuException() { }
+
+        public ScuException(string message) : base(message) { }
+
+        public ScuException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected ScuException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+    }
+}

src/fiskaltrust.ifPOS/v1/de/IDESSCD.cs

@@ -92,5 +92,11 @@ public interface IDESSCD
         [WebInvoke(BodyStyle = WebMessageBodyStyle.Bare, UriTemplate = "v1/endexportsession", Method = "POST")]
 #endif
         Task<EndExportSessionResponse> EndExportSessionAsync(EndExportSessionRequest request);
+
+        [OperationContract]
+#if WCF
+        [WebInvoke(BodyStyle = WebMessageBodyStyle.Bare, UriTemplate = "v1/echo", Method = "POST")]
+#endif
+        Task<ScuEchoResponse> EchoAsync(ScuEchoRequest request);
     }
 }

src/fiskaltrust.ifPOS/v1/de/Models/ScuEchoRequest.cs

@@ -0,0 +1,11 @@
+using System.Runtime.Serialization;
+
+namespace fiskaltrust.ifPOS.v1.de
+{
+    [DataContract]
+    public class ScuEchoRequest
+    {
+        [DataMember(Order = 10)]
+        public string Message { get; set; }
+    }
+}

src/fiskaltrust.ifPOS/v1/de/Models/ScuEchoResponse.cs

@@ -0,0 +1,11 @@
+using System.Runtime.Serialization;
+
+namespace fiskaltrust.ifPOS.v1.de
+{
+    [DataContract]
+    public class ScuEchoResponse
+    {
+        [DataMember(Order = 10)]
+        public string Message { get; set; }
+    }
+}

src/fiskaltrust.ifPOS/v1/de/Models/TseInfo.cs

@@ -28,7 +28,7 @@ public class TseInfo
         public string TseSerialNumberOctet { get; set; }
 
         [DataMember(Order = 80)]
-        public TseState CurrentState { get; set; }
+        public TseStates CurrentState { get; set; }
 
         [DataMember(Order = 90)]
         public IEnumerable<string> CertificatesBase64 { get; set; }

src/fiskaltrust.ifPOS/v1/de/Models/TseState.cs

@@ -6,6 +6,6 @@ namespace fiskaltrust.ifPOS.v1.de
     public class TseState
     {
         [DataMember(Order = 10)]
-        public TseStates CurrentState;
+        public TseStates CurrentState { get; set; }
     }
 }

test/fiskaltrust.ifPOS.Tests/Helpers/DummyDESSCD.cs

@@ -45,5 +45,7 @@ public async Task<FinishTransactionResponse> FinishTransactionAsync(FinishTransa
         public async Task<ExportDataResponse> ExportDataAsync(ExportDataRequest request) => await FromResult(new ExportDataResponse());
 
         public async Task<EndExportSessionResponse> EndExportSessionAsync(EndExportSessionRequest request) => await FromResult(new EndExportSessionResponse());
+
+        public async Task<ScuEchoResponse> EchoAsync(ScuEchoRequest request) => await FromResult(new ScuEchoResponse { Message = request.Message });
     }
 }

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.1-rc1",
+  "version": "1.3.1-rc2",
   "releaseBranches": [
     "^refs/heads/master$",
     "^refs/tags/v\\d+(?:\\.\\d+)*(?:-.*)?$"