diff --git a/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs b/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs index be9e5a36..6dc55611 100644 --- a/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs +++ b/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs @@ -172,7 +172,7 @@ namespace Octokit.Reactive /// Username of the new collaborator /// The permission to set. Only valid on organization-owned repositories. /// Thrown when a general API error occurs. - IObservable Add(string owner, string name, string user, CollaboratorRequest permission); + IObservable Add(string owner, string name, string user, CollaboratorRequest permission); /// /// Adds a new collaborator to the repository. @@ -195,7 +195,7 @@ namespace Octokit.Reactive /// Username of the new collaborator /// The permission to set. Only valid on organization-owned repositories. /// Thrown when a general API error occurs. - IObservable Add(long repositoryId, string user, CollaboratorRequest permission); + IObservable Add(long repositoryId, string user, CollaboratorRequest permission); /// /// Invites a user as a collaborator to a repository. diff --git a/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs b/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs index 6bee5da3..38f8f710 100644 --- a/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs +++ b/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs @@ -267,7 +267,7 @@ namespace Octokit.Reactive /// Username of the new collaborator /// The permission to set. Only valid on organization-owned repositories. /// Thrown when a general API error occurs. - public IObservable Add(string owner, string name, string user, CollaboratorRequest permission) + public IObservable Add(string owner, string name, string user, CollaboratorRequest permission) { Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner)); Ensure.ArgumentNotNullOrEmptyString(name, nameof(name)); @@ -303,7 +303,7 @@ namespace Octokit.Reactive /// Username of the new collaborator /// The permission to set. Only valid on organization-owned repositories. /// Thrown when a general API error occurs. - public IObservable Add(long repositoryId, string user, CollaboratorRequest permission) + public IObservable Add(long repositoryId, string user, CollaboratorRequest permission) { Ensure.ArgumentNotNullOrEmptyString(user, nameof(user)); Ensure.ArgumentNotNull(permission, nameof(permission)); diff --git a/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs b/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs index f255388a..7e5f0d90 100644 --- a/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs +++ b/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs @@ -391,7 +391,7 @@ namespace Octokit.Tests.Clients var connection = Substitute.For(); var client = new RepoCollaboratorsClient(connection); - connection.Connection.Put(Arg.Any(), Arg.Any()).ThrowsAsync(new AuthorizationException()); + connection.Put(Arg.Any(), Arg.Any()).ThrowsAsync(new AuthorizationException()); await Assert.ThrowsAsync(() => client.Add("owner", "test", "user1", new CollaboratorRequest(Permission.Pull))); await Assert.ThrowsAsync(() => client.Add(1, "user1", new CollaboratorRequest(Permission.Pull))); diff --git a/Octokit/Clients/IRepoCollaboratorsClient.cs b/Octokit/Clients/IRepoCollaboratorsClient.cs index d117d414..1cc05935 100644 --- a/Octokit/Clients/IRepoCollaboratorsClient.cs +++ b/Octokit/Clients/IRepoCollaboratorsClient.cs @@ -172,7 +172,7 @@ namespace Octokit /// Username of the new collaborator /// The permission to set. Only valid on organization-owned repositories. /// Thrown when a general API error occurs. - Task Add(string owner, string name, string user, CollaboratorRequest permission); + Task Add(string owner, string name, string user, CollaboratorRequest permission); /// /// Adds a new collaborator to the repository. @@ -195,7 +195,7 @@ namespace Octokit /// Username of the new collaborator /// The permission to set. Only valid on organization-owned repositories. /// Thrown when a general API error occurs. - Task Add(long repositoryId, string user, CollaboratorRequest permission); + Task Add(long repositoryId, string user, CollaboratorRequest permission); /// /// Invites a new collaborator to the repo diff --git a/Octokit/Clients/RepoCollaboratorsClient.cs b/Octokit/Clients/RepoCollaboratorsClient.cs index c91639d5..499ba4a2 100644 --- a/Octokit/Clients/RepoCollaboratorsClient.cs +++ b/Octokit/Clients/RepoCollaboratorsClient.cs @@ -292,21 +292,13 @@ namespace Octokit /// The permission to set. Only valid on organization-owned repositories. /// Thrown when a general API error occurs. [ManualRoute("PUT", "/repos/{owner}/{repo}/collaborators/{username}")] - public async Task Add(string owner, string name, string user, CollaboratorRequest permission) + public async Task Add(string owner, string name, string user, CollaboratorRequest permission) { Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner)); Ensure.ArgumentNotNullOrEmptyString(name, nameof(name)); Ensure.ArgumentNotNullOrEmptyString(user, nameof(user)); - - try - { - var response = await Connection.Put(ApiUrls.RepoCollaborator(owner, name, user), permission).ConfigureAwait(false); - return response.HttpResponse.IsTrue(); - } - catch (NotFoundException) - { - return false; - } + + return await ApiConnection.Put(ApiUrls.RepoCollaborator(owner, name, user), permission).ConfigureAwait(false); } /// @@ -337,19 +329,11 @@ namespace Octokit /// The permission to set. Only valid on organization-owned repositories. /// Thrown when a general API error occurs. [ManualRoute("PUT", "/repository/{id}/collaborators/{username}")] - public async Task Add(long repositoryId, string user, CollaboratorRequest permission) + public async Task Add(long repositoryId, string user, CollaboratorRequest permission) { Ensure.ArgumentNotNullOrEmptyString(user, nameof(user)); - try - { - var response = await Connection.Put(ApiUrls.RepoCollaborator(repositoryId, user), permission).ConfigureAwait(false); - return response.HttpResponse.IsTrue(); - } - catch (NotFoundException) - { - return false; - } + return await ApiConnection.Put(ApiUrls.RepoCollaborator(repositoryId, user), permission).ConfigureAwait(false); } ///