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

NuGetEntityTypeSerializer Id link patcher must retain curated feed name #3864

Merged
merged 1 commit into from
May 3, 2017
Merged

NuGetEntityTypeSerializer Id link patcher must retain curated feed name #3864

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/NuGetGallery/OData/Serializers/NuGetEntityTypeSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private void TryAnnotateV2FeedPackage(ODataEntry entry, EntityInstanceContext en

private static void NormalizeNavigationLinks(ODataEntry entry, HttpRequestMessage request, V2FeedPackage instance, string normalizedVersion)
{
var idLink = BuildIdLink("v2", instance.Id, normalizedVersion, request);
var idLink = BuildIdLink(instance.Id, normalizedVersion, request);

if (entry.ReadLink != null)
{
Expand Down Expand Up @@ -135,9 +135,9 @@ private static Uri BuildLinkForStreamProperty(string routePrefix, string id, str
return builder.Uri;
}

private static Uri BuildIdLink(string routePrefix, string id, string version, HttpRequestMessage request)
private static Uri BuildIdLink(string id, string version, HttpRequestMessage request)
{
return new Uri($"{request.RequestUri.Scheme}://{request.RequestUri.Host}/api/{routePrefix}/Packages(Id='{id}',Version='{version}')");
return new Uri($"{request.RequestUri.Scheme}://{request.RequestUri.Host}{request.RequestUri.LocalPath}(Id='{id}',Version='{version}')");
}

private static string EnsureTrailingSlash(string url)
Expand Down