Get fresh oauth token on every git clone

Previously token was fetched only once and saved in BitbucketSCMSource. Fixes jenkinsci#808. See also jenkinsci#810 and jenkinsci#796.
andrey-fomin · Mar 10, 2024 · eac1a85 · eac1a85
1 parent bbd5243
commit eac1a85
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMBuilder.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMBuilder.java
@@ -23,6 +23,7 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket;
 
+import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketAuthenticator;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketHref;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepositoryProtocol;
@@ -309,6 +310,13 @@ private String getCloneLink(List<BitbucketHref> cloneLinks) {
         return cloneLinks.stream()
             .filter(link -> protocol.matches(link.getName()))
             .findAny()
+            .map(bitbucketHref -> {
+                BitbucketAuthenticator authenticator = scmSource().authenticator();
+                if (authenticator == null) {
+                    return bitbucketHref;
+                }
+                return authenticator.addAuthToken(bitbucketHref);
+            })
             .orElseThrow(() -> new IllegalStateException("Can't find clone link for protocol " + protocol))
             .getHref();
     }

diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSource.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSource.java
@@ -86,7 +86,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 import jenkins.authentication.tokens.api.AuthenticationTokens;
 import jenkins.model.Jenkins;
 import jenkins.plugins.git.AbstractGitSCMSource.SCMRevisionImpl;
@@ -1039,12 +1038,7 @@ public SCM build(SCMHead head, SCMRevision revision) {
     }
 
     private void setPrimaryCloneLinks(List<BitbucketHref> links) {
-        BitbucketAuthenticator authenticator = authenticator();
-        if (authenticator == null) {
-            primaryCloneLinks = links;
-        } else {
-            primaryCloneLinks = links.stream().map(authenticator::addAuthToken).collect(Collectors.toList());
-        }
+        primaryCloneLinks = links;
     }
 
     @NonNull