@north7/entraaware 0.0.2 → 0.0.4

package/build/index.js

@@ -3,7 +3,7 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 import { Client } from "@microsoft/microsoft-graph-client";
-import { ClientSecretCredential } from "@azure/identity";
+import { ClientSecretCredential, DefaultAzureCredential } from "@azure/identity";
 import { TokenCredentialAuthenticationProvider } from "@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials/index.js";
 // Initialize clients
 let graphClient = null;
@@ -11,7 +11,7 @@ let azureCredential = null;
 // Create server instance
 const server = new McpServer({
     name: "EntraAware",
-    version: "0.0.1",
+    version: "0.0.3",
     capabilities: {
         resources: {},
         tools: {},
@@ -29,8 +29,24 @@ function getCredentials() {
 }
 function getAzureCredential() {
     if (!azureCredential) {
-        const { tenantId, clientId, clientSecret } = getCredentials();
-        azureCredential = new ClientSecretCredential(tenantId, clientId, clientSecret);
+        try {
+            // Try DefaultAzureCredential which includes CLI credentials
+            console.error("Attempting to use DefaultAzureCredential (will try Azure CLI if environment variables not set)");
+            azureCredential = new DefaultAzureCredential();
+        }
+        catch (error) {
+            // Fall back to ClientSecretCredential
+            console.error(`DefaultAzureCredential failed: ${error instanceof Error ? error.message : String(error)}`);
+            console.error("Falling back to ClientSecretCredential");
+            try {
+                const { tenantId, clientId, clientSecret } = getCredentials();
+                azureCredential = new ClientSecretCredential(tenantId, clientId, clientSecret);
+            }
+            catch (secretError) {
+                console.error(`ClientSecretCredential failed: ${secretError instanceof Error ? secretError.message : String(secretError)}`);
+                throw new Error("Failed to initialize any Azure credential. Please ensure you are logged in with 'az login' or have set environment variables.");
+            }
+        }
     }
     return azureCredential;
 }
@@ -81,6 +97,7 @@ server.tool("askEntra", "Direct access to Microsoft Graph API for accurate Entra
     top: z.number().optional().describe("Shorthand for $top query parameter"),
     count: z.boolean().optional().describe("Shorthand for $count=true to include count of items"),
 }, async ({ path, method, queryParams = {}, body, apiVersion, fetchAllPages, consistencyLevel, select, filter, expand, orderBy, top, count }) => {
+    console.error(`[askEntra] Processing request: ${method} ${path}`);
     try {
         // Process shorthand query parameters
         const processedParams = { ...queryParams };
@@ -96,27 +113,35 @@ server.tool("askEntra", "Direct access to Microsoft Graph API for accurate Entra
             processedParams['$top'] = top.toString();
         if (count)
             processedParams['$count'] = 'true';
-        // Initialize or get Graph client
+        console.error(`[askEntra] Getting Azure credential`);
+        // Initialize or get Azure credential
+        const credential = getAzureCredential();
+        console.error(`[askEntra] Initializing Graph client`);
+        // Initialize Graph client if not already done
         if (!graphClient) {
-            const credential = getAzureCredential();
             const authProvider = new TokenCredentialAuthenticationProvider(credential, {
                 scopes: ["https://graph.microsoft.com/.default"],
             });
             graphClient = Client.initWithMiddleware({ authProvider });
+            console.error(`[askEntra] Graph client initialized`);
         }
         // Build request with API path and version
+        console.error(`[askEntra] Creating request for ${path} with version ${apiVersion}`);
         let request = graphClient.api(path).version(apiVersion);
         // Add query parameters
         if (Object.keys(processedParams).length > 0) {
+            console.error(`[askEntra] Adding query parameters: ${JSON.stringify(processedParams)}`);
             request = request.query(processedParams);
         }
         // Add consistency level header if provided
         if (consistencyLevel) {
+            console.error(`[askEntra] Adding consistency level: ${consistencyLevel}`);
             request = request.header('ConsistencyLevel', consistencyLevel);
         }
         // Handle pagination for GET requests
         let result;
         if (method === 'get' && fetchAllPages) {
+            console.error(`[askEntra] Executing GET with pagination`);
             const firstPage = await request.get();
             // If no pagination needed, return first page
             if (!firstPage["@odata.nextLink"]) {
@@ -127,6 +152,7 @@ server.tool("askEntra", "Direct access to Microsoft Graph API for accurate Entra
                 const allItems = [...(firstPage.value || [])];
                 let nextLink = firstPage["@odata.nextLink"];
                 while (nextLink) {
+                    console.error(`[askEntra] Fetching next page: ${nextLink}`);
                     const nextPage = await graphClient.api(nextLink).get();
                     if (nextPage.value)
                         allItems.push(...nextPage.value);
@@ -142,6 +168,7 @@ server.tool("askEntra", "Direct access to Microsoft Graph API for accurate Entra
         }
         else {
             // Execute appropriate method
+            console.error(`[askEntra] Executing ${method} request`);
             switch (method) {
                 case 'get':
                     result = await request.get();
@@ -161,9 +188,14 @@ server.tool("askEntra", "Direct access to Microsoft Graph API for accurate Entra
                     break;
             }
         }
+        console.error(`[askEntra] Successfully executed request`);
         return formatApiResponse('Entra', method, path, result);
     }
     catch (err) {
+        console.error(`[askEntra] ERROR: ${err instanceof Error ? err.message : String(err)}`);
+        if (err instanceof Error && err.stack) {
+            console.error(`[askEntra] Stack trace: ${err.stack}`);
+        }
         return formatErrorResponse(err, 'Entra');
     }
 });
@@ -188,6 +220,7 @@ server.tool("askAzure", "Direct access to Azure Resource Management API for mana
     resourceGroupName: z.string().optional().describe("Resource group name for resource operations"),
     resourceName: z.string().optional().describe("Resource name for resource operations"),
 }, async ({ path, method, apiVersion, subscriptionId, body, queryParams = {}, fetchAllPages, operation = "custom", providerNamespace, resourceType, resourceGroupName, resourceName }) => {
+    console.error(`[askAzure] Processing request: ${operation} - ${method} ${path}`);
     try {
         // Default API versions for common resource types
         const defaultApiVersions = {
@@ -277,6 +310,7 @@ server.tool("askAzure", "Direct access to Azure Resource Management API for mana
             throw new Error("Azure Resource Management API requires an 'apiVersion' parameter");
         }
         // Get Azure credential
+        console.error(`[askAzure] Getting Azure credential`);
         const credential = getAzureCredential();
         // Construct the base URL and path
         const baseUrl = "https://management.azure.com";
@@ -288,10 +322,12 @@ server.tool("askAzure", "Direct access to Azure Resource Management API for mana
         const params = new URLSearchParams(queryParams);
         if (apiVersion)
             params.set('api-version', apiVersion);
+        console.error(`[askAzure] Requesting token for Azure Resource Management API`);
         // Get access token
         const tokenResponse = await credential.getToken("https://management.azure.com/.default");
         if (!tokenResponse?.token)
             throw new Error("Failed to acquire Azure access token");
+        console.error(`[askAzure] Successfully acquired token`);
         // Prepare request options
         const headers = {
             'Authorization': `Bearer ${tokenResponse.token}`,
@@ -306,10 +342,12 @@ server.tool("askAzure", "Direct access to Azure Resource Management API for mana
         }
         // Construct URL
         const url = `${baseUrl}${fullPath}?${params.toString()}`;
+        console.error(`[askAzure] Making request to ${url}`);
         // Execute request with pagination if needed
         let result;
         if (method === 'get' && fetchAllPages) {
             // Fetch first page
+            console.error(`[askAzure] Executing GET with pagination`);
             const response = await fetch(url, options);
             if (!response.ok) {
                 const errorText = await response.text();
@@ -325,6 +363,7 @@ server.tool("askAzure", "Direct access to Azure Resource Management API for mana
                 const allItems = [...(firstPage.value || [])];
                 let nextLink = firstPage.nextLink;
                 while (nextLink) {
+                    console.error(`[askAzure] Fetching next page: ${nextLink}`);
                     const pageResponse = await fetch(nextLink, options);
                     if (!pageResponse.ok)
                         throw new Error(`Azure API pagination error: ${pageResponse.status}`);
@@ -341,9 +380,11 @@ server.tool("askAzure", "Direct access to Azure Resource Management API for mana
         }
         else {
             // Single page request
+            console.error(`[askAzure] Executing ${method} request`);
             const response = await fetch(url, options);
             if (!response.ok) {
                 const errorText = await response.text();
+                console.error(`[askAzure] Request failed with status ${response.status}: ${errorText}`);
                 let errorDetail;
                 try {
                     errorDetail = JSON.parse(errorText);
@@ -359,9 +400,14 @@ server.tool("askAzure", "Direct access to Azure Resource Management API for mana
             const text = await response.text();
             result = text ? JSON.parse(text) : { status: "Success" };
         }
+        console.error(`[askAzure] Successfully executed request`);
         return formatApiResponse('Azure', method, path, result);
     }
     catch (err) {
+        console.error(`[askAzure] ERROR: ${err instanceof Error ? err.message : String(err)}`);
+        if (err instanceof Error && err.stack) {
+            console.error(`[askAzure] Stack trace: ${err.stack}`);
+        }
         return formatErrorResponse(err, 'Azure');
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north7/entraaware",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "type": "module",
   "main": "build/index.js",
   "bin": {