From c51763abd6dff210645a7c517114fcd05a5e71b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20B=C3=B6hm?= <thomas.boehm@tractive.com>
Date: Wed, 20 Mar 2024 09:00:03 +0100
Subject: [PATCH] Add project key to cache key

If a requests is sent with a project key, and the key is not part of the cache key, following requests for other projects will result in the cached repositories for the first project, leading to wrong results
---
 .../plugins/bitbucket/client/BitbucketCloudApiClient.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java
index b79ffaf64..0e363b1e3 100644
--- a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java
+++ b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java
@@ -784,11 +784,17 @@ public List<BitbucketCloudRepository> getRepositories(@CheckForNull UserRoleInRe
                 .set("pagelen", MAX_PAGE_LENGTH);
         if (StringUtils.isNotBlank(projectKey)) {
             template.set("q", "project.key=" + "\"" + projectKey + "\""); // q=project.key="<projectKey>"
+            cacheKey.append("::").append(projectKey);
+        } else {
+            cacheKey.append("::<undefined>");
         }
         if (role != null &&  authenticator != null) {
             template.set("role", role.getId());
             cacheKey.append("::").append(role.getId());
+        } else {
+            cacheKey.append("::<undefined>");
         }
+
         Callable<List<BitbucketCloudRepository>> request = () -> {
             List<BitbucketCloudRepository> repositories = new ArrayList<>();
             Integer pageNumber = 1;