@itentialopensource/adapter-utils 4.44.11 → 4.45.0

package/CHANGELOG.md

@@ -1,4 +1,14 @@
 
+## 4.45.0 [12-08-2021]
+
+* changes for uriOptions and not encoding query params
+
+Closes ADAPT-1866
+
+See merge request itentialopensource/adapter-utils!227
+
+---
+
 ## 4.44.11 [10-25-2021]
 
 * change to the npm registry url

package/lib/connectorRest.js

@@ -1760,6 +1760,20 @@ function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
         }
       }
 
+      // only add global options if there are global options to add
+      if (globalRequest && globalRequest.uriOptions
+          && Object.keys(globalRequest.uriOptions).length > 0) {
+        const optionString = querystring.stringify(globalRequest.uriOptions);
+
+        // if no query paramters yet - start with ?
+        if (options.path.indexOf('?') < 0) {
+          options.path += `?${optionString}`;
+        } else {
+          // if already have query parameters, add on to end
+          options.path += `&${optionString}`;
+        }
+      }
+
       // remove the path vars from the reqBody
       const actReqBody = Object.assign({}, reqBody);
       if (actReqBody && actReqBody.uriPathVars) {

package/lib/restHandler.js

@@ -19,6 +19,7 @@ let basepathGl = null;
 let globalRequestGl = null;
 let returnRawGl = false;
 let encodePath = true;
+let encodeUri = true;
 
 // INTERNAL FUNCTIONS
 /*
@@ -677,7 +678,23 @@ function buildRequestPath(entity, action, entitySchema, reqPath, uriPathVars, ur
           addquery = entitySchema.querykey;
         }
         if (systemQuery !== null) {
-          addquery += querystring.stringify(systemQuery);
+          // if we are encoding - use querystring since it does it all!
+          if (encodeUri === true) {
+            addquery += querystring.stringify(systemQuery);
+          } else {
+            // if not encoding we need to build
+            const qkeys = Object.keys(systemQuery);
+
+            // 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) {
+                addquery += '&';
+              }
+              // adds key=value
+              addquery += `${qkeys[k]}=${systemQuery[qkeys[k]]}`;
+            }
+          }
         }
       }
 
@@ -988,6 +1005,8 @@ class RestHandler {
     this.globalRequest = null;
     this.encode = properties.encode_pathvars;
     encodePath = this.encode;
+    this.encodeQ = properties.encode_queryvars;
+    encodeUri = this.encodeQ;
 
     // only need to set returnRaw if the property is true - defaults to false
     if (properties.request && properties.request.return_raw) {

package/package.json

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

package/propertiesSchema.json

@@ -51,6 +51,11 @@
       "description": "When true the path variables are encoded in the url",
       "default": true
     },
+    "encode_queryvars": {
+      "type": "boolean",
+      "description": "When true the query variables are encoded in the url",
+      "default": true
+    },
     "save_metric": {
       "type": [
         "boolean",