support redirect requests natively

Octokit.Reactive/Clients/IObservableRepositoryContentsClient.cs

@@ -34,8 +34,18 @@ public interface IObservableRepositoryContentsClient
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <returns></returns>
+        [Obsolete("Use GetArchive to download the archive instead")]
         IObservable<string> GetArchiveLink(string owner, string name);
 
+        /// <summary>
+        /// Get an archive of a given repository's contents
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/repos/contents/#get-archive-link</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <returns>A promise, containing the binary contents of the archive</returns>
+        IObservable<byte[]> GetArchive(string owner, string name);
+
         /// <summary>
         /// This method will return a 302 to a URL to download a tarball or zipball archive for a repository.
         /// Please make sure your HTTP framework is configured to follow redirects or you will need to use the 
@@ -47,8 +57,19 @@ public interface IObservableRepositoryContentsClient
         /// <param name="name">The name of the repository</param>
         /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
         /// <returns></returns>
+        [Obsolete("Use GetArchive to download the archive instead")]
         IObservable<string> GetArchiveLink(string owner, string name, ArchiveFormat archiveFormat);
 
+        /// <summary>
+        /// Get an archive of a given repository's contents, in a specific format
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/repos/contents/#get-archive-link</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
+        /// <returns>A promise, containing the binary contents of the archive</returns>
+        IObservable<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat);
+
         /// <summary>
         /// This method will return a 302 to a URL to download a tarball or zipball archive for a repository.
         /// Please make sure your HTTP framework is configured to follow redirects or you will need to use the 
@@ -61,8 +82,20 @@ public interface IObservableRepositoryContentsClient
         /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
         /// <param name="reference">A valid Git reference.</param>
         /// <returns></returns>
+        [Obsolete("Use GetArchive to download the archive instead")]
         IObservable<string> GetArchiveLink(string owner, string name, ArchiveFormat archiveFormat, string reference);
 
+        /// <summary>
+        /// Get an archive of a given repository's contents, using a specific format and reference
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/repos/contents/#get-archive-link</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
+        /// <param name="reference">A valid Git reference.</param>
+        /// <returns>A promise, containing the binary contents of the archive</returns>
+        IObservable<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat, string reference);
+
         /// <summary>
         /// Returns the contents of a file or directory in a repository.
         /// </summary>

Octokit.Reactive/Clients/ObservableRepositoryContentsClient.cs

@@ -59,11 +59,24 @@ public IObservable<string> GetReadmeHtml(string owner, string name)
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <returns></returns>
+        [Obsolete("Use GetArchive to download the archive instead")]
         public IObservable<string> GetArchiveLink(string owner, string name)
         {
             return GetArchiveLink(owner, name, ArchiveFormat.Tarball, string.Empty);
         }
 
+        /// <summary>
+        /// Get an archive of a given repository's contents
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/repos/contents/#get-archive-link</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <returns>A promise, containing the binary contents of the archive</returns>
+        public IObservable<byte[]> GetArchive(string owner, string name)
+        {
+            return _client.Repository.Content.GetArchive(owner, name).ToObservable();
+        }
+
         /// <summary>
         /// This method will return a 302 to a URL to download a tarball or zipball archive for a repository.
         /// Please make sure your HTTP framework is configured to follow redirects or you will need to use the 
@@ -75,11 +88,25 @@ public IObservable<string> GetArchiveLink(string owner, string name)
         /// <param name="name">The name of the repository</param>
         /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
         /// <returns></returns>
+        [Obsolete("Use GetArchive to download the archive instead")]
         public IObservable<string> GetArchiveLink(string owner, string name, ArchiveFormat archiveFormat)
         {
             return GetArchiveLink(owner, name, archiveFormat, String.Empty);
         }
 
+        /// <summary>
+        /// Get an archive of a given repository's contents, in a specific format
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/repos/contents/#get-archive-link</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
+        /// <returns>A promise, containing the binary contents of the archive</returns>
+        public IObservable<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat)
+        {
+            return _client.Repository.Content.GetArchive(owner, name, archiveFormat).ToObservable();
+        }
+
         /// <summary>
         /// This method will return a 302 to a URL to download a tarball or zipball archive for a repository.
         /// Please make sure your HTTP framework is configured to follow redirects or you will need to use the 
@@ -92,6 +119,7 @@ public IObservable<string> GetArchiveLink(string owner, string name, ArchiveForm
         /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
         /// <param name="reference">A valid Git reference.</param>
         /// <returns></returns>
+        [Obsolete("Use GetArchive to download the archive instead")]
         public IObservable<string> GetArchiveLink(string owner, string name, ArchiveFormat archiveFormat, string reference)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
@@ -100,6 +128,20 @@ public IObservable<string> GetArchiveLink(string owner, string name, ArchiveForm
             return _client.Repository.Content.GetArchiveLink(owner, name, archiveFormat, reference).ToObservable();
         }
 
+        /// <summary>
+        /// Get an archive of a given repository's contents, using a specific format and reference
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/repos/contents/#get-archive-link</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
+        /// <param name="reference">A valid Git reference.</param>
+        /// <returns>A promise, containing the binary contents of the archive</returns>
+        public IObservable<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat, string reference)
+        {
+            return _client.Repository.Content.GetArchive(owner, name, archiveFormat, reference).ToObservable();
+        }
+
         /// <summary>
         /// Returns the contents of a file or directory in a repository.
         /// </summary>

Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
-using Octokit.Tests.Helpers;
 using Octokit.Tests.Integration;
 using Xunit;
 
@@ -540,7 +539,6 @@ public async Task ReturnsForkedRepository()
         }
     }
 
-
     public class TheGetAllPublicMethod
     {
         [IntegrationTest(Skip = "Takes too long to run.")]

Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs

@@ -115,43 +115,43 @@ await Assert.ThrowsAsync<NotFoundException>(
             }
         }
 
-        [IntegrationTest]
-        public async Task GetsArchiveLinkAsTarball()
+        [IntegrationTest(Skip = "this will probably take too long")]
+        public async Task GetsArchiveAsTarball()
         {
             var github = Helper.GetAuthenticatedClient();
 
-            var archiveLink = await github
+            var archive = await github
                 .Repository
                 .Content
-                .GetArchiveLink("octokit", "octokit.net");
+                .GetArchive("octokit", "octokit.net");
 
-            Assert.Equal("https://codeload.github.com/octokit/octokit.net/legacy.tar.gz/master", archiveLink);
+            Assert.NotEmpty(archive);
         }
 
         [IntegrationTest]
-        public async Task GetsArchiveLinkAsZipball()
+        public async Task GetsArchiveAsZipball()
         {
             var github = Helper.GetAuthenticatedClient();
 
-            var archiveLink = await github
+            var archive = await github
                 .Repository
                 .Content
-                .GetArchiveLink("octokit", "octokit.net", ArchiveFormat.Zipball, "");
+                .GetArchive("octokit", "octokit.net", ArchiveFormat.Zipball, "");
 
-            Assert.Equal("https://codeload.github.com/octokit/octokit.net/legacy.zip/master", archiveLink);
+            Assert.NotEmpty(archive);
         }
 
         [IntegrationTest]
-        public async Task GetsArchiveLinkForReleaseBranchAsTarball()
+        public async Task GetsArchiveForReleaseBranchAsTarball()
         {
             var github = Helper.GetAuthenticatedClient();
 
-            var archiveLink = await github
+            var archive = await github
                 .Repository
                 .Content
-                .GetArchiveLink("alfhenrik", "ScriptCs.OctoKit", ArchiveFormat.Tarball, "dev");
+                .GetArchive("alfhenrik", "ScriptCs.OctoKit", ArchiveFormat.Tarball, "dev");
 
-            Assert.Equal("https://codeload.github.com/alfhenrik/ScriptCs.OctoKit/legacy.tar.gz/dev", archiveLink);
+            Assert.NotEmpty(archive);
         }
     }
 }

Octokit.Tests.Integration/HttpClientAdapterTests.cs

@@ -14,7 +14,7 @@ public class TheSendAsyncMethod
         [IntegrationTest]
         public async Task CanDownloadImage()
         {
-            var httpClient = new HttpClientAdapter();
+            var httpClient = new HttpClientAdapter(HttpMessageHandlerFactory.CreateDefault);
             var request = new Request
             {
                 BaseAddress = new Uri("https://github.global.ssl.fastly.net/", UriKind.Absolute),
@@ -36,7 +36,7 @@ public async Task CanDownloadImage()
         [IntegrationTest]
         public async Task CanCancelARequest()
         {
-            var httpClient = new HttpClientAdapter();
+            var httpClient = new HttpClientAdapter(HttpMessageHandlerFactory.CreateDefault);
             var request = new Request
             {
                 BaseAddress = new Uri("https://github.global.ssl.fastly.net/", UriKind.Absolute),

Octokit.Tests.Integration/Octokit.Tests.Integration.csproj

@@ -120,6 +120,7 @@
     <Compile Include="Reactive\ObservableRespositoryDeployKeysClientTests.cs" />
     <Compile Include="Reactive\ObservableUserEmailsClientTests.cs" />
     <Compile Include="Reactive\ObservableTeamsClientTests.cs" />
+    <Compile Include="RedirectTests.cs" />
     <Compile Include="SelfTests.cs" />
   </ItemGroup>
   <ItemGroup>

Octokit.Tests.Integration/RedirectTests.cs

@@ -0,0 +1,45 @@
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Octokit.Tests.Integration
+{
+    public class RedirectTests
+    {
+        [IntegrationTest]
+        public async Task ReturnsRedirectedRepository()
+        {
+            var github = Helper.GetAuthenticatedClient();
+
+            var repository = await github.Repository.Get("robconery", "massive");
+
+            Assert.Equal("https://github.com/FransBouma/Massive.git", repository.CloneUrl);
+            Assert.False(repository.Private);
+            Assert.False(repository.Fork);
+            Assert.Equal(AccountType.User, repository.Owner.Type);
+        }
+
+        [IntegrationTest]
+        public async Task CanCreateIssueOnRedirectedRepository()
+        {
+            var client = Helper.GetAuthenticatedClient();
+
+            var owner = "shiftkey-tester";
+            var oldRepoName = "repository-before-rename";
+            var newRepoName = "repository-after-rename";
+
+            var newIssue = new NewIssue("a test issue") { Body = "A new unassigned issue" };
+            var issue = await client.Issue.Create(owner, oldRepoName, newIssue);
+            Assert.NotNull(issue);
+
+            Assert.True(issue.Url.AbsoluteUri.Contains("repository-after-rename"));
+
+            var resolvedIssue = await client.Issue.Get(owner, newRepoName, issue.Number);
+
+            Assert.NotNull(resolvedIssue);
+
+            var update = resolvedIssue.ToUpdate();
+            update.State = ItemState.Closed;
+            await client.Issue.Update(owner, oldRepoName, issue.Number, update);
+        }
+    }
+}

Octokit.Tests/Http/ConnectionTests.cs

@@ -439,7 +439,7 @@ await connection.Post<string>(
                 httpClient.Received().Send(Arg.Is<IRequest>(req =>
                     req.BaseAddress == _exampleUri &&
                     req.Body == body &&
-                    req.Headers["Accept"] == "application/vnd.github.v3+json; charset=utf-8" &&
+                    req.Headers["Accept"] == "application/vnd.github.quicksilver-preview+json; charset=utf-8, application/vnd.github.v3+json; charset=utf-8" &&
                     req.ContentType == "application/arbitrary" &&
                     req.Method == HttpMethod.Post &&
                     req.Endpoint == new Uri("https://other.host.com/path?query=val")), Args.CancellationToken);

Octokit.Tests/Http/HttpClientAdapterTests.cs

@@ -178,6 +178,11 @@ public async Task SetsContentType()
 
         sealed class HttpClientAdapterTester : HttpClientAdapter
         {
+            public HttpClientAdapterTester()
+                : base(HttpMessageHandlerFactory.CreateDefault)
+            {
+            }
+
             public HttpRequestMessage BuildRequestMessageTester(IRequest request)
             {
                 return BuildRequestMessage(request);

Octokit.Tests/Http/JsonHttpPipelineTests.cs

@@ -30,7 +30,7 @@ public void SetsRequestAcceptHeader()
                 jsonPipeline.SerializeRequest(request);
 
                 Assert.Contains("Accept", request.Headers.Keys);
-                Assert.Equal("application/vnd.github.v3+json; charset=utf-8", request.Headers["Accept"]);
+                Assert.Equal("application/vnd.github.quicksilver-preview+json; charset=utf-8, application/vnd.github.v3+json; charset=utf-8", request.Headers["Accept"]);
             }
 
             [Fact]