From 37bc6f2a522b6815c1926491705ae30b81674d55 Mon Sep 17 00:00:00 2001 From: Adela Homolova Date: Sun, 8 Dec 2019 14:05:08 +0100 Subject: [PATCH] fix: as the bitbucket fails if the account is a team account add possibility to ownerId be a null --- src/services/bitbucket/BitbucketService.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/services/bitbucket/BitbucketService.ts b/src/services/bitbucket/BitbucketService.ts index fb0d9bbbe..141ca7880 100644 --- a/src/services/bitbucket/BitbucketService.ts +++ b/src/services/bitbucket/BitbucketService.ts @@ -95,7 +95,14 @@ export class BitbucketService implements IVCSService { } const ownerUrl = `www.bitbucket.org/${owner}`; - const ownerId = `${(await this.client.users.get({ username: owner })).data.uuid}`; + let ownerId: string | null; + try { + ownerId = `${(await this.client.users.get({ username: 'atlassian' })).data.uuid}`; + } catch (error) { + if (error.message.includes('is a team account')) { + ownerId = null; + } + } const response: DeepRequired> = await axios.get(apiUrl); @@ -122,7 +129,7 @@ export class BitbucketService implements IVCSService { id: val.destination.repository.uuid, owner: { login: owner, - id: ownerId, + id: ownerId, url: ownerUrl, }, },