ws-process 0.3.59 → 0.4.1

package/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/extensions */
 /* eslint-disable import/no-unresolved */
 // ws-process.js
 import axios from 'axios';
@@ -599,11 +600,20 @@ function asyncSend(msg) {
         }),
       );
 
+      const cProcess = getCurrentProcess(getState, msg.processID);
       const cProcessItemRoot = getCurrentProcessItem(getState, msg.processID);
 
-      if (!msg.action) {
+      if (!msg.action || (cProcess.options.useApi2 === true)) {
         let url;
+        let method;
+        if (msg.method) {
+          method = msg.method;
+        } else {
+          method = cProcess.options.method || 'POST';
+        }
         const user = getState().user.currentUser;
+        let httpBody = msg.body;
+        let httpParams = msg.params;
 
         if (/^https{0,1}:\/\//.test(msg.url)) {
           url = msg.url;
@@ -618,18 +628,29 @@ function asyncSend(msg) {
           //       return 'api-dev';
           //   }
           // });
+          if (msg.action === 'manageadir') {
+            url = '/a';
+            httpBody = { params: msg.params };
+            httpParams = undefined;
+          } else if (msg.action === 'manageconfiguration') {
+            url = '/c';
+          } else if (msg.action === 'api-hub') {
+            url = '/h';
+          } else {
+            url = msg.url;
+          }
 
           const currentState = getState();
           const {
             AltDomain: altDomain,
           } = tryit(() => currentState['api-Configuration'].merged.ui.result) || {};
           if (altDomain) {
-            url = [altDomain, msg.url.replace(/^\/{0,}/, '')].join('/');
+            url = [altDomain, url.replace(/^\/{0,}/, '')].join('/');
           } else {
             const myDomain = [
               'https://',
               [
-                user.system?.useApi2 === true ? 'api2' : 'api',
+                (user.system?.useApi2 === true || cProcess.options.useApi2 === true) ? 'api2' : 'api',
                 ['dev', 'staging'].find(
                   (each) => each === local.stage,
                 )
@@ -642,7 +663,7 @@ function asyncSend(msg) {
             ].join('');
             url = [
               myDomain,
-              msg.url.replace(/^\/{0,}/, ''),
+              url.replace(/^\/{0,}/, ''),
             ].join('/');
           }
         }
@@ -659,7 +680,7 @@ function asyncSend(msg) {
         headers['bsg-support-system-external-id'] = user.pid;
         // headers['bsg-support-partner-id'] = user.partnerID;
         // headers['bsg-support-system-id'] = user.systemID;
-        if (tryit(() => msg.body.Idp) === 'google' && !user.systemID && !user.partnerID) {
+        if (tryit(() => httpBody.Idp) === 'google' && !user.systemID && !user.partnerID) {
           headers['x-api-key'] = '5db1bf127d3fcc0cfdd8880cb5cbe6f9'; // means "initial login"
         } else {
           headers['x-api-key'] = [user.systemID, user.partnerID].join('@');
@@ -669,9 +690,9 @@ function asyncSend(msg) {
 
         const httpMSG = removeUndefinedKeys({
           url,
-          method: msg.method,
-          params: defined(msg.params, msg.method === 'GET' ? stringifyParams(msg.body) : undefined),
-          data: defined(msg.data, msg.method !== 'GET' ? msg.body : undefined),
+          method,
+          params: defined(httpParams, method === 'GET' ? stringifyParams(httpBody) : undefined),
+          data: defined(msg.data, method !== 'GET' ? httpBody : undefined),
           headers: {
             ...msg.headers,
             ...headers,
@@ -887,8 +908,8 @@ function asyncSend(msg) {
                 so we just wait for next message from lambda function
                 */
 
-              const cProcess = getCurrentProcess(getState, started.processID);
-              if (cProcess) {
+              const cProcessStarted = getCurrentProcess(getState, started.processID);
+              if (cProcessStarted) {
                 local.dispatch(
                   updateWSProcess(started.processID, {
                     action: started.action,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ws-process",
-  "version": "0.3.59",
+  "version": "0.4.1",
   "description": "Process Management for Web Socket Client",
   "main": "index.js",
   "type": "module",