Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't assume port 80 when generating nextLink in ASP.NET Core #1559 #1560

Merged
merged 3 commits into from Aug 10, 2018
Merged

Don't assume port 80 when generating nextLink in ASP.NET Core #1559 #1560

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b984a9a
Don't assume port 80 when generating nextLink in ASP.NET Core #1559
andrewlock Aug 3, 2018
2f4cce5
Add unit tests for GetNextPageLink
andrewlock Aug 9, 2018
9f1b720
Add copyright notice
andrewlock Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 83 additions & 0 deletions test/UnitTest/Microsoft.AspNetCore.OData.Test/Extensions/HttpRequestExtensionsTest.cs
View file
Open in desktop
@@ -0,0 +1,83 @@
using Microsoft.AspNet.OData.Extensions;
using Microsoft.AspNet.OData.Test.Abstraction;
using Microsoft.AspNetCore.Http;
using System;
using System.Net.Http;
using Xunit;

namespace Microsoft.AspNet.OData.Test
{
public class HttpRequestMessageExtensionsTest
{
[Theory]
[InlineData("http://localhost/Customers", 10, "http://localhost/Customers?$skip=10")]
[InlineData("http://localhost/Customers?$filter=Age ge 18", 10, "http://localhost/Customers?$filter=Age%20ge%2018&$skip=10")]
[InlineData("http://localhost/Customers?$top=20", 10, "http://localhost/Customers?$top=10&$skip=10")]
[InlineData("http://localhost/Customers?$skip=5&$top=10", 2, "http://localhost/Customers?$top=8&$skip=7")]
[InlineData("http://localhost/Customers?$filter=Age ge 18&$orderby=Name&$top=11&$skip=6", 10, "http://localhost/Customers?$filter=Age%20ge%2018&$orderby=Name&$top=1&$skip=16")]
[InlineData("http://localhost/Customers?testkey%23%2B%3D%3F%26=testvalue%23%2B%3D%3F%26", 10, "http://localhost/Customers?testkey%23%2B%3D%3F%26=testvalue%23%2B%3D%3F%26&$skip=10")]
public void GetNextPageLink_GetsNextPageLink(string requestUri, int pageSize, string nextPageUri)
{
// Arrange
HttpRequest request = RequestFactory.Create(HttpMethod.Get, requestUri);

// Act
Uri nextPageLink = request.GetNextPageLink(pageSize);

// Assert
Assert.Equal(nextPageUri, nextPageLink.AbsoluteUri);
}

[Theory]
[InlineData("http://localhost/Customers", 10, "http://localhost/Customers?$skip=10")]
[InlineData("https://localhost/Customers", 10, "https://localhost/Customers?$skip=10")]
[InlineData("http://example.com/Customers", 10, "http://example.com/Customers?$skip=10")]
[InlineData("https://example.com/Customers", 10, "https://example.com/Customers?$skip=10")]
public void GetNextPageLink_UsesNoPortWhenNotSpecified(string requestUri, int pageSize, string nextPageUri)
{
// Arrange
HttpRequest request = RequestFactory.Create(HttpMethod.Get, requestUri);

// Act
Uri nextPageLink = request.GetNextPageLink(pageSize);

// Assert
Assert.Equal(nextPageUri, nextPageLink.AbsoluteUri);
}

[Theory]
[InlineData("http://example.com:80/Customers", 10, "http://example.com/Customers?$skip=10")]
[InlineData("https://example.com:443/Customers", 10, "https://example.com/Customers?$skip=10")]
public void GetNextPageLink_UsesPortWhenDefaultPortIsProvided(string requestUri, int pageSize, string nextPageUri)
{
// Arrange
// The RequestFactory removes the default port, so we explicitly add it
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this case, when the port specified in uri is same as the default value. request.Host is formalized, so we add it back, and the generated linked is still the one w/o port number?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah - UriBuilder formalizes the uri inside GetNextPageLink() too. Which is absolutely fine, the problem before was that in these cases, port 80 would be enforced, even if it was https!

HttpRequest request = RequestFactory.Create(HttpMethod.Get, requestUri);
Uri uri = new Uri(requestUri);
var port = request.Scheme == "http" ? 80 : 443;
request.Host = new HostString(uri.Host, port);

// Act
Uri nextPageLink = request.GetNextPageLink(pageSize);

// Assert
Assert.Equal(nextPageUri, nextPageLink.AbsoluteUri);
}

[Theory]
[InlineData("http://localhost:808/Customers", 10, "http://localhost:808/Customers?$skip=10")]
[InlineData("https://localhost:4443/Customers", 10, "https://localhost:4443/Customers?$skip=10")]
[InlineData("http://localhost:5000/Customers", 10, "http://localhost:5000/Customers?$skip=10")]
public void GetNextPageLink_UsesCorrectPortWhenSpecified(string requestUri, int pageSize, string nextPageUri)
{
// Arrange
HttpRequest request = RequestFactory.Create(HttpMethod.Get, requestUri);

// Act
Uri nextPageLink = request.GetNextPageLink(pageSize);

// Assert
Assert.Equal(nextPageUri, nextPageLink.AbsoluteUri);
}
}
}