@itentialopensource/adapter-utils 5.0.2 → 5.0.4

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## 5.0.4 [07-18-2023]
+
+* Missing token fields oop change logic and key bug fix
+
+See merge request itentialopensource/adapter-utils!264
+
+---
+
+## 5.0.3 [07-18-2023]
+
+* fix bad return
+
+See merge request itentialopensource/adapter-utils!263
+
+---
+
 ## 5.0.2 [07-17-2023]
 
 * remove ds files and fix to expanded generic

package/lib/connectorRest.js

@@ -1577,6 +1577,29 @@ async function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
           tokenSchema = null;
         } else {
           log.debug(`${origin}: Using action and schema for token information`);
+          // If token info included in service config, override schema value
+          if (tokenUserField !== 'username') {
+            log.debug('Reading token user field from service configuration.');
+            tokenSchema.requestSchema.properties.username.external_name = tokenUserField;
+          }
+
+          if (tokenPwdField !== 'password') {
+            log.debug('Reading token password field from service configuration.');
+            tokenSchema.requestSchema.properties.password.external_name = tokenPwdField;
+          }
+
+          if (tokenResField !== 'token') {
+            log.debug('Reading token response field from service configuration.');
+            tokenSchema.responseSchema.properties.token.external_name = tokenResField;
+          }
+
+          if (tokenPath) {
+            log.debug('Reading token request URI path from service configuration.');
+            tokenSchema.entitypath = tokenPath;
+            if (tokenSchema.mockresponses && tokenSchema.mockresponses[0] && tokenSchema.mockresponses[0].name) {
+              tokenSchema.mockresponses[0].name = tokenPath;
+            }
+          }
         }
 
         // prepare the additional headers we received

package/lib/propertyUtil.js

@@ -327,12 +327,12 @@ 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() !== 'URLQUERY'
-          && 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'
-          && entitySchema.responseDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.responseDatatype.toUpperCase() !== 'XML2JSON') {
+        && entitySchema.responseDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.responseDatatype.toUpperCase() !== 'XML2JSON') {
         entitySchema.responseDatatype = 'PLAIN';
       }
 
@@ -367,7 +367,7 @@ class AdapterPropertyUtil {
                   mockResponse.response = 'mock file empty!';
                 }
               } else if (entitySchema.responseDatatype && (entitySchema.responseDatatype.toUpperCase() === 'XML'
-                  || entitySchema.responseDatatype.toUpperCase() === 'XML2JSON')) {
+                || entitySchema.responseDatatype.toUpperCase() === 'XML2JSON')) {
                 // read the mock date from the file system
                 mockResponse.response = fs.readFileSync(mockFileName, 'utf-8');
                 if (!mockResponse.response) {
@@ -719,7 +719,7 @@ class AdapterPropertyUtil {
               }
             }
           } else {
-          // add the specific pieces of the error object
+            // add the specific pieces of the error object
             errorObj.type = 'Invalid Action File';
             errorObj.vars = ['missing entity path', entityName];
 
@@ -768,12 +768,12 @@ 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() !== 'URLQUERY'
-            && 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'
-            && entitySchema.responseDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.responseDatatype.toUpperCase() !== 'XML2JSON') {
+          && entitySchema.responseDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.responseDatatype.toUpperCase() !== 'XML2JSON') {
           entitySchema.responseDatatype = 'PLAIN';
         }
 
@@ -807,7 +807,7 @@ class AdapterPropertyUtil {
                   // read the mock date from the file system
                   mockResponse.response = mockResp;
                 } else if (entitySchema.responseDatatype && (entitySchema.responseDatatype.toUpperCase() === 'XML'
-                    || entitySchema.responseDatatype.toUpperCase() === 'XML2JSON')) {
+                  || entitySchema.responseDatatype.toUpperCase() === 'XML2JSON')) {
                   // read the mock date from the file system
                   mockResponse.response = mockResp;
                 } else {
@@ -1011,16 +1011,23 @@ class AdapterPropertyUtil {
         }
 
         // start what we return
-        let retData = `${dataParts[0]}?`;
         let count = 0;
-
-        // query format - key=value& or key=value{end of url}
-        const queryData = dataParts[1].split('&');
+        let retData = '';
+        let queryData;
+        // If there is query daya
+        if (actualData.indexOf('?') > -1) {
+          retData = `${dataParts[0]}?`;
+          // query format - key=value& or key=value{end of url}
+          queryData = dataParts[1].split('&');
+        } else {
+          // If its a urlencode body
+          queryData = dataParts[0].split('&');
+        }
 
         // analyze the query fields
         for (let i = 0; i < queryData.length; i += 1) {
           // key of the query field
-          const key = queryData[i].split('=');
+          const key = queryData[i].split('=')[0];
           let found = false;
 
           // add any & to separate query params
@@ -1113,7 +1120,7 @@ class AdapterPropertyUtil {
         // recursive call with primary and secondary object
         combinedProps[propKeys[k]] = this.mergeProperties(thisProp, combinedProps[propKeys[k]]);
       } else if ((thisProp !== undefined && thisProp !== null && thisProp !== '')
-          || (combinedProps[propKeys[k]] === undefined || combinedProps[propKeys[k]] === null || combinedProps[propKeys[k]] === '')) {
+        || (combinedProps[propKeys[k]] === undefined || combinedProps[propKeys[k]] === null || combinedProps[propKeys[k]] === '')) {
         // if no secondary or primary has value merge it - overriding the secondary
         combinedProps[propKeys[k]] = thisProp;
       }

package/lib/requestHandler.js

@@ -1313,7 +1313,7 @@ class RequestHandler {
       }
 
       // validate the action files for the adapter
-      return callback(this.connector.makeTokenRequest('/none/token/path', useUser, reqBody, null, callProperties, callback));
+      return this.connector.makeTokenRequest('/none/token/path', useUser, reqBody, null, callProperties, callback);
     } catch (e) {
       // handle any exception
       const errorObj = this.transUtil.checkAndReturn(e, origin, 'Issue getting token');

package/package.json

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