Merge pull request #111 from xocasdashdash/improve-collaborator-check

Improved how it checks for github collaborator access

Author: aaronwalker

src/main/java/org/jenkinsci/plugins/pipeline/github/GitHubHelper.java

@@ -36,20 +36,17 @@ private GitHubHelper() {
         // go away
     }
 
-    public static List<String> getCollaborators(@Nonnull final Job<?,?> job) {
+    public static Boolean isAuthorized(@Nonnull final Job<?,?> job, @Nonnull final String User) {
         ExtendedGitHubClient client = getGitHubClient(job);
         RepositoryId repository = getRepositoryId(job);
         CollaboratorService collaboratorService = new CollaboratorService(client);
 
         try {
-            return collaboratorService.getCollaborators(repository)
-                    .stream()
-                    .map(User::getLogin)
-                    .collect(Collectors.toList());
+            return collaboratorService.isCollaborator(repository, User);
         } catch (final IOException e) {
-            LOG.debug("Received an exception while trying to retrieve the collaborators for the repository: {}",
-                    repository, e);
-            return Collections.emptyList();
+            LOG.debug("Received an exception while trying to check if user {} is a collaborator of repository: {}",
+                    User, repository, e);
+            return false;
         }
     }
 

src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/GitHubEventSubscriber.java

@@ -172,12 +172,7 @@ private void handleIssueComment(final GHSubscriberEvent event) {
     }
 
     private boolean isAuthorized(final WorkflowJob job, final String commentAuthor) {
-        return GitHubHelper.getCollaborators(job)
-                .stream()
-                .filter(commentAuthor::equals)
-                .findAny()
-                .map(a -> Boolean.TRUE)
-                .orElse(Boolean.FALSE);
+        return GitHubHelper.isAuthorized(job, commentAuthor);
     }
 
     private boolean triggerMatches(final IssueCommentTrigger trigger,