Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ private static void MakeServers(IList<OpenApiServer> servers, ParsingContext con
var schemes = context.GetFromTempStorage<List<string>>("schemes");
Uri defaultUrl = rootNode.Context.BaseUrl;

// so we don't default to the document path when a host is provided
if (string.IsNullOrEmpty(basePath) && !string.IsNullOrEmpty(host))
{
basePath = "/";
}

// If nothing is provided, don't create a server
if (host == null && basePath == null && schemes == null)
{
Expand Down
29 changes: 27 additions & 2 deletions test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,31 @@ public void JustHostNoDefault()
Assert.Equal("//www.foo.com", server.Url);
}

[Fact]
public void NoBasePath()
{
var input = @"
swagger: 2.0
info:
title: test
version: 1.0.0
host: www.foo.com
schemes:
- http
paths: {}
";
var reader = new OpenApiStringReader(new OpenApiReaderSettings()
{
BaseUrl = new Uri("https://www.foo.com/spec.yaml")
});

var doc = reader.Read(input, out var diagnostic);

var server = doc.Servers.First();
Assert.Equal(1, doc.Servers.Count);
Assert.Equal("http://www.foo.com", server.Url);
}

[Fact]
public void JustBasePathNoDefault()
{
Expand Down Expand Up @@ -203,14 +228,14 @@ public void JustHostWithCustomHostWithApi()
";
var reader = new OpenApiStringReader(new OpenApiReaderSettings()
{
BaseUrl = new Uri("https://dev.bing.com/api")
BaseUrl = new Uri("https://dev.bing.com/api/description.yaml")
});

var doc = reader.Read(input, out var diagnostic);

var server = doc.Servers.First();
Assert.Equal(1, doc.Servers.Count);
Assert.Equal("https://prod.bing.com/api", server.Url);
Assert.Equal("https://prod.bing.com", server.Url);
}

[Fact]
Expand Down