@itentialopensource/adapter-utils 6.1.11 → 6.1.13

package/lib/connectorRest.js

@@ -3169,6 +3169,11 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
   log.trace(origin);
 
   try {
+    // Store original path before authentication if not already stored
+    if (!request.pathBeforeAuth) {
+      request.pathBeforeAuth = request.header.path;
+    }
+
     // set up the right credentials - passed in overrides default
     let useUser = username;
     let usePass = password;
@@ -3791,6 +3796,11 @@ function retryInvalidResponse(request, callProperties, myTransTime, claimedLic,
   log.trace(origin);
 
   try {
+    // Restore original path before retry
+    if (request.pathBeforeAuth) {
+      request.header.path = request.pathBeforeAuth;
+    }
+
     // Need to get a new token and retry the request
     return requestAuthenticate(request, entitySchema, request.tokenUsed, callProperties, (mres, merror) => {
       if (merror) {

package/lib/requestHandler.js

@@ -152,23 +152,17 @@ function walkThroughActionFiles(directory) {
             // if invalid properties throw an error
             if (!result) {
               // Get the action and component from the first ajv error
-              let action = 'checkErrorDetails';
-              let component = 'checkErrorDetails';
-              const temp = validate.errors[0].dataPath;
-              const actStInd = temp.indexOf('[');
-              const actEndInd = temp.indexOf(']');
-              // if we have indexes for the action we can get specifics
-              if (actStInd >= 0 && actEndInd > actStInd) {
-                const actNum = temp.substring(actStInd + 1, actEndInd);
-                // get the action name from the number
-                if (actions.actions.length >= actNum) {
-                  action = actions.actions[actNum].name;
-                }
-                // get the component that failed for the action
-                if (temp.length > actEndInd + 1) {
-                  component = temp.substring(actEndInd + 2);
-                }
-              }
+              const instancePath = validate.errors?.[0]?.instancePath || '';
+              const match = instancePath.match(/\/actions\/(\d+)/);
+              const actNum = match ? parseInt(match[1], 10) : undefined;
+              // Get action name
+              const action = actions.actions?.[actNum]?.name ?? 'checkErrorDetails';
+              // Get component from remaining path
+              const remainingPath = match ? instancePath.substring(match[0].length) : '';
+              const component = remainingPath.length > 1
+                ? remainingPath.substring(1)
+                : 'checkErrorDetails';
+
               let msg = `${origin}: Error on validation of actions for entity `;
               msg += `${entities[e]} - ${action} - ${component}   Details: ${JSON.stringify(validate.errors)}`;
               clean.push(msg);

package/package.json

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