@atlassian-dc-mcp/bitbucket 0.17.0 → 0.17.1

package/src/__tests__/bitbucket-token-optimization.test.ts

@@ -1,3 +1,7 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { initializeRuntimeConfig } from '@atlassian-dc-mcp/common';
 import { BitbucketService } from '../bitbucket-service.js';
 import { PullRequestsService } from '../bitbucket-client/index.js';
 
@@ -67,12 +71,25 @@ function createComment(overrides: Record<string, unknown> = {}) {
 
 describe('BitbucketService token optimization paths', () => {
   let service: BitbucketService;
+  let tempHome: string;
+  let homedirSpy: jest.SpyInstance;
+  const originalPlatform = process.platform;
 
   beforeEach(() => {
+    tempHome = fs.mkdtempSync(path.join(os.tmpdir(), 'bitbucket-token-opt-home-'));
+    homedirSpy = jest.spyOn(os, 'homedir').mockReturnValue(tempHome);
+    Object.defineProperty(process, 'platform', { value: 'linux', configurable: true });
+    initializeRuntimeConfig();
     service = new BitbucketService('test-host', 'test-token');
     jest.clearAllMocks();
   });
 
+  afterEach(() => {
+    homedirSpy.mockRestore();
+    Object.defineProperty(process, 'platform', { value: originalPlatform, configurable: true });
+    fs.rmSync(tempHome, { recursive: true, force: true });
+  });
+
   describe('getPullRequestCommentsAndActions', () => {
     const mockActivityResponse = {
       isLastPage: false,

package/src/bitbucket-service.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { OpenAPI, ProjectService, PullRequestsService, RepositoryService } from './bitbucket-client/index.js';
 import { request as __request } from './bitbucket-client/core/request.js';
-import { handleApiOperation } from '@atlassian-dc-mcp/common';
+import { handleApiOperation, resolveOpenApiBase } from '@atlassian-dc-mcp/common';
 import { simplifyInboxPullRequests } from './inbox-pr-mapper.js';
 import { getDefaultPageSize, getMissingConfig } from './config.js';
 import {
@@ -29,17 +29,15 @@ export class BitbucketService {
   constructor(
     host: string | undefined,
     token: string | (() => string | undefined),
-    fullBaseUrl?: string,
+    apiBasePath?: string,
     getPageSize: () => number = getDefaultPageSize,
   ) {
-    if (fullBaseUrl) {
-      OpenAPI.BASE = fullBaseUrl;
-    } else if (host) {
-      OpenAPI.BASE = `https://${host}/rest`;
-    } else {
-      throw new Error('Either host or fullBaseUrl must be provided');
-    }
-
+    OpenAPI.BASE = resolveOpenApiBase({
+      host,
+      apiBasePath,
+      defaultBasePath: '/rest',
+      strippableSuffixes: ['/api/1.0', '/api/latest'],
+    });
     OpenAPI.TOKEN = resolveToken(token, 'Missing required environment variable: BITBUCKET_API_TOKEN');
     OpenAPI.VERSION = '1.0';
     this.getPageSize = getPageSize;

package/src/config.ts

@@ -12,7 +12,7 @@ export const BITBUCKET_PRODUCT: ProductDefinition = {
     token: 'BITBUCKET_API_TOKEN',
     defaultPageSize: 'BITBUCKET_DEFAULT_PAGE_SIZE',
   },
-  defaultApiBasePath: '/rest/api/1.0',
+  defaultApiBasePath: '/rest',
 };
 
 export function getBitbucketRuntimeConfig() {