@itentialopensource/adapter-utils 4.48.2 → 4.48.4

package/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+## 4.48.4 [10-25-2022]
+
+* Clean xml string sent into the adapter task and troubleshoot openstack_nova adapter
+
+Closes ADAPT-2382
+
+See merge request itentialopensource/adapter-utils!241
+
+---
+
+## 4.48.3 [10-17-2022]
+
+* Changes to have token data passed in url instead of body
+
+Closes ADAPT-2404
+
+See merge request itentialopensource/adapter-utils!240
+
+---
+
 ## 4.48.2 [10-04-2022]
 
 * Changes to have token data passed in url instead of body

package/lib/connectorRest.js

@@ -97,6 +97,8 @@ let healthy = false;
 const healthlock = 0;
 let healthcheck = false;
 const healthchecklock = 0;
+let encodeUri = true;
+let authQueryEncode = null;
 
 // Other global variables
 let id = null;
@@ -1990,7 +1992,39 @@ function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
             bodyString = querystring.stringify(tokenEntity);
           } else if (tokenSchema.requestDatatype && tokenSchema.requestDatatype.toUpperCase() === 'URLQUERY') {
             // if the datatype is URLQUERY need to put into the query on the request
-            bodyString = querystring.stringify(tokenEntity);
+            if (authQueryEncode != null) {
+              if (authQueryEncode === true) {
+                bodyString = querystring.stringify(tokenEntity);
+              } else {
+                bodyString = '';
+                // if not encoding we need to build
+                const qkeys = Object.keys(tokenEntity);
+                // add each query parameter and its value
+                for (let k = 0; k < qkeys.length; k += 1) {
+                  // need to add separator for everything after the first one
+                  if (k > 0) {
+                    bodyString += '&';
+                  }
+                  // adds key=value
+                  bodyString += `${qkeys[k]}=${tokenEntity[qkeys[k]]}`;
+                }
+              }
+            } else if (encodeUri === true) {
+              bodyString = querystring.stringify(tokenEntity);
+            } else {
+              bodyString = '';
+              // if not encoding we need to build
+              const qkeys = Object.keys(tokenEntity);
+              // add each query parameter and its value
+              for (let k = 0; k < qkeys.length; k += 1) {
+                // need to add separator for everything after the first one
+                if (k > 0) {
+                  bodyString += '&';
+                }
+                // adds key=value
+                bodyString += `${qkeys[k]}=${tokenEntity[qkeys[k]]}`;
+              }
+            }
 
             // append to the path
             if (options.path.indexOf('?') < 0) {
@@ -1998,7 +2032,7 @@ function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
             } else {
               options.path = `${options.path}&${bodyString}`;
             }
-            bodyString = '{}';
+            bodyString = '';
           }
 
           // if there is a body, set the content length of the body and add it to
@@ -2179,10 +2213,12 @@ function getTokenItem(pathForToken, user, reqBody, invalidToken, callProperties,
           // No valid token found, Need to get a new token and add it to the token list
           buildTokenRequest(pathForToken, reqBody, callProperties, (dyntoken, berror) => {
             if (berror) {
-              done(null, berror);
+              // done(null, berror);
+              return done(berror);
             }
             if (!dyntoken) {
-              done(null, 'No Token returned');
+              // done(null, 'No Token returned');
+              return done(new Error('No Token returned'));
             }
 
             let timeout = tokenTimeout;
@@ -3356,6 +3392,11 @@ class ConnectorRest {
       choosepath = props.choosepath;
     }
 
+    // set the encodeUri (optional - default is true)
+    if (typeof props.encode_queryvars === 'boolean') {
+      encodeUri = props.encode_queryvars;
+    }
+
     if (props.authentication) {
       // set the authentication method (required - default is null)
       if (typeof props.authentication.auth_method === 'string') {
@@ -3452,6 +3493,11 @@ class ConnectorRest {
       if (props.authentication.sso && typeof props.authentication.sso === 'object') {
         sso = props.authentication.sso;
       }
+
+      // set the authQueryEncode (optional - default is null)
+      if (typeof props.authentication.authQueryEncode === 'boolean') {
+        authQueryEncode = props.authentication.authQueryEncode;
+      }
     }
 
     // set the stub mode (optional - default is false)

package/lib/restHandler.js

@@ -906,6 +906,8 @@ function buildPayload(entity, action, entitySchema, payload) {
         thisBdata = '';
       }
       if (typeof thisBdata !== 'object') {
+        thisBdata = thisBdata.replace(/(\r\n|\n|\r)/gm, '');
+        thisBdata = thisBdata.replace(/>\s+?</g, '><');
         return thisBdata;
       }
     }

package/package.json

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