@rockcarver/frodo-lib 0.12.1 → 0.12.2-0

package/cjs/ops/JourneyOps.js

@@ -9,18 +9,19 @@ exports.describeTree = describeTree;
 exports.exportJourneyToFile = exportJourneyToFile;
 exports.exportJourneysToFile = exportJourneysToFile;
 exports.exportJourneysToFiles = exportJourneysToFiles;
-exports.getJourneyData = getJourneyData;
+exports.exportTree = exportTree;
+exports.findOrphanedNodes = findOrphanedNodes;
 exports.importFirstJourneyFromFile = importFirstJourneyFromFile;
 exports.importJourneyFromFile = importJourneyFromFile;
 exports.importJourneysFromFile = importJourneysFromFile;
 exports.importJourneysFromFiles = importJourneysFromFiles;
+exports.importTree = importTree;
+exports.isCustom = isCustom;
 exports.listJourneys = listJourneys;
-exports.prune = prune;
+exports.removeOrphanedNodes = removeOrphanedNodes;
 
 var _fs = _interopRequireDefault(require("fs"));
 
-var _yesno = _interopRequireDefault(require("yesno"));
-
 var _uuid = require("uuid");
 
 var _lodash = _interopRequireDefault(require("lodash"));
@@ -31,6 +32,8 @@ var _OpsUtils = require("./utils/OpsUtils");
 
 var _SessionStorage = _interopRequireDefault(require("../storage/SessionStorage"));
 
+var _NodeApi = require("../api/NodeApi");
+
 var _TreeApi = require("../api/TreeApi");
 
 var _EmailTemplateApi = require("../api/EmailTemplateApi");
@@ -68,9 +71,10 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var containerNodes = ['PageNode', 'CustomPageNode'];
 var scriptedNodes = ['ConfigProviderNode', 'ScriptedDecisionNode', 'ClientScriptNode', 'SocialProviderHandlerNode', 'CustomScriptNode'];
 var emailTemplateNodes = ['EmailSuspendNode', 'EmailTemplateNode'];
-var emptyScriptPlaceholder = '[Empty]'; // use a function vs a template variable to avoid problems in loops
+var emptyScriptPlaceholder = '[Empty]';
 
-function getSingleTreeFileDataTemplate() {
+// use a function vs a template variable to avoid problems in loops
+function createSingleTreeExportTemplate() {
   return {
     meta: {},
     innerNodes: {},
@@ -83,10 +87,10 @@ function getSingleTreeFileDataTemplate() {
     circlesOfTrust: {},
     tree: {}
   };
-} // use a function vs a template variable to avoid problems in loops
-
+}
 
-function getMultipleTreesFileDataTemplate() {
+// use a function vs a template variable to avoid problems in loops
+function createMultipleTreesExportTemplate() {
   return {
     meta: {},
     trees: {}
@@ -103,14 +107,23 @@ function getMultipleTreesFileDataTemplate() {
 
 function getSaml2NodeDependencies(_x, _x2, _x3) {
   return _getSaml2NodeDependencies.apply(this, arguments);
-}
+} // export async function getTreeNodes(treeObject) {
+//   const nodeList = Object.entries(treeObject.nodes);
+//   const results = await Promise.allSettled(
+//     nodeList.map(
+//       async ([nodeId, nodeInfo]) => await getNode(nodeId, nodeInfo['nodeType'])
+//     )
+//   );
+//   const nodes = results.filter((r) => r.status === 'fulfilled');
+//   nodes.map((f) => {
+//     return f.status;
+//   });
+//   const failedList = results.filter((r) => r.status === 'rejected');
+//   return nodes;
+// }
+
 /**
- * Helper method to create export data for a tree with all its
- * dependencies. The export data can be written to a file as is
- * (but it doesn't contain meta data).
- * @param {Object} treeObject tree object
- * @param {Object} exportData export data
- * @param {Object} options options object
+ * Export options
  */
 
 
@@ -150,7 +163,7 @@ function _getSaml2NodeDependencies() {
         }
       });
 
-      return function (_x35) {
+      return function (_x32) {
         return _ref.apply(this, arguments);
       };
     }());
@@ -184,19 +197,32 @@ function _getSaml2NodeDependencies() {
   return _getSaml2NodeDependencies.apply(this, arguments);
 }
 
-function exportTree(_x4, _x5, _x6) {
+/**
+ * Create export data for a tree with all its nodes and dependencies. The export data can be written to a file as is.
+ * @param {string} treeId tree id/name
+ * @param {ExportOptions} options export options
+ * @returns {Promise<SingleTreeExportTemplate>} a promise that resolves to an object containing the tree and all its nodes and dependencies
+ */
+function exportTree(_x4) {
   return _exportTree.apply(this, arguments);
 }
 /**
  * Export journey by id/name to file
- * @param {String} journeyId journey id/name
- * @param {String} file optional export file name
- * @param {Object} options reUuid:boolean: re-uuid all node objects, verbose:boolean: verbose output, deps:boolean: include dependencies
+ * @param {string} journeyId journey id/name
+ * @param {string} file optional export file name
+ * @param {ExportOptions} options export options
  */
 
 
 function _exportTree() {
-  _exportTree = _asyncToGenerator(function* (treeObject, exportData, options) {
+  _exportTree = _asyncToGenerator(function* (treeId) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+      useStringArrays: true,
+      deps: true,
+      verbose: false
+    };
+    var treeObject = yield (0, _TreeApi.getTree)(treeId);
+    var exportData = createSingleTreeExportTemplate();
     var {
       useStringArrays,
       deps,
@@ -223,7 +249,7 @@ function _exportTree() {
     var themes = []; // get all the nodes
 
     for (var [nodeId, nodeInfo] of Object.entries(treeObject.nodes)) {
-      nodePromises.push((0, _TreeApi.getNode)(nodeId, nodeInfo['nodeType']).then(response => response.data));
+      nodePromises.push((0, _NodeApi.getNode)(nodeId, nodeInfo['nodeType']));
     }
 
     if (verbose && nodePromises.length > 0) (0, _Console.printMessage)('  - Nodes:');
@@ -288,7 +314,7 @@ function _exportTree() {
 
       if (containerNodes.includes(nodeType)) {
         for (var innerNode of nodeObject.nodes) {
-          innerNodePromises.push((0, _TreeApi.getNode)(innerNode._id, innerNode.nodeType).then(response => response.data));
+          innerNodePromises.push((0, _NodeApi.getNode)(innerNode._id, innerNode.nodeType));
         } // frodo supports themes in platform deployments
 
 
@@ -455,16 +481,19 @@ function _exportTree() {
         });
       });
     }
+
+    return exportData;
   });
   return _exportTree.apply(this, arguments);
 }
 
-function exportJourneyToFile(_x7, _x8, _x9) {
+function exportJourneyToFile(_x5, _x6, _x7) {
   return _exportJourneyToFile.apply(this, arguments);
 }
 /**
  * Export all journeys to file
- * @param {String} file optional export file name
+ * @param {string} file optional export file name
+ * @param {ExportOptions} options export options
  */
 
 
@@ -480,37 +509,26 @@ function _exportJourneyToFile() {
     }
 
     if (!verbose) (0, _Console.createProgressIndicator)(undefined, "".concat(journeyId), 'indeterminate');
-    yield (0, _TreeApi.getTree)(journeyId).then( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(function* (response) {
-        var treeData = response.data;
-        var fileData = getSingleTreeFileDataTemplate();
 
-        try {
-          yield exportTree(treeData, fileData, options);
-          if (verbose) (0, _Console.createProgressIndicator)(undefined, "".concat(journeyId), 'indeterminate');
-          (0, _ExportImportUtils.saveJsonToFile)(fileData, fileName);
-          (0, _Console.stopProgressIndicator)("Exported ".concat(journeyId.brightCyan, " to ").concat(fileName.brightCyan, "."), 'success');
-        } catch (error) {
-          if (verbose) (0, _Console.createProgressIndicator)(undefined, "".concat(journeyId), 'indeterminate');
-          (0, _Console.stopProgressIndicator)("Error exporting journey ".concat(journeyId, ": ").concat(error), 'fail');
-        }
-      });
-
-      return function (_x36) {
-        return _ref2.apply(this, arguments);
-      };
-    }()).catch(err => {
-      (0, _Console.stopProgressIndicator)(err.message, 'fail');
-    });
+    try {
+      var fileData = yield exportTree(journeyId, options);
+      if (verbose) (0, _Console.createProgressIndicator)(undefined, "".concat(journeyId), 'indeterminate');
+      (0, _ExportImportUtils.saveJsonToFile)(fileData, fileName);
+      (0, _Console.stopProgressIndicator)("Exported ".concat(journeyId['brightCyan'], " to ").concat(fileName['brightCyan'], "."), 'success');
+    } catch (error) {
+      if (verbose) (0, _Console.createProgressIndicator)(undefined, "".concat(journeyId), 'indeterminate');
+      (0, _Console.stopProgressIndicator)("Error exporting journey ".concat(journeyId, ": ").concat(error), 'fail');
+    }
   });
   return _exportJourneyToFile.apply(this, arguments);
 }
 
-function exportJourneysToFile(_x10, _x11) {
+function exportJourneysToFile(_x8, _x9) {
   return _exportJourneysToFile.apply(this, arguments);
 }
 /**
  * Export all journeys to separate files
+ * @param {ExportOptions} options export options
  */
 
 
@@ -522,20 +540,16 @@ function _exportJourneysToFile() {
       fileName = (0, _ExportImportUtils.getTypedFilename)("all".concat((0, _ExportImportUtils.getRealmString)(), "Journeys"), 'journeys');
     }
 
-    var trees = (yield (0, _TreeApi.getTrees)()).data.result;
-    var fileData = getMultipleTreesFileDataTemplate();
+    var trees = yield (0, _TreeApi.getTrees)();
+    var fileData = createMultipleTreesExportTemplate();
     (0, _Console.createProgressIndicator)(trees.length, 'Exporting journeys...');
 
     for (var tree of trees) {
       (0, _Console.updateProgressIndicator)("".concat(tree._id));
 
       try {
-        // eslint-disable-next-line no-await-in-loop
-        var treeData = (yield (0, _TreeApi.getTree)(tree._id)).data;
-        var exportData = getSingleTreeFileDataTemplate();
-        delete exportData.meta; // eslint-disable-next-line no-await-in-loop
-
-        yield exportTree(treeData, exportData, options);
+        var exportData = yield exportTree(tree._id, options);
+        delete exportData.meta;
         fileData.trees[tree._id] = exportData;
       } catch (error) {
         (0, _Console.printMessage)("Error exporting journey ".concat(tree._id, ": ").concat(error), 'error');
@@ -548,30 +562,28 @@ function _exportJourneysToFile() {
   return _exportJourneysToFile.apply(this, arguments);
 }
 
-function exportJourneysToFiles(_x12) {
+function exportJourneysToFiles(_x10) {
   return _exportJourneysToFiles.apply(this, arguments);
 }
 /**
- * Get data for journey by id/name
- * @param {String} journeyId journey id/name
- * @returns {Object} object containing all journey data
+ * Import options
  */
 
 
 function _exportJourneysToFiles() {
   _exportJourneysToFiles = _asyncToGenerator(function* (options) {
-    var trees = (yield (0, _TreeApi.getTrees)()).data.result;
+    var trees = yield (0, _TreeApi.getTrees)();
     (0, _Console.createProgressIndicator)(trees.length, 'Exporting journeys...');
 
     for (var tree of trees) {
       (0, _Console.updateProgressIndicator)("".concat(tree._id));
-      var fileName = (0, _ExportImportUtils.getTypedFilename)("".concat(tree._id), 'journey'); // eslint-disable-next-line no-await-in-loop
-
-      var treeData = (yield (0, _TreeApi.getTree)(tree._id)).data;
-      var exportData = getSingleTreeFileDataTemplate(); // eslint-disable-next-line no-await-in-loop
+      var fileName = (0, _ExportImportUtils.getTypedFilename)("".concat(tree._id), 'journey');
 
-      yield exportTree(treeData, exportData, options);
-      (0, _ExportImportUtils.saveJsonToFile)(exportData, fileName);
+      try {
+        var exportData = yield exportTree(tree._id, options);
+        (0, _ExportImportUtils.saveJsonToFile)(exportData, fileName);
+      } catch (error) {// do we need to report status here?
+      }
     }
 
     (0, _Console.stopProgressIndicator)('Done');
@@ -579,35 +591,12 @@ function _exportJourneysToFiles() {
   return _exportJourneysToFiles.apply(this, arguments);
 }
 
-function getJourneyData(_x13) {
-  return _getJourneyData.apply(this, arguments);
-}
 /**
  * Helper to import a tree with all dependencies from an import data object (typically read from a file)
- * @param {Object} treeObject tree object containing tree and all its dependencies
- * @param {Object} options reUuid:boolean: re-uuid all node objects, verbose:boolean: verbose output
+ * @param {SingleTreeExportTemplate} treeObject tree object containing tree and all its dependencies
+ * @param {ImportOptions} options import options
  */
-
-
-function _getJourneyData() {
-  _getJourneyData = _asyncToGenerator(function* (journeyId) {
-    (0, _Console.createProgressIndicator)(undefined, "".concat(journeyId), 'indeterminate');
-    var journeyData = getSingleTreeFileDataTemplate();
-    var treeData = (yield (0, _TreeApi.getTree)(journeyId).catch(err => {
-      (0, _Console.stopProgressIndicator)(null, 'success');
-      (0, _Console.printMessage)(err, 'error');
-    }))['data'];
-    (0, _Console.updateProgressIndicator)();
-    yield exportTree(treeData, journeyData, {
-      useStringArrays: true
-    });
-    (0, _Console.stopProgressIndicator)(null, 'success');
-    return journeyData;
-  });
-  return _getJourneyData.apply(this, arguments);
-}
-
-function importTree(_x14, _x15) {
+function importTree(_x11, _x12) {
   return _importTree.apply(this, arguments);
 }
 /**
@@ -623,12 +612,8 @@ function importTree(_x14, _x15) {
 function _importTree() {
   _importTree = _asyncToGenerator(function* (treeObject, options) {
     var {
-      reUuid
-    } = options;
-    var {
-      deps
-    } = options;
-    var {
+      reUuid,
+      deps,
       verbose
     } = options;
     if (verbose) (0, _Console.printMessage)("\n- ".concat(treeObject.tree._id, "\n"), 'info', false);
@@ -682,8 +667,8 @@ function _importTree() {
       var themes = {};
 
       for (var theme of treeObject.themes) {
-        if (verbose) (0, _Console.printMessage)("    - ".concat(theme._id, " (").concat(theme.name, ")"), 'info');
-        themes[theme._id] = theme;
+        if (verbose) (0, _Console.printMessage)("    - ".concat(theme['_id'], " (").concat(theme['name'], ")"), 'info');
+        themes[theme['_id']] = theme;
       }
 
       try {
@@ -775,17 +760,17 @@ function _importTree() {
 
         yield (0, _CirclesOfTrustApi.createCircleOfTrust)(cotData) // eslint-disable-next-line no-unused-vars
         .catch( /*#__PURE__*/function () {
-          var _ref3 = _asyncToGenerator(function* (createCotErr) {
+          var _ref2 = _asyncToGenerator(function* (createCotErr) {
             if (createCotErr.response.status === 409 || createCotErr.response.status === 500) {
               yield (0, _CirclesOfTrustApi.updateCircleOfTrust)(cotId, cotData).catch( /*#__PURE__*/function () {
-                var _ref4 = _asyncToGenerator(function* (updateCotErr) {
+                var _ref3 = _asyncToGenerator(function* (updateCotErr) {
                   (0, _Console.printMessage)(createCotErr.response.data, 'error');
                   (0, _Console.printMessage)(updateCotErr.response.data, 'error');
                   throw new Error("Error creating/updating circle of trust ".concat(cotId));
                 });
 
-                return function (_x38) {
-                  return _ref4.apply(this, arguments);
+                return function (_x34) {
+                  return _ref3.apply(this, arguments);
                 };
               }());
             } else {
@@ -794,8 +779,8 @@ function _importTree() {
             }
           });
 
-          return function (_x37) {
-            return _ref3.apply(this, arguments);
+          return function (_x33) {
+            return _ref2.apply(this, arguments);
           };
         }());
       };
@@ -842,7 +827,7 @@ function _importTree() {
 
         try {
           // eslint-disable-next-line no-await-in-loop
-          yield (0, _TreeApi.putNode)(newUuid, nodeType, innerNodeData);
+          yield (0, _NodeApi.putNode)(newUuid, nodeType, innerNodeData);
         } catch (nodeImportError) {
           if (nodeImportError.response.status === 400 && nodeImportError.response.data.message === 'Data validation failed for the attribute, Script') {
             throw new Error("Missing script ".concat(innerNodeData['script'], " referenced by inner node ").concat(innerNodeId).concat(innerNodeId === newUuid ? '' : " [".concat(newUuid, "]"), " (").concat(innerNodeData['_type']['_id'], ") in journey ").concat(treeId, "."));
@@ -892,7 +877,7 @@ function _importTree() {
 
         try {
           // eslint-disable-next-line no-await-in-loop
-          yield (0, _TreeApi.putNode)(newUuid, _nodeType, nodeData);
+          yield (0, _NodeApi.putNode)(newUuid, _nodeType, nodeData);
         } catch (nodeImportError) {
           if (nodeImportError.response.status === 400 && nodeImportError.response.data.message === 'Data validation failed for the attribute, Script') {
             throw new Error("Missing script ".concat(nodeData['script'], " referenced by node ").concat(nodeId).concat(nodeId === newUuid ? '' : " [".concat(newUuid, "]"), " (").concat(nodeData['_type']['_id'], ") in journey ").concat(treeId, "."));
@@ -922,7 +907,7 @@ function _importTree() {
     // Set the identityResource for the tree to the selected resource.
 
 
-    if (treeObject.tree.identityResource && treeObject.tree.identityResource.endsWith('user')) {
+    if (treeObject.tree.identityResource && treeObject.tree['identityResource'].endsWith('user')) {
       treeObject.tree.identityResource = "managed/".concat((0, _OpsUtils.getRealmManagedUser)());
       if (verbose) (0, _Console.printMessage)("    - identityResource: ".concat(treeObject.tree.identityResource), 'info', false);
     }
@@ -961,14 +946,14 @@ function _importTree() {
   return _importTree.apply(this, arguments);
 }
 
-function resolveDependencies(_x16, _x17, _x18, _x19) {
+function resolveDependencies(_x13, _x14, _x15, _x16) {
   return _resolveDependencies.apply(this, arguments);
 }
 /**
  * Import a journey from file
- * @param {String} journeyId journey id/name
- * @param {String} file import file name
- * @param {boolean} options reUuid:boolean: re-uuid all node objects, verbose:boolean: verbose output
+ * @param {string} journeyId journey id/name
+ * @param {string} file import file name
+ * @param {ImportOptions} options import options
  */
 
 
@@ -1031,13 +1016,13 @@ function _resolveDependencies() {
   return _resolveDependencies.apply(this, arguments);
 }
 
-function importJourneyFromFile(_x20, _x21, _x22) {
+function importJourneyFromFile(_x17, _x18, _x19) {
   return _importJourneyFromFile.apply(this, arguments);
 }
 /**
  * Import first journey from file
- * @param {String} file import file name
- * @param {boolean} options reUuid:boolean: re-uuid all node objects, verbose:boolean: verbose output
+ * @param {string} file import file name
+ * @param {ImportOptions} options import options
  */
 
 
@@ -1048,7 +1033,7 @@ function _importJourneyFromFile() {
     } = options;
 
     _fs.default.readFile(file, 'utf8', /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator(function* (err, data) {
+      var _ref4 = _asyncToGenerator(function* (err, data) {
         if (err) throw err;
         var journeyData = JSON.parse(data); // check if this is a file with multiple trees and get journey by id
 
@@ -1061,7 +1046,7 @@ function _importJourneyFromFile() {
 
         if (journeyData && journeyId === journeyData.tree._id) {
           // attempt dependency resolution for single tree import
-          var installedJourneys = (yield (0, _TreeApi.getTrees)()).data.result.map(x => x._id);
+          var installedJourneys = (yield (0, _TreeApi.getTrees)()).map(x => x._id);
           var unresolvedJourneys = {};
           var resolvedJourneys = [];
           (0, _Console.createProgressIndicator)(undefined, 'Resolving dependencies', 'indeterminate');
@@ -1093,21 +1078,21 @@ function _importJourneyFromFile() {
         }
       });
 
-      return function (_x39, _x40) {
-        return _ref5.apply(this, arguments);
+      return function (_x35, _x36) {
+        return _ref4.apply(this, arguments);
       };
     }());
   });
   return _importJourneyFromFile.apply(this, arguments);
 }
 
-function importFirstJourneyFromFile(_x23, _x24) {
+function importFirstJourneyFromFile(_x20, _x21) {
   return _importFirstJourneyFromFile.apply(this, arguments);
 }
 /**
  * Helper to import multiple trees from a tree map
  * @param {Object} treesMap map of trees object
- * @param {boolean} options reUuid:boolean: re-uuid all node objects, verbose:boolean: verbose output
+ * @param {ImportOptions} options import options
  */
 
 
@@ -1118,7 +1103,7 @@ function _importFirstJourneyFromFile() {
     } = options;
 
     _fs.default.readFile(file, 'utf8', /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator(function* (err, data) {
+      var _ref5 = _asyncToGenerator(function* (err, data) {
         if (err) throw err;
 
         var journeyData = _lodash.default.cloneDeep(JSON.parse(data));
@@ -1141,7 +1126,7 @@ function _importFirstJourneyFromFile() {
 
         if (journeyData && journeyId) {
           // attempt dependency resolution for single tree import
-          var installedJourneys = (yield (0, _TreeApi.getTrees)()).data.result.map(x => x._id);
+          var installedJourneys = (yield (0, _TreeApi.getTrees)()).map(x => x._id);
           var unresolvedJourneys = {};
           var resolvedJourneys = [];
           (0, _Console.createProgressIndicator)(undefined, 'Resolving dependencies', 'indeterminate');
@@ -1173,27 +1158,27 @@ function _importFirstJourneyFromFile() {
 
       });
 
-      return function (_x41, _x42) {
-        return _ref6.apply(this, arguments);
+      return function (_x37, _x38) {
+        return _ref5.apply(this, arguments);
       };
     }());
   });
   return _importFirstJourneyFromFile.apply(this, arguments);
 }
 
-function importAllTrees(_x25, _x26) {
+function importAllTrees(_x22, _x23) {
   return _importAllTrees.apply(this, arguments);
 }
 /**
  * Import all journeys from file
- * @param {*} file import file name
- * @param {boolean} options reUuid:boolean: re-uuid all node objects, verbose:boolean: verbose output
+ * @param {string} file import file name
+ * @param {ImportOptions} options import options
  */
 
 
 function _importAllTrees() {
   _importAllTrees = _asyncToGenerator(function* (treesMap, options) {
-    var installedJourneys = (yield (0, _TreeApi.getTrees)()).data.result.map(x => x._id);
+    var installedJourneys = (yield (0, _TreeApi.getTrees)()).map(x => x._id);
     var unresolvedJourneys = {};
     var resolvedJourneys = [];
     (0, _Console.createProgressIndicator)(undefined, 'Resolving dependencies', 'indeterminate');
@@ -1226,12 +1211,12 @@ function _importAllTrees() {
   return _importAllTrees.apply(this, arguments);
 }
 
-function importJourneysFromFile(_x27, _x28) {
+function importJourneysFromFile(_x24, _x25) {
   return _importJourneysFromFile.apply(this, arguments);
 }
 /**
  * Import all journeys from separate files
- * @param {boolean} options reUuid:boolean: re-uuid all node objects, verbose:boolean: verbose output
+ * @param {ImportOptions} options import options
  */
 
 
@@ -1246,7 +1231,7 @@ function _importJourneysFromFile() {
   return _importJourneysFromFile.apply(this, arguments);
 }
 
-function importJourneysFromFiles(_x29) {
+function importJourneysFromFiles(_x26) {
   return _importJourneysFromFiles.apply(this, arguments);
 }
 /**
@@ -1309,10 +1294,37 @@ function describeTree(treeData) {
   treeMap['nodeTypes'] = nodeTypeMap;
   treeMap['scripts'] = scriptsMap;
   treeMap['emailTemplates'] = emailTemplatesMap;
+  (0, _Console.printMessage)("\nJourney: ".concat(treeMap['treeName']), 'data');
+  (0, _Console.printMessage)('========');
+  (0, _Console.printMessage)('\nNodes:', 'data');
+
+  if (Object.entries(treeMap['nodeTypes']).length) {
+    for (var [name, count] of Object.entries(treeMap['nodeTypes'])) {
+      (0, _Console.printMessage)("- ".concat(name, ": ").concat(count), 'data');
+    }
+  }
+
+  if (Object.entries(treeMap['scripts']).length) {
+    (0, _Console.printMessage)('\nScripts:', 'data');
+
+    for (var [_name, desc] of Object.entries(treeMap['scripts'])) {
+      (0, _Console.printMessage)("- ".concat(_name, ": ").concat(desc), 'data');
+    }
+  }
+
+  if (Object.entries(treeMap['emailTemplates']).length) {
+    (0, _Console.printMessage)('\nEmail Templates:', 'data');
+
+    for (var [_id] of Object.entries(treeMap['emailTemplates'])) {
+      (0, _Console.printMessage)("- ".concat(_id), 'data');
+    }
+  }
+
   return treeMap;
 }
 /**
  * Find all node configuration objects that are no longer referenced by any tree
+ * @returns {Promise<unknown[]>} a promise that resolves to an array of orphaned nodes
  */
 
 
@@ -1322,6 +1334,7 @@ function findOrphanedNodes() {
 /**
  * Remove orphaned nodes
  * @param {[Object]} orphanedNodes Pass in an array of orphaned node configuration objects to remove
+ * @returns {Promise<unknown[]>} a promise that resolves to an array nodes that encountered errors deleting
  */
 
 
@@ -1330,13 +1343,13 @@ function _findOrphanedNodes() {
     var allNodes = [];
     var orphanedNodes = [];
     var types = [];
-    var allJourneys = (yield (0, _TreeApi.getTrees)()).data.result;
+    var allJourneys = yield (0, _TreeApi.getTrees)();
     var errorMessage = '';
     var errorTypes = [];
     (0, _Console.createProgressIndicator)(undefined, "Counting total nodes...", 'indeterminate');
 
     try {
-      types = (yield (0, _TreeApi.getNodeTypes)()).data.result;
+      types = yield (0, _NodeApi.getNodeTypes)();
     } catch (error) {
       (0, _Console.printMessage)('Error retrieving all available node types:', 'error');
       (0, _Console.printMessage)(error.response.data, 'error');
@@ -1346,7 +1359,7 @@ function _findOrphanedNodes() {
     for (var type of types) {
       try {
         // eslint-disable-next-line no-await-in-loop, no-loop-func
-        (yield (0, _TreeApi.getNodesByType)(type._id)).data.result.forEach(node => {
+        (yield (0, _NodeApi.getNodesByType)(type._id)).forEach(node => {
           allNodes.push(node);
           (0, _Console.updateProgressIndicator)("".concat(allNodes.length, " total nodes").concat(errorMessage));
         });
@@ -1375,7 +1388,7 @@ function _findOrphanedNodes() {
 
           if (containerNodes.includes(node.nodeType)) {
             // eslint-disable-next-line no-await-in-loop
-            var containerNode = (yield (0, _TreeApi.getNode)(nodeId, node.nodeType)).data;
+            var containerNode = yield (0, _NodeApi.getNode)(nodeId, node.nodeType);
             containerNode.nodes.forEach(n => {
               activeNodes.push(n._id);
               (0, _Console.updateProgressIndicator)("".concat(activeNodes.length, " active nodes"));
@@ -1395,54 +1408,33 @@ function _findOrphanedNodes() {
   return _findOrphanedNodes.apply(this, arguments);
 }
 
-function removeOrphanedNodes(_x30) {
+function removeOrphanedNodes(_x27) {
   return _removeOrphanedNodes.apply(this, arguments);
 }
-/**
- * Prune orphaned nodes
- */
-
 
 function _removeOrphanedNodes() {
   _removeOrphanedNodes = _asyncToGenerator(function* (orphanedNodes) {
+    var errorNodes = [];
     (0, _Console.createProgressIndicator)(orphanedNodes.length, 'Removing orphaned nodes...');
 
     for (var node of orphanedNodes) {
-      (0, _Console.updateProgressIndicator)("Removing ".concat(node._id, "...")); // eslint-disable-next-line no-await-in-loop
+      (0, _Console.updateProgressIndicator)("Removing ".concat(node['_id'], "..."));
 
-      yield (0, _TreeApi.deleteNode)(node._id, node._type._id).catch(deleteError => {
-        (0, _Console.printMessage)("".concat(deleteError), 'error');
-      });
+      try {
+        // eslint-disable-next-line no-await-in-loop
+        yield (0, _NodeApi.deleteNode)(node['_id'], node['_type']['_id']);
+      } catch (deleteError) {
+        errorNodes.push(node);
+        (0, _Console.printMessage)(" ".concat(deleteError), 'error');
+      }
     }
 
     (0, _Console.stopProgressIndicator)("Removed ".concat(orphanedNodes.length, " orphaned nodes."));
+    return errorNodes;
   });
   return _removeOrphanedNodes.apply(this, arguments);
 }
 
-function prune() {
-  return _prune.apply(this, arguments);
-}
-
-function _prune() {
-  _prune = _asyncToGenerator(function* () {
-    var orphanedNodes = yield findOrphanedNodes();
-
-    if (orphanedNodes.length > 0) {
-      var ok = yield (0, _yesno.default)({
-        question: 'Prune (permanently delete) orphaned nodes? (y|n):'
-      });
-
-      if (ok) {
-        yield removeOrphanedNodes(orphanedNodes);
-      }
-    } else {
-      (0, _Console.printMessage)('No orphaned nodes found.');
-    }
-  });
-  return _prune.apply(this, arguments);
-}
-
 var OOTB_NODE_TYPES_7 = ['AcceptTermsAndConditionsNode', 'AccountActiveDecisionNode', 'AccountLockoutNode', 'AgentDataStoreDecisionNode', 'AnonymousSessionUpgradeNode', 'AnonymousUserNode', 'AttributeCollectorNode', 'AttributePresentDecisionNode', 'AttributeValueDecisionNode', 'AuthLevelDecisionNode', 'ChoiceCollectorNode', 'ConsentNode', 'CookiePresenceDecisionNode', 'CreateObjectNode', 'CreatePasswordNode', 'DataStoreDecisionNode', 'DeviceGeoFencingNode', 'DeviceLocationMatchNode', 'DeviceMatchNode', 'DeviceProfileCollectorNode', 'DeviceSaveNode', 'DeviceTamperingVerificationNode', 'DisplayUserNameNode', 'EmailSuspendNode', 'EmailTemplateNode', 'IdentifyExistingUserNode', 'IncrementLoginCountNode', 'InnerTreeEvaluatorNode', 'IotAuthenticationNode', 'IotRegistrationNode', 'KbaCreateNode', 'KbaDecisionNode', 'KbaVerifyNode', 'LdapDecisionNode', 'LoginCountDecisionNode', 'MessageNode', 'MetadataNode', 'MeterNode', 'ModifyAuthLevelNode', 'OneTimePasswordCollectorDecisionNode', 'OneTimePasswordGeneratorNode', 'OneTimePasswordSmsSenderNode', 'OneTimePasswordSmtpSenderNode', 'PageNode', 'PasswordCollectorNode', 'PatchObjectNode', 'PersistentCookieDecisionNode', 'PollingWaitNode', 'ProfileCompletenessDecisionNode', 'ProvisionDynamicAccountNode', 'ProvisionIdmAccountNode', 'PushAuthenticationSenderNode', 'PushResultVerifierNode', 'QueryFilterDecisionNode', 'RecoveryCodeCollectorDecisionNode', 'RecoveryCodeDisplayNode', 'RegisterLogoutWebhookNode', 'RemoveSessionPropertiesNode', 'RequiredAttributesDecisionNode', 'RetryLimitDecisionNode', 'ScriptedDecisionNode', 'SelectIdPNode', 'SessionDataNode', 'SetFailureUrlNode', 'SetPersistentCookieNode', 'SetSessionPropertiesNode', 'SetSuccessUrlNode', 'SocialFacebookNode', 'SocialGoogleNode', 'SocialNode', 'SocialOAuthIgnoreProfileNode', 'SocialOpenIdConnectNode', 'SocialProviderHandlerNode', 'TermsAndConditionsDecisionNode', 'TimeSinceDecisionNode', 'TimerStartNode', 'TimerStopNode', 'UsernameCollectorNode', 'ValidatedPasswordNode', 'ValidatedUsernameNode', 'WebAuthnAuthenticationNode', 'WebAuthnDeviceStorageNode', 'WebAuthnRegistrationNode', 'ZeroPageLoginNode', 'product-CertificateCollectorNode', 'product-CertificateUserExtractorNode', 'product-CertificateValidationNode', 'product-KerberosNode', 'product-ReCaptchaNode', 'product-Saml2Node', 'product-WriteFederationInformationNode'];
 var OOTB_NODE_TYPES_7_1 = ['PushRegistrationNode', 'GetAuthenticatorAppNode', 'MultiFactorRegistrationOptionsNode', 'OptOutMultiFactorAuthenticationNode'].concat(OOTB_NODE_TYPES_7);
 var OOTB_NODE_TYPES_7_2 = ['OathRegistrationNode', 'OathTokenVerifierNode', 'PassthroughAuthenticationNode', 'ConfigProviderNode', 'DebugNode'].concat(OOTB_NODE_TYPES_7_1);
@@ -1454,7 +1446,7 @@ var OOTB_NODE_TYPES_6 = ['AbstractSocialAuthLoginNode', 'AccountLockoutNode', 'A
  * @returns {boolean} True if the journey/tree contains any custom nodes, false otherwise.
  */
 
-function isCustom(_x31) {
+function isCustom(_x28) {
   return _isCustom.apply(this, arguments);
 }
 /**
@@ -1467,8 +1459,7 @@ function isCustom(_x31) {
 function _isCustom() {
   _isCustom = _asyncToGenerator(function* (journey) {
     var ootbNodeTypes = [];
-    var nodeList = journey.nodes; // console.log(nodeList);
-    // console.log(storage.session.getAmVersion());
+    var nodeList = journey.nodes;
 
     switch (_SessionStorage.default.session.getAmVersion()) {
       case '7.1.0':
@@ -1476,7 +1467,6 @@ function _isCustom() {
         break;
 
       case '7.2.0':
-        // console.log("here");
         ootbNodeTypes = OOTB_NODE_TYPES_7_2.slice(0);
         break;
 
@@ -1522,7 +1512,7 @@ function _isCustom() {
 
         if (containerNodes.includes(nodeList[node].nodeType)) {
           results.push( // eslint-disable-next-line no-await-in-loop
-          (yield (0, _TreeApi.getNode)(node, nodeList[node].nodeType))['data']);
+          yield (0, _NodeApi.getNode)(node, nodeList[node].nodeType));
         }
       }
     }
@@ -1551,7 +1541,7 @@ function listJourneys() {
 }
 /**
  * Delete a journey
- * @param {String} journeyId journey id/name
+ * @param {string} journeyId journey id/name
  * @param {Object} options deep=true also delete all the nodes and inner nodes, verbose=true print verbose info
  */
 
@@ -1563,7 +1553,7 @@ function _listJourneys() {
     var journeys = [];
 
     try {
-      journeys = (yield (0, _TreeApi.getTrees)()).data.result;
+      journeys = yield (0, _TreeApi.getTrees)();
     } catch (error) {
       (0, _Console.printMessage)("".concat(error.message), 'error');
       (0, _Console.printMessage)(error.response.data, 'error');
@@ -1597,7 +1587,7 @@ function _listJourneys() {
   return _listJourneys.apply(this, arguments);
 }
 
-function deleteJourney(_x32, _x33) {
+function deleteJourney(_x29, _x30) {
   return _deleteJourney.apply(this, arguments);
 }
 /**
@@ -1608,7 +1598,7 @@ function deleteJourney(_x32, _x33) {
 
 function _deleteJourney() {
   _deleteJourney = _asyncToGenerator(function* (journeyId, options) {
-    var spinner = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    var progress = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     var {
       deep
     } = options;
@@ -1618,10 +1608,10 @@ function _deleteJourney() {
     var status = {
       nodes: {}
     };
-    if (spinner) (0, _Console.createProgressIndicator)(undefined, "Deleting ".concat(journeyId, "..."), 'indeterminate');
-    if (spinner && verbose) (0, _Console.stopProgressIndicator)();
+    if (progress) (0, _Console.createProgressIndicator)(undefined, "Deleting ".concat(journeyId, "..."), 'indeterminate');
+    if (progress && verbose) (0, _Console.stopProgressIndicator)();
     return (0, _TreeApi.deleteTree)(journeyId).then( /*#__PURE__*/function () {
-      var _ref7 = _asyncToGenerator(function* (deleteTreeResponse) {
+      var _ref6 = _asyncToGenerator(function* (deleteTreeResponse) {
         status['status'] = 'success';
         var nodePromises = [];
         if (verbose) (0, _Console.printMessage)("Deleted ".concat(journeyId, " (tree)"), 'info');
@@ -1632,16 +1622,16 @@ function _deleteJourney() {
             if (containerNodes.includes(nodeObject['nodeType'])) {
               try {
                 // eslint-disable-next-line no-await-in-loop
-                var pageNode = (yield (0, _TreeApi.getNode)(nodeId, nodeObject['nodeType'])).data;
+                var containerNode = yield (0, _NodeApi.getNode)(nodeId, nodeObject['nodeType']);
                 if (verbose) (0, _Console.printMessage)("Read ".concat(nodeId, " (").concat(nodeObject['nodeType'], ") from ").concat(journeyId), 'info');
 
                 var _loop6 = function _loop6(innerNodeObject) {
-                  nodePromises.push((0, _TreeApi.deleteNode)(innerNodeObject._id, innerNodeObject.nodeType).then(response2 => {
+                  nodePromises.push((0, _NodeApi.deleteNode)(innerNodeObject._id, innerNodeObject.nodeType).then(response2 => {
                     status.nodes[innerNodeObject._id] = {
                       status: 'success'
                     };
                     if (verbose) (0, _Console.printMessage)("Deleted ".concat(innerNodeObject._id, " (").concat(innerNodeObject.nodeType, ") from ").concat(journeyId), 'info');
-                    return response2.data;
+                    return response2;
                   }).catch(error => {
                     status.nodes[innerNodeObject._id] = {
                       status: 'error',
@@ -1651,35 +1641,44 @@ function _deleteJourney() {
                   }));
                 };
 
-                for (var innerNodeObject of pageNode.nodes) {
+                for (var innerNodeObject of containerNode.nodes) {
                   _loop6(innerNodeObject);
                 } // finally delete the container node
 
 
-                nodePromises.push((0, _TreeApi.deleteNode)(nodeId, nodeObject['nodeType']).then(response2 => {
-                  status.nodes[nodeId] = {
+                nodePromises.push((0, _NodeApi.deleteNode)(containerNode._id, containerNode['_type']['_id']).then(response2 => {
+                  status.nodes[containerNode._id] = {
                     status: 'success'
                   };
-                  if (verbose) (0, _Console.printMessage)("Deleted ".concat(nodeId, " (").concat(nodeObject['nodeType'], ") from ").concat(journeyId), 'info');
-                  return response2.data;
+                  if (verbose) (0, _Console.printMessage)("Deleted ".concat(containerNode._id, " (").concat(containerNode['_type']['_id'], ") from ").concat(journeyId), 'info');
+                  return response2;
                 }).catch(error => {
-                  status.nodes[nodeId] = {
-                    status: 'error',
-                    error
-                  };
-                  if (verbose) (0, _Console.printMessage)("Error deleting container node ".concat(nodeId, " (").concat(nodeObject['nodeType'], ") from ").concat(journeyId, ": ").concat(error), 'error');
+                  var _error$response, _error$response$data;
+
+                  if ((error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.code) === 500 && error.response.data.message === 'Unable to read SMS config: Node did not exist') {
+                    status.nodes[containerNode._id] = {
+                      status: 'success'
+                    };
+                    if (verbose) (0, _Console.printMessage)("Deleted ".concat(containerNode._id, " (").concat(containerNode['_type']['_id'], ") from ").concat(journeyId), 'info');
+                  } else {
+                    status.nodes[containerNode._id] = {
+                      status: 'error',
+                      error
+                    };
+                    if (verbose) (0, _Console.printMessage)("Error deleting container node ".concat(containerNode._id, " (").concat(containerNode['_type']['_id'], ") from ").concat(journeyId, ": ").concat(error.response.data.message), 'error');
+                  }
                 }));
               } catch (error) {
                 if (verbose) (0, _Console.printMessage)("Error getting container node ".concat(nodeId, " (").concat(nodeObject['nodeType'], ") from ").concat(journeyId, ": ").concat(error), 'error');
               }
             } else {
               // delete the node
-              nodePromises.push((0, _TreeApi.deleteNode)(nodeId, nodeObject['nodeType']).then(response => {
+              nodePromises.push((0, _NodeApi.deleteNode)(nodeId, nodeObject['nodeType']).then(response => {
                 status.nodes[nodeId] = {
                   status: 'success'
                 };
                 if (verbose) (0, _Console.printMessage)("Deleted ".concat(nodeId, " (").concat(nodeObject['nodeType'], ") from ").concat(journeyId), 'info');
-                return response.data;
+                return response;
               }).catch(error => {
                 status.nodes[nodeId] = {
                   status: 'error',
@@ -1690,7 +1689,7 @@ function _deleteJourney() {
             }
           };
 
-          for (var [nodeId, nodeObject] of Object.entries(deleteTreeResponse.data.nodes)) {
+          for (var [nodeId, nodeObject] of Object.entries(deleteTreeResponse.nodes)) {
             yield* _loop5(nodeId, nodeObject);
           }
         } // wait until all the node calls are complete
@@ -1698,7 +1697,7 @@ function _deleteJourney() {
 
         yield Promise.allSettled(nodePromises); // report status
 
-        if (spinner) {
+        if (progress) {
           var nodeCount = 0;
           var errorCount = 0;
 
@@ -1717,8 +1716,8 @@ function _deleteJourney() {
         return status;
       });
 
-      return function (_x43) {
-        return _ref7.apply(this, arguments);
+      return function (_x39) {
+        return _ref6.apply(this, arguments);
       };
     }()).catch(error => {
       status['status'] = 'error';
@@ -1731,7 +1730,7 @@ function _deleteJourney() {
   return _deleteJourney.apply(this, arguments);
 }
 
-function deleteJourneys(_x34) {
+function deleteJourneys(_x31) {
   return _deleteJourneys.apply(this, arguments);
 }
 
@@ -1741,7 +1740,7 @@ function _deleteJourneys() {
       verbose
     } = options;
     var status = {};
-    var trees = (yield (0, _TreeApi.getTrees)()).data.result;
+    var trees = yield (0, _TreeApi.getTrees)();
     (0, _Console.createProgressIndicator)(trees.length, 'Deleting journeys...');
 
     for (var tree of trees) {