[bbs] fix incorrect revision fetch EXP-496 (#18572)

* [bbs] fix incorrect revision fetch

* Fixup

* fixup

* 1

* Revert tests and address feedback

* fixup

Author: mustard-mh

components/server/src/bitbucket-server/bitbucket-server-api.ts

@@ -10,6 +10,7 @@ import { inject, injectable } from "inversify";
 import { AuthProviderParams } from "../auth/auth-provider";
 import { BitbucketServerTokenHelper } from "./bitbucket-server-token-handler";
 import { CancellationToken } from "vscode-jsonrpc";
+import * as qs from "node:querystring";
 
 @injectable()
 export class BitbucketServerApi {
@@ -190,6 +191,51 @@ export class BitbucketServerApi {
         );
     }
 
+    async getBranchLatestCommit(
+        user: User,
+        params: {
+            repoKind: "projects" | "users" | string;
+            owner: string;
+            repositorySlug: string;
+            branch: string;
+        },
+    ): Promise<BitbucketServer.Branch | undefined> {
+        // @see https://developer.atlassian.com/server/bitbucket/rest/v811/api-group-repository/#api-api-latest-projects-projectkey-repos-repositoryslug-branches-get
+        // @see https://bitbucket.gitpod-dev.com/rest/api/1.0/users/huiwen/repos/mustard/branches?filterText=develop
+        const queryParam = qs.stringify({
+            filterText: params.branch,
+            boostMatches: true,
+        });
+        const q = "?" + queryParam;
+        const list = await this.runQuery<BitbucketServer.Paginated<BitbucketServer.Branch>>(
+            user,
+            `/${params.repoKind}/${params.owner}/repos/${params.repositorySlug}/branches${q}`,
+        );
+        return list.values?.find((e) => e.displayId === params.branch);
+    }
+
+    async getTagLatestCommit(
+        user: User,
+        params: {
+            repoKind: "projects" | "users" | string;
+            owner: string;
+            repositorySlug: string;
+            tag: string;
+        },
+    ): Promise<BitbucketServer.Tag | undefined> {
+        // @see https://developer.atlassian.com/server/bitbucket/rest/v811/api-group-repository/#api-api-latest-projects-projectkey-repos-repositoryslug-tags-get
+        // @see https://bitbucket.gitpod-dev.com/rest/api/1.0/users/huiwen/repos/mustard/tags?filterText=11
+        const queryParam = qs.stringify({
+            filterText: params.tag,
+        });
+        const q = "?" + queryParam;
+        const list = await this.runQuery<BitbucketServer.Paginated<BitbucketServer.Tag>>(
+            user,
+            `/${params.repoKind}/${params.owner}/repos/${params.repositorySlug}/tags${q}`,
+        );
+        return list.values?.find((e) => e.displayId === params.tag);
+    }
+
     async getDefaultBranch(
         user: User,
         params: { repoKind: "projects" | "users"; owner: string; repositorySlug: string },
@@ -411,6 +457,13 @@ export namespace BitbucketServer {
         isDefault: boolean;
     }
 
+    export interface Tag {
+        id: string;
+        displayId: string;
+        type: "TAG" | string;
+        latestCommit: string;
+    }
+
     export interface BranchWithMeta extends Branch {
         latestCommitMetadata: Commit;
         htmlUrl: string;

components/server/src/bitbucket-server/bitbucket-server-context-parser.ts

@@ -160,23 +160,60 @@ export class BitbucketServerContextParser extends AbstractContextParser implemen
                 more.ref = more.ref || repository.defaultBranch;
             }
             more.refType = more.refType || "branch";
-
             if (!more.revision) {
-                const tipCommitOnDefaultBranch = await this.api.getCommits(user, {
-                    repoKind,
-                    owner,
-                    repositorySlug: repoName,
-                    query: { limit: 1 },
-                });
-                const commits = tipCommitOnDefaultBranch?.values || [];
-                if (commits.length === 0) {
+                switch (more.refType) {
+                    case "branch": {
+                        if (!more.ref) {
+                            break;
+                        }
+                        const info = await this.api.getBranchLatestCommit(user, {
+                            repoKind,
+                            owner,
+                            repositorySlug: repoName,
+                            branch: more.ref!,
+                        });
+                        if (info) {
+                            more.revision = info.latestCommit;
+                        }
+                        break;
+                    }
+                    case "tag": {
+                        if (!more.ref) {
+                            break;
+                        }
+                        const info = await this.api.getTagLatestCommit(user, {
+                            repoKind,
+                            owner,
+                            repositorySlug: repoName,
+                            tag: more.ref!,
+                        });
+                        if (info) {
+                            more.revision = info.latestCommit;
+                        }
+                        break;
+                    }
+                    case "revision":
+                    default: {
+                        const tipCommitOnDefaultBranch = await this.api.getCommits(user, {
+                            repoKind,
+                            owner,
+                            repositorySlug: repoName,
+                            query: { limit: 1 },
+                        });
+                        const commits = tipCommitOnDefaultBranch?.values || [];
+                        if (commits.length === 0) {
+                            break;
+                        } else {
+                            more.revision = commits[0].id;
+                            // more.refType = "revision";
+                        }
+                    }
+                }
+                if (!more.revision) {
                     // empty repo
                     more.ref = undefined;
                     more.revision = "";
                     more.refType = undefined;
-                } else {
-                    more.revision = commits[0].id;
-                    // more.refType = "revision";
                 }
             }
 

components/server/src/bitbucket-server/bitbucket-server-file-provider.ts

@@ -45,7 +45,11 @@ export class BitbucketServerFileProvider implements FileProvider {
         const { owner, name, repoKind } = commit.repository;
 
         try {
-            const result = await this.api.fetchContent(user, `/${repoKind}/${owner}/repos/${name}/raw/${path}`);
+            // @see https://developer.atlassian.com/server/bitbucket/rest/v811/api-group-repository/#api-api-latest-projects-projectkey-repos-repositoryslug-raw-path-get
+            const result = await this.api.fetchContent(
+                user,
+                `/${repoKind}/${owner}/repos/${name}/raw/${path}?at=${commit.revision}`,
+            );
             return result;
         } catch (err) {
             console.debug({ userId: user.id }, err);