@rekog/mcp-nest 1.1.4 → 1.2.0

package/tests/mcp.e2e.spec.ts

@@ -1,25 +1,24 @@
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { Progress } from "@modelcontextprotocol/sdk/types.js";
 import { INestApplication, Injectable } from "@nestjs/common";
 import { Test, TestingModule } from "@nestjs/testing";
 import { z } from "zod";
-import { Tool } from "../src";
+import { Context, Tool } from "../src";
 import { McpModule } from "../src/mcp.module";
-import { Context } from "../src/services/mcp-tools.discovery";
-import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { Progress } from "@modelcontextprotocol/sdk/types.js";
 
-// Mock UserRepository for testing
+// Mock user repository
 @Injectable()
 class MockUserRepository {
   async findOne() {
     return {
-      id: "user123",
-      name: "Test User",
+      id: "userRepo123",
+      name: "Repository User",
       orgMemberships: [
         {
           orgId: "org123",
           organization: {
-            name: "Test Org",
+            name: "Repository Org",
           },
         },
       ],
@@ -27,25 +26,31 @@ class MockUserRepository {
   }
 }
 
+// Greeting tool that uses the authentication context
 @Injectable()
-export class GreetingTool {
+export class AuthGreetingTool {
   constructor(private readonly userRepository: MockUserRepository) {}
 
   @Tool({
     name: "hello-world",
-    description: "A sample tool that returns a greeting",
+    description: "A sample tool that accesses the authenticated user",
     parameters: z.object({
       name: z.string().default("World"),
     }),
   })
-  async sayHello({ name }, context: Context) {
-    const user = await this.userRepository.findOne();
-    const greeting = `Hello, ${name}! I'm ${user.name} from ${
-      user.orgMemberships[0].organization.name
-    }.`;
+  async sayHello({ name }, context: Context, request: Request & { user: any }) {
+    // Access both repository data and the authenticated user context
+    const repoUser = await this.userRepository.findOne();
+    const authUser = request.user; // Authenticated user from the request
+
+    // Construct greeting using both data sources
+    const greeting = `Hello, ${name}! I'm ${authUser.name} from ${
+      authUser.orgMemberships[0].organization.name
+    }. Repository user is ${repoUser.name}.`;
 
+    // Report progress for demonstration
     for (let i = 0; i < 5; i++) {
-      await new Promise((resolve) => setTimeout(resolve, 500));
+      await new Promise((resolve) => setTimeout(resolve, 200));
       await context.reportProgress({
         progress: (i+1) * 20,
         total: 100,
@@ -63,7 +68,7 @@ export class GreetingTool {
   }
 }
 
-describe("E2E: MCP Server via SSE", () => {
+describe("E2E: MCP Server with Authentication", () => {
   let app: INestApplication;
   let testPort: number;
 
@@ -73,25 +78,11 @@ describe("E2E: MCP Server via SSE", () => {
         McpModule.forRoot({
           name: "test-mcp-server",
           version: "0.0.1",
-          capabilities: {
-            tools: {
-              "hello-world": {
-                description: "A sample tool that returns a greeting",
-                input: {
-                  name: {
-                    type: "string",
-                    default: "World",
-                  },
-                },
-              },
-              "progress-test": {
-                description: "A tool that simulates progress",
-              },
-            },
-          },
+          // Specify the MockAuthGuard to protect the messages endpoint
+          guards: [],
         }),
       ],
-      providers: [GreetingTool, MockUserRepository],
+      providers: [AuthGreetingTool, MockUserRepository],
     }).compile();
 
     app = moduleFixture.createNestApplication();
@@ -114,45 +105,11 @@ describe("E2E: MCP Server via SSE", () => {
     const transport = new SSEClientTransport(sseUrl);
     await client.connect(transport);
     const tools = await client.listTools();
-    expect(tools.tools.length).toBeGreaterThan(0);
-    await client.close();
-  });
-
-  it('should inject dependencies into the tool and call the "hello-world" tool via SSE', async () => {
-    const client = new Client(
-      { name: "example-client", version: "1.0.0" },
-      { capabilities: {} },
-    );
-    const sseUrl = new URL(`http://localhost:${testPort}/sse`);
-    const transport = new SSEClientTransport(sseUrl);
-    await client.connect(transport);
-    const tools = await client.listTools();
-    expect(tools.tools.find((t) => t.name == "hello-world")).toBeDefined();
 
-    let countProgress=1;
-    const result = await client.callTool(
-      {
-        name: "hello-world",
-        arguments: { name: "World" },
-      },
-      undefined,
-      {
-        onprogress: (progress) => {
-          console.log(progress);
-          countProgress++;
-        },
-      },
-    );
+    // Verify that the authenticated tool is available
+    expect(tools.tools.length).toBeGreaterThan(0);
+    expect(tools.tools.find((t) => t.name === "hello-world")).toBeDefined();
 
-    expect(countProgress).toBe(5)
-    expect(result).toEqual({
-      content: [
-        {
-          type: "text",
-          text: "Hello, World! I'm Test User from Test Org.",
-        },
-      ],
-    });
     await client.close();
   });
-});
+});