Accept proxy URL without trailing slash

Author: jakublabno

smsapiTests/Integration/IntegrationTestBase.cs

@@ -10,18 +10,25 @@ namespace smsapiTests.Integration;
 
 public abstract class IntegrationTestBase
 {
+    protected virtual bool AutostartServer => true;
     private static string _currentHost;
-    
+
     [TestInitialize]
     public void InitializeServer()
     {
-        RunTestServer();
+        if (!AutostartServer) return;
+        RunTestServer(FreeHost());
     }
 
-    private static void RunTestServer()
+    protected void InitializeServer(string host)
     {
-        _currentHost = FreeHost();
-        
+        RunTestServer(host);
+    }
+
+    private static void RunTestServer(string host)
+    {
+        _currentHost = host;
+
         new WebHostBuilder()
             .UseKestrel()
             .UseStartup(typeof(Program))
@@ -36,7 +43,7 @@ protected static ProxyHTTP GetProxy()
         return new ProxyHTTP(_currentHost);
     }
 
-    private static string FreeHost()
+    protected static string FreeHost()
     {
         TcpListener l = new TcpListener(IPAddress.Loopback, 0);
         l.Start();

smsapiTests/Integration/ProxyPathTest.cs

@@ -0,0 +1,29 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SMSApi.Api;
+
+namespace smsapiTests.Integration;
+
+[TestClass]
+public class ProxyPathTest : IntegrationTestBase
+{
+    protected override bool AutostartServer => true;
+
+    [TestMethod]
+    public void proxy_adds_trailing_slash()
+    {
+        var client = new ClientOAuth("any");
+        var host = FreeHost();
+        InitializeServer(host);
+        var smsFactory = new SMSFactory(client, GetProxy());
+
+        SendAnyMessage(smsFactory);
+
+        var expectedUri = host + "/sms.do";
+        RequestAssert.AsserRawPath(expectedUri);
+    }
+
+    private static void SendAnyMessage(SMSFactory smsFactory)
+    {
+        SendActionHelper.SendAnySms(smsFactory);
+    }
+}

smsapiTests/Integration/RequestAssert.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Text.RegularExpressions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace smsapiTests.Integration;
@@ -24,13 +22,15 @@ public static void AssertContainsUserAgentHeader(string value)
         Assert.IsTrue(headerExists, $"Expected {value}, Found: {RequestStorage.UserAgentHeader}");
     }
 
-    public static void AsserPath(string path)
+    public static void AsserRawPath(string path)
     {
+        Assert.IsNotNull(RequestStorage.Path, "Missing request path");
+
         var pathEquals = RequestStorage
-            .Path
+            .RawPath
             .Equals(path);
 
-        Assert.IsTrue(pathEquals);
+        Assert.IsTrue(pathEquals, "Found: " + RequestStorage.RawPath);
     }
 
     public static void AssertContainsFormParameter(string name, string value)

smsapiTests/Integration/RequestInterceptorMiddleware.cs

@@ -1,8 +1,7 @@
-using System.Collections.Immutable;
 using System.Linq;
-using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 
 namespace smsapiTests.Integration;
 
@@ -20,8 +19,9 @@ public async Task InvokeAsync(HttpContext context)
         RequestStorage.Method = context.Request.Method;
         RequestStorage.AuthorizationHeader = context.Request.Headers.Authorization;
         RequestStorage.UserAgentHeader = context.Request.Headers.UserAgent;
-        RequestStorage.FormParameters = context.Request.Form.ToDictionary(k => k.Key, v => v.Value.ToString());
         RequestStorage.Path = $"{context.Request.Scheme}://{context.Request.Host.Value}{context.Request.Path.Value}";
+        RequestStorage.RawPath = context.Request.GetDisplayUrl();
+        RequestStorage.FormParameters = context.Request.Form.ToDictionary(k => k.Key, v => v.Value.ToString());
 
         await _next(context);
     }

smsapiTests/Integration/RequestStorage.cs

@@ -7,6 +7,7 @@ public static class RequestStorage
     public static string AuthorizationHeader;
     public static string UserAgentHeader;
     public static string Path;
+    public static string RawPath;
     public static Dictionary<string, string> FormParameters;
     public static string Method;
 }

smsapiTests/Integration/SendActionHelper.cs

@@ -11,8 +11,9 @@ public static void SendAnySms(SMSFactory smsFactory)
         {
             smsFactory.ActionSend("48500100100", "any").Execute();
         }
-        catch (MissingMethodException)
+        catch (MissingMethodException e)
         {
+            Console.WriteLine(@"Error sending message: " + e.Message);
         }
     }