Merge remote-tracking branch 'origin/main' into MCP-68

Author: blva

README.md

@@ -22,6 +22,7 @@ A Model Context Protocol server for interacting with MongoDB Databases and Mongo
     - [Environment Variables](#environment-variables)
     - [Command-Line Arguments](#command-line-arguments)
     - [MCP Client Configuration](#mcp-configuration-file-examples)
+    - [Proxy Support](#proxy-support)
 - [🤝 Contributing](#contributing)
 
 <a name="getting-started"></a>
@@ -574,6 +575,13 @@ npx -y mongodb-mcp-server@latest --apiClientId="your-atlas-service-accounts-clie
 }
 ```
 
+### Proxy Support
+
+The MCP Server will detect typical PROXY environment variables and use them for
+connecting to the Atlas API, your MongoDB Cluster, or any other external calls
+to third-party services like OID Providers. The behaviour is the same as what
+`mongosh` does, so the same settings will work in the MCP Server.
+
 ## 🤝Contributing
 
 Interested in contributing? Great! Please check our [Contributing Guide](CONTRIBUTING.md) for guidelines on code contributions, standards, adding new tools, and troubleshooting information.

src/common/session.ts

@@ -118,6 +118,8 @@ export class Session extends EventEmitter<{
                 w: connectOptions.writeConcern,
             },
             timeoutMS: connectOptions.timeoutMS,
+            proxy: { useEnvironmentVariableProxies: true },
+            applyProxyToOIDC: true,
         });
     }
 }

tests/unit/common/session.test.ts

@@ -63,30 +63,30 @@ describe("Session", () => {
             });
         }
 
-        it("should include client name when agent runner is set", async () => {
-            session.setAgentRunner({ name: "test-client", version: "1.0.0" });
-
-            await session.connectToMongoDB("mongodb://localhost:27017", config.connectOptions);
+        it("should configure the proxy to use environment variables", async () => {
+            await session.connectToMongoDB("mongodb://localhost", config.connectOptions);
             expect(session.serviceProvider).toBeDefined();
 
             const connectMock = MockNodeDriverServiceProvider.connect;
             expect(connectMock).toHaveBeenCalledOnce();
-            const connectionString = connectMock.mock.calls[0]?.[0];
 
-            // Should include the client name in the appName
-            expect(connectionString).toContain("--test-device-id--test-client");
+            const connectionConfig = connectMock.mock.calls[0]?.[1];
+            expect(connectionConfig?.proxy).toEqual({ useEnvironmentVariableProxies: true });
+            expect(connectionConfig?.applyProxyToOIDC).toEqual(true);
         });
 
-        it("should use 'unknown' for client name when agent runner is not set", async () => {
+        it("should include client name when agent runner is set", async () => {
+            session.setAgentRunner({ name: "test-client", version: "1.0.0" });
+
             await session.connectToMongoDB("mongodb://localhost:27017", config.connectOptions);
             expect(session.serviceProvider).toBeDefined();
 
             const connectMock = MockNodeDriverServiceProvider.connect;
             expect(connectMock).toHaveBeenCalledOnce();
             const connectionString = connectMock.mock.calls[0]?.[0];
 
-            // Should use 'unknown' for client name when agent runner is not set
-            expect(connectionString).toContain("--test-device-id--unknown");
+            // Should include the client name in the appName
+            expect(connectionString).toContain("--test-device-id--test-client");
         });
     });
 });