Merge pull request jenkinsci#71 from i386/fix-null-granted-authorities

samrocketman · web-flow · commit ec915614755f · 2016-10-25T11:51:00.000-07:00
Fix for "java.lang.IllegalArgumentException: Cannot pass a null Grant…
diff --git a/src/main/java/org/jenkinsci/plugins/GithubOAuthUserDetails.java b/src/main/java/org/jenkinsci/plugins/GithubOAuthUserDetails.java
@@ -21,21 +21,25 @@ public class GithubOAuthUserDetails extends User implements UserDetails {
 
     private static final long serialVersionUID = 1L;
 
+    private boolean hasGrantedAuthorities;
+
     private final GithubAuthenticationToken authenticationToken;
 
     public GithubOAuthUserDetails(@Nonnull String login, @Nonnull GrantedAuthority[] authorities) {
         super(login, "", true, true, true, true, authorities);
         this.authenticationToken = null;
+        this.hasGrantedAuthorities = true;
     }
 
     public GithubOAuthUserDetails(@Nonnull String login, @Nonnull GithubAuthenticationToken authenticationToken) {
-        super(login, "", true, true, true, true, null);
+        super(login, "", true, true, true, true, new GrantedAuthority[0]);
         this.authenticationToken = authenticationToken;
+        this.hasGrantedAuthorities = false;
     }
 
     @Override
     public GrantedAuthority[] getAuthorities() {
-        if (super.getAuthorities() == null) {
+        if (!hasGrantedAuthorities) {
             try {
                 GHUser user = authenticationToken.loadUser(getUsername());
                 setAuthorities(authenticationToken.getGrantedAuthorities(user));
