@frustrated/ms-graph-mcp 0.1.6 → 0.1.8

package/README.md

@@ -45,7 +45,7 @@ This will:
 Once initialized, Manus agents will typically run the MCP server to interact with Microsoft Graph. The server listens for JSON requests on `stdin` and outputs JSON responses to `stdout`.
 
 ```bash
-bunx --bun github:usually-frustrated/ms-graph-mcp run
+bunx --bun @frustrated/ms-graph-mcp run
 ```
 
 ### Top-Level Tools
@@ -62,7 +62,7 @@ For detailed information on specific tools and their functionalities, refer to t
 To view the currently configured Client ID, Tenant ID, and enabled/disabled tools:
 
 ```bash
-bunx --bun github:usually-frustrated/ms-graph-mcp permissions
+bunx --bun @frustrated/ms-graph-mcp permissions
 ```
 
 ### Revoking Access
@@ -70,7 +70,7 @@ bunx --bun github:usually-frustrated/ms-graph-mcp permissions
 To revoke authentication and clear all stored tokens:
 
 ```bash
-bunx --bun github:usually-frustrated/ms-graph-mcp revoke
+bunx --bun @frustrated/ms-graph-mcp revoke
 ```
 
 ## Documentation

package/bun.lock

@@ -5,7 +5,7 @@
     "": {
       "name": "@frustrated/ms-graph-mcp",
       "dependencies": {
-        "@azure/msal-node": "latest",
+        "@azure/msal-node": "^3.0.0",
         "@commander-js/extra-typings": "^14.0.0",
         "@microsoft/microsoft-graph-client": "^3.0.0",
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frustrated/ms-graph-mcp",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "A JSR-based TypeScript MCP package for personal Microsoft Graph access via CLI",
   "type": "module",
   "main": "./src/index.ts",

package/src/auth.ts

@@ -61,22 +61,10 @@ async function loadTokenCache(): Promise<boolean> {
 
 export async function initAuth(): Promise<void> {
   console.log("Initiating Microsoft Graph authentication...");
-  console.log(
-    "Please ensure you have registered a multi-tenant application in Azure AD with the following redirect URI: http://localhost:PORT/auth-callback",
-  );
 
   const cryptoProvider = new CryptoProvider();
   const pkceCodes = await cryptoProvider.generatePkceCodes();
 
-  const authCodeUrlParameters = {
-    scopes: SCOPES,
-    redirectUri: `http://localhost:0${REDIRECT_URI_PATH}`,
-    codeChallenge: pkceCodes.challenge,
-    codeChallengeMethod: "S256" as const,
-  };
-
-  const authCodeUrl = await pca.getAuthCodeUrl(authCodeUrlParameters);
-
   return new Promise((resolve, reject) => {
     const server = createServer(async (req, res) => {
       if (req.url?.startsWith(REDIRECT_URI_PATH)) {
@@ -86,10 +74,11 @@ export async function initAuth(): Promise<void> {
         if (code) {
           try {
             const addr = server.address() as AddressInfo;
+            const redirectUri = `http://localhost:${addr.port}${REDIRECT_URI_PATH}`;
             const tokenResult = await pca.acquireTokenByCode({
               code,
               scopes: SCOPES,
-              redirectUri: `http://localhost:${addr.port}${REDIRECT_URI_PATH}`,
+              redirectUri,
               codeVerifier: pkceCodes.verifier,
             });
 
@@ -123,16 +112,22 @@ export async function initAuth(): Promise<void> {
       }
     });
 
-    server.listen(0, () => {
-      const addr = server.address() as AddressInfo;
-      const finalRedirectUri = `http://localhost:${addr.port}${REDIRECT_URI_PATH}`;
-      const finalAuthUrl = authCodeUrl.replace(
-        `http://localhost:0${REDIRECT_URI_PATH}`,
-        finalRedirectUri,
-      );
-      console.log(
-        `\nOpen this URL in your browser to authenticate:\n\n  ${finalAuthUrl}\n`,
-      );
+    server.listen(0, async () => {
+      try {
+        const addr = server.address() as AddressInfo;
+        const redirectUri = `http://localhost:${addr.port}${REDIRECT_URI_PATH}`;
+        const authCodeUrl = await pca.getAuthCodeUrl({
+          scopes: SCOPES,
+          redirectUri,
+          codeChallenge: pkceCodes.challenge,
+          codeChallengeMethod: "S256" as const,
+        });
+        console.log(
+          `\nOpen this URL in your browser to authenticate:\n\n  ${authCodeUrl}\n`,
+        );
+      } catch (err) {
+        server.close(() => reject(err));
+      }
     });
 
     server.on("error", (err) => {