@itentialopensource/adapter-utils 4.45.4 → 4.45.7

package/CHANGELOG.md

@@ -1,4 +1,34 @@
 
+## 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
+
+Closes ADAPT-2048
+
+See merge request itentialopensource/adapter-utils!231
+
+---
+
 ## 4.45.4 [05-01-2022]
 
 * fix xml mockdata

package/lib/connectorRest.js

@@ -1135,6 +1135,14 @@ function getToken(reqPath, options, tokenSchema, bodyString, callProperties, cal
         translated = tokenResp.response;
       }
 
+      // since this is a stub, make sure we have what we need
+      if (!translated.token) {
+        translated.token = 'garbagetoken';
+      }
+      if (!translated.tokenp2) {
+        translated.tokenp2 = 'garbagetoken';
+      }
+
       // if what we got back is an array, just return the first element
       // should only have one token!!!
       if (translated && Array.isArray(translated)) {
@@ -1153,7 +1161,7 @@ function getToken(reqPath, options, tokenSchema, bodyString, callProperties, cal
       // do not make the call to return a token if the request is actually
       // to get a token. Getting a token to get a token -- that should go
       // direct to make request
-      return callback({ token: 'faketoken' });
+      return callback({ token: 'faketoken', tokenp2: 'faketoken' });
     }
 
     log.debug(`${origin}: OPTIONS: ${JSON.stringify(options)}`);
@@ -1857,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) {
@@ -1918,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;
@@ -2109,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;
 
@@ -2381,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/package.json

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

package/schemas/propertiesSchema.json

@@ -53,7 +53,7 @@
     },
     "encode_queryvars": {
       "type": "boolean",
-      "description": "When true the query variables are encoded in the url",
+      "description": "When true the query parameters are encoded in the url",
       "default": true
     },
     "save_metric": {