finalize the implementation

Author: MQ37

src/apify-client.ts

@@ -73,7 +73,7 @@ export class ApifyClient extends _ApifyClient {
         }
 
         super({
-            ...clientOptions, // Now safe to spread without authToken
+            ...clientOptions, // safe to spread without authToken
             baseUrl: getApifyAPIBaseUrl(),
             requestInterceptors,
         });

src/mcp/server.ts

@@ -402,7 +402,7 @@ export class ActorsMcpServer {
 
             // Validate auth token
             if (!authToken || !authToken.value) {
-                const msg = 'Valid authentication token required. It must be provided either in the authToken parameter or APIFY_TOKEN environment variable.';
+                const msg = `Valid authentication token required. It must be provided either in the Bearer Authorization header, APIFY_TOKEN environment variable or skyfire-pay-id header as Skyfire payment token.`;
                 log.error(msg);
                 await this.server.sendLoggingMessage({ level: 'error', data: msg });
                 throw new McpError(

src/types.ts

@@ -86,9 +86,16 @@ export interface ActorTool extends ToolBase {
 
 export type AuthTokenType = 'apify' | 'skyfire';
 
+/**
+ * Interface representing an authentication token used throughout the MCP server.
+ * This token is used to authenticate API calls to Apify services.
+ */
 export interface AuthToken {
+    /** The actual token string value used for authentication */
     value: string;
+    /** The type of authentication token, determining how it's processed */
     type: AuthTokenType;
+    /** Optional user ID associated with the token, typically populated for 'apify' type tokens via IAM validation */
     userId?: string;
 }
 

src/utils/progress.ts

@@ -4,7 +4,6 @@ import { ApifyClient } from '../apify-client.js';
 import { PROGRESS_NOTIFICATION_INTERVAL_MS } from '../const.js';
 import type { AuthToken } from '../types.js';
 
-// TODO: we should write actual integration test to verify this works in production using real token.
 export class ProgressTracker {
     private progressToken: string | number;
     private sendNotification: (notification: ProgressNotification) => Promise<void>;

tests/integration/internals.test.ts

@@ -15,13 +15,14 @@ beforeAll(() => {
     log.setLevel(log.LEVELS.OFF);
 });
 
+const authToken: AuthToken = {
+    value: process.env.APIFY_TOKEN as string,
+    type: 'apify',
+};
+
 describe('MCP server internals integration tests', () => {
     it('should load and restore tools from a tool list', async () => {
         const actorsMcpServer = new ActorsMcpServer(false);
-        const authToken: AuthToken = {
-            value: process.env.APIFY_TOKEN as string,
-            type: 'apify',
-        };
         const initialTools = await loadToolsFromInput({
             enableAddingActors: true,
         } as Input, authToken);
@@ -60,10 +61,7 @@ describe('MCP server internals integration tests', () => {
         };
 
         const actorsMCPServer = new ActorsMcpServer(false);
-        const authToken: AuthToken = {
-            value: process.env.APIFY_TOKEN as string,
-            type: 'apify',
-        };
+
         const seeded = await loadToolsFromInput({ enableAddingActors: true } as Input, authToken);
         actorsMCPServer.upsertTools(seeded);
         actorsMCPServer.registerToolsChangedHandler(onToolsChanged);
@@ -101,10 +99,7 @@ describe('MCP server internals integration tests', () => {
         };
 
         const actorsMCPServer = new ActorsMcpServer(false);
-        const authToken: AuthToken = {
-            value: process.env.APIFY_TOKEN as string,
-            type: 'apify',
-        };
+
         const seeded = await loadToolsFromInput({ enableAddingActors: true } as Input, authToken);
         actorsMCPServer.upsertTools(seeded);
         actorsMCPServer.registerToolsChangedHandler(onToolsChanged);