Post comments to correct repo when on a fork.

If the user had a forked repo checked out and was viewing the parent repo's PRs, posting a comment was erroneously trying to post the comment to the _fork_ repo, resulting in a "Not Found" exception.

Fixes #1195.

Author: grokys

src/GitHub.InlineReviews/Services/IPullRequestSessionService.cs

@@ -86,6 +86,7 @@ Task<byte[]> ExtractFileFromGit(
         /// Posts a new PR review comment.
         /// </summary>
         /// <param name="repository">The repository.</param>
+        /// <param name="repositoryOwner">The owner of the repository fork to post to.</param>
         /// <param name="user">The user posting the comment.</param>
         /// <param name="number">The pull request number.</param>
         /// <param name="body">The comment body.</param>
@@ -95,6 +96,7 @@ Task<byte[]> ExtractFileFromGit(
         /// <returns>A model representing the posted comment.</returns>
         Task<IPullRequestReviewCommentModel> PostReviewComment(
             ILocalRepositoryModel repository,
+            string repositoryOwner,
             IAccount user,
             int number,
             string body,
@@ -106,13 +108,15 @@ Task<IPullRequestReviewCommentModel> PostReviewComment(
         /// Posts a PR review comment reply.
         /// </summary>
         /// <param name="repository">The repository.</param>
+        /// <param name="repositoryOwner">The owner of the repository fork to post to.</param>
         /// <param name="user">The user posting the comment.</param>
         /// <param name="number">The pull request number.</param>
         /// <param name="body">The comment body.</param>
         /// <param name="inReplyTo">The comment ID to reply to.</param>
         /// <returns>A model representing the posted comment.</returns>
         Task<IPullRequestReviewCommentModel> PostReviewComment(
             ILocalRepositoryModel repository,
+            string repositoryOwner,
             IAccount user,
             int number,
             string body,

src/GitHub.InlineReviews/Services/PullRequestSession.cs

@@ -121,6 +121,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(string body,
         {
             var model = await service.PostReviewComment(
                 LocalRepository,
+                RepositoryOwner,
                 User,
                 PullRequest.Number,
                 body,
@@ -136,6 +137,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(string body,
         {
             var model = await service.PostReviewComment(
                 LocalRepository,
+                RepositoryOwner,
                 User,
                 PullRequest.Number,
                 body,

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

@@ -138,6 +138,7 @@ public async Task<string> GetPullRequestMergeBase(ILocalRepositoryModel reposito
         /// <inheritdoc/>
         public async Task<IPullRequestReviewCommentModel> PostReviewComment(
             ILocalRepositoryModel repository,
+            string repositoryOwner,
             IAccount user,
             int number,
             string body,
@@ -149,7 +150,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(
             var apiClient = await apiClientFactory.Create(address);
 
             var result = await apiClient.CreatePullRequestReviewComment(
-                repository.Owner,
+                repositoryOwner,
                 repository.Name,
                 number,
                 body,
@@ -177,6 +178,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(
         /// <inheritdoc/>
         public async Task<IPullRequestReviewCommentModel> PostReviewComment(
             ILocalRepositoryModel repository,
+            string repositoryOwner,
             IAccount user,
             int number,
             string body,
@@ -186,7 +188,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(
             var apiClient = await apiClientFactory.Create(address);
 
             var result = await apiClient.CreatePullRequestReviewComment(
-                repository.Owner,
+                repositoryOwner,
                 repository.Name,
                 number,
                 body,

test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionTests.cs

@@ -6,6 +6,7 @@
 using GitHub.InlineReviews.Services;
 using GitHub.InlineReviews.UnitTests.TestDoubles;
 using GitHub.Models;
+using GitHub.Primitives;
 using LibGit2Sharp;
 using NSubstitute;
 using Xunit;
@@ -511,6 +512,42 @@ Line 3 with comment
 
         public class ThePostReviewCommentMethod
         {
+            [Fact]
+            public async Task PostsToCorrectFork()
+            {
+                var service = Substitute.For<IPullRequestSessionService>();
+                var target = CreateTarget(service, "fork", "owner");
+
+                await target.PostReviewComment("New Comment", "COMMIT_ID", "file.cs", 1);
+
+                await service.Received(1).PostReviewComment(
+                    Arg.Any<ILocalRepositoryModel>(),
+                    "owner",
+                    Arg.Any<IAccount>(),
+                    PullRequestNumber,
+                    "New Comment",
+                    "COMMIT_ID",
+                    "file.cs",
+                    1);
+            }
+
+            [Fact]
+            public async Task PostsReplyToCorrectFork()
+            {
+                var service = Substitute.For<IPullRequestSessionService>();
+                var target = CreateTarget(service, "fork", "owner");
+
+                await target.PostReviewComment("New Comment", 1);
+
+                await service.Received(1).PostReviewComment(
+                    Arg.Any<ILocalRepositoryModel>(),
+                    "owner",
+                    Arg.Any<IAccount>(),
+                    PullRequestNumber,
+                    "New Comment",
+                    1);
+            }
+
             [Fact]
             public async Task UpdatesFileWithNewThread()
             {
@@ -529,6 +566,26 @@ public async Task UpdatesFileWithNewThread()
                 }
             }
 
+            PullRequestSession CreateTarget(
+                IPullRequestSessionService service,
+                string localRepositoryOwner,
+                string remoteRepositoryOwner)
+            {
+                var repository = Substitute.For<ILocalRepositoryModel>();
+
+                repository.CloneUrl.Returns(new UriString($"https://github.com/{localRepositoryOwner}/reop"));
+                repository.Owner.Returns(localRepositoryOwner);
+                repository.Name.Returns("repo");
+
+                return new PullRequestSession(
+                    service,
+                    Substitute.For<IAccount>(),
+                    CreatePullRequest(),
+                    repository,
+                    remoteRepositoryOwner,
+                    true);
+            }
+
             async Task<PullRequestSession> CreateTarget(FakeDiffService diffService)
             {
                 var baseContents = @"Line 1
@@ -652,10 +709,10 @@ static IPullRequestSessionService CreateService(FakeDiffService diffService)
             result.GetTipSha(Arg.Any<ILocalRepositoryModel>()).Returns("BRANCH_TIP");
 
             var diffChunk = "@@ -1,4 +1,4 @@";
-            result.PostReviewComment(null, null, 0, null, 0).ReturnsForAnyArgs(i =>
-                CreateComment(diffChunk, i.ArgAt<string>(3)));
-            result.PostReviewComment(null, null, 0, null, null, null, 0).ReturnsForAnyArgs(i =>
-                CreateComment(diffChunk, i.ArgAt<string>(3)));
+            result.PostReviewComment(null, null, null, 0, null, 0).ReturnsForAnyArgs(i =>
+                CreateComment(diffChunk, i.ArgAt<string>(4)));
+            result.PostReviewComment(null, null, null, 0, null, null, null, 0).ReturnsForAnyArgs(i =>
+                CreateComment(diffChunk, i.ArgAt<string>(4)));
             return result;
         }
     }