Fix the API prefix overly trimmed (#308)

Azure · Nov 4, 2021 · 142b7f8 · 142b7f8
1 parent 4ab63c2
commit 142b7f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/SwaggerUI.cs b/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/SwaggerUI.cs
@@ -65,7 +65,7 @@ public ISwaggerUI AddServer(IHttpRequestDataObject req, string routePrefix, IOpe
             {
                 this._baseUrl = baseUrl;
 
-                absolutePath = new Uri(this._baseUrl).AbsolutePath.Trim('/');
+                absolutePath = new Uri(this._baseUrl).AbsolutePath.TrimEnd('/');
                 this._swaggerUiApiPrefix = absolutePath;
 
                 return this;
@@ -89,7 +89,7 @@ public ISwaggerUI AddServer(IHttpRequestDataObject req, string routePrefix, IOpe
 
             this._baseUrl = servers.First().Url;
 
-            absolutePath = new Uri(this._baseUrl).AbsolutePath.Trim('/');
+            absolutePath = new Uri(this._baseUrl).AbsolutePath.TrimEnd('/');
             this._swaggerUiApiPrefix = absolutePath;
 
             return this;

diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/SwaggerUITests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/SwaggerUITests.cs
@@ -117,10 +117,10 @@ public void Given_Options_When_AddServer_Invoked_Then_It_Should_Return_BaseUrl(s
         }
 
         [DataTestMethod]
-        [DataRow("http", "localhost", "api", "api")]
-        [DataRow("https", "localhost", "api/", "api")]
-        [DataRow("http", "localhost", "api/prod", "api/prod")]
-        [DataRow("https", "localhost", "api/prod/", "api/prod")]
+        [DataRow("http", "localhost", "api", "/api")]
+        [DataRow("https", "localhost", "api/", "/api")]
+        [DataRow("http", "localhost", "api/prod", "/api/prod")]
+        [DataRow("https", "localhost", "api/prod/", "/api/prod")]
         public void Given_NullOptions_When_AddServer_Invoked_Then_It_Should_Return_SwaggerUIApiPrefix(string scheme, string host, string routePrefix, string expected)
         {
             var req = new Mock<IHttpRequestDataObject>();