@itentialopensource/adapter-utils 4.44.7 → 4.45.0

package/CHANGELOG.md

@@ -1,4 +1,54 @@
 
+## 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
+
+Closes ADAPT-1793
+
+See merge request itentialopensource/adapter-utils!224
+
+---
+
+## 4.44.10 [10-25-2021]
+
+* fixes for dbUtils, proxy, misspelling
+
+Closes ADAPT-1019
+
+See merge request itentialopensource/adapter-utils!223
+
+---
+
+## 4.44.9 [09-14-2021]
+
+* Refactor storage handling
+
+Closes ADAPT-870
+
+See merge request itentialopensource/adapter-utils!222
+
+---
+
+## 4.44.8 [08-29-2021]
+
+* fix this call where there is no this
+
+Closes ADAPT-880
+
+See merge request itentialopensource/adapter-utils!221
+
+---
+
 ## 4.44.7 [08-29-2021]
 
 * changes to fix async issues in getEntitiesSchema

package/lib/connectorRest.js

@@ -640,7 +640,7 @@ function makeRequest(request, entitySchema, callProperties, startTrip, attempt,
     } else if (proxyEnabled) {
       let proxy = `${proxyProtocol}://${proxyHost}:${proxyPort}`;
       if (proxyUser && proxyPassword) {
-        proxy = `${callProperties.proxy.protocol}://${proxyUser}:${proxyPassword}@${callProperties.proxy.host}:${callProperties.proxy.port}`;
+        proxy = `${proxyProtocol}://${proxyUser}:${proxyPassword}@${proxyHost}:${proxyPort}`;
       }
       request.header.agent = new HttpsProxyAgent(proxy);
 
@@ -1494,7 +1494,7 @@ function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
 
   try {
     // Get the entity schema from the file system
-    return this.propUtilInst.getEntitySchema('.system', 'getToken', this.dbUtil, (tokenSchema, healthError) => {
+    return propUtilInst.getEntitySchema('.system', 'getToken', this.dbUtil, (tokenSchema, healthError) => {
       if (healthError || !tokenSchema || Object.keys(tokenSchema).length === 0) {
         log.debug(`${origin}: Using adapter properties for token information`);
         tokenSchema = null;
@@ -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) {