Merge pull request #289 from Microsoft/dm/vnext/hostswithports

Handle parsing port in host when reading V2

Author: darrelmiller

src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs

@@ -145,43 +145,23 @@ private static void MakeServers(IList<OpenApiServer> servers, ParsingContext con
             }
 
             // Create the Server objects
-            if (schemes != null)
+            if (schemes != null && schemes.Count > 0)
             {
                 foreach (var scheme in schemes)
                 {
-                    if (String.IsNullOrEmpty(scheme))
-                    {
-                        host = "//" + host;  // The double slash prefix creates a relative url where the scheme is defined by the BaseUrl
-                    }
-
-                    var uriBuilder = new UriBuilder(scheme, host)
-                    {
-                        Path = basePath
-                    };
-
                     var server = new OpenApiServer
                     {
-                        Url = uriBuilder.ToString()
+                        Url = BuildUrl(scheme, host, basePath)
                     };
 
                     servers.Add(server);
                 }
             }
             else
             {
-                if (!String.IsNullOrEmpty(host))
-                {
-                    host = "//" + host;  // The double slash prefix creates a relative url where the scheme is defined by the BaseUrl
-                }
-                var uriBuilder = new UriBuilder()
-                {
-                    Scheme = null,
-                    Host = host,
-                    Path = basePath
-                };
                 var server = new OpenApiServer
                 {
-                    Url = uriBuilder.ToString()
+                    Url = BuildUrl(null, host, basePath)
                 };
 
                 servers.Add(server);
@@ -198,6 +178,37 @@ private static void MakeServers(IList<OpenApiServer> servers, ParsingContext con
             }
         }
 
+        private static string BuildUrl(string scheme, string host, string basePath)
+        {
+            if (String.IsNullOrEmpty(scheme) && !String.IsNullOrEmpty(host))
+            {
+                host = "//" + host;  // The double slash prefix creates a relative url where the scheme is defined by the BaseUrl
+            }
+
+            int? port = null;
+
+            if (!String.IsNullOrEmpty(host) && host.Contains(":"))
+            {
+                var pieces = host.Split(':');
+                host = pieces.First();
+                port = int.Parse(pieces.Last());
+            }
+
+            var uriBuilder = new UriBuilder()
+            {
+                Scheme = scheme,
+                Host = host,
+                Path = basePath
+            };
+
+            if (port != null)
+            {
+                uriBuilder.Port = port.Value;
+            }
+
+            return uriBuilder.ToString();
+        }
+
         public static OpenApiDocument LoadOpenApi(RootNode rootNode)
         {
             var openApidoc = new OpenApiDocument();

test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs

@@ -235,5 +235,27 @@ public void MultipleServers()
             Assert.Equal("https://dev.bing.com/api", doc.Servers.Last().Url);
         }
 
+        [Fact]
+        public void LocalHostWithCustomHost()
+        {
+            var input = @"
+swagger: 2.0
+info: 
+  title: test
+  version: 1.0.0
+host: localhost:23232
+paths: {}
+";
+            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            {
+                BaseUrl = new Uri("https://bing.com")
+            });
+
+            var doc = reader.Read(input, out var diagnostic);
+
+            var server = doc.Servers.First();
+            Assert.Equal(1, doc.Servers.Count);
+            Assert.Equal("https://localhost:23232", server.Url);
+        }
     }
 }