fix token issues

jussi-sa · jussi-sa · commit 4992d04bc0e6 · 2025-09-10T11:11:02.000+03:00
diff --git a/src/tools/MapboxApiBasedTool.ts b/src/tools/MapboxApiBasedTool.ts
@@ -5,9 +5,13 @@ import { BaseTool, OutputSchema } from './BaseTool.js';
 export abstract class MapboxApiBasedTool<
   InputSchema extends ZodTypeAny
 > extends BaseTool<InputSchema> {
-  static readonly MAPBOX_ACCESS_TOKEN = process.env.MAPBOX_ACCESS_TOKEN;
-  static readonly MAPBOX_API_ENDPOINT =
-    process.env.MAPBOX_API_ENDPOINT || 'https://api.mapbox.com/';
+  static get mapboxAccessToken() {
+    return process.env.MAPBOX_ACCESS_TOKEN;
+  }
+
+  static get mapboxApiEndpoint() {
+    return process.env.MAPBOX_API_ENDPOINT || 'https://api.mapbox.com/';
+  }
 
   constructor(params: { inputSchema: InputSchema }) {
     super(params);
@@ -20,12 +24,12 @@ export abstract class MapboxApiBasedTool<
    */
   static getUserNameFromToken(access_token?: string): string {
     if (!access_token) {
-      if (!MapboxApiBasedTool.MAPBOX_ACCESS_TOKEN) {
+      if (!MapboxApiBasedTool.mapboxAccessToken) {
         throw new Error(
           'No access token provided. Please set MAPBOX_ACCESS_TOKEN environment variable or pass it as an argument.'
         );
       }
-      access_token = MapboxApiBasedTool.MAPBOX_ACCESS_TOKEN;
+      access_token = MapboxApiBasedTool.mapboxAccessToken;
     }
 
     try {
@@ -84,7 +88,7 @@ export abstract class MapboxApiBasedTool<
       // In the streamableHttp, the authInfo is injected into extra from `req.auth`
       // https://github.com/modelcontextprotocol/typescript-sdk/blob/main/src/server/streamableHttp.ts#L405
       const authToken = extra?.authInfo?.token;
-      const accessToken = authToken || MapboxApiBasedTool.MAPBOX_ACCESS_TOKEN;
+      const accessToken = authToken || MapboxApiBasedTool.mapboxAccessToken;
       if (!accessToken) {
         throw new Error(
           'No access token available. Please provide via Bearer auth or MAPBOX_ACCESS_TOKEN env var'
diff --git a/src/tools/create-style-tool/CreateStyleTool.ts b/src/tools/create-style-tool/CreateStyleTool.ts
@@ -20,7 +20,7 @@ export class CreateStyleTool extends MapboxApiBasedTool<
     accessToken?: string
   ): Promise<any> {
     const username = MapboxApiBasedTool.getUserNameFromToken(accessToken);
-    const url = `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}styles/v1/${username}?access_token=${accessToken}`;
+    const url = `${MapboxApiBasedTool.mapboxApiEndpoint}styles/v1/${username}?access_token=${accessToken}`;
 
     const payload = {
       name: input.name,
diff --git a/src/tools/create-token-tool/CreateTokenTool.ts b/src/tools/create-token-tool/CreateTokenTool.ts
@@ -27,7 +27,7 @@ export class CreateTokenTool extends MapboxApiBasedTool<
       `CreateTokenTool: Creating public token with note: "${input.note}", scopes: ${JSON.stringify(input.scopes)}`
     );
 
-    const url = `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}tokens/v2/${username}?access_token=${accessToken}`;
+    const url = `${MapboxApiBasedTool.mapboxApiEndpoint}tokens/v2/${username}?access_token=${accessToken}`;
 
     const body: {
       note: string;
diff --git a/src/tools/delete-style-tool/DeleteStyleTool.ts b/src/tools/delete-style-tool/DeleteStyleTool.ts
@@ -19,7 +19,7 @@ export class DeleteStyleTool extends MapboxApiBasedTool<
     accessToken?: string
   ): Promise<any> {
     const username = MapboxApiBasedTool.getUserNameFromToken(accessToken);
-    const url = `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}styles/v1/${username}/${input.styleId}?access_token=${accessToken}`;
+    const url = `${MapboxApiBasedTool.mapboxApiEndpoint}styles/v1/${username}/${input.styleId}?access_token=${accessToken}`;
 
     const response = await fetch(url, {
       method: 'DELETE'
diff --git a/src/tools/list-styles-tool/ListStylesTool.ts b/src/tools/list-styles-tool/ListStylesTool.ts
@@ -34,7 +34,7 @@ export class ListStylesTool extends MapboxApiBasedTool<
       params.append('start', input.start);
     }
 
-    const url = `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}styles/v1/${username}?${params.toString()}`;
+    const url = `${MapboxApiBasedTool.mapboxApiEndpoint}styles/v1/${username}?${params.toString()}`;
 
     const response = await this.fetchImpl(url);
 
diff --git a/src/tools/list-tokens-tool/ListTokensTool.ts b/src/tools/list-tokens-tool/ListTokensTool.ts
@@ -49,7 +49,7 @@ export class ListTokensTool extends MapboxApiBasedTool<
     }
 
     let url: string | null =
-      `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}tokens/v2/${username}?${params.toString()}`;
+      `${MapboxApiBasedTool.mapboxApiEndpoint}tokens/v2/${username}?${params.toString()}`;
     const allTokens: unknown[] = [];
     let pageCount = 0;
     let nextPageUrl: string | null = null;
diff --git a/src/tools/preview-style-tool/PreviewStyleTool.ts b/src/tools/preview-style-tool/PreviewStyleTool.ts
@@ -41,7 +41,7 @@ export class PreviewStyleTool extends BaseTool<typeof PreviewStyleSchema> {
     const hashFragment =
       hashParams.length > 0 ? `#${hashParams.join('/')}` : '';
 
-    const url = `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}styles/v1/${username}/${input.styleId}.html?${params.toString()}${hashFragment}`;
+    const url = `${MapboxApiBasedTool.mapboxApiEndpoint}styles/v1/${username}/${input.styleId}.html?${params.toString()}${hashFragment}`;
 
     return {
       type: 'text',
diff --git a/src/tools/retrieve-style-tool/RetrieveStyleTool.ts b/src/tools/retrieve-style-tool/RetrieveStyleTool.ts
@@ -19,7 +19,7 @@ export class RetrieveStyleTool extends MapboxApiBasedTool<
     accessToken?: string
   ): Promise<any> {
     const username = MapboxApiBasedTool.getUserNameFromToken(accessToken);
-    const url = `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}styles/v1/${username}/${input.styleId}?access_token=${accessToken}`;
+    const url = `${MapboxApiBasedTool.mapboxApiEndpoint}styles/v1/${username}/${input.styleId}?access_token=${accessToken}`;
 
     const response = await fetch(url);
 
diff --git a/src/tools/tilequery-tool/TilequeryTool.ts b/src/tools/tilequery-tool/TilequeryTool.ts
@@ -16,7 +16,7 @@ export class TilequeryTool extends MapboxApiBasedTool<typeof TilequerySchema> {
   ): Promise<any> {
     const { tilesetId, longitude, latitude, ...queryParams } = input;
     const url = new URL(
-      `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}v4/${tilesetId}/tilequery/${longitude},${latitude}.json`
+      `${MapboxApiBasedTool.mapboxApiEndpoint}v4/${tilesetId}/tilequery/${longitude},${latitude}.json`
     );
 
     if (queryParams.radius !== undefined) {
diff --git a/src/tools/update-style-tool/UpdateStyleTool.ts b/src/tools/update-style-tool/UpdateStyleTool.ts
@@ -19,7 +19,7 @@ export class UpdateStyleTool extends MapboxApiBasedTool<
     accessToken?: string
   ): Promise<any> {
     const username = MapboxApiBasedTool.getUserNameFromToken(accessToken);
-    const url = `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}styles/v1/${username}/${input.styleId}?access_token=${accessToken}`;
+    const url = `${MapboxApiBasedTool.mapboxApiEndpoint}styles/v1/${username}/${input.styleId}?access_token=${accessToken}`;
 
     const payload: any = {};
     if (input.name) payload.name = input.name;
diff --git a/test/tools/MapboxApiBasedTool.test.ts b/test/tools/MapboxApiBasedTool.test.ts
@@ -33,10 +33,15 @@ describe('MapboxApiBasedTool', () => {
   const originalEnv = process.env;
 
   beforeEach(() => {
-    vi.stubEnv(
-      'MAPBOX_ACCESS_TOKEN',
-      `eyJhbGciOiJIUzI1NiJ9.${payload}.signature`
-    );
+    const mockToken = `eyJhbGciOiJIUzI1NiJ9.${payload}.signature`;
+    vi.stubEnv('mapboxAccessToken', mockToken);
+
+    // Reset the static property to pick up the new environment variable
+    Object.defineProperty(MapboxApiBasedTool, 'mapboxAccessToken', {
+      value: mockToken,
+      writable: true,
+      configurable: true
+    });
 
     testTool = new TestTool();
     // Mock the log method to test that errors are properly logged
@@ -56,7 +61,7 @@ describe('MapboxApiBasedTool', () => {
         JSON.stringify({ u: 'myusername' })
       ).toString('base64');
       const spy = vi
-        .spyOn(MapboxApiBasedTool, 'MAPBOX_ACCESS_TOKEN', 'get')
+        .spyOn(MapboxApiBasedTool, 'mapboxAccessToken', 'get')
         .mockReturnValue(`eyJhbGciOiJIUzI1NiJ9.${testPayload}.signature`);
 
       const username = MapboxApiBasedTool.getUserNameFromToken();
@@ -67,7 +72,7 @@ describe('MapboxApiBasedTool', () => {
 
     it('throws error when token is not set', () => {
       const spy = vi
-        .spyOn(MapboxApiBasedTool, 'MAPBOX_ACCESS_TOKEN', 'get')
+        .spyOn(MapboxApiBasedTool, 'mapboxAccessToken', 'get')
         .mockReturnValue(undefined);
 
       expect(() => MapboxApiBasedTool.getUserNameFromToken()).toThrow(
@@ -79,7 +84,7 @@ describe('MapboxApiBasedTool', () => {
 
     it('throws error when token has invalid format', () => {
       const spy = vi
-        .spyOn(MapboxApiBasedTool, 'MAPBOX_ACCESS_TOKEN', 'get')
+        .spyOn(MapboxApiBasedTool, 'mapboxAccessToken', 'get')
         .mockReturnValue('invalid-token-format');
 
       expect(() => MapboxApiBasedTool.getUserNameFromToken()).toThrow(
@@ -95,7 +100,7 @@ describe('MapboxApiBasedTool', () => {
       ).toString('base64');
 
       const spy = vi
-        .spyOn(MapboxApiBasedTool, 'MAPBOX_ACCESS_TOKEN', 'get')
+        .spyOn(MapboxApiBasedTool, 'mapboxAccessToken', 'get')
         .mockReturnValue(`eyJhbGciOiJIUzI1NiJ9.${invalidPayload}.signature`);
 
       expect(() => MapboxApiBasedTool.getUserNameFromToken()).toThrow(
@@ -109,7 +114,7 @@ describe('MapboxApiBasedTool', () => {
   describe('JWT token validation', () => {
     it('throws an error when the token is not in a valid JWT format', async () => {
       const spy = vi
-        .spyOn(MapboxApiBasedTool, 'MAPBOX_ACCESS_TOKEN', 'get')
+        .spyOn(MapboxApiBasedTool, 'mapboxAccessToken', 'get')
         .mockReturnValue('invalid-token-format');
 
       // Create a new instance with the modified token
@@ -163,7 +168,7 @@ describe('MapboxApiBasedTool', () => {
   describe('username extraction from token', () => {
     it('throws error for invalid JWT format', () => {
       const spy = vi
-        .spyOn(MapboxApiBasedTool, 'MAPBOX_ACCESS_TOKEN', 'get')
+        .spyOn(MapboxApiBasedTool, 'mapboxAccessToken', 'get')
         .mockReturnValue('invalid-token');
 
       expect(() => {
@@ -178,7 +183,7 @@ describe('MapboxApiBasedTool', () => {
         'eyJhbGciOiJIUzI1NiJ9.eyJhIjoidGVzdC1hcGkifQ.signature';
 
       const spy = vi
-        .spyOn(MapboxApiBasedTool, 'MAPBOX_ACCESS_TOKEN', 'get')
+        .spyOn(MapboxApiBasedTool, 'mapboxAccessToken', 'get')
         .mockReturnValue(tokenWithoutUsername);
 
       expect(() => {
diff --git a/test/tools/create-style-tool/CreateStyleTool.test.ts b/test/tools/create-style-tool/CreateStyleTool.test.ts
@@ -1,13 +1,17 @@
-process.env.MAPBOX_ACCESS_TOKEN =
-  'eyJhbGciOiJIUzI1NiJ9.eyJ1IjoidGVzdC11c2VyIiwiYSI6InRlc3QtYXBpIn0.signature';
-
-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { describe, it, expect, vi, afterEach, beforeAll } from 'vitest';
 import {
   setupFetch,
   assertHeadersSent
 } from '../../utils/fetchRequestUtils.js';
 import { CreateStyleTool } from '../../../src/tools/create-style-tool/CreateStyleTool.js';
 
+const mockToken =
+  'eyJhbGciOiJIUzI1NiJ9.eyJ1IjoidGVzdC11c2VyIiwiYSI6InRlc3QtYXBpIn0.signature';
+
+beforeAll(() => {
+  process.env.MAPBOX_ACCESS_TOKEN = mockToken;
+});
+
 describe('CreateStyleTool', () => {
   afterEach(() => {
     vi.restoreAllMocks();
diff --git a/test/tools/create-token-tool/CreateTokenTool.test.ts b/test/tools/create-token-tool/CreateTokenTool.test.ts
@@ -1,18 +1,21 @@
-// Set environment variables before any imports
-// Create a token with username in the payload
-const payload = Buffer.from(JSON.stringify({ u: 'testuser' })).toString(
-  'base64'
-);
-process.env.MAPBOX_ACCESS_TOKEN = `eyJhbGciOiJIUzI1NiJ9.${payload}.signature`;
-
-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { describe, it, expect, vi, afterEach, beforeAll } from 'vitest';
 import {
   setupFetch,
   assertHeadersSent
 } from '../../utils/fetchRequestUtils.js';
 import { MapboxApiBasedTool } from '../../../src/tools/MapboxApiBasedTool.js';
 import { CreateTokenTool } from '../../../src/tools/create-token-tool/CreateTokenTool.js';
 
+// Create a token with username in the payload
+const payload = Buffer.from(JSON.stringify({ u: 'testuser' })).toString(
+  'base64'
+);
+const mockToken = `eyJhbGciOiJIUzI1NiJ9.${payload}.signature`;
+
+beforeAll(() => {
+  process.env.MAPBOX_ACCESS_TOKEN = mockToken;
+});
+
 type TextContent = { type: 'text'; text: string };
 
 describe('CreateTokenTool', () => {
@@ -96,12 +99,7 @@ describe('CreateTokenTool', () => {
         ).toString('base64');
         const invalidToken = `eyJhbGciOiJIUzI1NiJ9.${invalidPayload}.signature`;
 
-        Object.defineProperty(MapboxApiBasedTool, 'MAPBOX_ACCESS_TOKEN', {
-          value: invalidToken,
-          writable: true,
-          configurable: true
-        });
-        process.env.MAPBOX_ACCESS_TOKEN = invalidToken;
+        vi.stubEnv('MAPBOX_ACCESS_TOKEN', invalidToken);
 
         // Setup fetch mock to prevent actual API calls
         const { fetch, mockFetch } = setupFetch();
@@ -129,12 +127,10 @@ describe('CreateTokenTool', () => {
         );
       } finally {
         // Restore
-        process.env.MAPBOX_ACCESS_TOKEN = originalEnvToken;
-        Object.defineProperty(MapboxApiBasedTool, 'MAPBOX_ACCESS_TOKEN', {
-          value: originalToken,
-          writable: true,
-          configurable: true
-        });
+        vi.unstubAllEnvs();
+        if (originalEnvToken) {
+          vi.stubEnv('MAPBOX_ACCESS_TOKEN', originalEnvToken);
+        }
       }
     });
   });
@@ -312,11 +308,7 @@ describe('CreateTokenTool', () => {
 
       try {
         // Temporarily modify the static property
-        Object.defineProperty(MapboxApiBasedTool, 'MAPBOX_API_ENDPOINT', {
-          value: 'https://api.staging.mapbox.com/',
-          writable: true,
-          configurable: true
-        });
+        vi.stubEnv('MAPBOX_API_ENDPOINT', 'https://api.staging.mapbox.com/');
 
         const mockResponse = {
           token: 'pk.test',
@@ -347,11 +339,10 @@ describe('CreateTokenTool', () => {
         );
       } finally {
         // Restore
-        Object.defineProperty(MapboxApiBasedTool, 'MAPBOX_API_ENDPOINT', {
-          value: originalEndpoint,
-          writable: true,
-          configurable: true
-        });
+        vi.unstubAllEnvs();
+        if (originalEndpoint) {
+          vi.stubEnv('MAPBOX_API_ENDPOINT', originalEndpoint);
+        }
       }
     });
   });
diff --git a/test/tools/list-styles-tool/ListStylesTool.test.ts b/test/tools/list-styles-tool/ListStylesTool.test.ts
@@ -1,14 +1,16 @@
-// Use a token with valid JWT format for tests
-process.env.MAPBOX_ACCESS_TOKEN =
-  'sk.eyJ1IjoidGVzdC11c2VyIiwiYSI6InRlc3QtYXBpIn0.signature';
-
-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { describe, it, expect, vi, afterEach, beforeAll } from 'vitest';
 import {
   setupFetch,
   assertHeadersSent
 } from '../../utils/fetchRequestUtils.js';
 import { ListStylesTool } from '../../../src/tools/list-styles-tool/ListStylesTool.js';
 
+const mockToken = 'sk.eyJ1IjoidGVzdC11c2VyIiwiYSI6InRlc3QtYXBpIn0.signature';
+
+beforeAll(() => {
+  process.env.MAPBOX_ACCESS_TOKEN = mockToken;
+});
+
 describe('ListStylesTool', () => {
   afterEach(() => {
     vi.restoreAllMocks();
diff --git a/test/tools/list-tokens-tool/ListTokensTool.test.ts b/test/tools/list-tokens-tool/ListTokensTool.test.ts

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export class ListStylesTool extends MapboxApiBasedTool<`
`34`	`34`	`params.append('start', input.start);`
`35`	`35`	`}`
`36`	`36`
`37`		- const url = `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}styles/v1/${username}?${params.toString()}`;
	`37`	+ const url = `${MapboxApiBasedTool.mapboxApiEndpoint}styles/v1/${username}?${params.toString()}`;
`38`	`38`
`39`	`39`	`const response = await this.fetchImpl(url);`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export class ListTokensTool extends MapboxApiBasedTool<`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`let url: string \| null =`
`52`		- `${MapboxApiBasedTool.MAPBOX_API_ENDPOINT}tokens/v2/${username}?${params.toString()}`;
	`52`	+ `${MapboxApiBasedTool.mapboxApiEndpoint}tokens/v2/${username}?${params.toString()}`;
`53`	`53`	`const allTokens: unknown[] = [];`
`54`	`54`	`let pageCount = 0;`
`55`	`55`	`let nextPageUrl: string \| null = null;`