Query api

PaymentGateway/CustomerVault.cs

@@ -14,9 +14,9 @@ public partial class GatewayClient
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse AddCustomer(AddCustomer request)
+        public async Task<GatewayResponse> AddCustomerAsync(AddCustomer request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }
@@ -26,9 +26,9 @@ public GatewayResponse AddCustomer(AddCustomer request)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse UpdateCustomer(UpdateCustomer request)
+        public async Task<GatewayResponse> UpdateCustomerAsync(UpdateCustomer request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }
@@ -38,9 +38,9 @@ public GatewayResponse UpdateCustomer(UpdateCustomer request)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse DeleteCustomer(DeleteCustomer request)
+        public async Task<GatewayResponse> DeleteCustomerAsync(DeleteCustomer request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }
@@ -50,9 +50,9 @@ public GatewayResponse DeleteCustomer(DeleteCustomer request)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse CustomerSale(CustomerSale request)
+        public async Task<GatewayResponse> CustomerSaleAsync(CustomerSale request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }
@@ -62,9 +62,9 @@ public GatewayResponse CustomerSale(CustomerSale request)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse CustomerAuth(CustomerAuth request)
+        public async Task<GatewayResponse> CustomerAuthAsync(CustomerAuth request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }
@@ -74,9 +74,9 @@ public GatewayResponse CustomerAuth(CustomerAuth request)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse CustomerCredit(CustomerCredit request)
+        public async Task<GatewayResponse> CustomerCreditAsync(CustomerCredit request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }
@@ -86,9 +86,9 @@ public GatewayResponse CustomerCredit(CustomerCredit request)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse CustomerOffline(CustomerOffline request)
+        public async Task<GatewayResponse> CustomerOfflineAsync(CustomerOffline request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }

PaymentGateway/GatewayClient.cs

@@ -1,10 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Net;
 using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
 using System.Web;
+using System.Xml.Serialization;
 using PaymentGateway.Helpers;
 using PaymentGateway.Models;
+using PaymentGateway.Query.Models;
 
 namespace PaymentGateway
 {
@@ -63,7 +68,7 @@ public GatewayClient(string securityKey) : this(securityKey, GatewayProvider.NMI
         public GatewayClient(string securityKey, string postUrl) : this(securityKey, new GatewayProvider(postUrl))
         { }
 
-        private Dictionary<string, string> MakeRequest(object model)
+        private async Task<Dictionary<string, string>> MakeRequest(object model)
         {
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
 
@@ -84,12 +89,12 @@ private Dictionary<string, string> MakeRequest(object model)
                 using (HttpClient client = new HttpClient())
                 {
                     using (var postContent = new FormUrlEncodedContent(Values))
-                    using (HttpResponseMessage response = client.PostAsync(Provider.PostUrl + "/transact.php", postContent).Result)
+                    using (HttpResponseMessage response = await client.PostAsync(Provider.PostUrl + "/transact.php", postContent).ConfigureAwait(false))
                     {
                         response.EnsureSuccessStatusCode();
                         using (HttpContent content = response.Content)
                         {
-                            string result = content.ReadAsStringAsync().Result;
+                            string result = await content.ReadAsStringAsync();
                             var values = HttpUtility.ParseQueryString(result);
                             foreach (var key in values.AllKeys)
                                 resp.Add(key, values[key]);
@@ -106,5 +111,47 @@ private Dictionary<string, string> MakeRequest(object model)
 
             return resp;
         }
+
+        private async Task<QueryResponse> MakeQueryRequest(object model)
+        {
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+
+            Dictionary<string, string> Values = new Dictionary<string, string>
+            {
+                { "security_key", SecurityKey }
+            };
+
+            var attributes = AttributeHelper.GetAttributes(model);
+            foreach (var kv in attributes)
+                Values.Add(kv.Key, kv.Value);
+
+            RequestStarted?.Invoke(this, new GatewayEventArgs(Values));
+
+            var resp = new QueryResponse();
+            try
+            {
+                using (HttpClient client = new HttpClient())
+                {
+                    using (var postContent = new FormUrlEncodedContent(Values))
+                    using (HttpResponseMessage response = await client.PostAsync(Provider.PostUrl + "/query.php", postContent).ConfigureAwait(false))
+                    {
+                        response.EnsureSuccessStatusCode();
+                        using (HttpContent content = response.Content)
+                        {
+                            string result = await content.ReadAsStringAsync();
+                            resp = (QueryResponse)new XmlSerializer(typeof(QueryResponse)).Deserialize(new MemoryStream(Encoding.UTF8.GetBytes(result)));
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new GatewayException($"Unable to communicate with gateway ({Provider.PostUrl}). Ensure {nameof(Provider.PostUrl)} has a correct value and the security key is correct. See inner exception for details.", ex);
+            }
+
+            //RequestCompleted?.Invoke(this, new GatewayEventArgs(resp));
+
+            return resp;
+        }
     }
 }

PaymentGateway/Invoices.cs

@@ -1,4 +1,6 @@
 using PaymentGateway.Models;
+using System.Threading.Tasks;
+
 namespace PaymentGateway
 {
     public partial class GatewayClient
@@ -8,9 +10,9 @@ public partial class GatewayClient
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse CreateInvoice(CreateInvoice request)
+        public async Task<GatewayResponse> CreateInvoiceAsync(CreateInvoice request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }
@@ -20,9 +22,9 @@ public GatewayResponse CreateInvoice(CreateInvoice request)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse UpdateInvoice(UpdateInvoice request)
+        public async Task<GatewayResponse> UpdateInvoiceAsync(UpdateInvoice request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }
@@ -32,9 +34,9 @@ public GatewayResponse UpdateInvoice(UpdateInvoice request)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse SendInvoice(SendInvoice request)
+        public async Task<GatewayResponse> SendInvoiceAsync(SendInvoice request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }
@@ -44,9 +46,9 @@ public GatewayResponse SendInvoice(SendInvoice request)
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public GatewayResponse CloseInvoice(CloseInvoice request)
+        public async Task<GatewayResponse> CloseInvoiceAsync(CloseInvoice request)
         {
-            var data = new GatewayResponse(MakeRequest(request));
+            var data = new GatewayResponse(await MakeRequest(request).ConfigureAwait(false));
 
             return data;
         }

PaymentGateway/Models/CustomerVault.cs

@@ -309,12 +309,6 @@ public class CustomerSale : Sale
         [ParameterName("order_description")]
         public string OrderDescription { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        [ParameterName("order_id")]
-        public string OrderId { get; set; }
-
         /// <summary>
         /// Who initiated the transaction. Values: 'customer' or 'merchant'
         /// </summary>