Merge pull request #2 from PSWinCom/HttpMessageHandler-in-xmltransport

Make Client and XmTransport more testfriendly

Author: audunhegranes

PSWin.Client/LinkMobility.PSWin.Client.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <Authors>Link Mobility NE</Authors>
     <Company></Company>
     <Description>Send SMS through PSWin gateway.</Description>

PSWin.Client/Transports/XmlTransport.cs

@@ -20,9 +20,9 @@ public class XmlTransport : ITransport
         private const uint BatchSize = 100;
 
         private readonly Uri endpoint;
+        private readonly HttpClient client;
         private string username;
         private string password;
-        private Lazy<HttpClient> client = new Lazy<HttpClient>(() => new HttpClient());
 
         /// <summary>
         /// Initialize the transport with an alternate endpoint.
@@ -32,11 +32,25 @@ public class XmlTransport : ITransport
         /// <param name="username">The username assigned to the account on the given <paramref name="endpoint"/>.</param>
         /// <param name="password">The password assigned to the account on the given <paramref name="endpoint"/>.</param>
         /// <param name="endpoint">The alternate XML endpoint to use.</param>
-        public XmlTransport(string username, string password, Uri endpoint)
+        /// <param name="client">HttpClient used when sending xml</param>
+        public XmlTransport(string username, string password, Uri endpoint, HttpClient client)
         {
             this.username = username;
             this.password = password;
             this.endpoint = endpoint;
+            this.client = client;
+        }
+
+        /// <summary>
+        /// Initialize the transport with an alternate endpoint.
+        /// This is useful if for example Link Mobility has assigned you an account on the test system.
+        /// Note that it must be an XML endpoint, not the SOAP or Simple HTTP endpoints that PSWin also provides.
+        /// </summary>
+        /// <param name="username">The username assigned to the account on the given <paramref name="endpoint"/>.</param>
+        /// <param name="password">The password assigned to the account on the given <paramref name="endpoint"/>.</param>
+        /// <param name="endpoint">The alternate XML endpoint to use.</param>
+        public XmlTransport(string username, string password, Uri endpoint) : this(username, password, endpoint, new HttpClient())
+        {
         }
 
         /// <summary>
@@ -72,7 +86,7 @@ private async Task<IEnumerable<MessageResult>> SendBatchAsync(Sms[] messageBatch
                 Content = new StringContent(payload.Declaration.ToString() + payload.ToString(), Encoding.UTF8, "text/xml"),
             };
 
-            var response = await client.Value.SendAsync(request);
+            var response = await client.SendAsync(request);
             if (!response.IsSuccessStatusCode)
                 throw new SendMessageException($"Sending failed because Gateway endpoint returned {(int)response.StatusCode} {response.ReasonPhrase}");