Merge pull request voxpupuli#889 from jhoblitt/groovy_helper/api_tokens

fix puppet_helper.groovy exception when listing users on recent jenkins versions
alphagov · Sep 21, 2018 · 24fb880 · 24fb880
2 parents 6ea2c61 + 1f327cd
commit 24fb880
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/files/puppet_helper.groovy b/files/puppet_helper.groovy
@@ -102,7 +102,7 @@ class Util {
     def tokenProperty = user.getProperty(jenkins.security.ApiTokenProperty)
     if (tokenProperty != null) {
       conf['api_token_public'] = tokenProperty.getApiToken()
-      conf['api_token_plain'] = tokenProperty.@apiToken.getPlainText()
+      conf['api_token_plain'] = tokenProperty.@apiToken?.getPlainText()
     }
 
     def passwordProperty = user.getProperty(hudson.security.HudsonPrivateSecurityRealm.Details)