@softeria/ms-365-mcp-server 0.1.11 → 0.2.2

package/index.mjs

@@ -1,510 +1,17 @@
 #!/usr/bin/env node
 
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { z } from 'zod';
-import { parseArgs } from './cli.mjs';
-import { readFileSync } from 'fs';
-import logger, { enableConsoleLogging } from './logger.mjs';
-import AuthManager from './auth.mjs';
-
-const packageJson = JSON.parse(readFileSync(new URL('./package.json', import.meta.url)));
-export const version = packageJson.version;
-
-const args = parseArgs();
-const filePath = args.file || '/Livet.xlsx';
-
-const authManager = new AuthManager();
-await authManager.loadTokenCache();
-
-let sessionId = null;
-
-async function createSession() {
-  try {
-    logger.info('Creating new Excel session...');
-    const accessToken = await 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');
-    sessionId = result.id;
-    return sessionId;
-  } catch (error) {
-    logger.error(`Error creating Excel session: ${error}`);
-    return null;
-  }
-}
-
-async function graphRequest(endpoint, options = {}) {
-  try {
-    let accessToken = await authManager.getToken();
-
-    const headers = {
-      Authorization: `Bearer ${accessToken}`,
-      'Content-Type': 'application/json',
-      ...(sessionId && { 'workbook-session-id': sessionId }),
-      ...options.headers,
-    };
-
-    const response = await fetch(
-      `https://graph.microsoft.com/v1.0/me/drive/root:${filePath}:${endpoint}`,
-      {
-        headers,
-        ...options,
-      }
-    );
-
-    if (response.status === 401) {
-      logger.info('Access token expired, refreshing...');
-      const newToken = await authManager.getToken(true);
-      await createSession();
-
-      headers.Authorization = `Bearer ${newToken}`;
-      if (sessionId) {
-        headers['workbook-session-id'] = sessionId;
-      }
-
-      const retryResponse = await fetch(
-        `https://graph.microsoft.com/v1.0/me/drive/root:${filePath}:${endpoint}`,
-        {
-          headers,
-          ...options,
-        }
-      );
-
-      if (!retryResponse.ok) {
-        throw new Error(`Graph API error: ${retryResponse.status} ${await retryResponse.text()}`);
-      }
-
-      return formatResponse(retryResponse);
-    }
-
-    if (!response.ok) {
-      throw new Error(`Graph API error: ${response.status} ${await response.text()}`);
-    }
-
-    return formatResponse(response);
-  } catch (error) {
-    logger.error(`Error in Graph API request: ${error}`);
-    return {
-      content: [{ type: 'text', text: JSON.stringify({ error: error.message }) }],
-    };
-  }
-}
-
-async function formatResponse(response) {
-  try {
-    if (response.status === 204) {
-      return {
-        content: [
-          {
-            type: 'text',
-            text: JSON.stringify({
-              message: 'Operation completed successfully',
-            }),
-          },
-        ],
-      };
-    }
-
-    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) => {
-          if (key.startsWith('@odata')) {
-            delete obj[key];
-          } else if (typeof obj[key] === 'object') {
-            removeODataProps(obj[key]);
-          }
-        });
-      }
-    };
-
-    removeODataProps(result);
-
-    return {
-      content: [{ type: 'text', text: JSON.stringify(result) }],
-    };
-  } catch (error) {
-    return {
-      content: [{ type: 'text', text: JSON.stringify({ message: 'Success' }) }],
-    };
-  }
-}
-
-const server = new McpServer({
-  name: 'ExcelUpdater',
-  version,
-});
-
-server.tool('login', {}, async () => {
-  try {
-    const text = await new Promise((r) => {
-      authManager.acquireTokenByDeviceCode(r);
-    });
-    return {
-      content: [
-        {
-          type: 'text',
-          text,
-        },
-      ],
-    };
-  } catch (error) {
-    return {
-      content: [
-        {
-          type: 'text',
-          text: JSON.stringify({ error: `Authentication failed: ${error.message}` }),
-        },
-      ],
-    };
-  }
-});
-
-server.tool('logout', {}, async () => {
-  try {
-    await authManager.logout();
-    return {
-      content: [
-        {
-          type: 'text',
-          text: JSON.stringify({ message: 'Logged out successfully' }),
-        },
-      ],
-    };
-  } catch (error) {
-    return {
-      content: [
-        {
-          type: 'text',
-          text: JSON.stringify({ error: 'Logout failed' }),
-        },
-      ],
-    };
-  }
-});
-
-server.tool('test-login', {}, async () => {
-  const result = await authManager.testLogin();
-  return {
-    content: [
-      {
-        type: 'text',
-        text: JSON.stringify(result),
-      },
-    ],
-  };
-});
-
-server.tool('verify-login', {}, async () => {
-  // Test the login after the user has completed the device code authentication
-  const testResult = await authManager.testLogin();
-
-  return {
-    content: [
-      {
-        type: 'text',
-        text: JSON.stringify(testResult),
-      },
-    ],
-  };
-});
-
-server.tool(
-  'update-excel',
-  {
-    worksheet: z.string().default('Sheet1').describe('Worksheet name'),
-    address: z.string().describe("Range address (e.g., 'A1:B5')"),
-    values: z.array(z.array(z.any())).describe('Values to update'),
-  },
-  async ({ worksheet, address, values }) => {
-    return graphRequest(`/workbook/worksheets('${worksheet}')/range(address='${address}')`, {
-      method: 'PATCH',
-      body: JSON.stringify({ values }),
-    });
-  }
-);
-
-server.tool(
-  'create-chart',
-  {
-    worksheet: z.string().default('Sheet1').describe('Worksheet name'),
-    type: z.string().describe("Chart type (e.g., 'ColumnClustered', 'Line', 'Pie')"),
-    dataRange: z.string().describe("Data range for the chart (e.g., 'A1:B10')"),
-    title: z.string().optional().describe('Title for the chart'),
-    position: z
-      .object({
-        x: z.number().describe('X position'),
-        y: z.number().describe('Y position'),
-        width: z.number().describe('Width'),
-        height: z.number().describe('Height'),
-      })
-      .describe('Chart position and dimensions'),
-  },
-  async ({ worksheet, type, dataRange, title, position }) => {
-    const body = {
-      type,
-      sourceData: dataRange,
-      position,
-    };
-
-    if (title) {
-      body.title = { text: title };
-    }
-
-    return graphRequest(`/workbook/worksheets('${worksheet}')/charts/add`, {
-      method: 'POST',
-      body: JSON.stringify(body),
-    });
-  }
-);
-
-server.tool(
-  'format-range',
-  {
-    worksheet: z.string().default('Sheet1').describe('Worksheet name'),
-    range: z.string().describe("Range address (e.g., 'A1:B5')"),
-    format: z
-      .object({
-        fill: z
-          .object({
-            color: z.string().optional().describe("Background color (e.g., '#FFFF00')"),
-          })
-          .optional(),
-        font: z
-          .object({
-            bold: z.boolean().optional().describe('Bold text'),
-            italic: z.boolean().optional().describe('Italic text'),
-            color: z.string().optional().describe("Font color (e.g., '#FF0000')"),
-            size: z.number().optional().describe('Font size'),
-          })
-          .optional(),
-        numberFormat: z.string().optional().describe("Number format (e.g., '0.00%', 'mm/dd/yyyy')"),
-      })
-      .describe('Formatting to apply'),
-  },
-  async ({ worksheet, range, format }) => {
-    return graphRequest(`/workbook/worksheets('${worksheet}')/range(address='${range}')/format`, {
-      method: 'PATCH',
-      body: JSON.stringify(format),
-    });
-  }
-);
-
-server.tool(
-  'sort-range',
-  {
-    worksheet: z.string().default('Sheet1').describe('Worksheet name'),
-    range: z.string().describe("Range address (e.g., 'A1:B5')"),
-    sortFields: z
-      .array(
-        z.object({
-          key: z.number().describe('Column index to sort by (zero-based)'),
-          sortOn: z
-            .string()
-            .optional()
-            .describe("Sorting criteria (e.g., 'Value', 'CellColor', 'FontColor', 'Icon')"),
-          ascending: z.boolean().optional().describe('Sort in ascending order (default: true)'),
-          color: z
-            .object({
-              color: z.string().describe('HTML color code'),
-              type: z.string().describe("Color type (e.g., 'Background', 'Font')"),
-            })
-            .optional()
-            .describe('Color information for sorting by color'),
-          dataOption: z
-            .string()
-            .optional()
-            .describe("Data option for sorting (e.g., 'Normal', 'TextAsNumber')"),
-          icon: z
-            .object({
-              set: z.string().describe('Icon set name'),
-              index: z.number().describe('Icon index'),
-            })
-            .optional()
-            .describe('Icon information for sorting by icon'),
-        })
-      )
-      .describe('Fields to sort by'),
-    matchCase: z.boolean().optional().describe('Whether the sort is case-sensitive'),
-    hasHeaders: z.boolean().optional().describe('Whether the range has headers (default: false)'),
-    orientation: z.string().optional().describe("Sort orientation ('Rows' or 'Columns')"),
-    method: z
-      .string()
-      .optional()
-      .describe("Sort method for Chinese characters ('PinYin' or 'StrokeCount')"),
-  },
-  async ({ worksheet, range, sortFields, matchCase, hasHeaders, orientation, method }) => {
-    const body = {
-      fields: sortFields,
-    };
-
-    if (matchCase !== undefined) body.matchCase = matchCase;
-    if (hasHeaders !== undefined) body.hasHeaders = hasHeaders;
-    if (orientation) body.orientation = orientation;
-    if (method) body.method = method;
-
-    return graphRequest(
-      `/workbook/worksheets('${worksheet}')/range(address='${range}')/sort/apply`,
-      {
-        method: 'POST',
-        body: JSON.stringify(body),
-      }
-    );
-  }
-);
-
-server.tool(
-  'create-table',
-  {
-    worksheet: z.string().default('Sheet1').describe('Worksheet name'),
-    range: z.string().describe("Range address (e.g., 'A1:B5')"),
-    hasHeaders: z.boolean().optional().describe('Whether the range has headers'),
-    tableName: z.string().optional().describe('Name for the new table'),
-  },
-  async ({ worksheet, range, hasHeaders = true, tableName }) => {
-    const body = {
-      address: range,
-      hasHeaders,
-    };
-
-    if (tableName) {
-      body.name = tableName;
-    }
-
-    return graphRequest(`/workbook/worksheets('${worksheet}')/tables/add`, {
-      method: 'POST',
-      body: JSON.stringify(body),
-    });
-  }
-);
-
-server.tool(
-  'get-range',
-  {
-    worksheet: z.string().default('Sheet1').describe('Worksheet name'),
-    range: z.string().describe("Range address (e.g., 'A1:B5')"),
-  },
-  async ({ worksheet, range }) => {
-    return graphRequest(`/workbook/worksheets('${worksheet}')/range(address='${range}')`, {
-      method: 'GET',
-    });
-  }
-);
-
-server.tool('list-worksheets', {}, async () => {
-  return graphRequest('/workbook/worksheets', {
-    method: 'GET',
-  });
-});
-
-server.tool('close-session', {}, async () => {
-  if (!sessionId) {
-    return {
-      content: [
-        {
-          type: 'text',
-          text: JSON.stringify({ message: 'No active session' }),
-        },
-      ],
-    };
-  }
-
-  try {
-    const accessToken = await 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) {
-      sessionId = null;
-      return {
-        content: [
-          {
-            type: 'text',
-            text: JSON.stringify({ message: 'Session 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' }),
-        },
-      ],
-    };
-  }
-});
-
-server.tool(
-  'delete-chart',
-  {
-    worksheet: z.string().default('Sheet1').describe('Worksheet name'),
-    chartName: z.string().describe('The name of the chart to delete'),
-  },
-  async ({ worksheet, chartName }) => {
-    return graphRequest(`/workbook/worksheets('${worksheet}')/charts('${chartName}')`, {
-      method: 'DELETE',
-    });
-  }
-);
-
-server.tool(
-  'get-charts',
-  {
-    worksheet: z.string().default('Sheet1').describe('Worksheet name'),
-  },
-  async ({ worksheet }) => {
-    return graphRequest(`/workbook/worksheets('${worksheet}')/charts`, {
-      method: 'GET',
-    });
-  }
-);
+import { parseArgs } from './src/cli.mjs';
+import logger from './src/logger.mjs';
+import AuthManager from './src/auth.mjs';
+import MicrosoftGraphServer from './src/server.mjs';
+import { version } from './src/version.mjs';
 
 async function main() {
   try {
-    if (args.v) {
-      enableConsoleLogging();
-    }
+    const args = parseArgs();
 
-    logger.info('Microsoft 365 MCP Server starting...');
+    const authManager = new AuthManager();
+    await authManager.loadTokenCache();
 
     if (args.login) {
       await authManager.acquireTokenByDeviceCode();
@@ -515,15 +22,21 @@ async function main() {
     }
 
     if (args.testLogin) {
+      logger.info('Testing login...');
       const result = await authManager.testLogin();
       console.log(JSON.stringify(result));
       process.exit(0);
     }
 
-    await createSession();
+    if (args.logout) {
+      await authManager.logout();
+      console.log(JSON.stringify({ message: 'Logged out successfully' }));
+      process.exit(0);
+    }
 
-    const transport = new StdioServerTransport();
-    await server.connect(transport);
+    const server = new MicrosoftGraphServer(authManager, args);
+    await server.initialize(version);
+    await server.start();
   } catch (error) {
     logger.error(`Startup error: ${error}`);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softeria/ms-365-mcp-server",
-  "version": "0.1.11",
+  "version": "0.2.2",
   "description": "Microsoft 365 MCP Server",
   "type": "module",
   "main": "index.mjs",

package/src/auth-tools.mjs

@@ -0,0 +1,74 @@
+export function registerAuthTools(server, authManager) {
+  server.tool('login', {}, async () => {
+    try {
+      const text = await new Promise((r) => {
+        authManager.acquireTokenByDeviceCode(r);
+      });
+      return {
+        content: [
+          {
+            type: 'text',
+            text,
+          },
+        ],
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify({ error: `Authentication failed: ${error.message}` }),
+          },
+        ],
+      };
+    }
+  });
+
+  server.tool('logout', {}, async () => {
+    try {
+      await authManager.logout();
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify({ message: 'Logged out successfully' }),
+          },
+        ],
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify({ error: 'Logout failed' }),
+          },
+        ],
+      };
+    }
+  });
+
+  server.tool('test-login', {}, async () => {
+    const result = await authManager.testLogin();
+    return {
+      content: [
+        {
+          type: 'text',
+          text: JSON.stringify(result),
+        },
+      ],
+    };
+  });
+
+  server.tool('verify-login', {}, async () => {
+    const testResult = await authManager.testLogin();
+
+    return {
+      content: [
+        {
+          type: 'text',
+          text: JSON.stringify(testResult),
+        },
+      ],
+    };
+  });
+}

package/{auth.mjs → src/auth.mjs}

@@ -8,7 +8,7 @@ import logger from './logger.mjs';
 const SERVICE_NAME = 'ms-365-mcp-server';
 const TOKEN_CACHE_ACCOUNT = 'msal-token-cache';
 const FALLBACK_DIR = path.dirname(fileURLToPath(import.meta.url));
-const FALLBACK_PATH = path.join(FALLBACK_DIR, '.token-cache.json');
+const FALLBACK_PATH = path.join(FALLBACK_DIR, '..', '.token-cache.json');
 
 const DEFAULT_CONFIG = {
   auth: {
@@ -19,10 +19,11 @@ const DEFAULT_CONFIG = {
 
 const DEFAULT_SCOPES = [
   'Files.ReadWrite',
-  'Files.ReadWrite.All',
-  'Sites.ReadWrite.All',
   'User.Read',
-  'User.ReadBasic.All',
+  'Calendars.Read',
+  'Calendars.ReadWrite',
+  'Mail.Read',
+  'Mail.ReadWrite',
 ];
 
 class AuthManager {