@itentialopensource/adapter-utils 4.45.5 → 4.46.0

package/CHANGELOG.md

@@ -1,4 +1,34 @@
 
+## 4.46.0 [07-27-2022]
+
+* Added code to skip split string on  dot for special cases
+
+Closes ADAPT-2266
+
+See merge request itentialopensource/adapter-utils!234
+
+---
+
+## 4.45.7 [07-25-2022]
+
+* Fix issue on no token where it takes exception
+
+Closes ADAPT-2244
+
+See merge request itentialopensource/adapter-utils!233
+
+---
+
+## 4.45.6 [05-19-2022]
+
+* Change for token request with Auth header and data
+
+Closes ADAPT-2056
+
+See merge request itentialopensource/adapter-utils!232
+
+---
+
 ## 4.45.5 [05-14-2022]
 
 * handle missing token data in mockdata

package/lib/connectorRest.js

@@ -1865,11 +1865,12 @@ function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
       let bodyString = null;
 
       // if we have been passed a schema and the Authorization is in a header
-      if (tokenSchema && tokenSchema.headers && tokenSchema.headers.Authorization) {
-        // request the token
-        options.headers['Content-length'] = 0;
-        return getToken(reqPath, options, tokenSchema, '', callProperties, callback);
-      }
+      // COMMENTED OUT AND HANDLED IN IF BELOW - take stuff out of body on line 1930
+      // if (tokenSchema && tokenSchema.headers && tokenSchema.headers.Authorization) {
+      //   // request the token
+      //   options.headers['Content-length'] = 0;
+      //   return getToken(reqPath, options, tokenSchema, '', callProperties, callback);
+      // }
       if (tokenSchema) {
         // if this is a get, need to put the username on the url
         if (options.path.indexOf('/{username}') >= 0) {
@@ -1926,6 +1927,12 @@ function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
             }
           }
 
+          if (tokenSchema.headers && tokenSchema.headers.Authorization) {
+            // remove the username and password from the creds
+            delete creds.username;
+            delete creds.password;
+          }
+
           // map the data we received to an Entity - will get back the defaults
           const tokenEntity = transUtilInst.mapToOutboundEntity(creds, tokenSchema.requestSchema);
           bodyString = tokenEntity;
@@ -2117,6 +2124,9 @@ function getTokenItem(pathForToken, user, reqBody, invalidToken, callProperties,
             if (berror) {
               done(null, berror);
             }
+            if (!dyntoken) {
+              done(null, 'No Token returned');
+            }
 
             let timeout = tokenTimeout;
 
@@ -2389,6 +2399,9 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
         if (berror) {
           return callback(null, berror);
         }
+        if (!dyntoken) {
+          return callback(null, 'No Token returned');
+        }
 
         // format the authentication string
         const tokenObj = {

package/lib/translatorUtil.js

@@ -247,6 +247,7 @@ function extractObject(dataObj, entitySchema, dynamicFields) {
   log.trace(origin);
   const returnObj = {};
   let addFields = dynamicFields;
+  const regex = /(?<!\\)\./gm;
 
   // if no translation needed - just return the object
   if (Object.hasOwnProperty.call(entitySchema, 'translate')
@@ -278,7 +279,7 @@ function extractObject(dataObj, entitySchema, dynamicFields) {
       // if the external name is something get that field
       if (field.external_name) {
         // need to determine the field in the incoming object where the data is
-        const externalPath = field.external_name.split('.');
+        const externalPath = field.external_name.split(regex).map((e) => (e.replace(/\\./g, '.')));
         let location = dataObj;
         let inField = null;
 
@@ -349,7 +350,7 @@ function extractObject(dataObj, entitySchema, dynamicFields) {
         // if the field is not in the schema - we need to add it
         // using the field name that came in since no translation
         if (field.external_name) {
-          const externalPath = field.external_name.split('.');
+          const externalPath = field.external_name.split(regex).map((e) => (e.replace(/\\./g, '.')));
 
           if (externalPath[externalPath.length - 1] === objectKeys[o]) {
             found = true;
@@ -488,7 +489,7 @@ function extractJSONEntity(dataObj, entitySchema) {
 function buildObject(dataObj, entitySchema, dynamicFields) {
   const origin = `${id}-translatorUtil-buildObject`;
   log.trace(origin);
-
+  const regex = /(?<!\\)\./gm;
   const returnObj = {};
   let addFields = dynamicFields;
 
@@ -531,7 +532,7 @@ function buildObject(dataObj, entitySchema, dynamicFields) {
         // if in the data object, add to the system entity
         if (fieldValue !== null) {
           // need to determine the field in the object where the data should go
-          const externalPath = field.external_name.split('.');
+          const externalPath = field.external_name.split(regex).map((e) => (e.replace(/\\./g, '.')));
           let location = returnObj;
 
           // get to the field in the object

package/package.json

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