zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-02 10:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Trims trailing slashes from user passed paths that appear before query string parameters (#2486)

Browse Source
This commit is contained in:
Chris Simpson
2022-07-15 20:50:35 +01:00
committed by GitHub
parent 5cf604b0a4
commit 13ba84b060
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs
+15 -1
View File
@@ -216,7 +216,21 @@ namespace Octokit.Tests.Integration.Clients
var contents = await github
.Repository
.Content
.GetAllContentsByRef("octokit", "octokit.net", "Octokit", "master");
.GetAllContentsByRef("octokit", "octokit.net", "Octokit", "main");
Assert.True(contents.Count > 2);
Assert.Equal(ContentType.Dir, contents.First().Type);
}
[IntegrationTest]
public async Task GetsDirectoryContentWithTrailingSlash()
{
var github = Helper.GetAuthenticatedClient();
var contents = await github
.Repository
.Content
.GetAllContentsByRef("octokit", "octokit.net", "Octokit/", "main");
Assert.True(contents.Count > 2);
Assert.Equal(ContentType.Dir, contents.First().Type);
Octokit/Helpers/ApiUrls.cs
+4 -4
View File
@@ -1698,7 +1698,7 @@ namespace Octokit
/// <returns></returns>
public static Uri TreeRecursive(string owner, string name, string reference)
{
return "repos/{0}/{1}/git/trees/{2}?recursive=1".FormatUri(owner, name, reference);
return "repos/{0}/{1}/git/trees/{2}?recursive=1".FormatUri(owner, name, reference.TrimEnd('/'));
}
/// <summary>
@@ -2445,7 +2445,7 @@ namespace Octokit
/// <returns>The <see cref="Uri"/> for getting the contents of the specified repository and path</returns>
public static Uri RepositoryContent(string owner, string name, string path, string reference)
{
return "repos/{0}/{1}/contents/{2}?ref={3}".FormatUri(owner, name, path == "/" ? "" : path, reference);
return "repos/{0}/{1}/contents/{2}?ref={3}".FormatUri(owner, name, path == "/" ? "" : path.TrimEnd('/'), reference);
}
/// <summary>
@@ -3451,7 +3451,7 @@ namespace Octokit
/// <returns>The <see cref="Uri"/> for getting the contents of the specified repository and path</returns>
public static Uri RepositoryContent(long repositoryId, string path, string reference)
{
return "repositories/{0}/contents/{1}?ref={2}".FormatUri(repositoryId, path, reference);
return "repositories/{0}/contents/{1}?ref={2}".FormatUri(repositoryId, path.TrimEnd('/'), reference);
}
/// <summary>
@@ -3708,7 +3708,7 @@ namespace Octokit
/// <returns>The <see cref="Uri"/> for the specified tree.</returns>
public static Uri TreeRecursive(long repositoryId, string reference)
{
return "repositories/{0}/git/trees/{1}?recursive=1".FormatUri(repositoryId, reference);
return "repositories/{0}/git/trees/{1}?recursive=1".FormatUri(repositoryId, reference.TrimEnd('/'));
}
/// <summary>