fix(bitbucket): attempt to fix bitbucket URL parsing

DXHeroes · Nov 16, 2019 · ef1a4d8 · ef1a4d8
1 parent e733cd6
commit ef1a4d8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/services/bitbucket/BitbucketService.ts b/src/services/bitbucket/BitbucketService.ts
@@ -43,11 +43,19 @@ export class BitbucketService implements ICVSService {
 
     this.client = new Bitbucket(clientOptions);
 
-    const username = GitUrlParse(argumentsProvider.uri).owner;
+    let username: string;
+    let password: string | undefined;
+    if (argumentsProvider.auth?.includes(':')) {
+      username = argumentsProvider.auth.split(':')[0];
+      password = argumentsProvider.auth.split(':')[1];
+    } else {
+      username = GitUrlParse(argumentsProvider.uri).owner;
+      password = argumentsProvider.auth;
+    }
 
     let auth: Bitbucket.Auth;
     if (argumentsProvider.auth) {
-      auth = { type: 'apppassword', username: username, password: argumentsProvider.auth };
+      auth = { type: 'apppassword', username, password: password! };
       this.client.authenticate(auth);
     }
   }

diff --git a/src/services/git/GitServiceUtils.ts b/src/services/git/GitServiceUtils.ts
@@ -29,6 +29,8 @@ export class GitServiceUtils {
     switch (service) {
       case GitService.github:
         return `/tree/${branch}${path}`;
+      case GitService.bitbucket:
+        return `/src/${branch}${path}`;
 
       default:
         return assertNever(service);

diff --git a/src/services/git/model.ts b/src/services/git/model.ts
@@ -1,5 +1,6 @@
 export enum GitService {
   github = 'github.com',
+  bitbucket = 'bitbucket.org',
 }
 
 export interface UserInfo {