@itentialopensource/adapter-utils 5.0.5 → 5.1.1

package/CHANGELOG.md

@@ -1,4 +1,22 @@
 
+## 5.1.1 [08-22-2023]
+
+* fix scrubing arrays - was not making copy
+
+See merge request itentialopensource/adapter-utils!268
+
+---
+
+## 5.1.0 [08-04-2023]
+
+* Changes to choosepath logic
+
+Closes ADAPT-2828
+
+See merge request itentialopensource/adapter-utils!267
+
+---
+
 ## 5.0.5 [07-24-2023]
 
 * Fix throttle bug on connectivity issue

package/error.json

@@ -90,6 +90,12 @@
       "displayString": "Invalid schema file: $VARIABLE$ in $VARIABLE$",
       "recommendation": "Verify the action file"
     },
+    {
+      "key": "Action Not Available",
+      "icode": "AD.305",
+      "displayString": "This action is $VARIABLE$ version $VARIABLE$",
+      "recommendation": "Run against an appropriate version if possible"
+    },
     {
       "key": "Query Not Translated",
       "icode": "AD.310",

package/lib/connectorRest.js

@@ -1173,7 +1173,7 @@ async function getToken(reqPath, options, tokenSchema, bodyString, callPropertie
         if (!tokenSchema.responseDatatype || tokenSchema.responseDatatype === 'JSON') {
           tokenResp.response = JSON.parse(tokenResp.response);
         }
-        log.debug(`${origin}: ${JSON.stringify(tokenResp.response)}`);
+        log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tokenResp.response))}`);
 
         // return the token from the token schema
         let translated = null;
@@ -2903,7 +2903,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
           }
 
           // format the authentication string
-          log.debug(`${origin}: ${JSON.stringify(tres)} being used for user: ${useUser}`);
+          log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tres))} being used for user: ${useUser}`);
           const authStrs = [];
           if (callProperties && callProperties.authentication && callProperties.authentication.auth_field_format) {
             if (Array.isArray(callProperties.authentication.auth_field_format)) {
@@ -2965,7 +2965,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
           return callback(null, errorObj);
         }
 
-        log.debug(`${origin}: ${JSON.stringify(tokenObj)} being used for user: ${useUser}`);
+        log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tokenObj))} being used for user: ${useUser}`);
         const authStrs = [];
         if (callProperties && callProperties.authentication && callProperties.authentication.auth_field_format) {
           if (Array.isArray(callProperties.authentication.auth_field_format)) {

package/lib/propertyUtil.js

@@ -10,12 +10,234 @@ const path = require('path');
 // The crypto libraries
 const cryptoJS = require('crypto-js');
 
+let id = null;
+
+/**
+ * @summary Determines the order of version in the list of items
+ *          Allowed formats:
+ *            #, #.#, #.#.#, etc
+ *            v#, v#.#, v#.#.#, etc
+ *            ver#, ver#.#, ver#.#.#, etc
+ *
+ * @function itemOrder
+ *
+ * @param {String} firstItem - the firstItem (required)
+ * @param {String} secondItem - the secondItem (required)
+ *
+ * @return {Number} -1 if firstItem is first; 0 if secondItem is first; 1 if equal
+ */
+function itemOrder(firstItem, secondItem) {
+  const origin = `${id}-propertyUtil-itemOrder`;
+  log.trace(origin);
+  let myFirst = firstItem;
+  let mySecond = secondItem;
+
+  // strip off 'v' or 'ver' so can handle like other . seperated things
+  if (myFirst) {
+    if (myFirst.toUpperCase().startsWith('VER')) {
+      myFirst = myFirst.substring(3);
+    }
+    if (myFirst.toUpperCase().startsWith('V')) {
+      myFirst = myFirst.substring(1);
+    }
+  }
+  if (mySecond) {
+    if (mySecond.toUpperCase().startsWith('VER')) {
+      mySecond = mySecond.substring(3);
+    }
+    if (mySecond.toUpperCase().startsWith('V')) {
+      mySecond = mySecond.substring(1);
+    }
+  }
+
+  // split the items based on versioning '.'
+  const firstParts = myFirst.split('.');
+  const secondParts = mySecond.split('.');
+
+  // like string compare in case not just #s but issue with different size #s (2 > 10)
+  // pad in front with leading 0 (assume number want same digits)
+  while (firstParts[0].length < secondParts[0].length) {
+    firstParts[0] = `0${firstParts[0]}`;
+  }
+  while (secondParts[0].length < firstParts[0].length) {
+    secondParts[0] = `0${secondParts[0]}`;
+  }
+
+  // if first is less
+  if (firstParts[0] < secondParts[0]) {
+    return -1;
+  }
+  // if second is less
+  if (firstParts[0] > secondParts[0]) {
+    return 0;
+  }
+  // can not continue if firstPart is length 1
+  if (firstParts.length === 1) {
+    // both length 1 and equal value
+    if (secondParts.length === 1) {
+      return 1;
+    }
+    // second one longer length (first 3; second 3.3) - so first is less
+    return -1;
+  }
+  // can not continue if secondPart is length 1
+  if (secondParts.length === 1) {
+    // first one longer length (first 3.3; second 3) - so second is less
+    return 0;
+  }
+
+  // both have to be at least length 2 and equal first
+  // remove the first item for each
+  firstParts.shift();
+  secondParts.shift();
+
+  // recursive call - putting back together remaining parts
+  return itemOrder(firstParts.join('.'), secondParts.join('.'));
+}
+
+/**
+ * @summary Goes through the available paths and returns the appropriate one
+ *
+ * @function returnPath
+ *
+ * @param {String} value - the text to encrypt (required)
+ * @param {Object} eInfo - the encryption information (optional)
+ *
+ * @return {String} the path to use in the call
+ */
+function returnPath(actionInfo, entityName, actionName, choosePath, startV, endV) {
+  const origin = `${id}-propertyUtil-returnPath`;
+  log.trace(origin);
+
+  // create the generic part of an error object
+  const errorObj = {
+    origin
+  };
+
+  // if there is no entitypath - throw error
+  if (!actionInfo.entitypath) {
+    // add the specific pieces of the error object
+    errorObj.type = 'Invalid Action File';
+    errorObj.vars = ['missing entity path for action', entityName];
+
+    // log (if not system entity) and return the error
+    if (entityName !== '.system') {
+      log.warn(`${origin}: Entity ${entityName} action ${actionName} - missing entity path`);
+      errorObj.error = [`${origin}: Entity ${entityName} action ${actionName} - missing entity path`];
+    }
+
+    throw new Error(JSON.stringify(errorObj));
+  }
+
+  // if entitypath is not a string or an object - throw error
+  if ((typeof actionInfo.entitypath !== 'string' && typeof actionInfo.entitypath !== 'object') || Array.isArray(actionInfo.entitypath)) {
+    // add the specific pieces of the error object
+    errorObj.type = 'Invalid Action File';
+    errorObj.vars = ['invalid entity path for action', entityName];
+
+    // log (if not system entity) and return the error
+    if (entityName !== '.system') {
+      log.warn(`${origin}: Entity ${entityName} action ${actionName} - invalid entity path`);
+      errorObj.error = [`${origin}: Entity ${entityName} action ${actionName} - invalid entity path`];
+    }
+
+    throw new Error(JSON.stringify(errorObj));
+  }
+
+  // if choosepath & it is before start - return error
+  if (choosePath && startV && itemOrder(startV, choosePath) === 0) {
+    // add the specific pieces of the error object
+    errorObj.type = 'Action Not Available';
+    errorObj.vars = ['not available until', startV];
+
+    // log (if not system entity) and return the error
+    if (entityName !== '.system') {
+      log.warn(`${origin}: Entity ${entityName} action ${actionName} - not available until version ${startV}`);
+      errorObj.error = [`${origin}: Entity ${entityName} action ${actionName} - not available until version ${startV}`];
+    }
+
+    throw new Error(JSON.stringify(errorObj));
+  }
+
+  // if choosepath & it is after end - return error
+  if (choosePath && endV && itemOrder(choosePath, endV) === 0) {
+    // add the specific pieces of the error object
+    errorObj.type = 'Action Not Available';
+    errorObj.vars = ['end of life in', endV];
+
+    // log (if not system entity) and return the error
+    if (entityName !== '.system') {
+      log.warn(`${origin}: Entity ${entityName} action ${actionName} - end of life in version ${endV}`);
+      errorObj.error = [`${origin}: Entity ${entityName} action ${actionName} - end of life in version ${endV}`];
+    }
+
+    throw new Error(JSON.stringify(errorObj));
+  }
+
+  // if the entitypath is a string - return it
+  if (typeof actionInfo.entitypath === 'string') {
+    // return the path we have
+    return actionInfo.entitypath;
+  }
+
+  // if the entitypath is an object instead of a string need to figure out which path to use
+  const ekeys = Object.keys(actionInfo.entitypath);
+
+  // if entitypath is object with no fields - throw error
+  if (ekeys.length === 0) {
+    // add the specific pieces of the error object
+    errorObj.type = 'Invalid Action File';
+    errorObj.vars = ['missing entity path for action', entityName];
+
+    // log (if not system entity) and return the error
+    if (entityName !== '.system') {
+      log.warn(`${origin}: Entity ${entityName} action ${actionName} - missing entity path`);
+      errorObj.error = [`${origin}: Entity ${entityName} action ${actionName} - missing entity path`];
+    }
+
+    throw new Error(JSON.stringify(errorObj));
+  }
+
+  // if nothing for me to base choice on
+  if (!choosePath) {
+    // the first one is the default so return it
+    return actionInfo.entitypath[ekeys[0]];
+  }
+
+  // initialization
+  let foundPath = '';
+  let beforePath = ekeys[0];
+
+  // go through the paths for an exact match
+  for (let ep = 0; ep < ekeys.length; ep += 1) {
+    // see if the key matches the choosepath value, if it does set the entitypath
+    if (choosePath && ekeys[ep] === choosePath) {
+      foundPath = actionInfo.entitypath[ekeys[ep]];
+      break;
+    }
+
+    // see if path key is before choosePath but after current beforePath (in between) - reset beforePath
+    if (itemOrder(choosePath, ekeys[ep]) === 0 && itemOrder(beforePath, ekeys[ep]) === -1) {
+      beforePath = ekeys[ep];
+    }
+  }
+
+  // if exact match was found
+  if (foundPath) {
+    return foundPath;
+  }
+
+  // if no exact then use the beforePath
+  return actionInfo.entitypath[beforePath];
+}
+
 class AdapterPropertyUtil {
   /**
    * Adapter Translator Utility
    * @constructor
    */
   constructor(prongId, directory) {
+    id = prongId;
     this.myid = prongId;
     this.baseDir = directory;
   }
@@ -265,31 +487,8 @@ class AdapterPropertyUtil {
       entitySchema.responseObjects = [];
       entitySchema.mockresponses = [];
 
-      // if the entitypath is an object instead of a string need to figure out which path to use
-      if (actionInfo.entitypath && typeof actionInfo.entitypath === 'object') {
-        const ekeys = Object.keys(actionInfo.entitypath);
-        if (ekeys.length > 0) {
-          // the first one is the default so if we do not have a match that is the one that will be used
-          entitySchema.entitypath = actionInfo.entitypath[ekeys[0]];
-          for (let ep = 1; ep < ekeys.length; ep += 1) {
-            // see if the key matches the choosepath value, if it does set the entitypath
-            if (choosepath && ekeys[ep] === choosepath) {
-              entitySchema.entitypath = actionInfo.entitypath[ekeys[ep]];
-              break;
-            }
-          }
-        } else {
-          // add the specific pieces of the error object
-          errorObj.type = 'Invalid Action File';
-          errorObj.vars = ['missing entity path', actionFile];
-
-          // log (if not system entity) and throw the error
-          if (entityName !== '.system') {
-            log.error(`${origin}: Entity ${entityName} action ${actionName} - missing entity path`);
-          }
-          throw new Error(JSON.stringify(errorObj));
-        }
-      }
+      // Determine the path to use for this call
+      entitySchema.entitypath = returnPath(actionInfo, entityName, actionName, choosepath, actionInfo.startVersion, actionInfo.endVersion);
 
       // if info provided, replace the defaults
       if (actionInfo.querykey) {
@@ -705,32 +904,8 @@ class AdapterPropertyUtil {
         entitySchema.responseObjects = [];
         entitySchema.mockresponses = [];
 
-        // if the entitypath is an object instead of a string need to figure out which path to use
-        if (actionInfo.entitypath && typeof actionInfo.entitypath === 'object') {
-          const ekeys = Object.keys(actionInfo.entitypath);
-          if (ekeys.length > 0) {
-            // the first one is the default so if we do not have a match that is the one that will be used
-            entitySchema.entitypath = actionInfo.entitypath[ekeys[0]];
-            for (let ep = 1; ep < ekeys.length; ep += 1) {
-              // see if the key matches the choosepath value, if it does set the entitypath
-              if (choosepath && ekeys[ep] === choosepath) {
-                entitySchema.entitypath = actionInfo.entitypath[ekeys[ep]];
-                break;
-              }
-            }
-          } else {
-            // add the specific pieces of the error object
-            errorObj.type = 'Invalid Action File';
-            errorObj.vars = ['missing entity path', entityName];
-
-            // log (if not system entity) and return the error
-            if (entityName !== '.system') {
-              log.warn(`${origin}: Entity ${entityName} action ${actionName} - missing entity path`);
-              errorObj.error = [`${origin}: Entity ${entityName} action ${actionName} - missing entity path`];
-            }
-            return callback(null, errorObj);
-          }
-        }
+        // Determine the path to use for this call
+        entitySchema.entitypath = returnPath(actionInfo, entityName, actionName, choosepath, actionInfo.startVersion, actionInfo.endVersion);
 
         // if info provided, replace the defaults
         if (actionInfo.querykey) {
@@ -972,7 +1147,7 @@ class AdapterPropertyUtil {
     }
 
     // This is the array of sensitive keys
-    let sensList = ['authorization', 'x-auth-token', 'x-csrf-token', 'x-amz-security-token', 'x-aws-ec2-metadata-token', 'cookie', 'set-cookie', 'token', 'tokenp2', 'user', 'username', 'passwd', 'password', 'api-key', 'client-id', 'client-secret', 'session', 'session-id'];
+    let sensList = ['authorization', 'x-auth-token', 'x-csrf-token', 'x-amz-security-token', 'x-aws-ec2-metadata-token', 'cookie', 'set-cookie', 'token', 'tokenp2', 'user', 'username', 'passwd', 'password', 'api-key', 'client-id', 'client-secret', 'session', 'session-id', 'jsessionid'];
 
     // add any additional items to scrub
     if (addItems && Array.isArray(addItems) && addItems.length > 0) {
@@ -982,17 +1157,6 @@ class AdapterPropertyUtil {
     // going to use copy of data so we do not mess up input - if object will still need to assign it
     let actualData = inData;
 
-    // if we are scrubbing an array
-    if (Array.isArray(actualData)) {
-      // need to go through each item in the array
-      for (let i = 0; i < actualData.length; i += 1) {
-        actualData[i] = this.scrubSensitiveInfo(actualData[i]);
-      }
-
-      // return the scrubbed array
-      return actualData;
-    }
-
     // if we are scrubbbing a string (e.g. URL)
     if (typeof actualData === 'string') {
       // if it is a Stringified JSON
@@ -1057,10 +1221,22 @@ class AdapterPropertyUtil {
       }
     }
 
-    // if we are scrubbing an object (or string that has been parsed)
-    if (typeof actualData === 'object') {
-      const retData = { ...actualData };
+    // want to make a copy and not alter the original object or array
+    const retData = JSON.parse(JSON.stringify(actualData));
+
+    // if we are scrubbing an array
+    if (Array.isArray(retData)) {
+      // need to go through each item in the array
+      for (let i = 0; i < retData.length; i += 1) {
+        retData[i] = this.scrubSensitiveInfo(retData[i]);
+      }
 
+      // return the scrubbed array
+      return retData;
+    }
+
+    // if we are scrubbing an object (or string that has been parsed)
+    if (typeof retData === 'object') {
       // go through each item in the object
       Object.keys(retData).forEach((key) => {
         // go deep through an object with recursive call

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-utils",
-  "version": "5.0.5",
+  "version": "5.1.1",
   "description": "Itential Adapter Utility Libraries",
   "scripts": {
     "postinstall": "node utils/setup.js",

package/schemas/propertiesSchema.json

@@ -250,14 +250,6 @@
           "description": "This property turns on logging of Authentication Information and should only be true when debugging authentication and connectivity",
           "default": false
         },
-        "sensitive": {
-          "type": "array",
-          "description": "List of sensitive keys to search and hide values from being logged",
-          "default": [],
-          "items": {
-            "type": "string"
-          }
-        },
         "client_id": {
           "type": "string",
           "description": "The client id for OAuth requests - can also use username depending on schema",
@@ -273,6 +265,14 @@
           "description": "The grant type for OAuth requests - can also provide in schema",
           "default": ""
         },
+        "sensitive": {
+          "type": "array",
+          "description": "List of sensitive keys to search and hide values from being logged",
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        },
         "sso": {
           "type": "object",
           "properties": {
@@ -300,6 +300,36 @@
               "maximum": 65535
             }
           }
+        },
+        "multiStepAuthCalls": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "Id of the step call",
+                "examples": [
+                  "getAccessToken"
+                ]
+              },
+              "requestFields": {
+                "type": "object",
+                "description": "The fields set in step request"
+              },
+              "responseFields": {
+                "type": "object",
+                "description": "The fields from the step result"
+             },
+              "successfullResponseCode": {
+                "type": "integer",
+                "description": "Expected response code for given step, if not set any successfull http response is accepted",
+                "examples": [
+                  200
+                ]
+              }
+            }
+          }
         }
       },
       "required": [
@@ -404,6 +434,11 @@
           "type": "object",
           "description": "Query object { device: xxxxx } to be placed into the healthcheck, will be converted to query string by the adapter",
           "default": {}
+        },
+        "addlHeaders": {
+          "type": "object",
+          "description": "headers that will be appended to the headers for the call",
+          "default": {}
         }
       },
       "required": [
@@ -919,21 +954,21 @@
                 "type": "object",
                 "description": "The json object with query parameters of the call to getDevice",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "body": {
                 "type": "object",
                 "description": "The json object with body of the call to getDevice",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "headers": {
                 "type": "object",
                 "description": "The json object with headers of the call to getDevice",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "handleFailure": {
@@ -949,7 +984,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to getDevice",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {}
               },
@@ -962,7 +997,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to getDevice",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {
                   "name": {
@@ -1015,21 +1050,21 @@
                 "type": "object",
                 "description": "The json object with query parameters of the call to getDevicesFiltered",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "body": {
                 "type": "object",
                 "description": "The json object with body of the call to getDevicesFiltered",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "headers": {
                 "type": "object",
                 "description": "The json object with headers of the call to getDevicesFiltered",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "handleFailure": {
@@ -1045,7 +1080,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to getDevice",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {}
               },
@@ -1058,7 +1093,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to getDevicesFiltered",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {
                   "name": {
@@ -1111,21 +1146,21 @@
                 "type": "object",
                 "description": "The json object with query parameters of the call to isAlive",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "body": {
                 "type": "object",
                 "description": "The json object with body of the call to isAlive",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "headers": {
                 "type": "object",
                 "description": "The json object with headers of the call to isAlive",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "handleFailure": {
@@ -1141,7 +1176,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to getDevice",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {}
               },
@@ -1154,7 +1189,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to isAlive",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {
                   "status": {
@@ -1192,21 +1227,21 @@
                 "type": "object",
                 "description": "The json object with query parameters of the call to getConfig",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "body": {
                 "type": "object",
                 "description": "The json object with body of the call to getConfig",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "headers": {
                 "type": "object",
                 "description": "The json object with headers of the call to getConfig",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "handleFailure": {
@@ -1222,7 +1257,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to getDevice",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {}
               },
@@ -1235,7 +1270,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to getConfig",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {}
               }
@@ -1262,21 +1297,21 @@
                 "type": "object",
                 "description": "The json object with query parameters of the call to getCount",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "body": {
                 "type": "object",
                 "description": "The json object with body of the call to getCount",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "headers": {
                 "type": "object",
                 "description": "The json object with headers of the call to getCount",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 }
               },
               "handleFailure": {
@@ -1292,7 +1327,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to getDevice",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {}
               },
@@ -1305,7 +1340,7 @@
                 "type": "object",
                 "description": "The json object with response fields of the call to getConfig",
                 "additionalProperties": {
-                  "type": "string"
+                  "type": ["string", "number"]
                 },
                 "properties": {}
               }
@@ -1379,21 +1414,21 @@
                       "type": "object",
                       "description": "The json object with query parameters of the call to getDevice",
                       "additionalProperties": {
-                        "type": "string"
+                        "type": ["string", "number"]
                       }
                     },
                     "body": {
                       "type": "object",
                       "description": "The json object with body of the call to getDevice",
                       "additionalProperties": {
-                        "type": "string"
+                        "type": ["string", "number"]
                       }
                     },
                     "headers": {
                       "type": "object",
                       "description": "The json object with headers of the call to getDevice",
                       "additionalProperties": {
-                        "type": "string"
+                        "type": ["string", "number"]
                       }
                     },
                     "handleFailure": {
@@ -1409,7 +1444,7 @@
                       "type": "object",
                       "description": "The json object with response fields of the call to getDevice",
                       "additionalProperties": {
-                        "type": "string"
+                        "type": ["string", "number"]
                       },
                       "properties": {}
                     },
@@ -1422,7 +1457,7 @@
                       "type": "object",
                       "description": "The json object with response fields of the call to getDevice",
                       "additionalProperties": {
-                        "type": "string"
+                        "type": ["string", "number"]
                       }
                     }
                   }