@itentialopensource/adapter-utils 4.44.7 → 4.45.0

package/lib/propertyUtil.js

@@ -428,7 +428,8 @@ class AdapterPropertyUtil {
         filter: {
           id: this.myid,
           entity: entityName
-        }
+        },
+        entity: entityName
       };
 
       // call to get the adapter schema from the database

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]]}`;
+            }
+          }
         }
       }
 
@@ -897,7 +914,7 @@ function buildPayload(entity, action, entitySchema, payload) {
           }
         }
       } else {
-        log.warn(`${origin}: Payload and Gloabl Payload can not be merged!`);
+        log.warn(`${origin}: Payload and Global Payload can not be merged!`);
       }
     }
 
@@ -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,16 +1,16 @@
 {
   "name": "@itentialopensource/adapter-utils",
-  "version": "4.44.7",
+  "version": "4.45.0",
   "description": "Itential Adapter Utility Libraries",
   "scripts": {
     "preinstall": "node utils/setup.js",
     "lint": "eslint . --ext .json --ext .js",
     "lint:errors": "eslint --quiet . --ext .json --ext .js",
-    "test:unit": "mocha test/unit/lib/requestHandlerTest.js --LOG=error && mocha test/unit/lib/restHandlerTest.js --LOG=error && mocha test/unit/lib/propertyUtilTest.js --LOG=error && mocha test/unit/lib/translatorUtilTest.js --LOG=error && mocha test/unit/lib/dbUtilTest.js --LOG=error",
+    "test:unit": "mocha test/unit/lib/requestHandlerTest.js --LOG=error && mocha test/unit/lib/restHandlerTest.js --LOG=error && mocha test/unit/lib/propertyUtilTest.js --LOG=error && mocha test/unit/lib/translatorUtilTest.js --LOG=error && mocha test/unit/lib/dbUtilTest.js --LOG=debug",
     "test:integration": "mocha test/integration/lib/requestHandlerTest.js --LOG=error && mocha test/integration/lib/restHandlerTest.js --LOG=error",
     "test:cover": "nyc --reporter html --reporter text mocha --recursive --reporter dot test/*",
     "test": "npm run test:unit && npm run test:integration",
-    "deploy": "npm publish --registry=http://registry.npmjs.org --access=public",
+    "deploy": "npm publish --registry=https://registry.npmjs.org --access=public",
     "build": "npm run deploy"
   },
   "license": "Apache-2.0",
@@ -51,7 +51,7 @@
     "eslint-plugin-json": "^3.0.0",
     "mocha": "^9.0.1",
     "nyc": "^15.1.0",
-    "strip-ansi": "^7.0.0",
+    "strip-ansi": "^7.0.1",
     "strip-ansi-cli": "^3.0.1",
     "testdouble": "^3.16.1",
     "winston": "^3.3.3"

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",