@optimizely-opal/opal-tool-ocp-sdk 0.0.0-beta.1 → 0.0.0-beta.11

package/src/function/ToolFunction.test.ts

@@ -26,26 +26,33 @@ jest.mock('@zaiusinc/app-sdk', () => ({
     bodyJSON: data,
     bodyAsU8Array: new Uint8Array()
   })),
+  amendLogContext: jest.fn(),
 }));
 
 // Create a concrete implementation for testing
 class TestToolFunction extends ToolFunction {
   private mockValidateBearerToken: jest.MockedFunction<(token: string) => boolean>;
+  private mockReady: jest.MockedFunction<() => Promise<boolean>>;
 
   public constructor(request?: any) {
     super(request || {}); // Pass the request parameter properly
     // Set the request directly without defaulting to empty object
     (this as any).request = request;
 
-    // Create a mock implementation of the abstract method
     this.mockValidateBearerToken = jest.fn().mockReturnValue(true);
+    this.mockReady = jest.fn().mockResolvedValue(true);
   }
 
-  // Implement the abstract method
+  // Override the concrete method with mock implementation for testing
   protected validateBearerToken(bearerToken: string): boolean {
     return this.mockValidateBearerToken(bearerToken);
   }
 
+  // Override the ready method with mock implementation for testing
+  protected ready(): Promise<boolean> {
+    return this.mockReady();
+  }
+
   // Expose request and validation mock for testing
   public getRequest() {
     return (this as any).request;
@@ -54,6 +61,10 @@ class TestToolFunction extends ToolFunction {
   public getMockValidateBearerToken() {
     return this.mockValidateBearerToken;
   }
+
+  public getMockReady() {
+    return this.mockReady;
+  }
 }
 
 describe('ToolFunction', () => {
@@ -82,6 +93,137 @@ describe('ToolFunction', () => {
     toolFunction = new TestToolFunction(mockRequest);
   });
 
+  describe('/ready endpoint', () => {
+    it('should return ready: true when ready method returns true', async () => {
+      // Arrange
+      const readyRequest = {
+        headers: new Map(),
+        method: 'GET',
+        path: '/ready'
+      };
+      toolFunction = new TestToolFunction(readyRequest);
+      toolFunction.getMockReady().mockResolvedValue(true);
+
+      // Act
+      const result = await toolFunction.perform();
+
+      // Assert
+      expect(toolFunction.getMockReady()).toHaveBeenCalledTimes(1);
+      expect(result).toEqual(new Response(200, { ready: true }));
+      expect(mockProcessRequest).not.toHaveBeenCalled(); // Should not call service
+    });
+
+    it('should return ready: false when ready method returns false', async () => {
+      // Arrange
+      const readyRequest = {
+        headers: new Map(),
+        method: 'GET',
+        path: '/ready'
+      };
+      toolFunction = new TestToolFunction(readyRequest);
+      toolFunction.getMockReady().mockResolvedValue(false);
+
+      // Act
+      const result = await toolFunction.perform();
+
+      // Assert
+      expect(toolFunction.getMockReady()).toHaveBeenCalledTimes(1);
+      expect(result).toEqual(new Response(200, { ready: false }));
+      expect(mockProcessRequest).not.toHaveBeenCalled(); // Should not call service
+    });
+
+    it('should handle ready method throwing an error', async () => {
+      // Arrange
+      const readyRequest = {
+        headers: new Map(),
+        method: 'GET',
+        path: '/ready'
+      };
+      toolFunction = new TestToolFunction(readyRequest);
+      toolFunction.getMockReady().mockRejectedValue(new Error('Ready check failed'));
+
+      // Act & Assert
+      await expect(toolFunction.perform()).rejects.toThrow('Ready check failed');
+      expect(toolFunction.getMockReady()).toHaveBeenCalledTimes(1);
+      expect(mockProcessRequest).not.toHaveBeenCalled(); // Should not call service
+    });
+
+    it('should handle /ready endpoint after bearer token validation passes', async () => {
+      // Arrange
+      const readyRequest = {
+        headers: new Map([['authorization', 'Bearer valid-token']]),
+        method: 'GET',
+        path: '/ready'
+      };
+      toolFunction = new TestToolFunction(readyRequest);
+      toolFunction.getMockReady().mockResolvedValue(true);
+      mockExtractBearerToken.mockReturnValue('valid-token');
+      toolFunction.getMockValidateBearerToken().mockReturnValue(true); // Make sure auth passes so we reach /ready
+
+      // Act
+      const result = await toolFunction.perform();
+
+      // Assert
+      expect(toolFunction.getMockReady()).toHaveBeenCalledTimes(1);
+      expect(result).toEqual(new Response(200, { ready: true }));
+      expect(mockExtractBearerToken).toHaveBeenCalledWith(readyRequest.headers); // Auth is checked first
+      expect(toolFunction.getMockValidateBearerToken()).toHaveBeenCalledWith('valid-token'); // Auth validation happens
+      expect(mockProcessRequest).not.toHaveBeenCalled(); // Should not call service
+    });
+
+    it('should return 403 when bearer token validation fails even for /ready endpoint', async () => {
+      // Arrange
+      const readyRequest = {
+        headers: new Map([['authorization', 'Bearer invalid-token']]),
+        method: 'GET',
+        path: '/ready'
+      };
+      toolFunction = new TestToolFunction(readyRequest);
+      toolFunction.getMockReady().mockResolvedValue(true);
+      mockExtractBearerToken.mockReturnValue('invalid-token');
+      toolFunction.getMockValidateBearerToken().mockReturnValue(false); // Auth fails
+
+      // Act
+      const result = await toolFunction.perform();
+
+      // Assert
+      expect(result).toEqual(new Response(403, { error: 'Forbidden' }));
+      expect(mockExtractBearerToken).toHaveBeenCalledWith(readyRequest.headers);
+      expect(toolFunction.getMockValidateBearerToken()).toHaveBeenCalledWith('invalid-token');
+      expect(toolFunction.getMockReady()).not.toHaveBeenCalled(); // Should not reach ready check
+      expect(mockProcessRequest).not.toHaveBeenCalled(); // Should not call service
+    });
+
+    it('should use default ready implementation when not overridden', async () => {
+      // Create a class that doesn't override ready method
+      class DefaultReadyToolFunction extends ToolFunction {
+        public constructor(request?: any) {
+          super(request || {});
+          (this as any).request = request;
+        }
+
+        public getRequest() {
+          return (this as any).request;
+        }
+      }
+
+      // Arrange
+      const readyRequest = {
+        headers: new Map(),
+        method: 'GET',
+        path: '/ready'
+      };
+      const defaultToolFunction = new DefaultReadyToolFunction(readyRequest);
+
+      // Act
+      const result = await defaultToolFunction.perform();
+
+      // Assert - Default implementation should return true
+      expect(result).toEqual(new Response(200, { ready: true }));
+      expect(mockProcessRequest).not.toHaveBeenCalled(); // Should not call service
+    });
+  });
+
   describe('bearer token validation', () => {
     it('should extract bearer token from headers and validate it', async () => {
       // Arrange
@@ -96,7 +238,7 @@ describe('ToolFunction', () => {
       // Assert
       expect(mockExtractBearerToken).toHaveBeenCalledWith(mockRequest.headers);
       expect(toolFunction.getMockValidateBearerToken()).toHaveBeenCalledWith(bearerToken);
-      expect(mockProcessRequest).toHaveBeenCalledWith(mockRequest);
+      expect(mockProcessRequest).toHaveBeenCalledWith(mockRequest, toolFunction);
       expect(result).toBe(mockResponse);
     });
 
@@ -130,7 +272,7 @@ describe('ToolFunction', () => {
       // Assert
       expect(mockExtractBearerToken).toHaveBeenCalledWith(mockRequest.headers);
       expect(toolFunction.getMockValidateBearerToken()).toHaveBeenCalledWith(complexToken);
-      expect(mockProcessRequest).toHaveBeenCalledWith(mockRequest);
+      expect(mockProcessRequest).toHaveBeenCalledWith(mockRequest, toolFunction);
       expect(result).toBe(mockResponse);
     });
 
@@ -190,7 +332,7 @@ describe('ToolFunction', () => {
       // Assert
       expect(mockExtractBearerToken).toHaveBeenCalledWith(mockRequest.headers);
       expect(toolFunction.getMockValidateBearerToken()).not.toHaveBeenCalled();
-      expect(mockProcessRequest).toHaveBeenCalledWith(mockRequest);
+      expect(mockProcessRequest).toHaveBeenCalledWith(mockRequest, toolFunction);
       expect(result).toBe(mockResponse);
     });
 
@@ -205,7 +347,35 @@ describe('ToolFunction', () => {
       // Assert
       expect(mockExtractBearerToken).toHaveBeenCalledWith(mockRequest.headers);
       expect(toolFunction.getMockValidateBearerToken()).not.toHaveBeenCalled();
-      expect(mockProcessRequest).toHaveBeenCalledWith(mockRequest);
+      expect(mockProcessRequest).toHaveBeenCalledWith(mockRequest, toolFunction);
+      expect(result).toBe(mockResponse);
+    });
+
+    it('should use default validateBearerToken implementation when not overridden', async () => {
+      // Create a class that doesn't override validateBearerToken
+      class DefaultToolFunction extends ToolFunction {
+        public constructor(request?: any) {
+          super(request || {});
+          (this as any).request = request;
+        }
+
+        public getRequest() {
+          return (this as any).request;
+        }
+      }
+
+      // Arrange
+      const defaultToolFunction = new DefaultToolFunction(mockRequest);
+      const bearerToken = 'any-token';
+      mockExtractBearerToken.mockReturnValue(bearerToken);
+      mockProcessRequest.mockResolvedValue(mockResponse);
+
+      // Act
+      const result = await defaultToolFunction.perform();
+
+      // Assert - Default implementation should return true and allow request to proceed
+      expect(mockExtractBearerToken).toHaveBeenCalledWith(mockRequest.headers);
+      expect(mockProcessRequest).toHaveBeenCalledWith(mockRequest, defaultToolFunction);
       expect(result).toBe(mockResponse);
     });
   });

package/src/function/ToolFunction.ts

@@ -1,4 +1,4 @@
-import { Function, Response } from '@zaiusinc/app-sdk';
+import { Function, Response, amendLogContext } from '@zaiusinc/app-sdk';
 import { toolsService } from '../service/Service';
 
 /**
@@ -7,19 +7,46 @@ import { toolsService } from '../service/Service';
  */
 export abstract class ToolFunction extends Function {
 
+  /**
+   * Override this method to implement any required credentials and/or other configuration
+   * exist and are valid. Reasonable caching should be utilized to prevent excessive requests to external resources.
+   * @async
+   * @returns true if the opal function is ready to use
+   */
+  protected ready(): Promise<boolean> {
+    return Promise.resolve(true);
+  }
+
   /**
    * Process the incoming request using the tools service
    *
    * @returns Response as the HTTP response
    */
   public async perform(): Promise<Response> {
+    amendLogContext({ opalThreadId: this.request.headers.get('x-opal-thread-id') || '' });
     const bearerToken = toolsService.extractBearerToken(this.request.headers);
     if (bearerToken && !this.validateBearerToken(bearerToken)) {
       return new Response(403, { error: 'Forbidden' });
     }
 
-    return toolsService.processRequest(this.request);
+    if (this.request.path === '/ready') {
+      const isReady = await this.ready();
+      return new Response(200, { ready: isReady });
+    }
+    // Pass 'this' as context so decorated methods can use the existing instance
+    return toolsService.processRequest(this.request, this);
   }
 
-  protected abstract validateBearerToken(bearerToken: string): boolean;
+  /**
+   * Validates the bearer token for authorization.
+   *
+   * This method provides a default implementation that accepts all tokens.
+   * Subclasses can override this method to implement custom bearer token validation logic.
+   *
+   * @param _bearerToken - The bearer token extracted from the Authorization header
+   * @returns true if the token is valid and the request should proceed, false to return 403 Forbidden
+   */
+  protected validateBearerToken(_bearerToken: string): boolean {
+    return true;
+  }
 }

package/src/service/Service.test.ts

@@ -1,12 +1,16 @@
 import { toolsService, Tool, Interaction } from './Service';
 import { Parameter, ParameterType, AuthRequirement, OptiIdAuthDataCredentials, OptiIdAuthData } from '../types/Models';
+import { ToolFunction } from '../function/ToolFunction';
 import { logger } from '@zaiusinc/app-sdk';
 
-// Mock the logger
+// Mock the logger and other app-sdk exports
 jest.mock('@zaiusinc/app-sdk', () => ({
   logger: {
     error: jest.fn()
   },
+  Function: class {
+    public constructor(public request: any) {}
+  },
   Response: jest.fn().mockImplementation((status, data) => ({
     status,
     data,
@@ -18,6 +22,7 @@ jest.mock('@zaiusinc/app-sdk', () => ({
 describe('ToolsService', () => {
   let mockTool: Tool<unknown>;
   let mockInteraction: Interaction<unknown>;
+  let mockToolFunction: ToolFunction;
 
   beforeEach(() => {
     // Clear registered functions and interactions before each test
@@ -27,6 +32,14 @@ describe('ToolsService', () => {
     // Reset all mocks
     jest.clearAllMocks();
 
+    // Create mock ToolFunction
+    mockToolFunction = {
+      ready: jest.fn().mockResolvedValue(true),
+      perform: jest.fn(),
+      validateBearerToken: jest.fn().mockReturnValue(true),
+      request: {} as any
+    } as any;
+
     // Create mock tool handler
     const mockToolHandler = jest.fn().mockResolvedValue({ result: 'success' });
 
@@ -90,7 +103,7 @@ describe('ToolsService', () => {
         );
 
         const discoveryRequest = createMockRequest({ path: '/discovery' });
-        const response = await toolsService.processRequest(discoveryRequest);
+        const response = await toolsService.processRequest(discoveryRequest, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(response).toHaveProperty('bodyJSON');
@@ -115,7 +128,7 @@ describe('ToolsService', () => {
 
       it('should return empty functions array when no tools are registered', async () => {
         const discoveryRequest = createMockRequest({ path: '/discovery' });
-        const response = await toolsService.processRequest(discoveryRequest);
+        const response = await toolsService.processRequest(discoveryRequest, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(response.bodyAsU8Array).toBeDefined();
@@ -149,7 +162,7 @@ describe('ToolsService', () => {
         );
 
         const discoveryRequest = createMockRequest({ path: '/discovery' });
-        const response = await toolsService.processRequest(discoveryRequest);
+        const response = await toolsService.processRequest(discoveryRequest, mockToolFunction);
 
         expect(response.status).toBe(200);
 
@@ -195,15 +208,101 @@ describe('ToolsService', () => {
 
       it('should execute tool successfully with parameters', async () => {
         const mockRequest = createMockRequest();
-        const response = await toolsService.processRequest(mockRequest);
+        const response = await toolsService.processRequest(mockRequest, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(mockTool.handler).toHaveBeenCalledWith(
+          mockToolFunction, // functionContext
           { param1: 'test-value' },
           undefined
         );
       });
 
+      it('should execute tool with existing ToolFunction instance context', async () => {
+        // Create a mock ToolFunction instance
+        const mockToolFunctionInstance = {
+          someProperty: 'test-value',
+          someMethod: jest.fn(),
+          ready: jest.fn().mockResolvedValue(true),
+          perform: jest.fn(),
+          validateBearerToken: jest.fn().mockReturnValue(true),
+          request: {} as any
+        } as any;
+
+        const mockRequest = createMockRequest();
+        const response = await toolsService.processRequest(mockRequest, mockToolFunctionInstance);
+
+        expect(response.status).toBe(200);
+        expect(mockTool.handler).toHaveBeenCalledWith(
+          mockToolFunctionInstance, // functionContext - existing instance
+          { param1: 'test-value' },
+          undefined
+        );
+      });
+
+      it('should allow handler in ToolFunction subclass to access request object', async () => {
+        // Create a mock class that extends ToolFunction
+        class MockToolFunction extends ToolFunction {
+          public testMethod() {
+            return `path: ${this.request.path}`;
+          }
+
+          public getRequestPath() {
+            return this.request.path;
+          }
+        }
+
+        // Create an instance with a mock request
+        const mockRequest = createMockRequest({ path: '/test-path' });
+        const mockToolFunctionInstance = new MockToolFunction(mockRequest);
+
+        // Create a handler that will use the ToolFunction instance's methods and properties
+        const handlerThatAccessesRequest = jest.fn().mockImplementation((
+          functionContext: any,
+          params: any,
+          _authData: any
+        ) => {
+          // This simulates what would happen in a decorated method of a ToolFunction subclass
+          if (functionContext && functionContext instanceof MockToolFunction) {
+            return Promise.resolve({
+              success: true,
+              requestPath: functionContext.getRequestPath(), // Use public method to access request
+              testMethodResult: functionContext.testMethod(),
+              receivedParams: params
+            });
+          }
+          return Promise.resolve({ success: false, error: 'No valid function context' });
+        });
+
+        // Register a tool with our custom handler
+        toolsService.registerTool(
+          'test-toolfunction-access',
+          'Test handler access to ToolFunction instance',
+          handlerThatAccessesRequest,
+          [],
+          '/test-toolfunction-access'
+        );
+
+        const testRequest = createMockRequest({
+          path: '/test-toolfunction-access',
+          bodyJSON: { action: 'test' }
+        });
+
+        const response = await toolsService.processRequest(testRequest, mockToolFunctionInstance);
+
+        expect(response.status).toBe(200);
+        expect((response as any).data).toBeDefined();
+        expect((response as any).data.success).toBe(true);
+        expect((response as any).data.requestPath).toBe('/test-path');
+        expect((response as any).data.testMethodResult).toBe('path: /test-path');
+        expect((response as any).data.receivedParams).toEqual({ action: 'test' });
+        expect(handlerThatAccessesRequest).toHaveBeenCalledWith(
+          mockToolFunctionInstance, // functionContext is the ToolFunction instance
+          { action: 'test' },
+          undefined
+        );
+      });
+
       it('should execute tool with OptiID auth data when provided', async () => {
         const authData = new OptiIdAuthData(
           'optiId',
@@ -221,10 +320,11 @@ describe('ToolsService', () => {
           })
         });
 
-        const response = await toolsService.processRequest(requestWithAuth);
+        const response = await toolsService.processRequest(requestWithAuth, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(mockTool.handler).toHaveBeenCalledWith(
+          mockToolFunction, // functionContext
           { param1: 'test-value' },
           authData
         );
@@ -236,10 +336,11 @@ describe('ToolsService', () => {
           body: JSON.stringify({ param1: 'test-value' })
         });
 
-        const response = await toolsService.processRequest(requestWithoutWrapper);
+        const response = await toolsService.processRequest(requestWithoutWrapper, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(mockTool.handler).toHaveBeenCalledWith(
+          mockToolFunction, // functionContext
           { param1: 'test-value' },
           undefined
         );
@@ -250,7 +351,7 @@ describe('ToolsService', () => {
         jest.mocked(mockTool.handler).mockRejectedValueOnce(new Error(errorMessage));
 
         const mockRequest = createMockRequest();
-        const response = await toolsService.processRequest(mockRequest);
+        const response = await toolsService.processRequest(mockRequest, mockToolFunction);
 
         expect(response.status).toBe(500);
         expect(logger.error).toHaveBeenCalledWith(
@@ -263,7 +364,7 @@ describe('ToolsService', () => {
         jest.mocked(mockTool.handler).mockRejectedValueOnce({});
 
         const mockRequest = createMockRequest();
-        const response = await toolsService.processRequest(mockRequest);
+        const response = await toolsService.processRequest(mockRequest, mockToolFunction);
 
         expect(response.status).toBe(500);
       });
@@ -285,10 +386,10 @@ describe('ToolsService', () => {
           body: JSON.stringify({ data: { param1: 'test-value' } })
         });
 
-        const response = await toolsService.processRequest(interactionRequest);
+        const response = await toolsService.processRequest(interactionRequest, mockToolFunction);
 
         expect(response.status).toBe(200);
-        expect(mockInteraction.handler).toHaveBeenCalledWith({ param1: 'test-value' }, undefined);
+        expect(mockInteraction.handler).toHaveBeenCalledWith(mockToolFunction, { param1: 'test-value' }, undefined);
       });
 
       it('should handle interaction request body without data wrapper', async () => {
@@ -298,10 +399,10 @@ describe('ToolsService', () => {
           body: JSON.stringify({ param1: 'test-value' })
         });
 
-        const response = await toolsService.processRequest(interactionRequest);
+        const response = await toolsService.processRequest(interactionRequest, mockToolFunction);
 
         expect(response.status).toBe(200);
-        expect(mockInteraction.handler).toHaveBeenCalledWith({ param1: 'test-value' }, undefined);
+        expect(mockInteraction.handler).toHaveBeenCalledWith(mockToolFunction, { param1: 'test-value' }, undefined);
       });
 
       it('should execute interaction with OptiID auth data when provided', async () => {
@@ -322,10 +423,11 @@ describe('ToolsService', () => {
           })
         });
 
-        const response = await toolsService.processRequest(interactionRequest);
+        const response = await toolsService.processRequest(interactionRequest, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(mockInteraction.handler).toHaveBeenCalledWith(
+          mockToolFunction, // functionContext
           { param1: 'test-value' },
           authData
         );
@@ -349,10 +451,11 @@ describe('ToolsService', () => {
           })
         });
 
-        const response = await toolsService.processRequest(interactionRequest);
+        const response = await toolsService.processRequest(interactionRequest, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(mockInteraction.handler).toHaveBeenCalledWith(
+          mockToolFunction, // functionContext
           {
             param1: 'test-value',
             auth: authData
@@ -370,7 +473,7 @@ describe('ToolsService', () => {
           bodyJSON: { data: { param1: 'test-value' } }
         });
 
-        const response = await toolsService.processRequest(interactionRequest);
+        const response = await toolsService.processRequest(interactionRequest, mockToolFunction);
 
         expect(response.status).toBe(500);
         expect(logger.error).toHaveBeenCalledWith(
@@ -383,7 +486,7 @@ describe('ToolsService', () => {
     describe('error cases', () => {
       it('should return 404 when no matching tool or interaction is found', async () => {
         const unknownRequest = createMockRequest({ path: '/unknown-endpoint' });
-        const response = await toolsService.processRequest(unknownRequest);
+        const response = await toolsService.processRequest(unknownRequest, mockToolFunction);
 
         expect(response.status).toBe(404);
       });
@@ -406,7 +509,7 @@ describe('ToolsService', () => {
           path: '/optid-auth-tool'
         });
 
-        const response = await toolsService.processRequest(authRequest);
+        const response = await toolsService.processRequest(authRequest, mockToolFunction);
 
         expect(response.status).toBe(200);
       });
@@ -427,10 +530,10 @@ describe('ToolsService', () => {
           body: null
         });
 
-        const response = await toolsService.processRequest(requestWithNullBody);
+        const response = await toolsService.processRequest(requestWithNullBody, mockToolFunction);
 
         expect(response.status).toBe(200);
-        expect(mockTool.handler).toHaveBeenCalledWith(null, undefined);
+        expect(mockTool.handler).toHaveBeenCalledWith(mockToolFunction, null, undefined);
       });
 
       it('should handle request with undefined bodyJSON', async () => {
@@ -447,10 +550,10 @@ describe('ToolsService', () => {
           body: undefined
         });
 
-        const response = await toolsService.processRequest(requestWithUndefinedBody);
+        const response = await toolsService.processRequest(requestWithUndefinedBody, mockToolFunction);
 
         expect(response.status).toBe(200);
-        expect(mockTool.handler).toHaveBeenCalledWith(undefined, undefined);
+        expect(mockTool.handler).toHaveBeenCalledWith(mockToolFunction, undefined, undefined);
       });
 
       it('should extract auth data from bodyJSON when body exists', async () => {
@@ -478,10 +581,11 @@ describe('ToolsService', () => {
           })
         });
 
-        const response = await toolsService.processRequest(requestWithAuth);
+        const response = await toolsService.processRequest(requestWithAuth, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(mockTool.handler).toHaveBeenCalledWith(
+          mockToolFunction, // functionContext
           { param1: 'test-value' },
           authData
         );
@@ -506,10 +610,11 @@ describe('ToolsService', () => {
           })
         });
 
-        const response = await toolsService.processRequest(requestWithoutAuth);
+        const response = await toolsService.processRequest(requestWithoutAuth, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(mockTool.handler).toHaveBeenCalledWith(
+          mockToolFunction, // functionContext
           { param1: 'test-value' },
           undefined
         );
@@ -537,10 +642,11 @@ describe('ToolsService', () => {
           body: ''
         });
 
-        const response = await toolsService.processRequest(requestWithAuthButNoBody);
+        const response = await toolsService.processRequest(requestWithAuthButNoBody, mockToolFunction);
 
         expect(response.status).toBe(200);
         expect(mockTool.handler).toHaveBeenCalledWith(
+          mockToolFunction, // functionContext
           { param1: 'test-value' },
           authData
         );