diff options
author | Joel Baranick <joel.baranick@ensighten.com> | 2015-10-28 12:54:10 -0700 |
---|---|---|
committer | Joel Baranick <joel.baranick@ensighten.com> | 2015-10-28 12:54:10 -0700 |
commit | f2294ad4c37592d4046fd02e35439340278b09a0 (patch) | |
tree | 0c9f4640a5b91f41fe6b73c2de67055c05bc9668 /src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java | |
parent | 8101c2fc7b6ca2b2fa1d835f2c5b2a5f159539a0 (diff) | |
download | bbprb-f2294ad4c37592d4046fd02e35439340278b09a0.tar.gz |
Add support for plaintext username/password unless credentials are specified.
Diffstat (limited to 'src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java')
-rw-r--r-- | src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java index 8606c45..fb43f12 100644 --- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java +++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java @@ -45,10 +45,17 @@ public class BitbucketRepository { public void init() { trigger = this.builder.getTrigger(); + String username = trigger.getUsername(); + String password = trigger.getPassword(); StandardUsernamePasswordCredentials credentials = getCredentials(trigger.getCredentialsId()); + if (credentials != null) { + username = credentials.getUsername(); + password = credentials.getPassword().getPlainText(); + } + client = new ApiClient( - credentials.getUsername(), - credentials.getPassword().getPlainText(), + username, + password, trigger.getRepositoryOwner(), trigger.getRepositoryName()); } |