@north7/entraaware 0.0.4 → 0.0.5

package/build/index.js

@@ -11,7 +11,7 @@ let azureCredential = null;
 // Create server instance
 const server = new McpServer({
     name: "EntraAware",
-    version: "0.0.3",
+    version: "0.0.5",
     capabilities: {
         resources: {},
         tools: {},
@@ -80,6 +80,23 @@ function formatErrorResponse(err, apiType) {
         ],
     };
 }
+// Process OData parameters for Graph API
+function processODataParams({ queryParams = {}, select, filter, expand, orderBy, top, count }) {
+    const processedParams = { ...queryParams };
+    if (select)
+        processedParams['$select'] = select;
+    if (filter)
+        processedParams['$filter'] = filter;
+    if (expand)
+        processedParams['$expand'] = expand;
+    if (orderBy)
+        processedParams['$orderby'] = orderBy;
+    if (top !== undefined)
+        processedParams['$top'] = top.toString();
+    if (count)
+        processedParams['$count'] = 'true';
+    return processedParams;
+}
 // MICROSOFT GRAPH API TOOL
 server.tool("askEntra", "Direct access to Microsoft Graph API for accurate Entra (Azure AD) data", {
     path: z.string().describe("The Graph API URL path (e.g. '/users/{id}/memberOf', '/directoryRoles')"),
@@ -97,51 +114,38 @@ 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 };
-        if (select)
-            processedParams['$select'] = select;
-        if (filter)
-            processedParams['$filter'] = filter;
-        if (expand)
-            processedParams['$expand'] = expand;
-        if (orderBy)
-            processedParams['$orderby'] = orderBy;
-        if (top !== undefined)
-            processedParams['$top'] = top.toString();
-        if (count)
-            processedParams['$count'] = 'true';
-        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
+        const processedParams = processODataParams({
+            queryParams,
+            select,
+            filter,
+            expand,
+            orderBy,
+            top,
+            count
+        });
+        // Initialize client on demand
         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"]) {
@@ -152,7 +156,6 @@ 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);
@@ -168,7 +171,6 @@ 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();
@@ -188,14 +190,9 @@ 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');
     }
 });
@@ -220,7 +217,6 @@ 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 = {
@@ -234,6 +230,12 @@ server.tool("askAzure", "Direct access to Azure Resource Management API for mana
             'Microsoft.Network/virtualNetworks': '2023-04-01',
             'Microsoft.KeyVault/vaults': '2023-02-01'
         };
+        // Set default API version for common paths if not provided
+        if (!apiVersion && !queryParams['api-version']) {
+            if (path === '/subscriptions') {
+                apiVersion = '2022-12-01'; // Default API version for listing subscriptions
+            }
+        }
         // Handle predefined operations
         if (operation !== "custom") {
             const requiredSubscriptionId = !['listResourceProviders', 'getResourceProvider', 'registerResourceProvider'].includes(operation);
@@ -310,7 +312,6 @@ 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";
@@ -322,12 +323,10 @@ 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}`,
@@ -342,12 +341,10 @@ 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();
@@ -363,7 +360,6 @@ 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}`);
@@ -380,11 +376,9 @@ 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);
@@ -400,14 +394,9 @@ 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.4",
+  "version": "0.0.5",
   "type": "module",
   "main": "build/index.js",
   "bin": {