Make it work?

Author: filiptronicek

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

@@ -4,18 +4,22 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { HTTPError } from "bitbucket/src/error/types";
+import { RequestOptions } from "bitbucket/src/plugins/register-endpoints/types";
 
-export class BitbucketHttpError extends Error {
-    status: number;
-    constructor(originalErr: HTTPError, message: string) {
-        if (originalErr.request?.headers.authorization) {
-            originalErr.request.headers.authorization = "<redacted>";
-        }
-        super(message);
-    }
+// this, because for some reason we can't import HTTPError from bitbucket/src/error/types. This is only a subset of the actual class
+export abstract class HTTPError extends Error {
+    public request: RequestOptions | undefined;
 }
 
 export function handleBitbucketError(err: Error): Error {
-    return err instanceof HTTPError ? new BitbucketHttpError(err, "Error parsing BB context") : err;
+    if (err.name !== "HTTPError") {
+        return err;
+    }
+
+    const httpError = err as HTTPError;
+    if (httpError.request?.headers.authorization) {
+        httpError.request.headers.authorization = "<redacted>";
+    }
+
+    return httpError;
 }

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

@@ -12,6 +12,7 @@ import { RepoURL } from "../repohost/repo-url";
 import { RepositoryProvider } from "../repohost/repository-provider";
 import { BitbucketApiFactory } from "./bitbucket-api-factory";
 import asyncBatch from "async-batch";
+import { handleBitbucketError } from "../bitbucket-server/utils";
 
 @injectable()
 export class BitbucketRepositoryProvider implements RepositoryProvider {
@@ -124,7 +125,8 @@ export class BitbucketRepositoryProvider implements RepositoryProvider {
     async hasReadAccess(user: User, owner: string, repo: string): Promise<boolean> {
         const api = await this.apiFactory.create(user);
         const result = await api.repositories.get({ workspace: owner, repo_slug: repo }).catch((e) => {
-            console.warn({ userId: user.id }, "hasReadAccess error", { owner, repo, status: e.status });
+            const error = e instanceof Error ? handleBitbucketError(e) : e;
+            console.warn({ userId: user.id }, "hasReadAccess error", error, { owner, repo });
             return null;
         });