@softeria/ms-365-mcp-server 0.11.4 → 0.11.5

package/dist/lib/microsoft-auth.js

@@ -1,75 +1,65 @@
-import logger from '../logger.js';
-/**
- * Microsoft Bearer Token Auth Middleware validates that the request has a valid Microsoft access token
- * The token is passed in the Authorization header as a Bearer token
- */
-export const microsoftBearerTokenAuthMiddleware = (req, res, next) => {
-    const authHeader = req.headers.authorization;
-    if (!authHeader || !authHeader.startsWith('Bearer ')) {
-        res.status(401).json({ error: 'Missing or invalid access token' });
-        return;
-    }
-    const accessToken = authHeader.substring(7);
-    // For Microsoft Graph, we don't validate the token here - we'll let the API calls fail if it's invalid
-    // and handle token refresh in the GraphClient
-    // Extract refresh token from a custom header (if provided)
-    const refreshToken = req.headers['x-microsoft-refresh-token'] || '';
-    // Store tokens in request for later use
-    req.microsoftAuth = {
-        accessToken,
-        refreshToken,
-    };
-    next();
+import logger from "../logger.js";
+const microsoftBearerTokenAuthMiddleware = (req, res, next) => {
+  const authHeader = req.headers.authorization;
+  if (!authHeader || !authHeader.startsWith("Bearer ")) {
+    res.status(401).json({ error: "Missing or invalid access token" });
+    return;
+  }
+  const accessToken = authHeader.substring(7);
+  const refreshToken = req.headers["x-microsoft-refresh-token"] || "";
+  req.microsoftAuth = {
+    accessToken,
+    refreshToken
+  };
+  next();
 };
-/**
- * Exchange authorization code for access token
- */
-export async function exchangeCodeForToken(code, redirectUri, clientId, clientSecret, tenantId = 'common', codeVerifier) {
-    const params = new URLSearchParams({
-        grant_type: 'authorization_code',
-        code,
-        redirect_uri: redirectUri,
-        client_id: clientId,
-        client_secret: clientSecret,
-    });
-    // Add code_verifier for PKCE flow
-    if (codeVerifier) {
-        params.append('code_verifier', codeVerifier);
-    }
-    const response = await fetch(`https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-        },
-        body: params
-    });
-    if (!response.ok) {
-        const error = await response.text();
-        logger.error(`Failed to exchange code for token: ${error}`);
-        throw new Error(`Failed to exchange code for token: ${error}`);
-    }
-    return response.json();
+async function exchangeCodeForToken(code, redirectUri, clientId, clientSecret, tenantId = "common", codeVerifier) {
+  const params = new URLSearchParams({
+    grant_type: "authorization_code",
+    code,
+    redirect_uri: redirectUri,
+    client_id: clientId,
+    client_secret: clientSecret
+  });
+  if (codeVerifier) {
+    params.append("code_verifier", codeVerifier);
+  }
+  const response = await fetch(`https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded"
+    },
+    body: params
+  });
+  if (!response.ok) {
+    const error = await response.text();
+    logger.error(`Failed to exchange code for token: ${error}`);
+    throw new Error(`Failed to exchange code for token: ${error}`);
+  }
+  return response.json();
 }
-/**
- * Refresh an access token
- */
-export async function refreshAccessToken(refreshToken, clientId, clientSecret, tenantId = 'common') {
-    const response = await fetch(`https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-        },
-        body: new URLSearchParams({
-            grant_type: 'refresh_token',
-            refresh_token: refreshToken,
-            client_id: clientId,
-            client_secret: clientSecret,
-        })
-    });
-    if (!response.ok) {
-        const error = await response.text();
-        logger.error(`Failed to refresh token: ${error}`);
-        throw new Error(`Failed to refresh token: ${error}`);
-    }
-    return response.json();
+async function refreshAccessToken(refreshToken, clientId, clientSecret, tenantId = "common") {
+  const response = await fetch(`https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded"
+    },
+    body: new URLSearchParams({
+      grant_type: "refresh_token",
+      refresh_token: refreshToken,
+      client_id: clientId,
+      client_secret: clientSecret
+    })
+  });
+  if (!response.ok) {
+    const error = await response.text();
+    logger.error(`Failed to refresh token: ${error}`);
+    throw new Error(`Failed to refresh token: ${error}`);
+  }
+  return response.json();
 }
+export {
+  exchangeCodeForToken,
+  microsoftBearerTokenAuthMiddleware,
+  refreshAccessToken
+};

package/dist/logger.js

@@ -1,33 +1,42 @@
-import winston from 'winston';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import fs from 'fs';
+import winston from "winston";
+import path from "path";
+import { fileURLToPath } from "url";
+import fs from "fs";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const logsDir = path.join(__dirname, '..', 'logs');
+const logsDir = path.join(__dirname, "..", "logs");
 if (!fs.existsSync(logsDir)) {
-    fs.mkdirSync(logsDir);
+  fs.mkdirSync(logsDir);
 }
 const logger = winston.createLogger({
-    level: process.env.LOG_LEVEL || 'info',
-    format: winston.format.combine(winston.format.timestamp({
-        format: 'YYYY-MM-DD HH:mm:ss',
-    }), winston.format.printf(({ level, message, timestamp }) => {
-        return `${timestamp} ${level.toUpperCase()}: ${message}`;
-    })),
-    transports: [
-        new winston.transports.File({
-            filename: path.join(logsDir, 'error.log'),
-            level: 'error',
-        }),
-        new winston.transports.File({
-            filename: path.join(logsDir, 'mcp-server.log'),
-        }),
-    ],
+  level: process.env.LOG_LEVEL || "info",
+  format: winston.format.combine(
+    winston.format.timestamp({
+      format: "YYYY-MM-DD HH:mm:ss"
+    }),
+    winston.format.printf(({ level, message, timestamp }) => {
+      return `${timestamp} ${level.toUpperCase()}: ${message}`;
+    })
+  ),
+  transports: [
+    new winston.transports.File({
+      filename: path.join(logsDir, "error.log"),
+      level: "error"
+    }),
+    new winston.transports.File({
+      filename: path.join(logsDir, "mcp-server.log")
+    })
+  ]
 });
-export const enableConsoleLogging = () => {
-    logger.add(new winston.transports.Console({
-        format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
-        silent: process.env.SILENT === 'true' || process.env.SILENT === '1',
-    }));
+const enableConsoleLogging = () => {
+  logger.add(
+    new winston.transports.Console({
+      format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
+      silent: process.env.SILENT === "true" || process.env.SILENT === "1"
+    })
+  );
+};
+var logger_default = logger;
+export {
+  logger_default as default,
+  enableConsoleLogging
 };
-export default logger;

package/dist/oauth-provider.js

@@ -1,48 +1,49 @@
-import { ProxyOAuthServerProvider } from '@modelcontextprotocol/sdk/server/auth/providers/proxyProvider.js';
-import logger from './logger.js';
-export class MicrosoftOAuthProvider extends ProxyOAuthServerProvider {
-    constructor(authManager) {
-        const tenantId = process.env.MS365_MCP_TENANT_ID || 'common';
-        const clientId = process.env.MS365_MCP_CLIENT_ID || '084a3e9f-a9f4-43f7-89f9-d229cf97853e';
-        super({
-            endpoints: {
-                authorizationUrl: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/authorize`,
-                tokenUrl: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`,
-                revocationUrl: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/logout`,
-            },
-            verifyAccessToken: async (token) => {
-                try {
-                    const response = await fetch('https://graph.microsoft.com/v1.0/me', {
-                        headers: {
-                            Authorization: `Bearer ${token}`,
-                        },
-                    });
-                    if (response.ok) {
-                        const userData = await response.json();
-                        logger.info(`OAuth token verified for user: ${userData.userPrincipalName}`);
-                        await authManager.setOAuthToken(token);
-                        return {
-                            token,
-                            clientId,
-                            scopes: [],
-                        };
-                    }
-                    else {
-                        throw new Error(`Token verification failed: ${response.status}`);
-                    }
-                }
-                catch (error) {
-                    logger.error(`OAuth token verification error: ${error}`);
-                    throw error;
-                }
-            },
-            getClient: async (client_id) => {
-                return {
-                    client_id,
-                    redirect_uris: ['http://localhost:3000/callback'],
-                };
-            },
-        });
-        this.authManager = authManager;
-    }
+import { ProxyOAuthServerProvider } from "@modelcontextprotocol/sdk/server/auth/providers/proxyProvider.js";
+import logger from "./logger.js";
+class MicrosoftOAuthProvider extends ProxyOAuthServerProvider {
+  constructor(authManager) {
+    const tenantId = process.env.MS365_MCP_TENANT_ID || "common";
+    const clientId = process.env.MS365_MCP_CLIENT_ID || "084a3e9f-a9f4-43f7-89f9-d229cf97853e";
+    super({
+      endpoints: {
+        authorizationUrl: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/authorize`,
+        tokenUrl: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`,
+        revocationUrl: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/logout`
+      },
+      verifyAccessToken: async (token) => {
+        try {
+          const response = await fetch("https://graph.microsoft.com/v1.0/me", {
+            headers: {
+              Authorization: `Bearer ${token}`
+            }
+          });
+          if (response.ok) {
+            const userData = await response.json();
+            logger.info(`OAuth token verified for user: ${userData.userPrincipalName}`);
+            await authManager.setOAuthToken(token);
+            return {
+              token,
+              clientId,
+              scopes: []
+            };
+          } else {
+            throw new Error(`Token verification failed: ${response.status}`);
+          }
+        } catch (error) {
+          logger.error(`OAuth token verification error: ${error}`);
+          throw error;
+        }
+      },
+      getClient: async (client_id) => {
+        return {
+          client_id,
+          redirect_uris: ["http://localhost:3000/callback"]
+        };
+      }
+    });
+    this.authManager = authManager;
+  }
 }
+export {
+  MicrosoftOAuthProvider
+};