bug: Fixing issues with two factor authentication overload and certai…

…n endpoints (#2524)
octokit · Aug 4, 2022 · a7d5e33 · a7d5e33
1 parent 6e72fda
commit a7d5e33
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 24 deletions.
diff --git a/Octokit.Tests/Clients/RepositoriesClientTests.cs b/Octokit.Tests/Clients/RepositoriesClientTests.cs
@@ -1389,7 +1389,7 @@ public async Task RequestsTheCorrectUrlForOwnerAndRepoWithEmptyTopics()
                 await _client.ReplaceAllTopics("owner", "name", _emptyTopics);
 
                 _connection.Received()
-                    .Put<RepositoryTopics>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/name/topics"), _emptyTopics, null);
+                    .Put<RepositoryTopics>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/name/topics"), _emptyTopics);
             }
 
             [Fact]
@@ -1398,7 +1398,7 @@ public async Task RequestsTheCorrectUrlForOwnerAndRepoWithListOfTopics()
                 await _client.ReplaceAllTopics("owner", "name", _listOfTopics);
 
                 _connection.Received()
-                    .Put<RepositoryTopics>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/name/topics"), _listOfTopics, null);
+                    .Put<RepositoryTopics>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/name/topics"), _listOfTopics);
             }
 
             [Fact]
@@ -1407,7 +1407,7 @@ public async Task RequestsTheCorrectUrlForRepoIdWithEmptyTopics()
                 await _client.ReplaceAllTopics(1234, _emptyTopics);
 
                 _connection.Received()
-                    .Put<RepositoryTopics>(Arg.Is<Uri>(u => u.ToString() == "repositories/1234/topics"), _emptyTopics, null);
+                    .Put<RepositoryTopics>(Arg.Is<Uri>(u => u.ToString() == "repositories/1234/topics"), _emptyTopics);
             }
 
             [Fact]
@@ -1416,7 +1416,7 @@ public async Task RequestsTheCorrectUrlForRepoIdWithListOfTopics()
                 await _client.ReplaceAllTopics(1234, _listOfTopics);
 
                 _connection.Received()
-                    .Put<RepositoryTopics>(Arg.Is<Uri>(u => u.ToString() == "repositories/1234/topics"), _listOfTopics, null);
+                    .Put<RepositoryTopics>(Arg.Is<Uri>(u => u.ToString() == "repositories/1234/topics"), _listOfTopics);
             }
         }
     }

diff --git a/Octokit.Tests/Clients/RepositoryBranchesClientTests.cs b/Octokit.Tests/Clients/RepositoryBranchesClientTests.cs
@@ -208,7 +208,7 @@ public void RequestsTheCorrectUrl()
                 client.UpdateBranchProtection("owner", "repo", "branch", update);
 
                 connection.Received()
-                    .Put<BranchProtectionSettings>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/repo/branches/branch/protection"), Arg.Any<BranchProtectionSettingsUpdate>(), null);
+                    .Put<BranchProtectionSettings>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/repo/branches/branch/protection"), Arg.Any<BranchProtectionSettingsUpdate>());
             }
 
             [Fact]
@@ -222,7 +222,7 @@ public void RequestsTheCorrectUrlWithRepositoryId()
                 client.UpdateBranchProtection(1, "branch", update);
 
                 connection.Received()
-                    .Put<BranchProtectionSettings>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/branches/branch/protection"), Arg.Any<BranchProtectionSettingsUpdate>(), null);
+                    .Put<BranchProtectionSettings>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/branches/branch/protection"), Arg.Any<BranchProtectionSettingsUpdate>());
             }
 
             [Fact]
@@ -490,7 +490,7 @@ public void RequestsTheCorrectUrl()
                 client.UpdateRequiredStatusChecksContexts("owner", "repo", "branch", update);
 
                 connection.Received()
-                    .Put<IReadOnlyList<string>>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/repo/branches/branch/protection/required_status_checks/contexts"), Arg.Any<IReadOnlyList<string>>(), null);
+                    .Put<IReadOnlyList<string>>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/repo/branches/branch/protection/required_status_checks/contexts"), Arg.Any<IReadOnlyList<string>>());
             }
 
             [Fact]
@@ -503,7 +503,7 @@ public void RequestsTheCorrectUrlWithRepositoryId()
                 client.UpdateRequiredStatusChecksContexts(1, "branch", update);
 
                 connection.Received()
-                    .Put<IReadOnlyList<string>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/branches/branch/protection/required_status_checks/contexts"), Arg.Any<IReadOnlyList<string>>(), null);
+                    .Put<IReadOnlyList<string>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/branches/branch/protection/required_status_checks/contexts"), Arg.Any<IReadOnlyList<string>>());
             }
 
             [Fact]
@@ -1057,8 +1057,7 @@ public void RequestsTheCorrectUrl()
                 connection.Received()
                     .Put<IReadOnlyList<Team>>(
                     Arg.Is<Uri>(u => u.ToString() == "repos/owner/repo/branches/branch/protection/restrictions/teams"),
-                    Arg.Any<IReadOnlyList<string>>(),
-                    null);
+                    Arg.Any<IReadOnlyList<string>>());
             }
 
             [Fact]
@@ -1073,8 +1072,7 @@ public void RequestsTheCorrectUrlWithRepositoryId()
                 connection.Received()
                     .Put<IReadOnlyList<Team>>(
                         Arg.Is<Uri>(u => u.ToString() == "repositories/1/branches/branch/protection/restrictions/teams"),
-                        Arg.Any<IReadOnlyList<string>>(),
-                        null);
+                        Arg.Any<IReadOnlyList<string>>());
             }
 
             [Fact]
@@ -1264,7 +1262,7 @@ public void RequestsTheCorrectUrl()
                 client.UpdateProtectedBranchUserRestrictions("owner", "repo", "branch", newUsers);
 
                 connection.Received()
-                    .Put<IReadOnlyList<User>>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/repo/branches/branch/protection/restrictions/users"), Arg.Any<IReadOnlyList<string>>(), null);
+                    .Put<IReadOnlyList<User>>(Arg.Is<Uri>(u => u.ToString() == "repos/owner/repo/branches/branch/protection/restrictions/users"), Arg.Any<IReadOnlyList<string>>());
             }
 
             [Fact]
@@ -1277,7 +1275,7 @@ public void RequestsTheCorrectUrlWithRepositoryId()
                 client.UpdateProtectedBranchUserRestrictions(1, "branch", newUsers);
 
                 connection.Received()
-                    .Put<IReadOnlyList<User>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/branches/branch/protection/restrictions/users"), Arg.Any<IReadOnlyList<string>>(), null);
+                    .Put<IReadOnlyList<User>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/branches/branch/protection/restrictions/users"), Arg.Any<IReadOnlyList<string>>());
             }
 
             [Fact]

diff --git a/Octokit/Clients/RepositoriesClient.cs b/Octokit/Clients/RepositoriesClient.cs
@@ -838,7 +838,7 @@ public async Task<RepositoryTopics> ReplaceAllTopics(string owner, string name,
             Ensure.ArgumentNotNull(topics, nameof(topics));
 
             var endpoint = ApiUrls.RepositoryTopics(owner, name);
-            var data = await ApiConnection.Put<RepositoryTopics>(endpoint, topics, null).ConfigureAwait(false);
+            var data = await ApiConnection.Put<RepositoryTopics>(endpoint, topics).ConfigureAwait(false);
 
             return data ?? new RepositoryTopics();
         }
@@ -860,7 +860,7 @@ public async Task<RepositoryTopics> ReplaceAllTopics(long repositoryId, Reposito
             Ensure.ArgumentNotNull(topics, nameof(topics));
 
             var endpoint = ApiUrls.RepositoryTopics(repositoryId);
-            var data = await ApiConnection.Put<RepositoryTopics>(endpoint, topics, null).ConfigureAwait(false);
+            var data = await ApiConnection.Put<RepositoryTopics>(endpoint, topics).ConfigureAwait(false);
 
             return data ?? new RepositoryTopics();
         }

diff --git a/Octokit/Clients/RepositoryBranchesClient.cs b/Octokit/Clients/RepositoryBranchesClient.cs
@@ -175,7 +175,7 @@ public Task<BranchProtectionSettings> UpdateBranchProtection(string owner, strin
             Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(update, nameof(update));
 
-            return ApiConnection.Put<BranchProtectionSettings>(ApiUrls.RepoBranchProtection(owner, name, branch), update, null);
+            return ApiConnection.Put<BranchProtectionSettings>(ApiUrls.RepoBranchProtection(owner, name, branch), update);
         }
 
         /// <summary>
@@ -193,7 +193,7 @@ public Task<BranchProtectionSettings> UpdateBranchProtection(long repositoryId,
             Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(update, nameof(update));
 
-            return ApiConnection.Put<BranchProtectionSettings>(ApiUrls.RepoBranchProtection(repositoryId, branch), update, null);
+            return ApiConnection.Put<BranchProtectionSettings>(ApiUrls.RepoBranchProtection(repositoryId, branch), update);
         }
 
         /// <summary>
@@ -431,7 +431,7 @@ public Task<IReadOnlyList<string>> UpdateRequiredStatusChecksContexts(string own
             Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
-            return ApiConnection.Put<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(owner, name, branch), contexts, null);
+            return ApiConnection.Put<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(owner, name, branch), contexts);
         }
 
         /// <summary>
@@ -449,7 +449,7 @@ public Task<IReadOnlyList<string>> UpdateRequiredStatusChecksContexts(long repos
             Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
-            return ApiConnection.Put<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(repositoryId, branch), contexts, null);
+            return ApiConnection.Put<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(repositoryId, branch), contexts);
         }
 
         /// <summary>
@@ -927,7 +927,7 @@ public Task<IReadOnlyList<Team>> UpdateProtectedBranchTeamRestrictions(string ow
             Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(teams, nameof(teams));
 
-            return ApiConnection.Put<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(owner, name, branch), teams, null);
+            return ApiConnection.Put<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(owner, name, branch), teams);
         }
 
         /// <summary>
@@ -945,7 +945,7 @@ public Task<IReadOnlyList<Team>> UpdateProtectedBranchTeamRestrictions(long repo
             Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(teams, nameof(teams));
 
-            return ApiConnection.Put<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(repositoryId, branch), teams, null);
+            return ApiConnection.Put<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(repositoryId, branch), teams);
         }
 
         /// <summary>
@@ -1079,7 +1079,7 @@ public Task<IReadOnlyList<User>> UpdateProtectedBranchUserRestrictions(string ow
             Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(users, nameof(users));
 
-            return ApiConnection.Put<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(owner, name, branch), users, null);
+            return ApiConnection.Put<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(owner, name, branch), users);
         }
 
         /// <summary>
@@ -1097,7 +1097,7 @@ public Task<IReadOnlyList<User>> UpdateProtectedBranchUserRestrictions(long repo
             Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(users, nameof(users));
 
-            return ApiConnection.Put<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(repositoryId, branch), users, null);
+            return ApiConnection.Put<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(repositoryId, branch), users);
         }
 
         /// <summary>