outlook-cli 1.2.1 → 1.2.3

package/utils/graph-api.js

@@ -5,6 +5,45 @@ const https = require('https');
 const config = require('../config');
 const mockData = require('./mock-data');
 
+function debugLog(...args) {
+  if (config.DEBUG_LOGS) {
+    console.error(...args);
+  }
+}
+
+function buildEncodedPath(path) {
+  return String(path || '')
+    .split('/')
+    .map((segment) => encodeURIComponent(segment))
+    .join('/');
+}
+
+function buildQueryString(queryParams = {}) {
+  if (!queryParams || Object.keys(queryParams).length === 0) {
+    return '';
+  }
+
+  const params = { ...queryParams };
+  const filter = params.$filter;
+  delete params.$filter;
+
+  let queryString = new URLSearchParams(params).toString();
+
+  if (filter) {
+    if (queryString) {
+      queryString += `&$filter=${encodeURIComponent(filter)}`;
+    } else {
+      queryString = `$filter=${encodeURIComponent(filter)}`;
+    }
+  }
+
+  if (!queryString) {
+    return '';
+  }
+
+  return `?${queryString}`;
+}
+
 /**
  * Makes a request to the Microsoft Graph API
  * @param {string} accessToken - The access token for authentication
@@ -17,53 +56,20 @@ const mockData = require('./mock-data');
 async function callGraphAPI(accessToken, method, path, data = null, queryParams = {}) {
   // For test tokens, we'll simulate the API call
   if (config.USE_TEST_MODE && accessToken.startsWith('test_access_token_')) {
-    console.error(`TEST MODE: Simulating ${method} ${path} API call`);
+    debugLog(`TEST MODE: Simulating ${method} ${path} API call`);
     return mockData.simulateGraphAPIResponse(method, path, data, queryParams);
   }
 
   try {
-    console.error(`Making real API call: ${method} ${path}`);
-    
-    // Encode path segments properly
-    const encodedPath = path.split('/')
-      .map(segment => encodeURIComponent(segment))
-      .join('/');
-    
-    // Build query string from parameters with special handling for OData filters
-    let queryString = '';
-    if (Object.keys(queryParams).length > 0) {
-      // Handle $filter parameter specially to ensure proper URI encoding
-      const filter = queryParams.$filter;
-      if (filter) {
-        delete queryParams.$filter; // Remove from regular params
-      }
-      
-      // Build query string with proper encoding for regular params
-      const params = new URLSearchParams();
-      for (const [key, value] of Object.entries(queryParams)) {
-        params.append(key, value);
-      }
-      
-      queryString = params.toString();
-      
-      // Add filter parameter separately with proper encoding
-      if (filter) {
-        if (queryString) {
-          queryString += `&$filter=${encodeURIComponent(filter)}`;
-        } else {
-          queryString = `$filter=${encodeURIComponent(filter)}`;
-        }
-      }
-      
-      if (queryString) {
-        queryString = '?' + queryString;
-      }
-      
-      console.error(`Query string: ${queryString}`);
-    }
-    
+    debugLog(`Making real API call: ${method} ${path}`);
+
+    const encodedPath = buildEncodedPath(path);
+    const queryString = buildQueryString(queryParams);
+
+    debugLog(`Query string: ${queryString}`);
+
     const url = `${config.GRAPH_API_ENDPOINT}${encodedPath}${queryString}`;
-    console.error(`Full URL: ${url}`);
+    debugLog(`Full URL: ${url}`);
     
     return new Promise((resolve, reject) => {
       const options = {
@@ -110,11 +116,93 @@ async function callGraphAPI(accessToken, method, path, data = null, queryParams
       req.end();
     });
   } catch (error) {
-    console.error('Error calling Graph API:', error);
+    debugLog('Error calling Graph API:', error);
+    throw error;
+  }
+}
+
+/**
+ * Makes a raw request to the Microsoft Graph API and returns bytes.
+ * @param {string} accessToken - The access token for authentication
+ * @param {string} method - HTTP method (GET, POST, etc.)
+ * @param {string} path - API endpoint path
+ * @param {object} data - Data to send for POST/PUT requests
+ * @param {object} queryParams - Query parameters
+ * @returns {Promise<{statusCode:number, headers:object, body:Buffer}>}
+ */
+async function callGraphAPIRaw(accessToken, method, path, data = null, queryParams = {}) {
+  if (config.USE_TEST_MODE && accessToken.startsWith('test_access_token_')) {
+    debugLog(`TEST MODE: Simulating raw ${method} ${path} API call`);
+    return {
+      statusCode: 200,
+      headers: {
+        'content-type': 'application/octet-stream'
+      },
+      body: Buffer.from('')
+    };
+  }
+
+  try {
+    debugLog(`Making raw API call: ${method} ${path}`);
+
+    const encodedPath = buildEncodedPath(path);
+    const queryString = buildQueryString(queryParams);
+    const url = `${config.GRAPH_API_ENDPOINT}${encodedPath}${queryString}`;
+    debugLog(`Full raw URL: ${url}`);
+
+    return new Promise((resolve, reject) => {
+      const options = {
+        method,
+        headers: {
+          Authorization: `Bearer ${accessToken}`
+        }
+      };
+
+      const req = https.request(url, options, (res) => {
+        const chunks = [];
+
+        res.on('data', (chunk) => {
+          chunks.push(chunk);
+        });
+
+        res.on('end', () => {
+          const body = Buffer.concat(chunks);
+
+          if (res.statusCode >= 200 && res.statusCode < 300) {
+            resolve({
+              statusCode: res.statusCode,
+              headers: res.headers,
+              body
+            });
+            return;
+          }
+
+          if (res.statusCode === 401) {
+            reject(new Error('UNAUTHORIZED'));
+            return;
+          }
+
+          reject(new Error(`API call failed with status ${res.statusCode}: ${body.toString('utf8')}`));
+        });
+      });
+
+      req.on('error', (error) => {
+        reject(new Error(`Network error during API call: ${error.message}`));
+      });
+
+      if (data && (method === 'POST' || method === 'PATCH' || method === 'PUT')) {
+        req.write(JSON.stringify(data));
+      }
+
+      req.end();
+    });
+  } catch (error) {
+    debugLog('Error calling Graph API (raw):', error);
     throw error;
   }
 }
 
 module.exports = {
-  callGraphAPI
+  callGraphAPI,
+  callGraphAPIRaw
 };