@itentialopensource/adapter-microsoft_office365 0.6.1 → 0.8.0

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+## 0.8.0 [02-13-2026]
+
+* minor/auto-migrate/20260213-112338
+
+See merge request itentialopensource/adapters/adapter-microsoft_office365!31
+
+---
+
 ## 0.3.4 [10-15-2024]
 
 * Changes made at 2024.10.14_20:32PM

package/PROPERTIES.md

@@ -54,7 +54,8 @@ This section defines **all** the properties that are available for the adapter,
         "healthcheck_on_timeout": false,
         "return_raw": false,
         "archiving": false,
-        "return_request": false
+        "return_request": false,
+        "keep_alive_interval": 0
       },
       "ssl": {
         "ecdhCurve": "",
@@ -403,6 +404,10 @@ The request section defines properties to help handle requests.
     <td style="padding:15px">return_request</td>
     <td style="padding:15px">Optional flag. Default is false. Will return the actual request that is made including headers. This should only be used during debugging issues as there could be credentials in the actual request.</td>
   </tr>
+  <tr>
+    <td style="padding:15px">keep_alive_interval</td>
+    <td style="padding:15px">Optional. TCP keep-alive interval in seconds for long-lived connections. Set to 0 to disable keep-alive (default). When enabled, minimum value is 30 seconds.</td>
+  </tr>
 </table>
 <br>
 

package/TAB2.md

@@ -139,7 +139,8 @@ Sample Properties can be used to help you configure the adapter in the Itential
       "healthcheck_on_timeout": true,
       "return_raw": false,
       "archiving": false,
-      "return_request": false
+      "return_request": false,
+      "keep_alive_interval": 0
     },
     "proxy": {
       "enabled": false,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@itentialopensource/adapter-microsoft_office365",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "description": "This adapter integrates with system described as: odataServiceForNamespaceMicrosoft.graph.",
   "main": "adapter.js",
   "systemName": "Microsoft Office 365",
-  "wizardVersion": "3.8.0",
-  "engineVersion": "1.79.2",
+  "wizardVersion": "3.12.1",
+  "engineVersion": "1.82.5",
   "adapterType": "http",
   "scripts": {
     "preinstall": "node utils/setup.js",
@@ -40,8 +40,8 @@
   ],
   "license": "Apache-2.0",
   "engines": {
-    "node": ">= 14.0.0",
-    "npm": ">= 6.0.0"
+    "node": ">= 18.18.0",
+    "npm": ">= 9.8.1"
   },
   "repository": {
     "type": "git",
@@ -50,14 +50,14 @@
   "author": "Itential",
   "homepage": "https://gitlab.com/itentialopensource/adapters/adapter-microsoft_office365#readme",
   "dependencies": {
-    "@itentialopensource/adapter-utils": "6.0.3",
+    "@itentialopensource/adapter-utils": "6.1.14",
     "acorn": "8.14.1",
     "ajv": "8.17.1",
-    "axios": "1.12.2",
+    "axios": "1.13.5",
     "commander": "11.1.0",
     "fs-extra": "11.3.0",
     "json-query": "2.2.2",
-    "mocha": "10.8.2",
+    "mocha": "11.3.0",
     "mocha-param": "2.0.1",
     "mongodb": "4.17.2",
     "ping": "0.4.4",

package/propertiesSchema.json

@@ -61,7 +61,7 @@
         "boolean",
         "string"
       ],
-      "description": "When true the metrics collected by the adapter will be stored in mongo or on the filesystem",
+      "description": "When true the metrics collected by the adapter will be stored in mongo or in the adapter. If a full path is provided, metrics will be saved in the path provided.",
       "default": false
     },
     "stub": {
@@ -458,7 +458,7 @@
           "type": "integer",
           "description": "How often the healthcheck should run (in milliseconds).",
           "default": 300000,
-          "minimum": 60000,
+          "minimum": 30000,
           "maximum": 3600000
         },
         "protocol": {
@@ -693,6 +693,13 @@
           "type": "boolean",
           "description": "This property turns on returning the response information - need to be carefull in case credentials are in the path",
           "default": false
+        },
+        "keep_alive_interval": {
+          "type": "integer",
+          "description": "TCP keep-alive interval in milliseconds to prevent connection timeout during long-running requests. 0 = disabled (default). Minimum value when enabled is 30000ms (30 seconds). Values below 30000ms will be auto-corrected to 30000ms with a warning.",
+          "default": 0,
+          "minimum": 0,
+          "maximum": 3600000
         }
       },
       "required": [
@@ -1104,7 +1111,7 @@
               },
               "requestFields": {
                 "type": "object",
-                "description": "The json object with response fields of the call to getDevice",
+                "description": "The json object with request fields of the call to getDevice",
                 "additionalProperties": {
                   "type": [
                     "string",
@@ -1247,7 +1254,7 @@
               },
               "requestFields": {
                 "type": "object",
-                "description": "The json object with response fields of the call to getDevice",
+                "description": "The json object with request fields of the call to getDevice",
                 "additionalProperties": {
                   "type": [
                     "string",
@@ -1358,7 +1365,7 @@
               },
               "requestFields": {
                 "type": "object",
-                "description": "The json object with response fields of the call to getDevice",
+                "description": "The json object with request fields of the call to getDevice",
                 "additionalProperties": {
                   "type": [
                     "string",
@@ -1454,7 +1461,7 @@
               },
               "requestFields": {
                 "type": "object",
-                "description": "The json object with response fields of the call to getDevice",
+                "description": "The json object with request fields of the call to getDevice",
                 "additionalProperties": {
                   "type": [
                     "string",
@@ -1539,7 +1546,7 @@
               },
               "requestFields": {
                 "type": "object",
-                "description": "The json object with response fields of the call to getDevice",
+                "description": "The json object with request fields of the call to getDevice",
                 "additionalProperties": {
                   "type": [
                     "string",
@@ -1622,12 +1629,12 @@
                   "properties": {
                     "path": {
                       "type": "string",
-                      "description": "The fully qualified path of the call to getDevice (e.g. /rest/api/device/{deviceid})",
+                      "description": "The fully qualified path of the call to populate the cache (e.g. /rest/api/devices)",
                       "default": ""
                     },
                     "method": {
                       "type": "string",
-                      "description": "The method of the call to getDevice",
+                      "description": "The method of the call to populate the cache",
                       "default": "GET"
                     },
                     "pagination": {
@@ -1664,7 +1671,7 @@
                     },
                     "query": {
                       "type": "object",
-                      "description": "The json object with query parameters of the call to getDevice",
+                      "description": "The json object with query parameters of the call to populate the cache",
                       "additionalProperties": {
                         "type": [
                           "string",
@@ -1674,7 +1681,7 @@
                     },
                     "body": {
                       "type": "object",
-                      "description": "The json object with body of the call to getDevice",
+                      "description": "The json object with body of the call to populate the cache",
                       "additionalProperties": {
                         "type": [
                           "string",
@@ -1684,7 +1691,7 @@
                     },
                     "headers": {
                       "type": "object",
-                      "description": "The json object with headers of the call to getDevice",
+                      "description": "The json object with headers of the call to populate the cache",
                       "additionalProperties": {
                         "type": [
                           "string",
@@ -1703,7 +1710,7 @@
                     },
                     "requestFields": {
                       "type": "object",
-                      "description": "The json object with response fields of the call to getDevice",
+                      "description": "The json object with request fields of the call to populate the cache",
                       "additionalProperties": {
                         "type": [
                           "string",
@@ -1719,7 +1726,7 @@
                     },
                     "responseFields": {
                       "type": "object",
-                      "description": "The json object with response fields of the call to getDevice",
+                      "description": "The json object with response fields of the call to populate the cache",
                       "additionalProperties": {
                         "type": [
                           "string",
@@ -1760,4 +1767,4 @@
       }
     }
   }
-}
+}

package/report/updateReport1766088561842.json

@@ -0,0 +1,120 @@
+{
+  "errors": [],
+  "statistics": [
+    {
+      "owner": "errorJson",
+      "description": "New adapter errors available for use",
+      "value": 0
+    },
+    {
+      "owner": "errorJson",
+      "description": "Adapter errors no longer available for use",
+      "value": 0
+    },
+    {
+      "owner": "errorJson",
+      "description": "Adapter errors that have been updated (e.g. recommendation changes)",
+      "value": 31
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of production dependencies",
+      "value": 15
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of development dependencies",
+      "value": 6
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of npm scripts",
+      "value": 17
+    },
+    {
+      "owner": "packageJson",
+      "description": "Runtime Library dependency",
+      "value": "6.1.7"
+    },
+    {
+      "owner": "propertiesSchemaJson",
+      "description": "Adapter properties defined in the propertiesSchema file",
+      "value": 83
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the README.md",
+      "value": 345
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the SUMMARY.md",
+      "value": 9
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the PROPERTIES.md",
+      "value": 682
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the TROUBLESHOOT.md",
+      "value": 57
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the ENHANCE.md",
+      "value": 70
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the BROKER.md",
+      "value": 70
+    },
+    {
+      "owner": "unitTestJS",
+      "description": "Number of lines of code in unit tests",
+      "value": 1768
+    },
+    {
+      "owner": "unitTestJS",
+      "description": "Number of unit tests",
+      "value": 88
+    },
+    {
+      "owner": "integrationTestJS",
+      "description": "Number of lines of code in integration tests",
+      "value": 700
+    },
+    {
+      "owner": "integrationTestJS",
+      "description": "Number of integration tests",
+      "value": 19
+    },
+    {
+      "owner": "staticFile",
+      "description": "Number of lines of code in adapterBase.js",
+      "value": 1527
+    },
+    {
+      "owner": "staticFile",
+      "description": "Number of static files added",
+      "value": 37
+    },
+    {
+      "owner": "Overall",
+      "description": "Total lines of Code",
+      "value": 3995
+    },
+    {
+      "owner": "Overall",
+      "description": "Total Tests",
+      "value": 107
+    },
+    {
+      "owner": "Overall",
+      "description": "Total Files",
+      "value": 6
+    }
+  ]
+}

package/report/updateReport1770999819701.json

@@ -0,0 +1,120 @@
+{
+  "errors": [],
+  "statistics": [
+    {
+      "owner": "errorJson",
+      "description": "New adapter errors available for use",
+      "value": 0
+    },
+    {
+      "owner": "errorJson",
+      "description": "Adapter errors no longer available for use",
+      "value": 0
+    },
+    {
+      "owner": "errorJson",
+      "description": "Adapter errors that have been updated (e.g. recommendation changes)",
+      "value": 31
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of production dependencies",
+      "value": 15
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of development dependencies",
+      "value": 6
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of npm scripts",
+      "value": 17
+    },
+    {
+      "owner": "packageJson",
+      "description": "Runtime Library dependency",
+      "value": "6.1.14"
+    },
+    {
+      "owner": "propertiesSchemaJson",
+      "description": "Adapter properties defined in the propertiesSchema file",
+      "value": 83
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the README.md",
+      "value": 345
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the SUMMARY.md",
+      "value": 9
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the PROPERTIES.md",
+      "value": 682
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the TROUBLESHOOT.md",
+      "value": 57
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the ENHANCE.md",
+      "value": 70
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the BROKER.md",
+      "value": 70
+    },
+    {
+      "owner": "unitTestJS",
+      "description": "Number of lines of code in unit tests",
+      "value": 1768
+    },
+    {
+      "owner": "unitTestJS",
+      "description": "Number of unit tests",
+      "value": 88
+    },
+    {
+      "owner": "integrationTestJS",
+      "description": "Number of lines of code in integration tests",
+      "value": 700
+    },
+    {
+      "owner": "integrationTestJS",
+      "description": "Number of integration tests",
+      "value": 19
+    },
+    {
+      "owner": "staticFile",
+      "description": "Number of lines of code in adapterBase.js",
+      "value": 1527
+    },
+    {
+      "owner": "staticFile",
+      "description": "Number of static files added",
+      "value": 37
+    },
+    {
+      "owner": "Overall",
+      "description": "Total lines of Code",
+      "value": 3995
+    },
+    {
+      "owner": "Overall",
+      "description": "Total Tests",
+      "value": 107
+    },
+    {
+      "owner": "Overall",
+      "description": "Total Files",
+      "value": 6
+    }
+  ]
+}

package/sampleProperties.json

@@ -84,7 +84,8 @@
       "healthcheck_on_timeout": true,
       "return_raw": false,
       "archiving": false,
-      "return_request": false
+      "return_request": false,
+      "keep_alive_interval": 0
     },
     "proxy": {
       "enabled": false,
@@ -273,4 +274,4 @@
   "brokers": [],
   "logLevel": "none",
   "timeout": 120000
-}
+}

package/test/unit/adapterTestUnit.js

@@ -280,10 +280,10 @@ describe('[unit] MicrosoftOffice365 Adapter Test', () => {
           assert.notEqual(null, packageDotJson.dependencies);
           assert.notEqual('', packageDotJson.dependencies);
           assert.equal('8.17.1', packageDotJson.dependencies.ajv);
-          assert.equal('1.12.2', packageDotJson.dependencies.axios);
+          assert.equal('1.13.5', packageDotJson.dependencies.axios);
           assert.equal('11.1.0', packageDotJson.dependencies.commander);
           assert.equal('11.3.0', packageDotJson.dependencies['fs-extra']);
-          assert.equal('10.8.2', packageDotJson.dependencies.mocha);
+          assert.equal('11.3.0', packageDotJson.dependencies.mocha);
           assert.equal('2.0.1', packageDotJson.dependencies['mocha-param']);
           assert.equal('0.4.4', packageDotJson.dependencies.ping);
           assert.equal('1.4.10', packageDotJson.dependencies['readline-sync']);

package/utils/methodDocumentor.js

@@ -19,17 +19,14 @@ function createObjectForFunction(
   workflow
 ) {
   const funcObject = {};
-  // if the entity path is not set, then the object is not created.
-  if (entityPath !== undefined) {
-    funcObject.method_signature = `${funcName}(${funcArgs.join(', ')})`;
-    funcObject.path = entityPath;
-    if (description === undefined) {
-      funcObject.description = '';
-      funcObject.workflow = 'No';
-    } else {
-      funcObject.description = description;
-      funcObject.workflow = workflow;
-    }
+  funcObject.method_signature = `${funcName}(${funcArgs.join(', ')})`;
+  funcObject.path = entityPath !== undefined ? entityPath : '';
+  if (description === undefined) {
+    funcObject.description = '';
+    funcObject.workflow = 'No';
+  } else {
+    funcObject.description = description;
+    funcObject.workflow = workflow;
   }
   return funcObject;
 }
@@ -77,7 +74,8 @@ function readFileUsingLib(filename, descriptionObj, workflowObj, functionList) {
   // parsing the file to get the function and class declarations.
   const aFileFuncArgs = acorn.parse(aFile, { ecmaVersion: 2020 });
 
-  let callName = 'identifyRequest';
+  // Track all method names that can be called (identifyRequest + any proxy methods)
+  const allowedCallNames = new Set(['identifyRequest']);
   // Looping through all the declarations parsed:
   aFileFuncArgs.body.forEach((e) => {
     // Getting only the class declaration as it has our required functions.
@@ -103,9 +101,10 @@ function readFileUsingLib(filename, descriptionObj, workflowObj, functionList) {
         method.value.body.body.forEach((statement) => {
           recurseCallExpressions(statement, callList);
         });
+        // Find calls to identifyRequest OR any discovered proxy methods
         const requests = [];
         for (let i = 0; i < callList.length; i += 1) {
-          if (callList[i].callee.property && callList[i].callee.property.name === callName) {
+          if (callList[i].callee.property && allowedCallNames.has(callList[i].callee.property.name)) {
             requests.push(callList[i]);
           }
         }
@@ -114,34 +113,60 @@ function readFileUsingLib(filename, descriptionObj, workflowObj, functionList) {
           if (expr.arguments.length < 2) {
             throw new Error(`Bad inputs in method ${funcName}`);
           }
-          const entity = expr.arguments[0].value;
-          const actionName = expr.arguments[1].value;
-          if (expr !== undefined && (expr.arguments[0].type !== 'Literal' || expr.arguments[1].type !== 'Literal')) {
-            const param1 = method.value.params[0];
-            const param2 = method.value.params[1];
-            if (param1.type !== 'Identifier' || param2.type !== 'Identifier'
-                || expr.arguments[0].type !== 'Identifier' || expr.arguments[1].type !== 'Identifier'
-                || param1.name !== expr.arguments[0].name || param2.name !== expr.arguments[1].name) {
-              throw new Error(`identifyRequest proxy method ${funcName} unknown format`);
-            } else if (callName !== 'identifyRequest') {
-              throw new Error(`MethodDocumentor not yet programmed to handle multiple helper methods: 1) ${callName}, 2) ${funcName}`);
+
+          const arg0Type = expr.arguments[0].type;
+          const arg1Type = expr.arguments[1].type;
+
+          let entityPath;
+
+          if (arg0Type === 'Literal' && arg1Type === 'Literal') {
+            const entity = expr.arguments[0].value;
+            const actionName = expr.arguments[1].value;
+            entityPath = getPathFromEntity(entity, actionName);
+          } else {
+            // Non-standard format: anything that's not both literals
+            // Special handling for proxy methods (both args are identifiers matching first 2 params)
+            if (arg0Type === 'Identifier' && arg1Type === 'Identifier') {
+              const param1 = method.value.params[0];
+              const param2 = method.value.params[1];
+              const arg0Name = expr.arguments[0].name;
+              const arg1Name = expr.arguments[1].name;
+
+              // Check if this is a valid proxy method
+              const isValidProxy = param1 && param2
+                  && param1.type === 'Identifier' && param2.type === 'Identifier'
+                  && param1.name === arg0Name && param2.name === arg1Name;
+
+              // Only process valid proxy methods
+              if (isValidProxy) {
+                const calledMethod = expr.callee.property.name;
+
+                // Skip nested proxies (proxies calling other proxies)
+                if (calledMethod !== 'identifyRequest') {
+                  console.log(`Skipping nested proxy method: ${funcName} (calls ${calledMethod})`);
+                  return;
+                }
+
+                // First-level proxy: calls identifyRequest directly
+                // Add this proxy to the set so other methods can call it
+                allowedCallNames.add(funcName);
+              }
             }
-            callName = funcName;
+
+            // All non-standard formats get documented without path
+            entityPath = undefined;
           }
-          const entityPath = getPathFromEntity(entity, actionName);
 
           // Creating and storing the object for the method.
-          if (entityPath !== undefined) {
-            functionList.push(
-              createObjectForFunction(
-                funcName,
-                funcArgs,
-                entityPath,
-                descriptionObj[funcName],
-                workflowObj[funcName]
-              )
-            );
-          }
+          functionList.push(
+            createObjectForFunction(
+              funcName,
+              funcArgs,
+              entityPath,
+              descriptionObj[funcName],
+              workflowObj[funcName]
+            )
+          );
         }
       });
     }