Add injectable DevelopersApi support and OAuth 2.0 tool

Author: ech0s7r

README.md

@@ -28,6 +28,7 @@ The toolkit provides the following tools for agents to use:
 * `get-documentation-section-content`: Retrieves the complete content for a specific documentation section.
 * `get-documentation-page`: Retrieves the complete content of a specific documentation page.
 * `get-oauth10a-integration-guide`: Retrieves the comprehensive OAuth 1.0a integration guide.
+* `get-oauth20-integration-guide`: Retrieves the comprehensive OAuth 2.0 integration guide.
 * `get-openfinance-integration-guide`: Retrieves the comprehensive Open Finance integration guide.
 
 ### API Operations

modelcontextprotocol/README.md

@@ -14,7 +14,7 @@ This MCP server acts as a bridge between MCP clients and Mastercard Developers r
 - List available Mastercard services
 - Query API specifications and their operations
 - Access documentation for each service
-- Retrieve integration guides for OAuth 1.0a and Open Finance
+- Retrieve integration guides for OAuth 1.0a, OAuth 2.0, and Open Finance
 
 ## Available Tools
 
@@ -40,6 +40,8 @@ This MCP server acts as a bridge between MCP clients and Mastercard Developers r
 
 - **`get-oauth10a-integration-guide`**: Retrieves the comprehensive OAuth 1.0a integration guide including step-by-step instructions, code examples, and best practices for Mastercard APIs.
 
+- **`get-oauth20-integration-guide`**: Retrieves the comprehensive OAuth 2.0 integration guide including step-by-step instructions, code examples, and best practices for Mastercard APIs.
+
 - **`get-openfinance-integration-guide`**: Retrieves the comprehensive Open Finance integration guide including setup instructions, API usage examples, and implementation best practices.
 
 ## Configuration Options

typescript/package-lock.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.4",
+  "version": "0.1.5",
   "name": "@mastercard/developers-agent-toolkit",
   "homepage": "https://github.com/mastercard/developers-agent-toolkit",
   "description": "Agent Toolkit for Mastercard Developers Platform",

typescript/package.json

@@ -3,6 +3,9 @@ import { tools } from '@/shared/tools';
 import { ToolContext } from '@/shared/types';
 import { version } from '../../package.json';
 
+export type { DevelopersApi, Tool, ToolContext } from '@/shared/types';
+export { tools } from '@/shared/tools';
+
 export interface MastercardDevelopersAgentToolkitConfig {
   service?: string;
   apiSpecification?: string;

typescript/src/modelcontextprotocol/index.ts

@@ -1,4 +1,4 @@
-import { MastercardAPIClient } from '@/shared/api';
+import { defaultDevelopersApi, MastercardAPIClient } from '@/shared/api';
 import fetch, { RequestInfo, Response } from 'node-fetch';
 
 const mcd = (path: string) => {
@@ -8,6 +8,12 @@ const mcd = (path: string) => {
 const mockFetch = fetch as jest.MockedFunction<typeof fetch>;
 jest.mock('node-fetch');
 
+describe('defaultDevelopersApi', () => {
+  it('uses the default MastercardAPIClient implementation', () => {
+    expect(defaultDevelopersApi).toBeInstanceOf(MastercardAPIClient);
+  });
+});
+
 describe('MastercardAPIClient', () => {
   let client: MastercardAPIClient;
 

typescript/src/shared/api/__tests__/index.test.ts

@@ -1,6 +1,8 @@
 import { z } from 'zod';
 import fetch from 'node-fetch';
 
+import type { DevelopersApi } from '@/shared/types';
+
 const PathSchema = z
   .string()
   .min(1, 'Path must be a non-empty string')
@@ -106,5 +108,4 @@ export class MastercardAPIClient {
   }
 }
 
-const api = new MastercardAPIClient();
-export default api;
+export const defaultDevelopersApi: DevelopersApi = new MastercardAPIClient();

typescript/src/shared/api/index.ts

@@ -2,11 +2,9 @@ import {
   execute,
   getParameters,
 } from '@/shared/tools/documentation/getDocumentation';
-import api from '@/shared/api';
+import { createMockApi } from '@/tests/mockDevelopersApi';
 
-jest.mock<typeof api>('@/shared/api');
-
-const mockApi = api as jest.Mocked<typeof api>;
+const mockApi = createMockApi();
 
 describe('execute', () => {
   beforeEach(() => {
@@ -17,7 +15,7 @@ describe('execute', () => {
     const mockResult = 'mock documentation';
     mockApi.getDocumentation.mockResolvedValue(mockResult);
 
-    const result = await execute({}, { serviceId: 'test-service' });
+    const result = await execute({}, mockApi, { serviceId: 'test-service' });
 
     expect(mockApi.getDocumentation).toHaveBeenCalledWith('test-service');
     expect(result).toBe(mockResult);
@@ -27,7 +25,7 @@ describe('execute', () => {
     const mockResult = 'mock documentation';
     mockApi.getDocumentation.mockResolvedValue(mockResult);
 
-    const result = await execute({ serviceId: 'context-service' }, {});
+    const result = await execute({ serviceId: 'context-service' }, mockApi, {});
 
     expect(mockApi.getDocumentation).toHaveBeenCalledWith('context-service');
     expect(result).toBe(mockResult);

typescript/src/shared/tools/documentation/__tests__/getDocumentation.test.ts

@@ -2,11 +2,9 @@ import {
   execute,
   getParameters,
 } from '@/shared/tools/documentation/getDocumentationPage';
-import api from '@/shared/api';
+import { createMockApi } from '@/tests/mockDevelopersApi';
 
-jest.mock<typeof api>('@/shared/api');
-
-const mockApi = api as jest.Mocked<typeof api>;
+const mockApi = createMockApi();
 
 describe('execute', () => {
   beforeEach(() => {
@@ -17,7 +15,7 @@ describe('execute', () => {
     const mockResult = 'mock documentation page content';
     mockApi.getDocumentationPage.mockResolvedValue(mockResult);
 
-    const result = await execute({}, { pagePath: '/test/page.md' });
+    const result = await execute({}, mockApi, { pagePath: '/test/page.md' });
 
     expect(mockApi.getDocumentationPage).toHaveBeenCalledWith('/test/page.md');
     expect(result).toBe(mockResult);

typescript/src/shared/tools/documentation/__tests__/getDocumentationPage.test.ts

@@ -2,11 +2,9 @@ import {
   execute,
   getParameters,
 } from '@/shared/tools/documentation/getDocumentationSection';
-import api from '@/shared/api';
+import { createMockApi } from '@/tests/mockDevelopersApi';
 
-jest.mock<typeof api>('@/shared/api');
-
-const mockApi = api as jest.Mocked<typeof api>;
+const mockApi = createMockApi();
 
 describe('execute', () => {
   beforeEach(() => {
@@ -17,10 +15,10 @@ describe('execute', () => {
     const mockResult = 'mock documentation section content';
     mockApi.getDocumentationSection.mockResolvedValue(mockResult);
 
-    const result = await execute(
-      {},
-      { serviceId: 'test-service', sectionId: 'test-section' }
-    );
+    const result = await execute({}, mockApi, {
+      serviceId: 'test-service',
+      sectionId: 'test-section',
+    });
 
     expect(mockApi.getDocumentationSection).toHaveBeenCalledWith(
       'test-service',
@@ -33,10 +31,9 @@ describe('execute', () => {
     const mockResult = 'mock documentation section content';
     mockApi.getDocumentationSection.mockResolvedValue(mockResult);
 
-    const result = await execute(
-      { serviceId: 'context-service' },
-      { sectionId: 'test-section' }
-    );
+    const result = await execute({ serviceId: 'context-service' }, mockApi, {
+      sectionId: 'test-section',
+    });
 
     expect(mockApi.getDocumentationSection).toHaveBeenCalledWith(
       'context-service',