@softeria/ms-365-mcp-server 0.30.0 → 0.30.1

package/dist/graph-client.js

@@ -2,33 +2,26 @@ import logger from "./logger.js";
 import { refreshAccessToken } from "./lib/microsoft-auth.js";
 import { encode as toonEncode } from "@toon-format/toon";
 import { getCloudEndpoints } from "./cloud-config.js";
+import { getRequestTokens } from "./request-context.js";
 class GraphClient {
   constructor(authManager, secrets, outputFormat = "json") {
-    this.accessToken = null;
-    this.refreshToken = null;
     this.outputFormat = "json";
     this.authManager = authManager;
     this.secrets = secrets;
     this.outputFormat = outputFormat;
   }
-  setOAuthTokens(accessToken, refreshToken) {
-    this.accessToken = accessToken;
-    this.refreshToken = refreshToken || null;
-  }
   async makeRequest(endpoint, options = {}) {
-    let accessToken = options.accessToken || this.accessToken || await this.authManager.getToken();
-    let refreshToken = options.refreshToken || this.refreshToken;
+    const contextTokens = getRequestTokens();
+    let accessToken = options.accessToken ?? contextTokens?.accessToken ?? await this.authManager.getToken();
+    const refreshToken = options.refreshToken ?? contextTokens?.refreshToken;
     if (!accessToken) {
       throw new Error("No access token available");
     }
     try {
       let response = await this.performRequest(endpoint, accessToken, options);
       if (response.status === 401 && refreshToken) {
-        await this.refreshAccessToken(refreshToken);
-        accessToken = this.accessToken || accessToken;
-        if (!accessToken) {
-          throw new Error("Failed to refresh access token");
-        }
+        const newTokens = await this.refreshAccessToken(refreshToken);
+        accessToken = newTokens.accessToken;
         response = await this.performRequest(endpoint, accessToken, options);
       }
       if (response.status === 403) {
@@ -89,10 +82,10 @@ class GraphClient {
       tenantId,
       this.secrets.cloudType
     );
-    this.accessToken = response.access_token;
-    if (response.refresh_token) {
-      this.refreshToken = response.refresh_token;
-    }
+    return {
+      accessToken: response.access_token,
+      refreshToken: response.refresh_token
+    };
   }
   async performRequest(endpoint, accessToken, options) {
     const cloudEndpoints = getCloudEndpoints(this.secrets.cloudType);

package/dist/request-context.js

@@ -0,0 +1,9 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+const requestContext = new AsyncLocalStorage();
+function getRequestTokens() {
+  return requestContext.getStore();
+}
+export {
+  getRequestTokens,
+  requestContext
+};

package/dist/server.js

@@ -16,6 +16,7 @@ import {
 } from "./lib/microsoft-auth.js";
 import { getSecrets } from "./secrets.js";
 import { getCloudEndpoints } from "./cloud-config.js";
+import { requestContext } from "./request-context.js";
 function parseHttpOption(httpOption) {
   if (typeof httpOption === "boolean") {
     return { host: void 0, port: 3e3 };
@@ -248,13 +249,7 @@ class MicrosoftGraphServer {
         "/mcp",
         microsoftBearerTokenAuthMiddleware,
         async (req, res) => {
-          try {
-            if (req.microsoftAuth) {
-              this.graphClient.setOAuthTokens(
-                req.microsoftAuth.accessToken,
-                req.microsoftAuth.refreshToken
-              );
-            }
+          const handler = async () => {
             const transport = new StreamableHTTPServerTransport({
               sessionIdGenerator: void 0
               // Stateless mode
@@ -264,6 +259,19 @@ class MicrosoftGraphServer {
             });
             await this.server.connect(transport);
             await transport.handleRequest(req, res, void 0);
+          };
+          try {
+            if (req.microsoftAuth) {
+              await requestContext.run(
+                {
+                  accessToken: req.microsoftAuth.accessToken,
+                  refreshToken: req.microsoftAuth.refreshToken
+                },
+                handler
+              );
+            } else {
+              await handler();
+            }
           } catch (error) {
             logger.error("Error handling MCP GET request:", error);
             if (!res.headersSent) {
@@ -283,13 +291,7 @@ class MicrosoftGraphServer {
         "/mcp",
         microsoftBearerTokenAuthMiddleware,
         async (req, res) => {
-          try {
-            if (req.microsoftAuth) {
-              this.graphClient.setOAuthTokens(
-                req.microsoftAuth.accessToken,
-                req.microsoftAuth.refreshToken
-              );
-            }
+          const handler = async () => {
             const transport = new StreamableHTTPServerTransport({
               sessionIdGenerator: void 0
               // Stateless mode
@@ -299,6 +301,19 @@ class MicrosoftGraphServer {
             });
             await this.server.connect(transport);
             await transport.handleRequest(req, res, req.body);
+          };
+          try {
+            if (req.microsoftAuth) {
+              await requestContext.run(
+                {
+                  accessToken: req.microsoftAuth.accessToken,
+                  refreshToken: req.microsoftAuth.refreshToken
+                },
+                handler
+              );
+            } else {
+              await handler();
+            }
           } catch (error) {
             logger.error("Error handling MCP POST request:", error);
             if (!res.headersSent) {

package/logs/mcp-server.log

@@ -1,5 +1,5 @@
-2026-01-12 13:28:46 INFO: Using environment variables for secrets
-2026-01-12 13:28:46 INFO: Using environment variables for secrets
-2026-01-12 13:28:46 INFO: Using environment variables for secrets
-2026-01-12 13:28:46 INFO: Using environment variables for secrets
-2026-01-12 13:28:46 INFO: Using environment variables for secrets
+2026-01-19 11:31:37 INFO: Using environment variables for secrets
+2026-01-19 11:31:37 INFO: Using environment variables for secrets
+2026-01-19 11:31:37 INFO: Using environment variables for secrets
+2026-01-19 11:31:37 INFO: Using environment variables for secrets
+2026-01-19 11:31:37 INFO: Using environment variables for secrets

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softeria/ms-365-mcp-server",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "description": " A Model Context Protocol (MCP) server for interacting with Microsoft 365 and Office services through the Graph API",
   "type": "module",
   "main": "dist/index.js",