zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-05 11:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into protected-branches-v2

Browse Source
This commit is contained in:
Ryan Gribble
2016-08-25 06:40:05 +10:00
parent c96ee7ac01 4072a6f592
commit 46dc145e72
7 changed files with 188 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs
+25
View File
@@ -605,6 +605,31 @@ public class RepositoriesClientTests
Assert.Equal(AccountType.Organization, repository.Owner.Type);
}
[IntegrationTest]
public async Task ReturnsRenamedRepository()
{
var github = Helper.GetAuthenticatedClient();
var repository = await github.Repository.Get("michael-wolfenden", "Polly");
Assert.Equal("https://github.com/App-vNext/Polly.git", repository.CloneUrl);
Assert.False(repository.Private);
Assert.False(repository.Fork);
//Assert.Equal(AccountType.User, repository.Owner.Type);
repository = await github.Repository.Get("fsprojects", "FSharp.Atom");
Assert.Equal("https://github.com/ionide/ionide-atom-fsharp.git", repository.CloneUrl);
Assert.False(repository.Private);
Assert.False(repository.Fork);
repository = await github.Repository.Get("cabbage89", "Orchard.Weixin");
Assert.Equal("https://github.com/cabbage89/Orchard.WeChat.git", repository.CloneUrl);
Assert.False(repository.Private);
Assert.False(repository.Fork);
}
[IntegrationTest]
public async Task ReturnsOrganizationRepositoryWithRepositoryId()
{
Octokit.Tests.Integration/RedirectTests.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Octokit.Tests.Integration
Assert.Equal(AccountType.User, repository.Owner.Type);
}
[IntegrationTest(Skip = "This test is super-unreliable right now - see https://github.com/octokit/octokit.net/issues/874 for discussion")]
[IntegrationTest]
public async Task CanCreateIssueOnRedirectedRepository()
{
var client = Helper.GetAuthenticatedClient();
Octokit.Tests/Http/RedirectHandlerTests.cs
+36 -34
View File
@@ -14,10 +14,12 @@ namespace Octokit.Tests.Http
[Fact]
public async Task OkStatusShouldPassThrough()
{
var invoker = CreateInvoker(new HttpResponseMessage(HttpStatusCode.OK));
var handler = CreateMockHttpHandler(new HttpResponseMessage(HttpStatusCode.OK));
var adapter = new HttpClientAdapter(handler);
var httpRequestMessage = CreateRequest(HttpMethod.Get);
var response = await invoker.SendAsync(httpRequestMessage, new CancellationToken());
var response = await adapter.SendAsync(httpRequestMessage, new CancellationToken());
Assert.Equal(response.StatusCode, HttpStatusCode.OK);
Assert.Same(response.RequestMessage, httpRequestMessage);
@@ -32,11 +34,12 @@ namespace Octokit.Tests.Http
var redirectResponse = new HttpResponseMessage(statusCode);
redirectResponse.Headers.Location = new Uri("http://example.org/bar");
var invoker = CreateInvoker(redirectResponse,
new HttpResponseMessage(HttpStatusCode.OK));
var handler = CreateMockHttpHandler(redirectResponse, new HttpResponseMessage(HttpStatusCode.OK));
var adapter = new HttpClientAdapter(handler);
var httpRequestMessage = CreateRequest(HttpMethod.Post);
var response = await invoker.SendAsync(httpRequestMessage, new CancellationToken());
var response = await adapter.SendAsync(httpRequestMessage, new CancellationToken());
Assert.Equal(response.RequestMessage.Method, httpRequestMessage.Method);
Assert.NotSame(response.RequestMessage, httpRequestMessage);
@@ -48,11 +51,12 @@ namespace Octokit.Tests.Http
var redirectResponse = new HttpResponseMessage(HttpStatusCode.SeeOther);
redirectResponse.Headers.Location = new Uri("http://example.org/bar");
var invoker = CreateInvoker(redirectResponse,
new HttpResponseMessage(HttpStatusCode.OK));
var handler = CreateMockHttpHandler(redirectResponse, new HttpResponseMessage(HttpStatusCode.OK));
var adapter = new HttpClientAdapter(handler);
var httpRequestMessage = CreateRequest(HttpMethod.Post);
var response = await invoker.SendAsync(httpRequestMessage, new CancellationToken());
var response = await adapter.SendAsync(httpRequestMessage, new CancellationToken());
Assert.Equal(HttpMethod.Get, response.RequestMessage.Method);
Assert.NotSame(response.RequestMessage, httpRequestMessage);
@@ -64,12 +68,13 @@ namespace Octokit.Tests.Http
var redirectResponse = new HttpResponseMessage(HttpStatusCode.Redirect);
redirectResponse.Headers.Location = new Uri("http://example.org/bar");
var invoker = CreateInvoker(redirectResponse,
new HttpResponseMessage(HttpStatusCode.OK));
var handler = CreateMockHttpHandler(redirectResponse, new HttpResponseMessage(HttpStatusCode.OK));
var adapter = new HttpClientAdapter(handler);
var httpRequestMessage = CreateRequest(HttpMethod.Get);
httpRequestMessage.Headers.Authorization = new AuthenticationHeaderValue("fooAuth", "aparam");
var response = await invoker.SendAsync(httpRequestMessage, new CancellationToken());
var response = await adapter.SendAsync(httpRequestMessage, new CancellationToken());
Assert.NotSame(response.RequestMessage, httpRequestMessage);
Assert.Equal("fooAuth", response.RequestMessage.Headers.Authorization.Scheme);
@@ -86,12 +91,13 @@ namespace Octokit.Tests.Http
var redirectResponse = new HttpResponseMessage(statusCode);
redirectResponse.Headers.Location = new Uri("http://example.net/bar");
var invoker = CreateInvoker(redirectResponse,
new HttpResponseMessage(HttpStatusCode.OK));
var handler = CreateMockHttpHandler(redirectResponse, new HttpResponseMessage(HttpStatusCode.OK));
var adapter = new HttpClientAdapter(handler);
var httpRequestMessage = CreateRequest(HttpMethod.Get);
httpRequestMessage.Headers.Authorization = new AuthenticationHeaderValue("fooAuth", "aparam");
var response = await invoker.SendAsync(httpRequestMessage, new CancellationToken());
var response = await adapter.SendAsync(httpRequestMessage, new CancellationToken());
Assert.NotSame(response.RequestMessage, httpRequestMessage);
Assert.Null(response.RequestMessage.Headers.Authorization);
@@ -106,16 +112,16 @@ namespace Octokit.Tests.Http
var redirectResponse = new HttpResponseMessage(statusCode);
redirectResponse.Headers.Location = new Uri("http://example.org/bar");
var invoker = CreateInvoker(redirectResponse,
new HttpResponseMessage(HttpStatusCode.OK));
var handler = CreateMockHttpHandler(redirectResponse, new HttpResponseMessage(HttpStatusCode.OK));
var adapter = new HttpClientAdapter(handler);
var httpRequestMessage = CreateRequest(HttpMethod.Post);
httpRequestMessage.Content = new StringContent("Hello World");
var response = await invoker.SendAsync(httpRequestMessage, new CancellationToken());
var response = await adapter.SendAsync(httpRequestMessage, new CancellationToken());
Assert.Equal(response.RequestMessage.Method, httpRequestMessage.Method);
Assert.NotSame(response.RequestMessage, httpRequestMessage);
Assert.Equal("Hello World", await response.RequestMessage.Content.ReadAsStringAsync());
}
// POST see other with content
@@ -125,12 +131,13 @@ namespace Octokit.Tests.Http
var redirectResponse = new HttpResponseMessage(HttpStatusCode.SeeOther);
redirectResponse.Headers.Location = new Uri("http://example.org/bar");
var invoker = CreateInvoker(redirectResponse,
new HttpResponseMessage(HttpStatusCode.OK));
var handler = CreateMockHttpHandler(redirectResponse, new HttpResponseMessage(HttpStatusCode.OK));
var adapter = new HttpClientAdapter(handler);
var httpRequestMessage = CreateRequest(HttpMethod.Post);
httpRequestMessage.Content = new StringContent("Hello World");
var response = await invoker.SendAsync(httpRequestMessage, new CancellationToken());
var response = await adapter.SendAsync(httpRequestMessage, new CancellationToken());
Assert.Equal(HttpMethod.Get, response.RequestMessage.Method);
Assert.NotSame(response.RequestMessage, httpRequestMessage);
@@ -145,14 +152,14 @@ namespace Octokit.Tests.Http
var redirectResponse2 = new HttpResponseMessage(HttpStatusCode.Found);
redirectResponse2.Headers.Location = new Uri("http://example.org/foo");
var invoker = CreateInvoker(redirectResponse, redirectResponse2);
var handler = CreateMockHttpHandler(redirectResponse, redirectResponse2);
var adapter = new HttpClientAdapter(handler);
var httpRequestMessage = CreateRequest(HttpMethod.Get);
Assert.ThrowsAsync<InvalidOperationException>(
() => invoker.SendAsync(httpRequestMessage, new CancellationToken()));
() => adapter.SendAsync(httpRequestMessage, new CancellationToken()));
}
static HttpRequestMessage CreateRequest(HttpMethod method)
@@ -163,14 +170,9 @@ namespace Octokit.Tests.Http
return httpRequestMessage;
}
static HttpMessageInvoker CreateInvoker(HttpResponseMessage httpResponseMessage1, HttpResponseMessage httpResponseMessage2 = null)
static Func<HttpMessageHandler> CreateMockHttpHandler(HttpResponseMessage httpResponseMessage1, HttpResponseMessage httpResponseMessage2 = null)
{
var redirectHandler = new RedirectHandler
{
InnerHandler = new MockRedirectHandler(httpResponseMessage1, httpResponseMessage2)
};
var invoker = new HttpMessageInvoker(redirectHandler);
return invoker;
return () => new MockRedirectHandler(httpResponseMessage1, httpResponseMessage2);
}
}
Octokit.Tests/Models/OrganizationTests.cs
+58
View File
@@ -0,0 +1,58 @@
using System.Linq;
using Octokit;
using Octokit.Internal;
using Xunit;
public class OrganizationTest
{
[Fact]
public void CanBeDeserializedWithNullPrivateGistsDiskUsageAndCollaborators()
{
const string json = @"{
""login"": ""octocat"",
""id"": 1234,
""url"": ""https://api.github.com/orgs/octocat"",
""repos_url"": ""https://api.github.com/orgs/octocat/repos"",
""events_url"": ""https://api.github.com/orgs/octocat/events"",
""hooks_url"": ""https://api.github.com/orgs/octocat/hooks"",
""issues_url"": ""https://api.github.com/orgs/octocat/issues"",
""members_url"": ""https://api.github.com/orgs/octocat/members{/member}"",
""public_members_url"": ""https://api.github.com/orgs/octocat/public_members{/member}"",
""avatar_url"": ""https://avatars.githubusercontent.com/u/1234?v=3"",
""description"": ""Test org."",
""name"": ""Octocat"",
""company"": null,
""blog"": ""http://octocat.abc"",
""location"": """",
""email"": """",
""public_repos"": 13,
""public_gists"": 0,
""followers"": 0,
""following"": 0,
""html_url"": ""https://github.com/octocat"",
""created_at"": ""2012-09-11T21:54:25Z"",
""updated_at"": ""2016-08-02T05:44:12Z"",
""type"": ""Organization"",
""total_private_repos"": 1,
""owned_private_repos"": 1,
""private_gists"": null,
""disk_usage"": null,
""collaborators"": null,
""billing_email"": null,
""plan"": {
""name"": ""organization"",
""space"": 976562499,
""private_repos"": 9999,
""filled_seats"": 45,
""seats"": 45
}
}";
var serializer = new SimpleJsonSerializer();
var org = serializer.Deserialize<Organization>(json);
Assert.Equal("octocat", org.Login);
Assert.Equal(1234, org.Id);
}
}
Octokit.Tests/Octokit.Tests.csproj
+1
View File
@@ -184,6 +184,7 @@
<Compile Include="Models\DeploymentTests.cs" />
<Compile Include="Models\GistTests.cs" />
<Compile Include="Models\IssueEventTests.cs" />
<Compile Include="Models\OrganizationTests.cs" />
<Compile Include="Models\IssueTest.cs" />
<Compile Include="Models\MigrationTests.cs" />
<Compile Include="Models\NewReferenceTests.cs" />
Octokit/Http/HttpClientAdapter.cs
+64 -47
View File
@@ -20,6 +20,8 @@ namespace Octokit.Internal
{
readonly HttpClient _http;
public const string RedirectCountKey = "RedirectCount";
[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
public HttpClientAdapter(Func<HttpMessageHandler> getHandler)
{
@@ -42,8 +44,8 @@ namespace Octokit.Internal
using (var requestMessage = BuildRequestMessage(request))
{
// Make the request
var responseMessage = await _http.SendAsync(requestMessage, HttpCompletionOption.ResponseContentRead, cancellationTokenForRequest).ConfigureAwait(false);
var responseMessage = await SendAsync(requestMessage, cancellationTokenForRequest).ConfigureAwait(false);
return await BuildResponse(responseMessage).ConfigureAwait(false);
}
}
@@ -168,19 +170,20 @@ namespace Octokit.Internal
if (_http != null) _http.Dispose();
}
}
}
internal class RedirectHandler : DelegatingHandler
{
public const string RedirectCountKey = "RedirectCount";
public bool Enabled { get; set; }
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
var response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
// Clone the request/content incase we get a redirect
var clonedRequest = await CloneHttpRequestMessageAsync(request);
// Can't redirect without somewhere to redirect too. Throw?
if (response.Headers.Location == null) return response;
// Send initial response
var response = await _http.SendAsync(request, HttpCompletionOption.ResponseContentRead, cancellationToken).ConfigureAwait(false);
// Can't redirect without somewhere to redirect to.
if (response.Headers.Location == null)
{
return response;
}
// Don't redirect if we exceed max number of redirects
var redirectCount = 0;
@@ -192,7 +195,6 @@ namespace Octokit.Internal
{
throw new InvalidOperationException("The redirect count for this request has been exceeded. Aborting.");
}
request.Properties[RedirectCountKey] = ++redirectCount;
if (response.StatusCode == HttpStatusCode.MovedPermanently
|| response.StatusCode == HttpStatusCode.Redirect
@@ -201,55 +203,70 @@ namespace Octokit.Internal
|| response.StatusCode == HttpStatusCode.TemporaryRedirect
|| (int)response.StatusCode == 308)
{
var newRequest = CopyRequest(response.RequestMessage);
if (response.StatusCode == HttpStatusCode.SeeOther)
{
newRequest.Content = null;
newRequest.Method = HttpMethod.Get;
clonedRequest.Content = null;
clonedRequest.Method = HttpMethod.Get;
}
else
// Increment the redirect count
clonedRequest.Properties[RedirectCountKey] = ++redirectCount;
// Set the new Uri based on location header
clonedRequest.RequestUri = response.Headers.Location;
// Clear authentication if redirected to a different host
if (string.Compare(clonedRequest.RequestUri.Host, request.RequestUri.Host, StringComparison.OrdinalIgnoreCase) != 0)
{
if (request.Content != null && request.Content.Headers.ContentLength != 0)
{
var stream = await request.Content.ReadAsStreamAsync().ConfigureAwait(false);
if (stream.CanSeek)
{
stream.Position = 0;
}
else
{
throw new Exception("Cannot redirect a request with an unbuffered body");
}
newRequest.Content = new StreamContent(stream);
}
clonedRequest.Headers.Authorization = null;
}
newRequest.RequestUri = response.Headers.Location;
if (string.Compare(newRequest.RequestUri.Host, request.RequestUri.Host, StringComparison.OrdinalIgnoreCase) != 0)
{
newRequest.Headers.Authorization = null;
}
response = await SendAsync(newRequest, cancellationToken).ConfigureAwait(false);
// Send redirected request
response = await SendAsync(clonedRequest, cancellationToken).ConfigureAwait(false);
}
return response;
}
[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
private static HttpRequestMessage CopyRequest(HttpRequestMessage oldRequest)
public static async Task<HttpRequestMessage> CloneHttpRequestMessageAsync(HttpRequestMessage oldRequest)
{
var newrequest = new HttpRequestMessage(oldRequest.Method, oldRequest.RequestUri);
var newRequest = new HttpRequestMessage(oldRequest.Method, oldRequest.RequestUri);
// Copy the request's content (via a MemoryStream) into the cloned object
var ms = new MemoryStream();
if (oldRequest.Content != null)
{
await oldRequest.Content.CopyToAsync(ms).ConfigureAwait(false);
ms.Position = 0;
newRequest.Content = new StreamContent(ms);
// Copy the content headers
if (oldRequest.Content.Headers != null)
{
foreach (var h in oldRequest.Content.Headers)
{
newRequest.Content.Headers.Add(h.Key, h.Value);
}
}
}
newRequest.Version = oldRequest.Version;
foreach (var header in oldRequest.Headers)
{
newrequest.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
foreach (var property in oldRequest.Properties)
{
newrequest.Properties.Add(property);
newRequest.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
return newrequest;
foreach (var property in oldRequest.Properties)
{
newRequest.Properties.Add(property);
}
return newRequest;
}
}
}
internal class RedirectHandler : DelegatingHandler
{
}
}
Octokit/Models/Response/Account.cs
+3 -3
View File
@@ -55,7 +55,7 @@ namespace Octokit
/// <summary>
/// Number of collaborators the account has.
/// </summary>
public int Collaborators { get; protected set; }
public int? Collaborators { get; protected set; }
/// <summary>
/// Company the account works for.
@@ -70,7 +70,7 @@ namespace Octokit
/// <summary>
/// Amount of disk space the account is using.
/// </summary>
public int DiskUsage { get; protected set; }
public int? DiskUsage { get; protected set; }
/// <summary>
/// The account's email.
@@ -138,7 +138,7 @@ namespace Octokit
/// <summary>
/// Number of private gists the account has created.
/// </summary>
public int PrivateGists { get; protected set; }
public int? PrivateGists { get; protected set; }
/// <summary>
/// Number of public gists the account has created.