@itentialopensource/adapter-utils 4.48.1 → 4.48.3

package/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+## 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
+
+Closes ADAPT-2404
+
+See merge request itentialopensource/adapter-utils!239
+
+---
+
 ## 4.48.1 [09-22-2022]
 
 * Add capability to send base64 and buffer in formData

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;
@@ -1988,6 +1990,49 @@ function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
             bodyString = JSON.stringify(tokenEntity);
           } else if (tokenSchema.requestDatatype && tokenSchema.requestDatatype.toUpperCase() === 'URLENCODE') {
             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
+            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) {
+              options.path = `${options.path}?${bodyString}`;
+            } else {
+              options.path = `${options.path}&${bodyString}`;
+            }
+            bodyString = '';
           }
 
           // if there is a body, set the content length of the body and add it to
@@ -3345,6 +3390,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') {
@@ -3441,6 +3491,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/propertyUtil.js

@@ -326,8 +326,8 @@ class AdapterPropertyUtil {
 
       // need to make sure we have supported datatypes - PLAIN is best if not supported - no translation or encoding
       if (entitySchema.requestDatatype.toUpperCase() !== 'JSON' && entitySchema.requestDatatype.toUpperCase() !== 'XML'
-          && entitySchema.requestDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.requestDatatype.toUpperCase() !== 'FORM'
-          && entitySchema.requestDatatype.toUpperCase() !== 'JSON2XML') {
+          && entitySchema.requestDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.requestDatatype.toUpperCase() !== 'URLQUERY'
+          && entitySchema.requestDatatype.toUpperCase() !== 'FORM' && entitySchema.requestDatatype.toUpperCase() !== 'JSON2XML') {
         entitySchema.requestDatatype = 'PLAIN';
       }
       if (entitySchema.responseDatatype.toUpperCase() !== 'JSON' && entitySchema.responseDatatype.toUpperCase() !== 'XML'
@@ -761,8 +761,8 @@ class AdapterPropertyUtil {
 
         // need to make sure we have supported datatypes - PLAIN is best if not supported - no translation or encoding
         if (entitySchema.requestDatatype.toUpperCase() !== 'JSON' && entitySchema.requestDatatype.toUpperCase() !== 'XML'
-            && entitySchema.requestDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.requestDatatype.toUpperCase() !== 'FORM'
-            && entitySchema.requestDatatype.toUpperCase() !== 'JSON2XML') {
+            && entitySchema.requestDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.requestDatatype.toUpperCase() !== 'URLQUERY'
+            && entitySchema.requestDatatype.toUpperCase() !== 'FORM' && entitySchema.requestDatatype.toUpperCase() !== 'JSON2XML') {
           entitySchema.requestDatatype = 'PLAIN';
         }
         if (entitySchema.responseDatatype.toUpperCase() !== 'JSON' && entitySchema.responseDatatype.toUpperCase() !== 'XML'

package/package.json

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