From 786aa9ae3ac8dde2f2097fd36f1f18b96e37176f Mon Sep 17 00:00:00 2001
From: Manoj - <kaparwan@gmail.com>
Date: Tue, 2 Feb 2021 22:59:51 +1100
Subject: [PATCH] branchUrl backward compatibility  if 404 with new format

---
 packages/integration/src/bitbucket/core.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/integration/src/bitbucket/core.ts b/packages/integration/src/bitbucket/core.ts
index e9a76d1ee0..f22c727f63 100644
--- a/packages/integration/src/bitbucket/core.ts
+++ b/packages/integration/src/bitbucket/core.ts
@@ -32,12 +32,19 @@ export async function getBitbucketDefaultBranch(
 
   const isHosted = resource === 'bitbucket.org';
   // Bitbucket Server https://docs.atlassian.com/bitbucket-server/rest/7.9.0/bitbucket-rest.html#idp184
-  // Changed branchUrl to support Atlassian Bitbucket v5.11.1 , which has different branchUrl format
   const branchUrl = isHosted
     ? `${config.apiBaseUrl}/repositories/${project}/${repoName}`
-    : `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/branches/default`;
+    : `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/default-branch`;
     
-  const response = await fetch(branchUrl, getBitbucketRequestOptions(config));
+  var response = await fetch(branchUrl, getBitbucketRequestOptions(config));
+  
+  if (response.status === 404) {
+    // First try the new format, and then if it gets specifically a 404 it should try the old format 
+    // (to support old  Atlassian Bitbucket v5.11.1 format ) 
+    branchUrl = `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/branches/default`;
+    response = await fetch(branchUrl, getBitbucketRequestOptions(config));
+  }
+  
   if (!response.ok) {
     const message = `Failed to retrieve default branch from ${branchUrl}, ${response.status} ${response.statusText}`;
     throw new Error(message);