fix bitbucket app password auth case

Author: msukkari

packages/backend/src/bitbucket.ts

@@ -64,7 +64,7 @@ export const getBitbucketReposFromConfig = async (config: BitbucketConnectionCon
     const token = await getTokenFromConfig(config.token, orgId, db, logger);
 
     //const deploymentType = config.deploymentType;
-    const client = cloudClient(token);
+    const client = cloudClient(config.user, token);
 
     let allRepos: BitbucketRepository[] = [];
     let notFound: {
@@ -101,12 +101,14 @@ export const getBitbucketReposFromConfig = async (config: BitbucketConnectionCon
     };
 }
 
-function cloudClient(token: string | undefined): BitbucketClient {
+function cloudClient(user: string | undefined, token: string | undefined): BitbucketClient {
+
+    const authorizationString = !user || user == "x-token-auth" ? `Bearer ${token}` : `Basic ${Buffer.from(`${user}:${token}`).toString('base64')}`;
     const clientOptions: ClientOptions = {
         baseUrl: BITBUCKET_CLOUD_API,
         headers: {
             Accept: "application/json",
-            Authorization: `Bearer ${token}`,
+            Authorization: authorizationString,
         },
     };
 

packages/backend/src/repoManager.ts

@@ -177,7 +177,7 @@ export class RepoManager implements IRepoManager {
             return undefined;
         }
 
-        const username = (() => {
+        let username = (() => {
             switch (repo.external_codeHostType) {
                 case 'gitlab':
                     return 'oauth2';
@@ -202,6 +202,11 @@ export class RepoManager implements IRepoManager {
             if (config.token) {
                 password = await getTokenFromConfig(config.token, connection.orgId, db, this.logger);
                 if (password) {
+                    // If we're using a bitbucket connection, check to see if we're provided a username
+                    if (connection.connectionType === 'bitbucket') {
+                        const bitbucketConfig = config as BitbucketConnectionConfig;
+                        username = bitbucketConfig.user ?? "x-token-auth";
+                    }
                     break;
                 }
             }