@itentialopensource/adapter-utils 4.48.9 → 4.48.11

package/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+## 4.48.11 [04-03-2023]
+
+* Add sso support to MSA
+
+Closes ADAPT-2638
+
+See merge request itentialopensource/adapter-utils!251
+
+---
+
+## 4.48.10 [03-24-2023]
+
+* Added option to remove username and password from auth body and option to remove response headers
+
+Closes ADAPT-2628
+
+See merge request itentialopensource/adapter-utils!250
+
+---
+
 ## 4.48.9 [03-23-2023]
 
 * Add logic to strip escapes from the request body

package/lib/connectorRest.js

@@ -101,6 +101,7 @@ let healthcheck = false;
 const healthchecklock = 0;
 let encodeUri = true;
 let authQueryEncode = null;
+let addCreds = true;
 
 // Other global variables
 let id = null;
@@ -1726,12 +1727,40 @@ async function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
           options.port = tokenSchema.sso.port;
         }
 
+        // specific token properties for auth request call
+        if (callProperties && callProperties.mfa && callProperties.mfa.host) {
+          options.hostname = callProperties.mfa.host;
+        }
+        if (callProperties && callProperties.mfa && callProperties.mfa.port) {
+          options.port = callProperties.mfa.port;
+        }
+        if (callProperties && callProperties.mfa && callProperties.mfa.protocol) {
+          // need to put protocol in token schema
+          if (!tokenSchema) {
+            tokenSchema = {
+              sso: {
+                protocol: callProperties.mfa.protocol
+              }
+            };
+          } else if (tokenSchema && !tokenSchema.sso) {
+            tokenSchema.sso = {
+              protocol: callProperties.mfa.protocol
+            };
+          } else if (tokenSchema && tokenSchema.sso && !tokenSchema.sso.protocol) {
+            tokenSchema.sso.protocol = callProperties.mfa.protocol;
+          }
+        }
+
         // If there is a token schema, need to take the data from there
         if (tokenSchema) {
           options.path = tokenSchema.entitypath;
           options.method = tokenSchema.method;
         }
 
+        if (callProperties && callProperties.mfa && callProperties.mfa.path) {
+          options.path = callProperties.mfa.path;
+        }
+
         // if the path has a base path parameter in it, need to replace it
         let bpathStr = '{base_path}';
         if (options.path.indexOf(bpathStr) >= 0) {
@@ -2009,6 +2038,12 @@ async function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
                 }
               }
 
+              if (actReqBody && !addCreds) {
+                // remove the username and password from the creds
+                delete creds.username;
+                delete creds.password;
+              }
+
               if (tokenSchema.headers && tokenSchema.headers.Authorization) {
                 // remove the username and password from the creds
                 delete creds.username;
@@ -2537,6 +2572,25 @@ function buildMfaBody(prop, mfaStepConfiguration, callProperties) {
     callProperties.mfa.stepBody[prop] = mfaStepConfiguration.requestFields[prop];
   }
 }
+
+/*  */
+function buildMfaSso(prop, mfaStepConfiguration, callProperties) {
+  const origin = `${id}-connectorRest-buildMfaSso`;
+  log.trace(origin);
+  const fullPropertyValue = mfaStepConfiguration.sso[prop];
+  // Check if fullPropertyValue has reference in curly braces (e.g., {getSubToken.responseFields.token})
+  let propertyValue = fullPropertyValue;
+  const matching = searchTextInCurlyBraces(fullPropertyValue);
+  if (matching) {
+    const matchedText = matching[0];
+    propertyValue = matching[1];
+    const resolvedValue = getReferencedMfaValue(propertyValue);
+    callProperties.mfa[prop] = fullPropertyValue.replace(matchedText, resolvedValue);
+  } else {
+    callProperties.mfa[prop] = mfaStepConfiguration.sso[prop];
+  }
+}
+
 /*  */
 function getReferencedMfaValue(propertyValue) {
   const origin = `${id}-connectorRest-getReferencedMfaValue`;
@@ -2560,6 +2614,15 @@ function buildMfaStepData(step, callProperties) {
   const mfaStepConfiguration = multiStepAuthCalls[step];
   callProperties.mfa.stepBody = {};
   callProperties.mfa.stepHeaders = {};
+  if (mfaStepConfiguration.sso) {
+    callProperties.mfa.host = '';
+    callProperties.mfa.port = '';
+    callProperties.mfa.protocol = '';
+    callProperties.mfa.path = '';
+    Object.keys(mfaStepConfiguration.sso).forEach((prop) => {
+      buildMfaSso(prop, mfaStepConfiguration, callProperties);
+    });
+  }
   if (mfaStepConfiguration.requestFields) {
     Object.keys(mfaStepConfiguration.requestFields).forEach((prop) => {
       if (prop.startsWith('header')) {
@@ -3837,6 +3900,10 @@ class ConnectorRest {
       if (typeof props.authentication.authQueryEncode === 'boolean') {
         authQueryEncode = props.authentication.authQueryEncode;
       }
+
+      if (typeof props.authentication.addCreds === 'boolean') {
+        addCreds = props.authentication.addCreds;
+      }
     }
 
     // set the stub mode (optional - default is false)

package/lib/restHandler.js

@@ -23,6 +23,7 @@ let returnRawGl = false;
 let encodePath = true;
 let encodeUri = true;
 let stripEscapes = false;
+let returnResponseHeaders = true;
 // INTERNAL FUNCTIONS
 /*
  * INTERNAL FUNCTION: Get the best match for the mock data response
@@ -360,6 +361,10 @@ function handleRestRequest(request, entityId, entitySchema, callProperties, filt
         delete retObject.reqHdr;
       }
 
+      if (returnResponseHeaders === false && retObject.headers) {
+        delete retObject.headers;
+      }
+
       // if we want the raw response
       if (returnRawGl || (callProperties && callProperties.request && callProperties.request.return_raw)) {
         retObject.raw = resObj.response;
@@ -1042,6 +1047,10 @@ class RestHandler {
       this.globalRequest = properties.request.global_request;
       globalRequestGl = this.globalRequest;
     }
+
+    if (typeof properties.request.returnResponseHeaders === 'boolean') {
+      returnResponseHeaders = properties.request.returnResponseHeaders;
+    }
   }
 
   /**

package/package.json

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