@softeria/ms-365-mcp-server 0.13.4 → 0.15.0

package/dist/graph-client.js

@@ -2,75 +2,14 @@ import logger from "./logger.js";
 import { refreshAccessToken } from "./lib/microsoft-auth.js";
 class GraphClient {
   constructor(authManager) {
-    // accountId -> (filePath -> sessionId)
     this.accessToken = null;
     this.refreshToken = null;
     this.authManager = authManager;
-    this.sessions = /* @__PURE__ */ new Map();
   }
   setOAuthTokens(accessToken, refreshToken) {
     this.accessToken = accessToken;
     this.refreshToken = refreshToken || null;
   }
-  async getCurrentAccountId() {
-    const currentAccount = await this.authManager.getCurrentAccount();
-    return currentAccount?.homeAccountId || null;
-  }
-  getAccountSessions(accountId) {
-    if (!this.sessions.has(accountId)) {
-      this.sessions.set(accountId, /* @__PURE__ */ new Map());
-    }
-    return this.sessions.get(accountId);
-  }
-  async getSessionForFile(filePath) {
-    const accountId = await this.getCurrentAccountId();
-    if (!accountId) return null;
-    const accountSessions = this.getAccountSessions(accountId);
-    return accountSessions.get(filePath) || null;
-  }
-  async setSessionForFile(filePath, sessionId) {
-    const accountId = await this.getCurrentAccountId();
-    if (!accountId) return;
-    const accountSessions = this.getAccountSessions(accountId);
-    accountSessions.set(filePath, sessionId);
-  }
-  async createSession(filePath) {
-    try {
-      if (!filePath) {
-        logger.error("No file path provided for Excel session");
-        return null;
-      }
-      const existingSession = await this.getSessionForFile(filePath);
-      if (existingSession) {
-        return existingSession;
-      }
-      logger.info(`Creating new Excel session for file: ${filePath}`);
-      const accessToken = await this.authManager.getToken();
-      const response = await fetch(
-        `https://graph.microsoft.com/v1.0/me/drive/root:${filePath}:/workbook/createSession`,
-        {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${accessToken}`,
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify({ persistChanges: true })
-        }
-      );
-      if (!response.ok) {
-        const errorText = await response.text();
-        logger.error(`Failed to create session: ${response.status} - ${errorText}`);
-        return null;
-      }
-      const result = await response.json();
-      logger.info(`Session created successfully for file: ${filePath}`);
-      await this.setSessionForFile(filePath, result.id);
-      return result.id;
-    } catch (error) {
-      logger.error(`Error creating Excel session: ${error}`);
-      return null;
-    }
-  }
   async makeRequest(endpoint, options = {}) {
     let accessToken = options.accessToken || this.accessToken || await this.authManager.getToken();
     let refreshToken = options.refreshToken || this.refreshToken;
@@ -99,7 +38,9 @@ class GraphClient {
         );
       }
       if (!response.ok) {
-        throw new Error(`Microsoft Graph API error: ${response.status} ${response.statusText}`);
+        throw new Error(
+          `Microsoft Graph API error: ${response.status} ${response.statusText} - ${await response.text()}`
+        );
       }
       const text = await response.text();
       if (text === "") {
@@ -129,23 +70,10 @@ class GraphClient {
     }
   }
   async performRequest(endpoint, accessToken, options) {
-    let url;
-    let sessionId = null;
-    if (options.excelFile && !endpoint.startsWith("/drive") && !endpoint.startsWith("/users") && !endpoint.startsWith("/me") && !endpoint.startsWith("/teams") && !endpoint.startsWith("/chats") && !endpoint.startsWith("/planner")) {
-      sessionId = await this.getSessionForFile(options.excelFile);
-      if (!sessionId) {
-        sessionId = await this.createSessionWithToken(options.excelFile, accessToken);
-      }
-      url = `https://graph.microsoft.com/v1.0/me/drive/root:${options.excelFile}:${endpoint}`;
-    } else if (endpoint.startsWith("/drive") || endpoint.startsWith("/users") || endpoint.startsWith("/me") || endpoint.startsWith("/teams") || endpoint.startsWith("/chats") || endpoint.startsWith("/planner")) {
-      url = `https://graph.microsoft.com/v1.0${endpoint}`;
-    } else {
-      throw new Error("Excel operation requested without specifying a file");
-    }
+    const url = `https://graph.microsoft.com/v1.0${endpoint}`;
     const headers = {
       Authorization: `Bearer ${accessToken}`,
       "Content-Type": "application/json",
-      ...sessionId && { "workbook-session-id": sessionId },
       ...options.headers
     };
     return fetch(url, {
@@ -167,42 +95,6 @@ class GraphClient {
       };
     }
   }
-  async createSessionWithToken(filePath, accessToken) {
-    try {
-      if (!filePath) {
-        logger.error("No file path provided for Excel session");
-        return null;
-      }
-      const existingSession = await this.getSessionForFile(filePath);
-      if (existingSession) {
-        return existingSession;
-      }
-      logger.info(`Creating new Excel session for file: ${filePath}`);
-      const response = await fetch(
-        `https://graph.microsoft.com/v1.0/me/drive/root:${filePath}:/workbook/createSession`,
-        {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${accessToken}`,
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify({ persistChanges: true })
-        }
-      );
-      if (!response.ok) {
-        const errorText = await response.text();
-        logger.error(`Failed to create session: ${response.status} - ${errorText}`);
-        return null;
-      }
-      const result = await response.json();
-      logger.info(`Session created successfully for file: ${filePath}`);
-      await this.setSessionForFile(filePath, result.id);
-      return result.id;
-    } catch (error) {
-      logger.error(`Error creating Excel session: ${error}`);
-      return null;
-    }
-  }
   formatJsonResponse(data, rawResponse = false) {
     if (rawResponse) {
       return {
@@ -230,231 +122,6 @@ class GraphClient {
       content: [{ type: "text", text: JSON.stringify(data, null, 2) }]
     };
   }
-  async graphRequestOld(endpoint, options = {}) {
-    try {
-      logger.info(`Calling ${endpoint} with options: ${JSON.stringify(options)}`);
-      let accessToken = await this.authManager.getToken();
-      let url;
-      let sessionId = null;
-      if (options.excelFile && !endpoint.startsWith("/drive") && !endpoint.startsWith("/users") && !endpoint.startsWith("/me") && !endpoint.startsWith("/teams") && !endpoint.startsWith("/chats") && !endpoint.startsWith("/planner") && !endpoint.startsWith("/sites")) {
-        sessionId = await this.getSessionForFile(options.excelFile);
-        if (!sessionId) {
-          sessionId = await this.createSession(options.excelFile);
-        }
-        url = `https://graph.microsoft.com/v1.0/me/drive/root:${options.excelFile}:${endpoint}`;
-      } else if (endpoint.startsWith("/drive") || endpoint.startsWith("/users") || endpoint.startsWith("/me") || endpoint.startsWith("/teams") || endpoint.startsWith("/chats") || endpoint.startsWith("/planner") || endpoint.startsWith("/sites")) {
-        url = `https://graph.microsoft.com/v1.0${endpoint}`;
-      } else {
-        logger.error("Excel operation requested without specifying a file");
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({ error: "No Excel file specified for this operation" })
-            }
-          ]
-        };
-      }
-      const headers = {
-        Authorization: `Bearer ${accessToken}`,
-        "Content-Type": "application/json",
-        ...sessionId && { "workbook-session-id": sessionId },
-        ...options.headers
-      };
-      delete options.headers;
-      logger.info(` ** Making request to ${url} with options: ${JSON.stringify(options)}`);
-      const response = await fetch(url, {
-        headers,
-        ...options
-      });
-      if (response.status === 401) {
-        logger.info("Access token expired, refreshing...");
-        const newToken = await this.authManager.getToken(true);
-        if (options.excelFile && !endpoint.startsWith("/drive") && !endpoint.startsWith("/users") && !endpoint.startsWith("/me") && !endpoint.startsWith("/teams") && !endpoint.startsWith("/chats") && !endpoint.startsWith("/planner") && !endpoint.startsWith("/sites")) {
-          sessionId = await this.createSession(options.excelFile);
-        }
-        headers.Authorization = `Bearer ${newToken}`;
-        if (sessionId && !endpoint.startsWith("/drive") && !endpoint.startsWith("/users") && !endpoint.startsWith("/me") && !endpoint.startsWith("/teams") && !endpoint.startsWith("/chats") && !endpoint.startsWith("/planner") && !endpoint.startsWith("/sites")) {
-          headers["workbook-session-id"] = sessionId;
-        }
-        const retryResponse = await fetch(url, {
-          headers,
-          ...options
-        });
-        if (!retryResponse.ok) {
-          throw new Error(`Graph API error: ${retryResponse.status} ${await retryResponse.text()}`);
-        }
-        return this.formatResponse(retryResponse, options.rawResponse);
-      }
-      if (!response.ok) {
-        throw new Error(`Graph API error: ${response.status} ${await response.text()}`);
-      }
-      return this.formatResponse(response, options.rawResponse);
-    } catch (error) {
-      logger.error(`Error in Graph API request: ${error}`);
-      return {
-        content: [{ type: "text", text: JSON.stringify({ error: error.message }) }],
-        isError: true
-      };
-    }
-  }
-  async formatResponse(response, rawResponse = false) {
-    try {
-      if (response.status === 204) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                message: "Operation completed successfully"
-              })
-            }
-          ]
-        };
-      }
-      if (rawResponse) {
-        const contentType2 = response.headers.get("content-type");
-        if (contentType2 && contentType2.startsWith("text/")) {
-          const text = await response.text();
-          return {
-            content: [{ type: "text", text }]
-          };
-        }
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                message: "Binary file content received",
-                contentType: contentType2,
-                contentLength: response.headers.get("content-length")
-              })
-            }
-          ]
-        };
-      }
-      const contentType = response.headers.get("content-type");
-      if (contentType && !contentType.includes("application/json")) {
-        if (contentType.startsWith("text/")) {
-          const text = await response.text();
-          return {
-            content: [{ type: "text", text }]
-          };
-        }
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                message: "Binary or non-JSON content received",
-                contentType,
-                contentLength: response.headers.get("content-length")
-              })
-            }
-          ]
-        };
-      }
-      const result = await response.json();
-      const removeODataProps = (obj) => {
-        if (!obj || typeof obj !== "object") return;
-        if (Array.isArray(obj)) {
-          obj.forEach((item) => removeODataProps(item));
-        } else {
-          Object.keys(obj).forEach((key) => {
-            const objRecord = obj;
-            if (key.startsWith("@odata") && !["@odata.nextLink", "@odata.count"].includes(key)) {
-              delete objRecord[key];
-            } else if (typeof objRecord[key] === "object") {
-              removeODataProps(objRecord[key]);
-            }
-          });
-        }
-      };
-      removeODataProps(result);
-      return {
-        content: [{ type: "text", text: JSON.stringify(result) }]
-      };
-    } catch (error) {
-      logger.error(`Error formatting response: ${error}`);
-      return {
-        content: [{ type: "text", text: JSON.stringify({ message: "Success" }) }]
-      };
-    }
-  }
-  async closeSession(filePath) {
-    const sessionId = await this.getSessionForFile(filePath);
-    if (!filePath || !sessionId) {
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({ message: "No active session for the specified file" })
-          }
-        ]
-      };
-    }
-    try {
-      const accessToken = await this.authManager.getToken();
-      const response = await fetch(
-        `https://graph.microsoft.com/v1.0/me/drive/root:${filePath}:/workbook/closeSession`,
-        {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${accessToken}`,
-            "Content-Type": "application/json",
-            "workbook-session-id": sessionId
-          }
-        }
-      );
-      if (response.ok) {
-        const accountId = await this.getCurrentAccountId();
-        if (accountId) {
-          const accountSessions = this.getAccountSessions(accountId);
-          accountSessions.delete(filePath);
-        }
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({ message: `Session for ${filePath} closed successfully` })
-            }
-          ]
-        };
-      } else {
-        throw new Error(`Failed to close session: ${response.status}`);
-      }
-    } catch (error) {
-      logger.error(`Error closing session: ${error}`);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({ error: `Failed to close session for ${filePath}` })
-          }
-        ],
-        isError: true
-      };
-    }
-  }
-  async closeAllSessions() {
-    const results = [];
-    const accountId = await this.getCurrentAccountId();
-    if (accountId) {
-      const accountSessions = this.getAccountSessions(accountId);
-      for (const [filePath] of accountSessions) {
-        const result = await this.closeSession(filePath);
-        results.push(result);
-      }
-    }
-    return {
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify({ message: "All sessions closed", results })
-        }
-      ]
-    };
-  }
 }
 var graph_client_default = GraphClient;
 export {

package/dist/graph-tools.js

@@ -21,7 +21,7 @@ function registerGraphTools(server, graphClient, readOnly = false, enabledToolsP
   }
   for (const tool of api.endpoints) {
     const endpointConfig = endpointsData.find((e) => e.toolName === tool.alias);
-    if (endpointConfig?.requiresWorkAccount && !orgMode) {
+    if (!orgMode && endpointConfig && !endpointConfig.scopes && endpointConfig.workScopes) {
       logger.info(`Skipping work account tool ${tool.alias} - not in org mode`);
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softeria/ms-365-mcp-server",
-  "version": "0.13.4",
+  "version": "0.15.0",
   "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",
@@ -19,7 +19,7 @@
     "format:check": "prettier --check \"**/*.{ts,mts,js,mjs,json,md}\"",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "verify": "npm run lint && npm run format:check && npm run build && npm run test",
+    "verify": "npm run generate && npm run lint && npm run format:check && npm run build && npm run test",
     "inspector": "npx @modelcontextprotocol/inspector tsx src/index.ts"
   },
   "keywords": [

package/src/endpoints.json

@@ -314,189 +314,169 @@
     "pathPattern": "/me/chats",
     "method": "get",
     "toolName": "list-chats",
-    "scopes": ["Chat.Read"],
-    "requiresWorkAccount": true
+    "workScopes": ["Chat.Read"]
   },
   {
     "pathPattern": "/chats/{chat-id}",
     "method": "get",
     "toolName": "get-chat",
-    "scopes": ["Chat.Read"],
-    "requiresWorkAccount": true
+    "workScopes": ["Chat.Read"]
   },
   {
     "pathPattern": "/chats/{chat-id}/messages",
     "method": "get",
     "toolName": "list-chat-messages",
-    "scopes": ["ChatMessage.Read"],
-    "requiresWorkAccount": true
+    "workScopes": ["ChatMessage.Read"]
   },
   {
     "pathPattern": "/chats/{chat-id}/messages/{chatMessage-id}",
     "method": "get",
     "toolName": "get-chat-message",
-    "scopes": ["ChatMessage.Read"],
-    "requiresWorkAccount": true
+    "workScopes": ["ChatMessage.Read"]
   },
   {
     "pathPattern": "/chats/{chat-id}/messages",
     "method": "post",
     "toolName": "send-chat-message",
-    "scopes": ["ChatMessage.Send"],
-    "requiresWorkAccount": true
+    "workScopes": ["ChatMessage.Send"]
   },
   {
     "pathPattern": "/me/joinedTeams",
     "method": "get",
     "toolName": "list-joined-teams",
-    "scopes": ["Team.ReadBasic.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Team.ReadBasic.All"]
   },
   {
     "pathPattern": "/teams/{team-id}",
     "method": "get",
     "toolName": "get-team",
-    "scopes": ["Team.ReadBasic.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Team.ReadBasic.All"]
   },
   {
     "pathPattern": "/teams/{team-id}/channels",
     "method": "get",
     "toolName": "list-team-channels",
-    "scopes": ["Channel.ReadBasic.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Channel.ReadBasic.All"]
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}",
     "method": "get",
     "toolName": "get-team-channel",
-    "scopes": ["Channel.ReadBasic.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Channel.ReadBasic.All"]
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages",
     "method": "get",
     "toolName": "list-channel-messages",
-    "scopes": ["ChannelMessage.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["ChannelMessage.Read.All"]
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}",
     "method": "get",
     "toolName": "get-channel-message",
-    "scopes": ["ChannelMessage.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["ChannelMessage.Read.All"]
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages",
     "method": "post",
     "toolName": "send-channel-message",
-    "scopes": ["ChannelMessage.Send"],
-    "requiresWorkAccount": true
+    "workScopes": ["ChannelMessage.Send"]
   },
   {
     "pathPattern": "/teams/{team-id}/members",
     "method": "get",
     "toolName": "list-team-members",
-    "scopes": ["TeamMember.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["TeamMember.Read.All"]
   },
   {
     "pathPattern": "/chats/{chat-id}/messages/{chatMessage-id}/replies",
     "method": "get",
     "toolName": "list-chat-message-replies",
-    "scopes": ["ChatMessage.Read"],
-    "requiresWorkAccount": true
+    "workScopes": ["ChatMessage.Read"]
   },
   {
     "pathPattern": "/chats/{chat-id}/messages/{chatMessage-id}/replies",
     "method": "post",
     "toolName": "reply-to-chat-message",
-    "scopes": ["ChatMessage.Send"],
-    "requiresWorkAccount": true
+    "workScopes": ["ChatMessage.Send"]
   },
   {
     "pathPattern": "/sites",
     "method": "get",
     "toolName": "search-sharepoint-sites",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}",
     "method": "get",
     "toolName": "get-sharepoint-site",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}/drives",
     "method": "get",
     "toolName": "list-sharepoint-site-drives",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}/drives/{drive-id}",
     "method": "get",
     "toolName": "get-sharepoint-site-drive-by-id",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}/items",
     "method": "get",
     "toolName": "list-sharepoint-site-items",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}/items/{baseItem-id}",
     "method": "get",
     "toolName": "get-sharepoint-site-item",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}/lists",
     "method": "get",
     "toolName": "list-sharepoint-site-lists",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}/lists/{list-id}",
     "method": "get",
     "toolName": "get-sharepoint-site-list",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}/lists/{list-id}/items",
     "method": "get",
     "toolName": "list-sharepoint-site-list-items",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}/lists/{list-id}/items/{listItem-id}",
     "method": "get",
     "toolName": "get-sharepoint-site-list-item",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/{site-id}/getByPath(path='{path}')",
     "method": "get",
     "toolName": "get-sharepoint-site-by-path",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
   },
   {
     "pathPattern": "/sites/delta()",
     "method": "get",
     "toolName": "get-sharepoint-sites-delta",
-    "scopes": ["Sites.Read.All"],
-    "requiresWorkAccount": true
+    "workScopes": ["Sites.Read.All"]
+  },
+  {
+    "pathPattern": "/search/query",
+    "method": "post",
+    "toolName": "search-query",
+    "scopes": ["Mail.Read", "Calendars.Read", "Files.Read.All", "People.Read"],
+    "workScopes": ["Sites.Read.All", "Chat.Read", "ChannelMessage.Read.All"]
   }
 ]