@north7/entraaware 0.0.3 → 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: {},
@@ -30,15 +30,22 @@ function getCredentials() {
 function getAzureCredential() {
     if (!azureCredential) {
         try {
-            // First try to create a DefaultAzureCredential that can use Azure CLI or other authentication methods
+            // Try DefaultAzureCredential which includes CLI credentials
+            console.error("Attempting to use DefaultAzureCredential (will try Azure CLI if environment variables not set)");
             azureCredential = new DefaultAzureCredential();
-            console.error("Using DefaultAzureCredential - will try Azure CLI if environment variables not set");
         }
         catch (error) {
-            // Fall back to ClientSecretCredential if DefaultAzureCredential fails
-            console.error("DefaultAzureCredential failed, falling back to ClientSecretCredential");
-            const { tenantId, clientId, clientSecret } = getCredentials();
-            azureCredential = new ClientSecretCredential(tenantId, clientId, clientSecret);
+            // 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;
@@ -73,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')"),
@@ -92,20 +116,16 @@ server.tool("askEntra", "Direct access to Microsoft Graph API for accurate Entra
 }, async ({ path, method, queryParams = {}, body, apiVersion, fetchAllPages, consistencyLevel, select, filter, expand, orderBy, top, count }) => {
     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';
-        // Initialize or get Graph client
+        const processedParams = processODataParams({
+            queryParams,
+            select,
+            filter,
+            expand,
+            orderBy,
+            top,
+            count
+        });
+        // Initialize client on demand
         if (!graphClient) {
             const credential = getAzureCredential();
             const authProvider = new TokenCredentialAuthenticationProvider(credential, {
@@ -210,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);

package/package.json

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