Skip to content

Commit 9ee2230

Browse files
sergeibbbsergeibbb
committed
Shows connected bitbucket-server integration on remotes
(#4107, #4146)
1 parent 916f92d commit 9ee2230

File tree

4 files changed

+291
-6
lines changed

4 files changed

+291
-6
lines changed

‎src/constants.storage.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export type GlobalStorage = {
9595
[key in `azure:${string}:projects`]: Stored<StoredAzureProject[] | undefined>;
9696
} & { [key in `bitbucket:${string}:account`]: Stored<StoredBitbucketAccount | undefined> } & {
9797
[key in `bitbucket:${string}:workspaces`]: Stored<StoredBitbucketWorkspace[] | undefined>;
98-
};
98+
} & { [key in `bitbucket-server:${string}:account`]: Stored<StoredBitbucketAccount | undefined> };
9999

100100
export type StoredIntegrationConfigurations = Record<string, StoredConfiguredIntegrationDescriptor[] | undefined>;
101101

‎src/plus/integrations/integrationService.ts

+46
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,47 @@ export class IntegrationService implements Disposable {
614614
await import(/* webpackChunkName: "integrations" */ './providers/bitbucket')
615615
).BitbucketIntegration(this.container, this.authenticationService, this.getProvidersApi.bind(this));
616616
break;
617+
case SelfHostedIntegrationId.BitbucketServer:
618+
if (domain == null) {
619+
integration = this.findCachedById(id);
620+
if (integration != null) {
621+
// return immediately in order to not to cache it after the "switch" block:
622+
return integration;
623+
}
624+
625+
const existingConfigured = await this.getConfigured({
626+
id: SelfHostedIntegrationId.BitbucketServer,
627+
});
628+
if (existingConfigured.length) {
629+
const { domain: configuredDomain } = existingConfigured[0];
630+
if (configuredDomain == null) {
631+
throw new Error(`Domain is required for '${id}' integration`);
632+
}
633+
integration = new (
634+
await import(/* webpackChunkName: "integrations" */ './providers/bitbucket-server')
635+
).BitbucketServerIntegration(
636+
this.container,
637+
this.authenticationService,
638+
this.getProvidersApi.bind(this),
639+
configuredDomain,
640+
);
641+
// assign domain because it's part of caching key:
642+
domain = configuredDomain;
643+
break;
644+
}
645+
646+
return undefined;
647+
}
648+
649+
integration = new (
650+
await import(/* webpackChunkName: "integrations" */ './providers/bitbucket-server')
651+
).BitbucketServerIntegration(
652+
this.container,
653+
this.authenticationService,
654+
this.getProvidersApi.bind(this),
655+
domain,
656+
);
657+
break;
617658
case HostingIntegrationId.AzureDevOps:
618659
integration = new (
619660
await import(/* webpackChunkName: "integrations" */ './providers/azureDevOps')
@@ -685,6 +726,11 @@ export class IntegrationService implements Disposable {
685726
return get(HostingIntegrationId.Bitbucket) as RT;
686727
}
687728
return (getOrGetCached === this.get ? Promise.resolve(undefined) : undefined) as RT;
729+
case 'bitbucket-server':
730+
if (!isBitbucketCloudDomain(remote.provider.domain)) {
731+
return get(SelfHostedIntegrationId.BitbucketServer) as RT;
732+
}
733+
return (getOrGetCached === this.get ? Promise.resolve(undefined) : undefined) as RT;
688734
case 'github':
689735
if (remote.provider.domain != null && !isGitHubDotCom(remote.provider.domain)) {
690736
return get(

‎src/plus/integrations/providers/bitbucket-server.ts

+238
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
import type { AuthenticationSession, CancellationToken } from 'vscode';
2+
import { md5 } from '@env/crypto';
3+
import { SelfHostedIntegrationId } from '../../../constants.integrations';
4+
import type { Container } from '../../../container';
5+
import type { Account } from '../../../git/models/author';
6+
import type { DefaultBranch } from '../../../git/models/defaultBranch';
7+
import type { Issue, IssueShape } from '../../../git/models/issue';
8+
import type { IssueOrPullRequest, IssueOrPullRequestType } from '../../../git/models/issueOrPullRequest';
9+
import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../../git/models/pullRequest';
10+
import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata';
11+
import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider';
12+
import type { IntegrationAuthenticationService } from '../authentication/integrationAuthenticationService';
13+
import type { ProviderAuthenticationSession } from '../authentication/models';
14+
import { HostingIntegration } from '../integration';
15+
import type { BitbucketRepositoryDescriptor } from './bitbucket/models';
16+
import { fromProviderPullRequest, providersMetadata } from './models';
17+
import type { ProvidersApi } from './providersApi';
18+
19+
const metadata = providersMetadata[SelfHostedIntegrationId.BitbucketServer];
20+
const authProvider = Object.freeze({ id: metadata.id, scopes: metadata.scopes });
21+
22+
export class BitbucketServerIntegration extends HostingIntegration<
23+
SelfHostedIntegrationId.BitbucketServer,
24+
BitbucketRepositoryDescriptor
25+
> {
26+
readonly authProvider: IntegrationAuthenticationProviderDescriptor = authProvider;
27+
readonly id = SelfHostedIntegrationId.BitbucketServer;
28+
protected readonly key =
29+
`${this.id}:${this.domain}` satisfies `${SelfHostedIntegrationId.BitbucketServer}:${string}`;
30+
readonly name: string = 'Bitbucket Data Center';
31+
32+
constructor(
33+
container: Container,
34+
authenticationService: IntegrationAuthenticationService,
35+
getProvidersApi: () => Promise<ProvidersApi>,
36+
private readonly _domain: string,
37+
) {
38+
super(container, authenticationService, getProvidersApi);
39+
}
40+
41+
get domain(): string {
42+
return this._domain;
43+
}
44+
45+
protected get apiBaseUrl(): string {
46+
return `https://${this.domain}/rest/api/1.0`;
47+
}
48+
49+
protected override async mergeProviderPullRequest(
50+
{ accessToken }: AuthenticationSession,
51+
pr: PullRequest,
52+
options?: {
53+
mergeMethod?: PullRequestMergeMethod;
54+
},
55+
): Promise<boolean> {
56+
const api = await this.getProvidersApi();
57+
return api.mergePullRequest(this.id, pr, {
58+
accessToken: accessToken,
59+
mergeMethod: options?.mergeMethod,
60+
});
61+
}
62+
63+
protected override async getProviderAccountForCommit(
64+
_session: AuthenticationSession,
65+
_repo: BitbucketRepositoryDescriptor,
66+
_ref: string,
67+
_options?: {
68+
avatarSize?: number;
69+
},
70+
): Promise<Account | undefined> {
71+
return Promise.resolve(undefined);
72+
}
73+
74+
protected override async getProviderAccountForEmail(
75+
_session: AuthenticationSession,
76+
_repo: BitbucketRepositoryDescriptor,
77+
_email: string,
78+
_options?: {
79+
avatarSize?: number;
80+
},
81+
): Promise<Account | undefined> {
82+
return Promise.resolve(undefined);
83+
}
84+
85+
protected override async getProviderDefaultBranch(
86+
_session: AuthenticationSession,
87+
_repo: BitbucketRepositoryDescriptor,
88+
): Promise<DefaultBranch | undefined> {
89+
return Promise.resolve(undefined);
90+
}
91+
92+
protected override async getProviderIssueOrPullRequest(
93+
{ accessToken }: AuthenticationSession,
94+
repo: BitbucketRepositoryDescriptor,
95+
id: string,
96+
type: undefined | IssueOrPullRequestType,
97+
): Promise<IssueOrPullRequest | undefined> {
98+
if (type !== 'pullrequest') {
99+
return undefined;
100+
}
101+
return (await this.container.bitbucket)?.getIssueOrPullRequest(
102+
this,
103+
accessToken,
104+
repo.owner,
105+
repo.name,
106+
id,
107+
this.apiBaseUrl,
108+
{
109+
type: 'pullrequest',
110+
},
111+
);
112+
}
113+
114+
protected override async getProviderIssue(
115+
_session: AuthenticationSession,
116+
_repo: BitbucketRepositoryDescriptor,
117+
_id: string,
118+
): Promise<Issue | undefined> {
119+
return Promise.resolve(undefined);
120+
}
121+
122+
protected override async getProviderPullRequestForBranch(
123+
_session: AuthenticationSession,
124+
_repo: BitbucketRepositoryDescriptor,
125+
_branch: string,
126+
_options?: {
127+
avatarSize?: number;
128+
include?: PullRequestState[];
129+
},
130+
): Promise<PullRequest | undefined> {
131+
return Promise.resolve(undefined);
132+
}
133+
134+
protected override async getProviderPullRequestForCommit(
135+
_session: AuthenticationSession,
136+
_repo: BitbucketRepositoryDescriptor,
137+
_ref: string,
138+
): Promise<PullRequest | undefined> {
139+
return Promise.resolve(undefined);
140+
}
141+
142+
protected override async getProviderRepositoryMetadata(
143+
_session: AuthenticationSession,
144+
_repo: BitbucketRepositoryDescriptor,
145+
_cancellation?: CancellationToken,
146+
): Promise<RepositoryMetadata | undefined> {
147+
return Promise.resolve(undefined);
148+
}
149+
150+
private _accounts: Map<string, Account | undefined> | undefined;
151+
protected override async getProviderCurrentAccount({
152+
accessToken,
153+
}: AuthenticationSession): Promise<Account | undefined> {
154+
this._accounts ??= new Map<string, Account | undefined>();
155+
156+
const cachedAccount = this._accounts.get(accessToken);
157+
if (cachedAccount == null) {
158+
const api = await this.getProvidersApi();
159+
const user = await api.getCurrentUser(this.id, { accessToken: accessToken, baseUrl: this.apiBaseUrl });
160+
this._accounts.set(
161+
accessToken,
162+
user
163+
? {
164+
provider: this,
165+
id: user.id,
166+
name: user.name ?? undefined,
167+
email: user.email ?? undefined,
168+
avatarUrl: user.avatarUrl ?? undefined,
169+
username: user.username ?? undefined,
170+
}
171+
: undefined,
172+
);
173+
}
174+
175+
return this._accounts.get(accessToken);
176+
}
177+
178+
protected override async searchProviderMyPullRequests(
179+
session: ProviderAuthenticationSession,
180+
repos?: BitbucketRepositoryDescriptor[],
181+
): Promise<PullRequest[] | undefined> {
182+
if (repos != null) {
183+
// TODO: implement repos version
184+
return undefined;
185+
}
186+
187+
const api = await this.getProvidersApi();
188+
const integration = await this.container.integrations.get(this.id);
189+
if (!api || !integration) {
190+
return undefined;
191+
}
192+
const prs = await api.getBitbucketServerPullRequestsForCurrentUser({ accessToken: session.accessToken });
193+
return prs?.map(pr => fromProviderPullRequest(pr, integration));
194+
}
195+
196+
protected override async searchProviderMyIssues(
197+
_session: AuthenticationSession,
198+
_repos?: BitbucketRepositoryDescriptor[],
199+
): Promise<IssueShape[] | undefined> {
200+
return Promise.resolve(undefined);
201+
}
202+
203+
private readonly storagePrefix = 'bitbucket-server';
204+
protected override async providerOnConnect(): Promise<void> {
205+
if (this._session == null) return;
206+
207+
const accountStorageKey = md5(this._session.accessToken);
208+
209+
const storedAccount = this.container.storage.get(`${this.storagePrefix}:${accountStorageKey}:account`);
210+
211+
let account: Account | undefined = storedAccount?.data ? { ...storedAccount.data, provider: this } : undefined;
212+
213+
if (storedAccount == null) {
214+
account = await this.getProviderCurrentAccount(this._session);
215+
if (account != null) {
216+
// Clear all other stored workspaces and repositories and accounts when our session changes
217+
await this.container.storage.deleteWithPrefix(this.storagePrefix);
218+
await this.container.storage.store(`${this.storagePrefix}:${accountStorageKey}:account`, {
219+
v: 1,
220+
timestamp: Date.now(),
221+
data: {
222+
id: account.id,
223+
name: account.name,
224+
email: account.email,
225+
avatarUrl: account.avatarUrl,
226+
username: account.username,
227+
},
228+
});
229+
}
230+
}
231+
this._accounts ??= new Map<string, Account | undefined>();
232+
this._accounts.set(this._session.accessToken, account);
233+
}
234+
235+
protected override providerOnDisconnect(): void {
236+
this._accounts = undefined;
237+
}
238+
}

‎src/plus/integrations/providers/bitbucket.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,14 @@ export class BitbucketIntegration extends HostingIntegration<
279279
return issueResult;
280280
}
281281

282+
private readonly storagePrefix = 'bitbucket';
282283
protected override async providerOnConnect(): Promise<void> {
283284
if (this._session == null) return;
284285

285286
const accountStorageKey = md5(this._session.accessToken);
286287

287-
const storedAccount = this.container.storage.get(`bitbucket:${accountStorageKey}:account`);
288-
const storedWorkspaces = this.container.storage.get(`bitbucket:${accountStorageKey}:workspaces`);
288+
const storedAccount = this.container.storage.get(`${this.storagePrefix}:${accountStorageKey}:account`);
289+
const storedWorkspaces = this.container.storage.get(`${this.storagePrefix}:${accountStorageKey}:workspaces`);
289290

290291
let account: Account | undefined = storedAccount?.data ? { ...storedAccount.data, provider: this } : undefined;
291292
let workspaces = storedWorkspaces?.data?.map(o => ({ ...o }));
@@ -294,8 +295,8 @@ export class BitbucketIntegration extends HostingIntegration<
294295
account = await this.getProviderCurrentAccount(this._session);
295296
if (account != null) {
296297
// Clear all other stored workspaces and repositories and accounts when our session changes
297-
await this.container.storage.deleteWithPrefix('bitbucket');
298-
await this.container.storage.store(`bitbucket:${accountStorageKey}:account`, {
298+
await this.container.storage.deleteWithPrefix(this.storagePrefix);
299+
await this.container.storage.store(`${this.storagePrefix}:${accountStorageKey}:account`, {
299300
v: 1,
300301
timestamp: Date.now(),
301302
data: {
@@ -313,7 +314,7 @@ export class BitbucketIntegration extends HostingIntegration<
313314

314315
if (storedWorkspaces == null) {
315316
workspaces = await this.getProviderResourcesForUser(this._session, true);
316-
await this.container.storage.store(`bitbucket:${accountStorageKey}:workspaces`, {
317+
await this.container.storage.store(`${this.storagePrefix}:${accountStorageKey}:workspaces`, {
317318
v: 1,
318319
timestamp: Date.now(),
319320
data: workspaces,

0 commit comments

Comments
 (0)