Implements getAccountForCommit for Bitbucket DataCenter

(#4192, #4243)

Author: sergeibbb

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

@@ -2,7 +2,7 @@ import type { AuthenticationSession, CancellationToken } from 'vscode';
 import { md5 } from '@env/crypto';
 import { SelfHostedIntegrationId } from '../../../constants.integrations';
 import type { Container } from '../../../container';
-import type { Account } from '../../../git/models/author';
+import type { Account, UnidentifiedAuthor } from '../../../git/models/author';
 import type { DefaultBranch } from '../../../git/models/defaultBranch';
 import type { Issue, IssueShape } from '../../../git/models/issue';
 import type { IssueOrPullRequest, IssueOrPullRequestType } from '../../../git/models/issueOrPullRequest';
@@ -64,14 +64,24 @@ export class BitbucketServerIntegration extends HostingIntegration<
 	}
 
 	protected override async getProviderAccountForCommit(
-		_session: AuthenticationSession,
-		_repo: BitbucketRepositoryDescriptor,
-		_rev: string,
-		_options?: {
+		{ accessToken }: AuthenticationSession,
+		repo: BitbucketRepositoryDescriptor,
+		rev: string,
+		options?: {
 			avatarSize?: number;
 		},
-	): Promise<Account | undefined> {
-		return Promise.resolve(undefined);
+	): Promise<Account | UnidentifiedAuthor | undefined> {
+		return (await this.container.bitbucket)?.getServerAccountForCommit(
+			this,
+			accessToken,
+			repo.owner,
+			repo.name,
+			rev,
+			this.apiBaseUrl,
+			{
+				avatarSize: options?.avatarSize,
+			},
+		);
 	}
 
 	protected override async getProviderAccountForEmail(

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

@@ -51,6 +51,12 @@ export interface BitbucketServerPullRequestRef {
 	};
 }
 
+export interface BitbucketAuthor {
+	name: string;
+	emailAddress: string;
+	id: undefined;
+}
+
 export interface BitbucketServerUser {
 	name: string;
 	emailAddress: string;
@@ -73,6 +79,22 @@ export interface BitbucketServerPullRequestUser {
 	status: 'UNAPPROVED' | 'NEEDS_WORK' | 'APPROVED';
 }
 
+export interface BitbucketServerBriefCommit {
+	displayId: string;
+	id: string;
+}
+
+export interface BitbucketServerCommit {
+	author: BitbucketServerUser | BitbucketAuthor;
+	authorTimestamp: number;
+	committer: BitbucketServerUser | BitbucketAuthor;
+	committerTimestamp: number;
+	displayId: string;
+	id: string;
+	message: string;
+	parents: (BitbucketServerCommit | BitbucketServerBriefCommit)[];
+}
+
 export interface BitbucketServerPullRequest {
 	id: number;
 	version: number;

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

@@ -26,7 +26,7 @@ import { Logger } from '../../../../system/logger';
 import type { LogScope } from '../../../../system/logger.scope';
 import { getLogScope } from '../../../../system/logger.scope';
 import { maybeStopWatch } from '../../../../system/stopwatch';
-import type { BitbucketServerPullRequest } from '../bitbucket-server/models';
+import type { BitbucketServerCommit, BitbucketServerPullRequest } from '../bitbucket-server/models';
 import { normalizeBitbucketServerPullRequest } from '../bitbucket-server/models';
 import { fromProviderPullRequest } from '../models';
 import type { BitbucketCommit, BitbucketIssue, BitbucketPullRequest, BitbucketRepository } from './models';
@@ -519,6 +519,60 @@ export class BitbucketApi implements Disposable {
 		}
 	}
 
+	@debug<BitbucketApi['getServerAccountForCommit']>({ args: { 0: p => p.name, 1: '<token>' } })
+	async getServerAccountForCommit(
+		provider: Provider,
+		token: string,
+		owner: string,
+		repo: string,
+		rev: string,
+		baseUrl: string,
+		_options?: {
+			avatarSize?: number;
+		},
+		cancellation?: CancellationToken,
+	): Promise<Account | UnidentifiedAuthor | undefined> {
+		const scope = getLogScope();
+
+		try {
+			const commit = await this.request<BitbucketServerCommit>(
+				provider,
+				token,
+				baseUrl,
+				`projects/${owner}/repos/${repo}/commits/${rev}`,
+				{
+					method: 'GET',
+				},
+				scope,
+				cancellation,
+			);
+			if (!commit?.author) {
+				return undefined;
+			}
+			if (commit.author.id != null) {
+				return {
+					provider: provider,
+					id: commit.author.id.toString(),
+					username: commit.author.name,
+					name: commit.author.name,
+					email: commit.author.emailAddress,
+					avatarUrl: commit.author?.avatarUrl,
+				} satisfies Account;
+			}
+			return {
+				provider: provider,
+				id: undefined,
+				username: undefined,
+				name: commit.author.name,
+				email: commit.author.emailAddress,
+				avatarUrl: undefined,
+			} satisfies UnidentifiedAuthor;
+		} catch (ex) {
+			Logger.error(ex, scope);
+			return undefined;
+		}
+	}
+
 	private async request<T>(
 		provider: Provider,
 		token: string,