@rockcarver/frodo-lib 2.0.0-37 → 2.0.0-39

package/cjs/ops/JourneyOps.js

@@ -439,9 +439,9 @@ function _exportJourney() {
         useStringArrays,
         deps
       } = options;
-      var verbose = state.getDebug();
+      var verbose = state.getVerbose();
       if (verbose) (0, _Console.printMessage)({
-        message: "\n- ".concat(_treeObject._id, "\n"),
+        message: "- ".concat(_treeObject._id),
         type: 'info',
         newline: false,
         state
@@ -449,17 +449,20 @@ function _exportJourney() {
 
       // Process tree
       if (verbose) (0, _Console.printMessage)({
-        message: '  - Flow',
+        message: '\n  - Flow',
+        newline: false,
         state
       });
       exportData.tree = _treeObject;
       if (verbose && _treeObject.identityResource) (0, _Console.printMessage)({
-        message: "    - identityResource: ".concat(_treeObject.identityResource),
-        state,
-        type: 'info'
+        message: "\n    - identityResource: ".concat(_treeObject.identityResource),
+        type: 'info',
+        newline: false,
+        state
       });
       if (verbose) (0, _Console.printMessage)({
-        message: "    - Done",
+        message: "\n    - Done",
+        newline: false,
         type: 'info',
         state
       });
@@ -489,7 +492,8 @@ function _exportJourney() {
         }));
       }
       if (verbose && nodePromises.length > 0) (0, _Console.printMessage)({
-        message: '  - Nodes:',
+        message: '\n  - Nodes:',
+        newline: false,
         state
       });
       var nodeObjects = yield Promise.all(nodePromises);
@@ -499,9 +503,9 @@ function _exportJourney() {
         var _nodeId = nodeObject._id;
         var nodeType = nodeObject._type._id;
         if (verbose) (0, _Console.printMessage)({
-          message: "    - ".concat(_nodeId, " (").concat(nodeType, ")"),
+          message: "\n    - ".concat(_nodeId, " (").concat(nodeType, ")"),
           type: 'info',
-          newline: true,
+          newline: false,
           state
         });
         exportData.nodes[nodeObject._id] = nodeObject;
@@ -609,7 +613,8 @@ function _exportJourney() {
 
       // Process inner nodes
       if (verbose && innerNodePromises.length > 0) (0, _Console.printMessage)({
-        message: '  - Inner nodes:',
+        message: '\n  - Inner nodes:',
+        newline: false,
         state
       });
       try {
@@ -620,9 +625,9 @@ function _exportJourney() {
             var innerNodeId = innerNodeObject._id;
             var innerNodeType = innerNodeObject._type._id;
             if (verbose) (0, _Console.printMessage)({
-              message: "    - ".concat(innerNodeId, " (").concat(innerNodeType, ")"),
+              message: "\n    - ".concat(innerNodeId, " (").concat(innerNodeType, ")"),
               type: 'info',
-              newline: true,
+              newline: false,
               state
             });
             exportData.innerNodes[innerNodeId] = innerNodeObject;
@@ -707,7 +712,8 @@ function _exportJourney() {
 
       // Process email templates
       if (verbose && emailTemplatePromises.length > 0) (0, _Console.printMessage)({
-        message: '  - Email templates:',
+        message: '\n  - Email templates:',
+        newline: false,
         state
       });
       try {
@@ -715,9 +721,9 @@ function _exportJourney() {
         for (var _settledPromise of settledEmailTemplatePromises) {
           if (_settledPromise.status === 'fulfilled' && _settledPromise.value) {
             if (verbose) (0, _Console.printMessage)({
-              message: "    - ".concat(_settledPromise.value._id.split('/')[1]).concat(_settledPromise.value.displayName ? " (".concat(_settledPromise.value.displayName, ")") : ''),
+              message: "\n    - ".concat(_settledPromise.value._id.split('/')[1]).concat(_settledPromise.value.displayName ? " (".concat(_settledPromise.value.displayName, ")") : ''),
               type: 'info',
-              newline: true,
+              newline: false,
               state
             });
             exportData.emailTemplates[_settledPromise.value._id.split('/')[1]] = _settledPromise.value;
@@ -735,25 +741,29 @@ function _exportJourney() {
         for (var saml2NodeDependency of saml2NodeDependencies) {
           if (saml2NodeDependency) {
             if (verbose) (0, _Console.printMessage)({
-              message: '  - SAML2 entity providers:',
+              message: '\n  - SAML2 entity providers:',
+              newline: false,
               state
             });
             for (var saml2Entity of saml2NodeDependency.saml2Entities) {
               if (verbose) (0, _Console.printMessage)({
-                message: "    - ".concat(saml2Entity.entityLocation, " ").concat(saml2Entity.entityId),
+                message: "\n    - ".concat(saml2Entity.entityLocation, " ").concat(saml2Entity.entityId),
                 type: 'info',
+                newline: false,
                 state
               });
               exportData.saml2Entities[saml2Entity._id] = saml2Entity;
             }
             if (verbose) (0, _Console.printMessage)({
-              message: '  - SAML2 circles of trust:',
+              message: '\n  - SAML2 circles of trust:',
+              newline: false,
               state
             });
             for (var circleOfTrust of saml2NodeDependency.circlesOfTrust) {
               if (verbose) (0, _Console.printMessage)({
-                message: "    - ".concat(circleOfTrust._id),
+                message: "\n    - ".concat(circleOfTrust._id),
                 type: 'info',
+                newline: false,
                 state
               });
               exportData.circlesOfTrust[circleOfTrust._id] = circleOfTrust;
@@ -771,7 +781,8 @@ function _exportJourney() {
         var socialProviders = yield Promise.resolve(socialProviderPromise);
         if (socialProviders) {
           if (verbose) (0, _Console.printMessage)({
-            message: '  - OAuth2/OIDC (social) identity providers:',
+            message: '\n  - OAuth2/OIDC (social) identity providers:',
+            newline: false,
             state
           });
           for (var socialProvider of socialProviders.result) {
@@ -779,8 +790,9 @@ function _exportJourney() {
             // filteredProviders property of a SelectIdPNode do it here.
             if (socialProvider && (!filteredSocialProviders || filteredSocialProviders.length === 0 || filteredSocialProviders.includes(socialProvider._id))) {
               if (verbose) (0, _Console.printMessage)({
-                message: "    - ".concat(socialProvider._id),
+                message: "\n    - ".concat(socialProvider._id),
                 type: 'info',
+                newline: false,
                 state
               });
               scriptPromises.push((0, _ScriptApi.getScript)({
@@ -799,7 +811,8 @@ function _exportJourney() {
 
       // Process scripts
       if (verbose && scriptPromises.length > 0) (0, _Console.printMessage)({
-        message: '  - Scripts:',
+        message: '\n  - Scripts:',
+        newline: false,
         state
       });
       try {
@@ -807,9 +820,9 @@ function _exportJourney() {
         for (var scriptObject of scriptObjects) {
           if (scriptObject) {
             if (verbose) (0, _Console.printMessage)({
-              message: "    - ".concat(scriptObject._id, " (").concat(scriptObject.name, ")"),
+              message: "\n    - ".concat(scriptObject._id, " (").concat(scriptObject.name, ")"),
               type: 'info',
-              newline: true,
+              newline: false,
               state
             });
             scriptObject.script = useStringArrays ? (0, _ExportImportUtils.convertBase64TextToArray)(scriptObject.script) : JSON.stringify((0, _Base64Utils.decode)(scriptObject.script));
@@ -825,7 +838,8 @@ function _exportJourney() {
       // Process themes
       if (themePromise) {
         if (verbose) (0, _Console.printMessage)({
-          message: '  - Themes:',
+          message: '\n  - Themes:',
+          newline: false,
           state
         });
         try {
@@ -837,8 +851,9 @@ function _exportJourney() {
             themes.includes(themeObject._id) || themes.includes(themeObject.name) || // has this journey been linked to a theme?
             (_themeObject$linkedTr = themeObject.linkedTrees) !== null && _themeObject$linkedTr !== void 0 && _themeObject$linkedTr.includes(_treeObject._id))) {
               if (verbose) (0, _Console.printMessage)({
-                message: "    - ".concat(themeObject._id, " (").concat(themeObject.name, ")"),
+                message: "\n    - ".concat(themeObject._id, " (").concat(themeObject.name, ")"),
                 type: 'info',
+                newline: false,
                 state
               });
               exportData.themes.push(themeObject);
@@ -850,6 +865,12 @@ function _exportJourney() {
           errors.push(error);
         }
       }
+      if (verbose) (0, _Console.printMessage)({
+        message: "\n",
+        type: 'info',
+        newline: false,
+        state
+      });
     } catch (error) {
       var _error$response15;
       error.message = "Error exporting journey ".concat(journeyId, ": ").concat(((_error$response15 = error.response) === null || _error$response15 === void 0 || (_error$response15 = _error$response15.data) === null || _error$response15 === void 0 ? void 0 : _error$response15.message) || error.message);
@@ -1003,9 +1024,9 @@ function _importJourney() {
       reUuid,
       deps
     } = options;
-    var verbose = state.getDebug();
+    var verbose = state.getVerbose();
     if (verbose) (0, _Console.printMessage)({
-      message: "\n- ".concat(importData.tree._id, "\n"),
+      message: "- ".concat(importData.tree._id, "\n"),
       type: 'info',
       newline: false,
       state
@@ -1018,11 +1039,12 @@ function _importJourney() {
     if (deps && importData.scripts && Object.entries(importData.scripts).length > 0) {
       if (verbose) (0, _Console.printMessage)({
         message: '  - Scripts:',
+        newline: false,
         state
       });
       for (var [scriptId, scriptObject] of Object.entries(importData.scripts)) {
         if (verbose) (0, _Console.printMessage)({
-          message: "    - ".concat(scriptId, " (").concat(scriptObject['name'], ")"),
+          message: "\n    - ".concat(scriptId, " (").concat(scriptObject['name'], ")"),
           type: 'info',
           newline: false,
           state
@@ -1054,12 +1076,13 @@ function _importJourney() {
     // Process email templates
     if (deps && importData.emailTemplates && Object.entries(importData.emailTemplates).length > 0) {
       if (verbose) (0, _Console.printMessage)({
-        message: '  - Email templates:',
+        message: '\n  - Email templates:',
+        newline: false,
         state
       });
       for (var [templateId, templateData] of Object.entries(importData.emailTemplates)) {
         if (verbose) (0, _Console.printMessage)({
-          message: "    - ".concat(templateId),
+          message: "\n    - ".concat(templateId),
           type: 'info',
           newline: false,
           state
@@ -1085,14 +1108,16 @@ function _importJourney() {
     // Process themes
     if (deps && importData.themes && importData.themes.length > 0) {
       if (verbose) (0, _Console.printMessage)({
-        message: '  - Themes:',
+        message: '\n  - Themes:',
+        newline: false,
         state
       });
       var themes = new Map();
       for (var theme of importData.themes) {
         if (verbose) (0, _Console.printMessage)({
-          message: "    - ".concat(theme['_id'], " (").concat(theme['name'], ")"),
+          message: "\n    - ".concat(theme['_id'], " (").concat(theme['name'], ")"),
           type: 'info',
+          newline: false,
           state
         });
         themes[theme['_id']] = theme;
@@ -1112,13 +1137,15 @@ function _importJourney() {
     // Process social providers
     if (deps && importData.socialIdentityProviders && Object.entries(importData.socialIdentityProviders).length > 0) {
       if (verbose) (0, _Console.printMessage)({
-        message: '  - OAuth2/OIDC (social) identity providers:',
+        message: '\n  - OAuth2/OIDC (social) identity providers:',
+        newline: false,
         state
       });
       for (var [providerId, providerData] of Object.entries(importData.socialIdentityProviders)) {
         if (verbose) (0, _Console.printMessage)({
-          message: "    - ".concat(providerId),
+          message: "\n    - ".concat(providerId),
           type: 'info',
+          newline: false,
           state
         });
         try {
@@ -1160,7 +1187,8 @@ function _importJourney() {
     // Process saml providers
     if (deps && importData.saml2Entities && Object.entries(importData.saml2Entities).length > 0) {
       if (verbose) (0, _Console.printMessage)({
-        message: '  - SAML2 entity providers:',
+        message: '\n  - SAML2 entity providers:',
+        newline: false,
         state
       });
       for (var [, _providerData] of Object.entries(importData.saml2Entities)) {
@@ -1168,8 +1196,9 @@ function _importJourney() {
         var entityId = _providerData['entityId'];
         var entityLocation = _providerData['entityLocation'];
         if (verbose) (0, _Console.printMessage)({
-          message: "    - ".concat(entityLocation, " ").concat(entityId),
+          message: "\n    - ".concat(entityLocation, " ").concat(entityId),
           type: 'info',
+          newline: false,
           state
         });
         var metaData = null;
@@ -1219,14 +1248,16 @@ function _importJourney() {
     // Process circles of trust
     if (deps && importData.circlesOfTrust && Object.entries(importData.circlesOfTrust).length > 0) {
       if (verbose) (0, _Console.printMessage)({
-        message: '  - SAML2 circles of trust:',
+        message: '\n  - SAML2 circles of trust:',
+        newline: false,
         state
       });
       for (var [cotId, cotData] of Object.entries(importData.circlesOfTrust)) {
         delete cotData['_rev'];
         if (verbose) (0, _Console.printMessage)({
-          message: "    - ".concat(cotId),
+          message: "\n    - ".concat(cotId),
           type: 'info',
+          newline: false,
           state
         });
         try {
@@ -1277,9 +1308,9 @@ function _importJourney() {
     }
     if (Object.entries(innerNodes).length > 0) {
       if (verbose) (0, _Console.printMessage)({
-        message: '  - Inner nodes:',
+        message: '\n  - Inner nodes:',
         type: 'text',
-        newline: true,
+        newline: false,
         state
       });
       for (var [innerNodeId, innerNodeData] of Object.entries(innerNodes)) {
@@ -1293,7 +1324,7 @@ function _importJourney() {
         }
         innerNodeData['_id'] = newUuid;
         if (verbose) (0, _Console.printMessage)({
-          message: "    - ".concat(newUuid).concat(reUuid ? '*' : '', " (").concat(nodeType, ")"),
+          message: "\n    - ".concat(newUuid).concat(reUuid ? '*' : '', " (").concat(nodeType, ")"),
           type: 'info',
           newline: false,
           state
@@ -1375,7 +1406,8 @@ function _importJourney() {
     // Process nodes
     if (importData.nodes && Object.entries(importData.nodes).length > 0) {
       if (verbose) (0, _Console.printMessage)({
-        message: '  - Nodes:',
+        message: '\n  - Nodes:',
+        newline: false,
         state
       });
       // eslint-disable-next-line prefer-const
@@ -1396,7 +1428,7 @@ function _importJourney() {
           }
         }
         if (verbose) (0, _Console.printMessage)({
-          message: "    - ".concat(newUuid).concat(reUuid ? '*' : '', " (").concat(_nodeType, ")"),
+          message: "\n    - ".concat(newUuid).concat(reUuid ? '*' : '', " (").concat(_nodeType, ")"),
           type: 'info',
           newline: false,
           state
@@ -1471,7 +1503,8 @@ function _importJourney() {
 
     // Process tree
     if (verbose) (0, _Console.printMessage)({
-      message: '  - Flow',
+      message: '\n  - Flow',
+      newline: false,
       state
     });
     if (reUuid) {
@@ -1490,7 +1523,7 @@ function _importJourney() {
         state
       }));
       if (verbose) (0, _Console.printMessage)({
-        message: "    - identityResource: ".concat(importData.tree.identityResource),
+        message: "\n    - identityResource: ".concat(importData.tree.identityResource),
         type: 'info',
         newline: false,
         state