@rockcarver/frodo-cli 2.0.0-3 → 2.0.0-31

package/esm/cli/journey/journey-disable.js

@@ -1,7 +1,13 @@
-import { FrodoCommand } from '../FrodoCommand';
-import { Option } from 'commander';
 import { frodo } from '@rockcarver/frodo-lib';
-import { showSpinner, failSpinner, succeedSpinner, printMessage } from '../../utils/Console';
+import { Option } from 'commander';
+import { failSpinner, printMessage, showSpinner, succeedSpinner } from '../../utils/Console';
+import { FrodoCommand } from '../FrodoCommand';
+const {
+  getTokens
+} = frodo.login;
+const {
+  disableJourney
+} = frodo.authn.journey;
 const program = new FrodoCommand('frodo journey disable');
 program.description('Disable journeys/trees.').addOption(new Option('-i, --journey-id <journey>', 'Name of a journey/tree.'))
 // .addOption(
@@ -15,9 +21,9 @@ program.description('Disable journeys/trees.').addOption(new Option('-i, --journ
 async (host, realm, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, realm, user, password, options, command);
   // disable
-  if (options.journeyId && (await frodo.login.getTokens())) {
+  if (options.journeyId && (await getTokens())) {
     showSpinner(`Disabling journey ${options.journeyId}...`);
-    if (await frodo.authn.journey.disableJourney(options.journeyId)) {
+    if (await disableJourney(options.journeyId)) {
       succeedSpinner(`Disabled journey ${options.journeyId}.`);
     } else {
       failSpinner(`Disabling journey ${options.journeyId} failed.`);
@@ -34,4 +40,4 @@ async (host, realm, user, password, options, command) => {
 );
 
 program.parse();
-//# sourceMappingURL=journey-disable.js.map
+//# sourceMappingURL=journey-disable.js.map

package/esm/cli/journey/journey-disable.js.map

@@ -1 +1 @@
-{"version":3,"file":"journey-disable.js","names":["FrodoCommand","Option","frodo","showSpinner","failSpinner","succeedSpinner","printMessage","program","description","addOption","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","journeyId","login","getTokens","authn","journey","disableJourney","help","process","exitCode","parse"],"sources":["cli/journey/journey-disable.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport { Option } from 'commander';\nimport { frodo } from '@rockcarver/frodo-lib';\nimport {\n  showSpinner,\n  failSpinner,\n  succeedSpinner,\n  printMessage,\n} from '../../utils/Console';\n\nconst program = new FrodoCommand('frodo journey disable');\n\nprogram\n  .description('Disable journeys/trees.')\n  .addOption(\n    new Option('-i, --journey-id <journey>', 'Name of a journey/tree.')\n  )\n  // .addOption(\n  //   new Option(\n  //     '-a, --all',\n  //     'Disable all the journeys/trees in a realm. Ignored with -i.'\n  //   )\n  // )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      // disable\n      if (options.journeyId && (await frodo.login.getTokens())) {\n        showSpinner(`Disabling journey ${options.journeyId}...`);\n        if (await frodo.authn.journey.disableJourney(options.journeyId)) {\n          succeedSpinner(`Disabled journey ${options.journeyId}.`);\n        } else {\n          failSpinner(`Disabling journey ${options.journeyId} failed.`);\n        }\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage('Unrecognized combination of options or no options...');\n        program.help();\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,MAAM,QAAQ,WAAW;AAClC,SAASC,KAAK,QAAQ,uBAAuB;AAC7C,SACEC,WAAW,EACXC,WAAW,EACXC,cAAc,EACdC,YAAY,QACP,qBAAqB;AAE5B,MAAMC,OAAO,GAAG,IAAIP,YAAY,CAAC,uBAAuB,CAAC;AAEzDO,OAAO,CACJC,WAAW,CAAC,yBAAyB,CAAC,CACtCC,SAAS,CACR,IAAIR,MAAM,CAAC,4BAA4B,EAAE,yBAAyB,CACpE;AACA;AACA;AACA;AACA;AACA;AACA;AAAA,CACCS,MAAM;AACL;AACA,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACvDA,OAAO,CAACC,wBAAwB,CAC9BN,IAAI,EACJC,KAAK,EACLC,IAAI,EACJC,QAAQ,EACRC,OAAO,EACPC,OACF,CAAC;EACD;EACA,IAAID,OAAO,CAACG,SAAS,KAAK,MAAMhB,KAAK,CAACiB,KAAK,CAACC,SAAS,CAAC,CAAC,CAAC,EAAE;IACxDjB,WAAW,CAAE,qBAAoBY,OAAO,CAACG,SAAU,KAAI,CAAC;IACxD,IAAI,MAAMhB,KAAK,CAACmB,KAAK,CAACC,OAAO,CAACC,cAAc,CAACR,OAAO,CAACG,SAAS,CAAC,EAAE;MAC/Db,cAAc,CAAE,oBAAmBU,OAAO,CAACG,SAAU,GAAE,CAAC;IAC1D,CAAC,MAAM;MACLd,WAAW,CAAE,qBAAoBW,OAAO,CAACG,SAAU,UAAS,CAAC;IAC/D;EACF;EACA;EAAA,KACK;IACHZ,YAAY,CAAC,sDAAsD,CAAC;IACpEC,OAAO,CAACiB,IAAI,CAAC,CAAC;IACdC,OAAO,CAACC,QAAQ,GAAG,CAAC;EACtB;AACF;AACA;AACF,CAAC;;AAEHnB,OAAO,CAACoB,KAAK,CAAC,CAAC"}
+{"version":3,"file":"journey-disable.js","names":["frodo","Option","failSpinner","printMessage","showSpinner","succeedSpinner","FrodoCommand","getTokens","login","disableJourney","authn","journey","program","description","addOption","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","journeyId","help","process","exitCode","parse"],"sources":["../../../src/cli/journey/journey-disable.ts"],"sourcesContent":["import { frodo } from '@rockcarver/frodo-lib';\nimport { Option } from 'commander';\n\nimport {\n  failSpinner,\n  printMessage,\n  showSpinner,\n  succeedSpinner,\n} from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\n\nconst { getTokens } = frodo.login;\nconst { disableJourney } = frodo.authn.journey;\n\nconst program = new FrodoCommand('frodo journey disable');\n\nprogram\n  .description('Disable journeys/trees.')\n  .addOption(\n    new Option('-i, --journey-id <journey>', 'Name of a journey/tree.')\n  )\n  // .addOption(\n  //   new Option(\n  //     '-a, --all',\n  //     'Disable all the journeys/trees in a realm. Ignored with -i.'\n  //   )\n  // )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      // disable\n      if (options.journeyId && (await getTokens())) {\n        showSpinner(`Disabling journey ${options.journeyId}...`);\n        if (await disableJourney(options.journeyId)) {\n          succeedSpinner(`Disabled journey ${options.journeyId}.`);\n        } else {\n          failSpinner(`Disabling journey ${options.journeyId} failed.`);\n        }\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage('Unrecognized combination of options or no options...');\n        program.help();\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,KAAK,QAAQ,uBAAuB;AAC7C,SAASC,MAAM,QAAQ,WAAW;AAElC,SACEC,WAAW,EACXC,YAAY,EACZC,WAAW,EACXC,cAAc,QACT,qBAAqB;AAC5B,SAASC,YAAY,QAAQ,iBAAiB;AAE9C,MAAM;EAAEC;AAAU,CAAC,GAAGP,KAAK,CAACQ,KAAK;AACjC,MAAM;EAAEC;AAAe,CAAC,GAAGT,KAAK,CAACU,KAAK,CAACC,OAAO;AAE9C,MAAMC,OAAO,GAAG,IAAIN,YAAY,CAAC,uBAAuB,CAAC;AAEzDM,OAAO,CACJC,WAAW,CAAC,yBAAyB,CAAC,CACtCC,SAAS,CACR,IAAIb,MAAM,CAAC,4BAA4B,EAAE,yBAAyB,CACpE;AACA;AACA;AACA;AACA;AACA;AACA;AAAA,CACCc,MAAM;AACL;AACA,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACvDA,OAAO,CAACC,wBAAwB,CAC9BN,IAAI,EACJC,KAAK,EACLC,IAAI,EACJC,QAAQ,EACRC,OAAO,EACPC,OACF,CAAC;EACD;EACA,IAAID,OAAO,CAACG,SAAS,KAAK,MAAMhB,SAAS,CAAC,CAAC,CAAC,EAAE;IAC5CH,WAAW,CAAE,qBAAoBgB,OAAO,CAACG,SAAU,KAAI,CAAC;IACxD,IAAI,MAAMd,cAAc,CAACW,OAAO,CAACG,SAAS,CAAC,EAAE;MAC3ClB,cAAc,CAAE,oBAAmBe,OAAO,CAACG,SAAU,GAAE,CAAC;IAC1D,CAAC,MAAM;MACLrB,WAAW,CAAE,qBAAoBkB,OAAO,CAACG,SAAU,UAAS,CAAC;IAC/D;EACF;EACA;EAAA,KACK;IACHpB,YAAY,CAAC,sDAAsD,CAAC;IACpES,OAAO,CAACY,IAAI,CAAC,CAAC;IACdC,OAAO,CAACC,QAAQ,GAAG,CAAC;EACtB;AACF;AACA;AACF,CAAC;;AAEHd,OAAO,CAACe,KAAK,CAAC,CAAC"}

package/esm/cli/journey/journey-enable.js

@@ -1,7 +1,13 @@
-import { FrodoCommand } from '../FrodoCommand';
-import { Option } from 'commander';
 import { frodo } from '@rockcarver/frodo-lib';
-import { showSpinner, failSpinner, succeedSpinner, printMessage } from '../../utils/Console';
+import { Option } from 'commander';
+import { failSpinner, printMessage, showSpinner, succeedSpinner } from '../../utils/Console';
+import { FrodoCommand } from '../FrodoCommand';
+const {
+  getTokens
+} = frodo.login;
+const {
+  enableJourney
+} = frodo.authn.journey;
 const program = new FrodoCommand('frodo journey enable');
 program.description('Enable journeys/trees.').addOption(new Option('-i, --journey-id <journey>', 'Name of a journey/tree.'))
 // .addOption(
@@ -15,9 +21,9 @@ program.description('Enable journeys/trees.').addOption(new Option('-i, --journe
 async (host, realm, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, realm, user, password, options, command);
   // enable
-  if (options.journeyId && (await frodo.login.getTokens())) {
+  if (options.journeyId && (await getTokens())) {
     showSpinner(`Enabling journey ${options.journeyId}...`);
-    if (await frodo.authn.journey.enableJourney(options.journeyId)) {
+    if (await enableJourney(options.journeyId)) {
       succeedSpinner(`Enabled journey ${options.journeyId}.`);
     } else {
       failSpinner(`Enabling journey ${options.journeyId} failed.`);
@@ -34,4 +40,4 @@ async (host, realm, user, password, options, command) => {
 );
 
 program.parse();
-//# sourceMappingURL=journey-enable.js.map
+//# sourceMappingURL=journey-enable.js.map

package/esm/cli/journey/journey-enable.js.map

@@ -1 +1 @@
-{"version":3,"file":"journey-enable.js","names":["FrodoCommand","Option","frodo","showSpinner","failSpinner","succeedSpinner","printMessage","program","description","addOption","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","journeyId","login","getTokens","authn","journey","enableJourney","help","process","exitCode","parse"],"sources":["cli/journey/journey-enable.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport { Option } from 'commander';\nimport { frodo } from '@rockcarver/frodo-lib';\nimport {\n  showSpinner,\n  failSpinner,\n  succeedSpinner,\n  printMessage,\n} from '../../utils/Console';\n\nconst program = new FrodoCommand('frodo journey enable');\n\nprogram\n  .description('Enable journeys/trees.')\n  .addOption(\n    new Option('-i, --journey-id <journey>', 'Name of a journey/tree.')\n  )\n  // .addOption(\n  //   new Option(\n  //     '-a, --all',\n  //     'Enable all the journeys/trees in a realm. Ignored with -i.'\n  //   )\n  // )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      // enable\n      if (options.journeyId && (await frodo.login.getTokens())) {\n        showSpinner(`Enabling journey ${options.journeyId}...`);\n        if (await frodo.authn.journey.enableJourney(options.journeyId)) {\n          succeedSpinner(`Enabled journey ${options.journeyId}.`);\n        } else {\n          failSpinner(`Enabling journey ${options.journeyId} failed.`);\n        }\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage('Unrecognized combination of options or no options...');\n        program.help();\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,MAAM,QAAQ,WAAW;AAClC,SAASC,KAAK,QAAQ,uBAAuB;AAC7C,SACEC,WAAW,EACXC,WAAW,EACXC,cAAc,EACdC,YAAY,QACP,qBAAqB;AAE5B,MAAMC,OAAO,GAAG,IAAIP,YAAY,CAAC,sBAAsB,CAAC;AAExDO,OAAO,CACJC,WAAW,CAAC,wBAAwB,CAAC,CACrCC,SAAS,CACR,IAAIR,MAAM,CAAC,4BAA4B,EAAE,yBAAyB,CACpE;AACA;AACA;AACA;AACA;AACA;AACA;AAAA,CACCS,MAAM;AACL;AACA,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACvDA,OAAO,CAACC,wBAAwB,CAC9BN,IAAI,EACJC,KAAK,EACLC,IAAI,EACJC,QAAQ,EACRC,OAAO,EACPC,OACF,CAAC;EACD;EACA,IAAID,OAAO,CAACG,SAAS,KAAK,MAAMhB,KAAK,CAACiB,KAAK,CAACC,SAAS,CAAC,CAAC,CAAC,EAAE;IACxDjB,WAAW,CAAE,oBAAmBY,OAAO,CAACG,SAAU,KAAI,CAAC;IACvD,IAAI,MAAMhB,KAAK,CAACmB,KAAK,CAACC,OAAO,CAACC,aAAa,CAACR,OAAO,CAACG,SAAS,CAAC,EAAE;MAC9Db,cAAc,CAAE,mBAAkBU,OAAO,CAACG,SAAU,GAAE,CAAC;IACzD,CAAC,MAAM;MACLd,WAAW,CAAE,oBAAmBW,OAAO,CAACG,SAAU,UAAS,CAAC;IAC9D;EACF;EACA;EAAA,KACK;IACHZ,YAAY,CAAC,sDAAsD,CAAC;IACpEC,OAAO,CAACiB,IAAI,CAAC,CAAC;IACdC,OAAO,CAACC,QAAQ,GAAG,CAAC;EACtB;AACF;AACA;AACF,CAAC;;AAEHnB,OAAO,CAACoB,KAAK,CAAC,CAAC"}
+{"version":3,"file":"journey-enable.js","names":["frodo","Option","failSpinner","printMessage","showSpinner","succeedSpinner","FrodoCommand","getTokens","login","enableJourney","authn","journey","program","description","addOption","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","journeyId","help","process","exitCode","parse"],"sources":["../../../src/cli/journey/journey-enable.ts"],"sourcesContent":["import { frodo } from '@rockcarver/frodo-lib';\nimport { Option } from 'commander';\n\nimport {\n  failSpinner,\n  printMessage,\n  showSpinner,\n  succeedSpinner,\n} from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\n\nconst { getTokens } = frodo.login;\nconst { enableJourney } = frodo.authn.journey;\n\nconst program = new FrodoCommand('frodo journey enable');\n\nprogram\n  .description('Enable journeys/trees.')\n  .addOption(\n    new Option('-i, --journey-id <journey>', 'Name of a journey/tree.')\n  )\n  // .addOption(\n  //   new Option(\n  //     '-a, --all',\n  //     'Enable all the journeys/trees in a realm. Ignored with -i.'\n  //   )\n  // )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      // enable\n      if (options.journeyId && (await getTokens())) {\n        showSpinner(`Enabling journey ${options.journeyId}...`);\n        if (await enableJourney(options.journeyId)) {\n          succeedSpinner(`Enabled journey ${options.journeyId}.`);\n        } else {\n          failSpinner(`Enabling journey ${options.journeyId} failed.`);\n        }\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage('Unrecognized combination of options or no options...');\n        program.help();\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,KAAK,QAAQ,uBAAuB;AAC7C,SAASC,MAAM,QAAQ,WAAW;AAElC,SACEC,WAAW,EACXC,YAAY,EACZC,WAAW,EACXC,cAAc,QACT,qBAAqB;AAC5B,SAASC,YAAY,QAAQ,iBAAiB;AAE9C,MAAM;EAAEC;AAAU,CAAC,GAAGP,KAAK,CAACQ,KAAK;AACjC,MAAM;EAAEC;AAAc,CAAC,GAAGT,KAAK,CAACU,KAAK,CAACC,OAAO;AAE7C,MAAMC,OAAO,GAAG,IAAIN,YAAY,CAAC,sBAAsB,CAAC;AAExDM,OAAO,CACJC,WAAW,CAAC,wBAAwB,CAAC,CACrCC,SAAS,CACR,IAAIb,MAAM,CAAC,4BAA4B,EAAE,yBAAyB,CACpE;AACA;AACA;AACA;AACA;AACA;AACA;AAAA,CACCc,MAAM;AACL;AACA,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACvDA,OAAO,CAACC,wBAAwB,CAC9BN,IAAI,EACJC,KAAK,EACLC,IAAI,EACJC,QAAQ,EACRC,OAAO,EACPC,OACF,CAAC;EACD;EACA,IAAID,OAAO,CAACG,SAAS,KAAK,MAAMhB,SAAS,CAAC,CAAC,CAAC,EAAE;IAC5CH,WAAW,CAAE,oBAAmBgB,OAAO,CAACG,SAAU,KAAI,CAAC;IACvD,IAAI,MAAMd,aAAa,CAACW,OAAO,CAACG,SAAS,CAAC,EAAE;MAC1ClB,cAAc,CAAE,mBAAkBe,OAAO,CAACG,SAAU,GAAE,CAAC;IACzD,CAAC,MAAM;MACLrB,WAAW,CAAE,oBAAmBkB,OAAO,CAACG,SAAU,UAAS,CAAC;IAC9D;EACF;EACA;EAAA,KACK;IACHpB,YAAY,CAAC,sDAAsD,CAAC;IACpES,OAAO,CAACY,IAAI,CAAC,CAAC;IACdC,OAAO,CAACC,QAAQ,GAAG,CAAC;EACtB;AACF;AACA;AACF,CAAC;;AAEHd,OAAO,CAACe,KAAK,CAAC,CAAC"}

package/esm/cli/journey/journey-export.js

@@ -1,16 +1,28 @@
-import { FrodoCommand } from '../FrodoCommand';
+import { frodo } from '@rockcarver/frodo-lib';
 import { Option } from 'commander';
-import { frodo, state } from '@rockcarver/frodo-lib';
-import { exportJourneyToFile, exportJourneysToFile, exportJourneysToFiles } from '../../ops/JourneyOps';
+import { exportJourneysToFile, exportJourneysToFiles, exportJourneyToFile } from '../../ops/JourneyOps';
 import { printMessage, verboseMessage } from '../../utils/Console';
+import { FrodoCommand } from '../FrodoCommand';
+const {
+  getTokens
+} = frodo.login;
 const program = new FrodoCommand('frodo journey export');
-program.description('Export journeys/trees.').addOption(new Option('-i, --journey-id <journey>', 'Name of a journey/tree. If specified, -a and -A are ignored.')).addOption(new Option('-f, --file <file>', 'Name of the file to write the exported journey(s) to. Ignored with -A.')).addOption(new Option('-a, --all', 'Export all the journeys/trees in a realm. Ignored with -i.')).addOption(new Option('-A, --all-separate', 'Export all the journeys/trees in a realm as separate files <journey/tree name>.json. Ignored with -i or -a.')).addOption(new Option('--use-string-arrays', 'Where applicable, use string arrays to store multi-line text (e.g. scripts).').default(false, 'off')).addOption(new Option('--no-deps', 'Do not include any dependencies (scripts, email templates, SAML entity providers and circles of trust, social identity providers, themes).')).addOption(new Option('-D, --directory <directory>', 'Destination directory.')).addOption(new Option('-O, --organize <method>', 'Organize exports into folders using the indicated method. Valid values for method:\n' + 'id: folders named by id of exported object\n' + 'type: folders named by type (e.g. script, journey, idp)\n' + 'type/id: folders named by type with sub-folders named by id')).action(
+program.description('Export journeys/trees.').addOption(new Option('-i, --journey-id <journey>', 'Name of a journey/tree. If specified, -a and -A are ignored.')).addOption(new Option('-f, --file <file>', 'Name of the file to write the exported journey(s) to. Ignored with -A.')).addOption(new Option('-a, --all', 'Export all the journeys/trees in a realm. Ignored with -i.')).addOption(new Option('-A, --all-separate', 'Export all the journeys/trees in a realm as separate files <journey/tree name>.json. Ignored with -i or -a.')).addOption(new Option('--use-string-arrays', 'Where applicable, use string arrays to store multi-line text (e.g. scripts).').default(false, 'off')).addOption(new Option('--no-deps', 'Do not include any dependencies (scripts, email templates, SAML entity providers and circles of trust, social identity providers, themes).'))
+// .addOption(
+//   new Option(
+//     '-O, --organize <method>',
+//     'Organize exports into folders using the indicated method. Valid values for method:\n' +
+//       'id: folders named by id of exported object\n' +
+//       'type: folders named by type (e.g. script, journey, idp)\n' +
+//       'type/id: folders named by type with sub-folders named by id'
+//   )
+// )
+.action(
 // implement command logic inside action handler
 async (host, realm, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, realm, user, password, options, command);
-  if (options.directory) state.setDirectory(options.directory);
   // export
-  if (options.journeyId && (await frodo.login.getTokens())) {
+  if (options.journeyId && (await getTokens())) {
     verboseMessage('Exporting journey...');
     await exportJourneyToFile(options.journeyId, options.file, {
       useStringArrays: options.useStringArrays,
@@ -18,7 +30,7 @@ async (host, realm, user, password, options, command) => {
     });
   }
   // --all -a
-  else if (options.all && (await frodo.login.getTokens())) {
+  else if (options.all && (await getTokens())) {
     verboseMessage('Exporting all journeys to a single file...');
     await exportJourneysToFile(options.file, {
       useStringArrays: options.useStringArrays,
@@ -26,7 +38,7 @@ async (host, realm, user, password, options, command) => {
     });
   }
   // --all-separate -A
-  else if (options.allSeparate && (await frodo.login.getTokens())) {
+  else if (options.allSeparate && (await getTokens())) {
     verboseMessage('Exporting all journeys to separate files...');
     await exportJourneysToFiles({
       useStringArrays: options.useStringArrays,
@@ -44,4 +56,4 @@ async (host, realm, user, password, options, command) => {
 );
 
 program.parse();
-//# sourceMappingURL=journey-export.js.map
+//# sourceMappingURL=journey-export.js.map

package/esm/cli/journey/journey-export.js.map

@@ -1 +1 @@
-{"version":3,"file":"journey-export.js","names":["FrodoCommand","Option","frodo","state","exportJourneyToFile","exportJourneysToFile","exportJourneysToFiles","printMessage","verboseMessage","program","description","addOption","default","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","directory","setDirectory","journeyId","login","getTokens","file","useStringArrays","deps","all","allSeparate","help","process","exitCode","parse"],"sources":["cli/journey/journey-export.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport { Option } from 'commander';\nimport { frodo, state } from '@rockcarver/frodo-lib';\nimport {\n  exportJourneyToFile,\n  exportJourneysToFile,\n  exportJourneysToFiles,\n} from '../../ops/JourneyOps';\nimport { printMessage, verboseMessage } from '../../utils/Console';\n\nconst program = new FrodoCommand('frodo journey export');\n\nprogram\n  .description('Export journeys/trees.')\n  .addOption(\n    new Option(\n      '-i, --journey-id <journey>',\n      'Name of a journey/tree. If specified, -a and -A are ignored.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-f, --file <file>',\n      'Name of the file to write the exported journey(s) to. Ignored with -A.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-a, --all',\n      'Export all the journeys/trees in a realm. Ignored with -i.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-A, --all-separate',\n      'Export all the journeys/trees in a realm as separate files <journey/tree name>.json. Ignored with -i or -a.'\n    )\n  )\n  .addOption(\n    new Option(\n      '--use-string-arrays',\n      'Where applicable, use string arrays to store multi-line text (e.g. scripts).'\n    ).default(false, 'off')\n  )\n  .addOption(\n    new Option(\n      '--no-deps',\n      'Do not include any dependencies (scripts, email templates, SAML entity providers and circles of trust, social identity providers, themes).'\n    )\n  )\n  .addOption(\n    new Option('-D, --directory <directory>', 'Destination directory.')\n  )\n  .addOption(\n    new Option(\n      '-O, --organize <method>',\n      'Organize exports into folders using the indicated method. Valid values for method:\\n' +\n        'id: folders named by id of exported object\\n' +\n        'type: folders named by type (e.g. script, journey, idp)\\n' +\n        'type/id: folders named by type with sub-folders named by id'\n    )\n  )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      if (options.directory) state.setDirectory(options.directory);\n      // export\n      if (options.journeyId && (await frodo.login.getTokens())) {\n        verboseMessage('Exporting journey...');\n        await exportJourneyToFile(options.journeyId, options.file, {\n          useStringArrays: options.useStringArrays,\n          deps: options.deps,\n        });\n      }\n      // --all -a\n      else if (options.all && (await frodo.login.getTokens())) {\n        verboseMessage('Exporting all journeys to a single file...');\n        await exportJourneysToFile(options.file, {\n          useStringArrays: options.useStringArrays,\n          deps: options.deps,\n        });\n      }\n      // --all-separate -A\n      else if (options.allSeparate && (await frodo.login.getTokens())) {\n        verboseMessage('Exporting all journeys to separate files...');\n        await exportJourneysToFiles({\n          useStringArrays: options.useStringArrays,\n          deps: options.deps,\n        });\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage(\n          'Unrecognized combination of options or no options...',\n          'error'\n        );\n        program.help();\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"journey-export.js","names":["frodo","Option","exportJourneysToFile","exportJourneysToFiles","exportJourneyToFile","printMessage","verboseMessage","FrodoCommand","getTokens","login","program","description","addOption","default","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","journeyId","file","useStringArrays","deps","all","allSeparate","help","process","exitCode","parse"],"sources":["../../../src/cli/journey/journey-export.ts"],"sourcesContent":["import { frodo } from '@rockcarver/frodo-lib';\nimport { Option } from 'commander';\n\nimport {\n  exportJourneysToFile,\n  exportJourneysToFiles,\n  exportJourneyToFile,\n} from '../../ops/JourneyOps';\nimport { printMessage, verboseMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\n\nconst { getTokens } = frodo.login;\n\nconst program = new FrodoCommand('frodo journey export');\n\nprogram\n  .description('Export journeys/trees.')\n  .addOption(\n    new Option(\n      '-i, --journey-id <journey>',\n      'Name of a journey/tree. If specified, -a and -A are ignored.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-f, --file <file>',\n      'Name of the file to write the exported journey(s) to. Ignored with -A.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-a, --all',\n      'Export all the journeys/trees in a realm. Ignored with -i.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-A, --all-separate',\n      'Export all the journeys/trees in a realm as separate files <journey/tree name>.json. Ignored with -i or -a.'\n    )\n  )\n  .addOption(\n    new Option(\n      '--use-string-arrays',\n      'Where applicable, use string arrays to store multi-line text (e.g. scripts).'\n    ).default(false, 'off')\n  )\n  .addOption(\n    new Option(\n      '--no-deps',\n      'Do not include any dependencies (scripts, email templates, SAML entity providers and circles of trust, social identity providers, themes).'\n    )\n  )\n  // .addOption(\n  //   new Option(\n  //     '-O, --organize <method>',\n  //     'Organize exports into folders using the indicated method. Valid values for method:\\n' +\n  //       'id: folders named by id of exported object\\n' +\n  //       'type: folders named by type (e.g. script, journey, idp)\\n' +\n  //       'type/id: folders named by type with sub-folders named by id'\n  //   )\n  // )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      // export\n      if (options.journeyId && (await getTokens())) {\n        verboseMessage('Exporting journey...');\n        await exportJourneyToFile(options.journeyId, options.file, {\n          useStringArrays: options.useStringArrays,\n          deps: options.deps,\n        });\n      }\n      // --all -a\n      else if (options.all && (await getTokens())) {\n        verboseMessage('Exporting all journeys to a single file...');\n        await exportJourneysToFile(options.file, {\n          useStringArrays: options.useStringArrays,\n          deps: options.deps,\n        });\n      }\n      // --all-separate -A\n      else if (options.allSeparate && (await getTokens())) {\n        verboseMessage('Exporting all journeys to separate files...');\n        await exportJourneysToFiles({\n          useStringArrays: options.useStringArrays,\n          deps: options.deps,\n        });\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage(\n          'Unrecognized combination of options or no options...',\n          'error'\n        );\n        program.help();\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,KAAK,QAAQ,uBAAuB;AAC7C,SAASC,MAAM,QAAQ,WAAW;AAElC,SACEC,oBAAoB,EACpBC,qBAAqB,EACrBC,mBAAmB,QACd,sBAAsB;AAC7B,SAASC,YAAY,EAAEC,cAAc,QAAQ,qBAAqB;AAClE,SAASC,YAAY,QAAQ,iBAAiB;AAE9C,MAAM;EAAEC;AAAU,CAAC,GAAGR,KAAK,CAACS,KAAK;AAEjC,MAAMC,OAAO,GAAG,IAAIH,YAAY,CAAC,sBAAsB,CAAC;AAExDG,OAAO,CACJC,WAAW,CAAC,wBAAwB,CAAC,CACrCC,SAAS,CACR,IAAIX,MAAM,CACR,4BAA4B,EAC5B,8DACF,CACF,CAAC,CACAW,SAAS,CACR,IAAIX,MAAM,CACR,mBAAmB,EACnB,wEACF,CACF,CAAC,CACAW,SAAS,CACR,IAAIX,MAAM,CACR,WAAW,EACX,4DACF,CACF,CAAC,CACAW,SAAS,CACR,IAAIX,MAAM,CACR,oBAAoB,EACpB,6GACF,CACF,CAAC,CACAW,SAAS,CACR,IAAIX,MAAM,CACR,qBAAqB,EACrB,8EACF,CAAC,CAACY,OAAO,CAAC,KAAK,EAAE,KAAK,CACxB,CAAC,CACAD,SAAS,CACR,IAAIX,MAAM,CACR,WAAW,EACX,4IACF,CACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA,CACCa,MAAM;AACL;AACA,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACvDA,OAAO,CAACC,wBAAwB,CAC9BN,IAAI,EACJC,KAAK,EACLC,IAAI,EACJC,QAAQ,EACRC,OAAO,EACPC,OACF,CAAC;EACD;EACA,IAAID,OAAO,CAACG,SAAS,KAAK,MAAMd,SAAS,CAAC,CAAC,CAAC,EAAE;IAC5CF,cAAc,CAAC,sBAAsB,CAAC;IACtC,MAAMF,mBAAmB,CAACe,OAAO,CAACG,SAAS,EAAEH,OAAO,CAACI,IAAI,EAAE;MACzDC,eAAe,EAAEL,OAAO,CAACK,eAAe;MACxCC,IAAI,EAAEN,OAAO,CAACM;IAChB,CAAC,CAAC;EACJ;EACA;EAAA,KACK,IAAIN,OAAO,CAACO,GAAG,KAAK,MAAMlB,SAAS,CAAC,CAAC,CAAC,EAAE;IAC3CF,cAAc,CAAC,4CAA4C,CAAC;IAC5D,MAAMJ,oBAAoB,CAACiB,OAAO,CAACI,IAAI,EAAE;MACvCC,eAAe,EAAEL,OAAO,CAACK,eAAe;MACxCC,IAAI,EAAEN,OAAO,CAACM;IAChB,CAAC,CAAC;EACJ;EACA;EAAA,KACK,IAAIN,OAAO,CAACQ,WAAW,KAAK,MAAMnB,SAAS,CAAC,CAAC,CAAC,EAAE;IACnDF,cAAc,CAAC,6CAA6C,CAAC;IAC7D,MAAMH,qBAAqB,CAAC;MAC1BqB,eAAe,EAAEL,OAAO,CAACK,eAAe;MACxCC,IAAI,EAAEN,OAAO,CAACM;IAChB,CAAC,CAAC;EACJ;EACA;EAAA,KACK;IACHpB,YAAY,CACV,sDAAsD,EACtD,OACF,CAAC;IACDK,OAAO,CAACkB,IAAI,CAAC,CAAC;IACdC,OAAO,CAACC,QAAQ,GAAG,CAAC;EACtB;AACF;AACA;AACF,CAAC;;AAEHpB,OAAO,CAACqB,KAAK,CAAC,CAAC"}

package/esm/cli/journey/journey-import.js

@@ -1,15 +1,18 @@
-import { FrodoCommand } from '../FrodoCommand';
-import { Option } from 'commander';
 import { frodo } from '@rockcarver/frodo-lib';
-import { importJourneyFromFile, importJourneysFromFile, importJourneysFromFiles, importFirstJourneyFromFile } from '../../ops/JourneyOps';
+import { Option } from 'commander';
+import { importFirstJourneyFromFile, importJourneyFromFile, importJourneysFromFile, importJourneysFromFiles } from '../../ops/JourneyOps';
 import { printMessage } from '../../utils/Console';
+import { FrodoCommand } from '../FrodoCommand';
+const {
+  getTokens
+} = frodo.login;
 const program = new FrodoCommand('frodo journey import');
 program.description('Import journey/tree.').addOption(new Option('-i, --journey-id <journey>', 'Name of a journey/tree. If specified, -a and -A are ignored.')).addOption(new Option('-f, --file <file>', 'Name of the file to import the journey(s) from. Ignored with -A.')).addOption(new Option('-a, --all', 'Import all the journeys/trees from single file. Ignored with -i.')).addOption(new Option('-A, --all-separate', 'Import all the journeys/trees from separate files (*.json) in the current directory. Ignored with -i or -a.')).addOption(new Option('--re-uuid', 'Generate new UUIDs for all nodes during import.').default(false, 'off')).addOption(new Option('--no-deps', 'Do not include any dependencies (scripts, email templates, SAML entity providers and circles of trust, social identity providers, themes).')).action(
 // implement command logic inside action handler
 async (host, realm, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, realm, user, password, options, command);
   // import
-  if (options.journeyId && (await frodo.login.getTokens())) {
+  if (options.journeyId && (await getTokens())) {
     printMessage(`Importing journey ${options.journeyId}...`);
     importJourneyFromFile(options.journeyId, options.file, {
       reUuid: options.reUuid,
@@ -17,7 +20,7 @@ async (host, realm, user, password, options, command) => {
     });
   }
   // --all -a
-  else if (options.all && options.file && (await frodo.login.getTokens())) {
+  else if (options.all && options.file && (await getTokens())) {
     printMessage(`Importing all journeys from a single file (${options.file})...`);
     importJourneysFromFile(options.file, {
       reUuid: options.reUuid,
@@ -25,7 +28,7 @@ async (host, realm, user, password, options, command) => {
     });
   }
   // --all-separate -A
-  else if (options.allSeparate && !options.file && (await frodo.login.getTokens())) {
+  else if (options.allSeparate && !options.file && (await getTokens())) {
     printMessage('Importing all journeys from separate files in current directory...');
     importJourneysFromFiles({
       reUuid: options.reUuid,
@@ -33,7 +36,7 @@ async (host, realm, user, password, options, command) => {
     });
   }
   // import first journey in file
-  else if (options.file && (await frodo.login.getTokens())) {
+  else if (options.file && (await getTokens())) {
     printMessage('Importing first journey in file...');
     importFirstJourneyFromFile(options.file, {
       reUuid: options.reUuid,
@@ -51,4 +54,4 @@ async (host, realm, user, password, options, command) => {
 );
 
 program.parse();
-//# sourceMappingURL=journey-import.js.map
+//# sourceMappingURL=journey-import.js.map

package/esm/cli/journey/journey-import.js.map

@@ -1 +1 @@
-{"version":3,"file":"journey-import.js","names":["FrodoCommand","Option","frodo","importJourneyFromFile","importJourneysFromFile","importJourneysFromFiles","importFirstJourneyFromFile","printMessage","program","description","addOption","default","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","journeyId","login","getTokens","file","reUuid","deps","all","allSeparate","help","process","exitCode","parse"],"sources":["cli/journey/journey-import.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport { Option } from 'commander';\nimport { frodo } from '@rockcarver/frodo-lib';\nimport {\n  importJourneyFromFile,\n  importJourneysFromFile,\n  importJourneysFromFiles,\n  importFirstJourneyFromFile,\n} from '../../ops/JourneyOps';\nimport { printMessage } from '../../utils/Console';\n\nconst program = new FrodoCommand('frodo journey import');\n\nprogram\n  .description('Import journey/tree.')\n  .addOption(\n    new Option(\n      '-i, --journey-id <journey>',\n      'Name of a journey/tree. If specified, -a and -A are ignored.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-f, --file <file>',\n      'Name of the file to import the journey(s) from. Ignored with -A.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-a, --all',\n      'Import all the journeys/trees from single file. Ignored with -i.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-A, --all-separate',\n      'Import all the journeys/trees from separate files (*.json) in the current directory. Ignored with -i or -a.'\n    )\n  )\n  .addOption(\n    new Option(\n      '--re-uuid',\n      'Generate new UUIDs for all nodes during import.'\n    ).default(false, 'off')\n  )\n  .addOption(\n    new Option(\n      '--no-deps',\n      'Do not include any dependencies (scripts, email templates, SAML entity providers and circles of trust, social identity providers, themes).'\n    )\n  )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      // import\n      if (options.journeyId && (await frodo.login.getTokens())) {\n        printMessage(`Importing journey ${options.journeyId}...`);\n        importJourneyFromFile(options.journeyId, options.file, {\n          reUuid: options.reUuid,\n          deps: options.deps,\n        });\n      }\n      // --all -a\n      else if (options.all && options.file && (await frodo.login.getTokens())) {\n        printMessage(\n          `Importing all journeys from a single file (${options.file})...`\n        );\n        importJourneysFromFile(options.file, {\n          reUuid: options.reUuid,\n          deps: options.deps,\n        });\n      }\n      // --all-separate -A\n      else if (\n        options.allSeparate &&\n        !options.file &&\n        (await frodo.login.getTokens())\n      ) {\n        printMessage(\n          'Importing all journeys from separate files in current directory...'\n        );\n        importJourneysFromFiles({\n          reUuid: options.reUuid,\n          deps: options.deps,\n        });\n      }\n      // import first journey in file\n      else if (options.file && (await frodo.login.getTokens())) {\n        printMessage('Importing first journey in file...');\n        importFirstJourneyFromFile(options.file, {\n          reUuid: options.reUuid,\n          deps: options.deps,\n        });\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage('Unrecognized combination of options or no options...');\n        program.help();\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"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"}
+{"version":3,"file":"journey-import.js","names":["frodo","Option","importFirstJourneyFromFile","importJourneyFromFile","importJourneysFromFile","importJourneysFromFiles","printMessage","FrodoCommand","getTokens","login","program","description","addOption","default","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","journeyId","file","reUuid","deps","all","allSeparate","help","process","exitCode","parse"],"sources":["../../../src/cli/journey/journey-import.ts"],"sourcesContent":["import { frodo } from '@rockcarver/frodo-lib';\nimport { Option } from 'commander';\n\nimport {\n  importFirstJourneyFromFile,\n  importJourneyFromFile,\n  importJourneysFromFile,\n  importJourneysFromFiles,\n} from '../../ops/JourneyOps';\nimport { printMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\n\nconst { getTokens } = frodo.login;\n\nconst program = new FrodoCommand('frodo journey import');\n\nprogram\n  .description('Import journey/tree.')\n  .addOption(\n    new Option(\n      '-i, --journey-id <journey>',\n      'Name of a journey/tree. If specified, -a and -A are ignored.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-f, --file <file>',\n      'Name of the file to import the journey(s) from. Ignored with -A.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-a, --all',\n      'Import all the journeys/trees from single file. Ignored with -i.'\n    )\n  )\n  .addOption(\n    new Option(\n      '-A, --all-separate',\n      'Import all the journeys/trees from separate files (*.json) in the current directory. Ignored with -i or -a.'\n    )\n  )\n  .addOption(\n    new Option(\n      '--re-uuid',\n      'Generate new UUIDs for all nodes during import.'\n    ).default(false, 'off')\n  )\n  .addOption(\n    new Option(\n      '--no-deps',\n      'Do not include any dependencies (scripts, email templates, SAML entity providers and circles of trust, social identity providers, themes).'\n    )\n  )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      // import\n      if (options.journeyId && (await getTokens())) {\n        printMessage(`Importing journey ${options.journeyId}...`);\n        importJourneyFromFile(options.journeyId, options.file, {\n          reUuid: options.reUuid,\n          deps: options.deps,\n        });\n      }\n      // --all -a\n      else if (options.all && options.file && (await getTokens())) {\n        printMessage(\n          `Importing all journeys from a single file (${options.file})...`\n        );\n        importJourneysFromFile(options.file, {\n          reUuid: options.reUuid,\n          deps: options.deps,\n        });\n      }\n      // --all-separate -A\n      else if (options.allSeparate && !options.file && (await getTokens())) {\n        printMessage(\n          'Importing all journeys from separate files in current directory...'\n        );\n        importJourneysFromFiles({\n          reUuid: options.reUuid,\n          deps: options.deps,\n        });\n      }\n      // import first journey in file\n      else if (options.file && (await getTokens())) {\n        printMessage('Importing first journey in file...');\n        importFirstJourneyFromFile(options.file, {\n          reUuid: options.reUuid,\n          deps: options.deps,\n        });\n      }\n      // unrecognized combination of options or no options\n      else {\n        printMessage('Unrecognized combination of options or no options...');\n        program.help();\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"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"}

package/esm/cli/journey/journey-list.js

@@ -1,14 +1,17 @@
 import { frodo, state } from '@rockcarver/frodo-lib';
-import { FrodoCommand } from '../FrodoCommand';
 import { Option } from 'commander';
 import { listJourneys } from '../../ops/JourneyOps';
 import { verboseMessage } from '../../utils/Console';
+import { FrodoCommand } from '../FrodoCommand';
+const {
+  getTokens
+} = frodo.login;
 const program = new FrodoCommand('frodo journey list');
 program.description('List journeys/trees.').addOption(new Option('-l, --long', 'Long with all fields.').default(false, 'false')).addOption(new Option('-a, --analyze', 'Analyze journeys for custom nodes.')).action(
 // implement command logic inside action handler
 async (host, realm, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, realm, user, password, options, command);
-  if (await frodo.login.getTokens()) {
+  if (await getTokens()) {
     verboseMessage(`Listing journeys in realm "${state.getRealm()}"...`);
     listJourneys(options.long, options.analyze);
   } else {
@@ -19,4 +22,4 @@ async (host, realm, user, password, options, command) => {
 );
 
 program.parse();
-//# sourceMappingURL=journey-list.js.map
+//# sourceMappingURL=journey-list.js.map

package/esm/cli/journey/journey-list.js.map

@@ -1 +1 @@
-{"version":3,"file":"journey-list.js","names":["frodo","state","FrodoCommand","Option","listJourneys","verboseMessage","program","description","addOption","default","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","login","getTokens","getRealm","long","analyze","process","exitCode","parse"],"sources":["cli/journey/journey-list.ts"],"sourcesContent":["import { frodo, state } from '@rockcarver/frodo-lib';\nimport { FrodoCommand } from '../FrodoCommand';\nimport { Option } from 'commander';\nimport { listJourneys } from '../../ops/JourneyOps';\nimport { verboseMessage } from '../../utils/Console';\n\nconst program = new FrodoCommand('frodo journey list');\n\nprogram\n  .description('List journeys/trees.')\n  .addOption(\n    new Option('-l, --long', 'Long with all fields.').default(false, 'false')\n  )\n  .addOption(new Option('-a, --analyze', 'Analyze journeys for custom nodes.'))\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      if (await frodo.login.getTokens()) {\n        verboseMessage(`Listing journeys in realm \"${state.getRealm()}\"...`);\n        listJourneys(options.long, options.analyze);\n      } else {\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AACpD,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,MAAM,QAAQ,WAAW;AAClC,SAASC,YAAY,QAAQ,sBAAsB;AACnD,SAASC,cAAc,QAAQ,qBAAqB;AAEpD,MAAMC,OAAO,GAAG,IAAIJ,YAAY,CAAC,oBAAoB,CAAC;AAEtDI,OAAO,CACJC,WAAW,CAAC,sBAAsB,CAAC,CACnCC,SAAS,CACR,IAAIL,MAAM,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAACM,OAAO,CAAC,KAAK,EAAE,OAAO,CAC1E,CAAC,CACAD,SAAS,CAAC,IAAIL,MAAM,CAAC,eAAe,EAAE,oCAAoC,CAAC,CAAC,CAC5EO,MAAM;AACL;AACA,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACvDA,OAAO,CAACC,wBAAwB,CAC9BN,IAAI,EACJC,KAAK,EACLC,IAAI,EACJC,QAAQ,EACRC,OAAO,EACPC,OACF,CAAC;EACD,IAAI,MAAMhB,KAAK,CAACkB,KAAK,CAACC,SAAS,CAAC,CAAC,EAAE;IACjCd,cAAc,CAAE,8BAA6BJ,KAAK,CAACmB,QAAQ,CAAC,CAAE,MAAK,CAAC;IACpEhB,YAAY,CAACW,OAAO,CAACM,IAAI,EAAEN,OAAO,CAACO,OAAO,CAAC;EAC7C,CAAC,MAAM;IACLC,OAAO,CAACC,QAAQ,GAAG,CAAC;EACtB;AACF;AACA;AACF,CAAC;;AAEHlB,OAAO,CAACmB,KAAK,CAAC,CAAC"}
+{"version":3,"file":"journey-list.js","names":["frodo","state","Option","listJourneys","verboseMessage","FrodoCommand","getTokens","login","program","description","addOption","default","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","getRealm","long","analyze","process","exitCode","parse"],"sources":["../../../src/cli/journey/journey-list.ts"],"sourcesContent":["import { frodo, state } from '@rockcarver/frodo-lib';\nimport { Option } from 'commander';\n\nimport { listJourneys } from '../../ops/JourneyOps';\nimport { verboseMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\n\nconst { getTokens } = frodo.login;\n\nconst program = new FrodoCommand('frodo journey list');\n\nprogram\n  .description('List journeys/trees.')\n  .addOption(\n    new Option('-l, --long', 'Long with all fields.').default(false, 'false')\n  )\n  .addOption(new Option('-a, --analyze', 'Analyze journeys for custom nodes.'))\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      if (await getTokens()) {\n        verboseMessage(`Listing journeys in realm \"${state.getRealm()}\"...`);\n        listJourneys(options.long, options.analyze);\n      } else {\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AACpD,SAASC,MAAM,QAAQ,WAAW;AAElC,SAASC,YAAY,QAAQ,sBAAsB;AACnD,SAASC,cAAc,QAAQ,qBAAqB;AACpD,SAASC,YAAY,QAAQ,iBAAiB;AAE9C,MAAM;EAAEC;AAAU,CAAC,GAAGN,KAAK,CAACO,KAAK;AAEjC,MAAMC,OAAO,GAAG,IAAIH,YAAY,CAAC,oBAAoB,CAAC;AAEtDG,OAAO,CACJC,WAAW,CAAC,sBAAsB,CAAC,CACnCC,SAAS,CACR,IAAIR,MAAM,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAACS,OAAO,CAAC,KAAK,EAAE,OAAO,CAC1E,CAAC,CACAD,SAAS,CAAC,IAAIR,MAAM,CAAC,eAAe,EAAE,oCAAoC,CAAC,CAAC,CAC5EU,MAAM;AACL;AACA,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACvDA,OAAO,CAACC,wBAAwB,CAC9BN,IAAI,EACJC,KAAK,EACLC,IAAI,EACJC,QAAQ,EACRC,OAAO,EACPC,OACF,CAAC;EACD,IAAI,MAAMZ,SAAS,CAAC,CAAC,EAAE;IACrBF,cAAc,CAAE,8BAA6BH,KAAK,CAACmB,QAAQ,CAAC,CAAE,MAAK,CAAC;IACpEjB,YAAY,CAACc,OAAO,CAACI,IAAI,EAAEJ,OAAO,CAACK,OAAO,CAAC;EAC7C,CAAC,MAAM;IACLC,OAAO,CAACC,QAAQ,GAAG,CAAC;EACtB;AACF;AACA;AACF,CAAC;;AAEHhB,OAAO,CAACiB,KAAK,CAAC,CAAC"}

package/esm/cli/journey/journey-prune.js

@@ -1,24 +1,35 @@
-import { FrodoCommand } from '../FrodoCommand';
 import { frodo, state } from '@rockcarver/frodo-lib';
 import yesno from 'yesno';
 import { printMessage, verboseMessage } from '../../utils/Console';
+import { FrodoCommand } from '../FrodoCommand';
+const {
+  getTokens
+} = frodo.login;
+const {
+  findOrphanedNodes,
+  removeOrphanedNodes
+} = frodo.authn.node;
 const program = new FrodoCommand('frodo journey prune');
 program.description('Prune orphaned configuration artifacts left behind after deleting authentication trees. You will be prompted before any destructive operations are performed.').action(
 // implement command logic inside action handler
 async (host, realm, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, realm, user, password, options, command);
-  if (await frodo.login.getTokens()) {
+  if (await getTokens()) {
     verboseMessage(`Pruning orphaned configuration artifacts in realm "${state.getRealm()}"...`);
-    const orphanedNodes = await frodo.authn.journey.findOrphanedNodes();
-    if (orphanedNodes.length > 0) {
-      const ok = await yesno({
-        question: 'Prune (permanently delete) orphaned nodes? (y|n):'
-      });
-      if (ok) {
-        await frodo.authn.journey.removeOrphanedNodes(orphanedNodes);
+    try {
+      const orphanedNodes = await findOrphanedNodes();
+      if (orphanedNodes.length > 0) {
+        const ok = await yesno({
+          question: 'Prune (permanently delete) orphaned nodes? (y|n):'
+        });
+        if (ok) {
+          await removeOrphanedNodes(orphanedNodes);
+        }
+      } else {
+        printMessage('No orphaned nodes found.');
       }
-    } else {
-      printMessage('No orphaned nodes found.');
+    } catch (error) {
+      printMessage(`Error pruning orphaned nodes: ${error.message}`, 'error');
     }
   } else {
     process.exitCode = 1;
@@ -28,4 +39,4 @@ async (host, realm, user, password, options, command) => {
 );
 
 program.parse();
-//# sourceMappingURL=journey-prune.js.map
+//# sourceMappingURL=journey-prune.js.map

package/esm/cli/journey/journey-prune.js.map

@@ -1 +1 @@
-{"version":3,"file":"journey-prune.js","names":["FrodoCommand","frodo","state","yesno","printMessage","verboseMessage","program","description","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","login","getTokens","getRealm","orphanedNodes","authn","journey","findOrphanedNodes","length","ok","question","removeOrphanedNodes","process","exitCode","parse"],"sources":["cli/journey/journey-prune.ts"],"sourcesContent":["import { FrodoCommand } from '../FrodoCommand';\nimport { frodo, state } from '@rockcarver/frodo-lib';\nimport yesno from 'yesno';\nimport { printMessage, verboseMessage } from '../../utils/Console';\n\nconst program = new FrodoCommand('frodo journey prune');\n\nprogram\n  .description(\n    'Prune orphaned configuration artifacts left behind after deleting authentication trees. You will be prompted before any destructive operations are performed.'\n  )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      if (await frodo.login.getTokens()) {\n        verboseMessage(\n          `Pruning orphaned configuration artifacts in realm \"${state.getRealm()}\"...`\n        );\n        const orphanedNodes = await frodo.authn.journey.findOrphanedNodes();\n        if (orphanedNodes.length > 0) {\n          const ok = await yesno({\n            question: 'Prune (permanently delete) orphaned nodes? (y|n):',\n          });\n          if (ok) {\n            await frodo.authn.journey.removeOrphanedNodes(orphanedNodes);\n          }\n        } else {\n          printMessage('No orphaned nodes found.');\n        }\n      } else {\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AACpD,OAAOC,KAAK,MAAM,OAAO;AACzB,SAASC,YAAY,EAAEC,cAAc,QAAQ,qBAAqB;AAElE,MAAMC,OAAO,GAAG,IAAIN,YAAY,CAAC,qBAAqB,CAAC;AAEvDM,OAAO,CACJC,WAAW,CACV,+JACF,CAAC,CACAC,MAAM;AACL;AACA,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACvDA,OAAO,CAACC,wBAAwB,CAC9BN,IAAI,EACJC,KAAK,EACLC,IAAI,EACJC,QAAQ,EACRC,OAAO,EACPC,OACF,CAAC;EACD,IAAI,MAAMb,KAAK,CAACe,KAAK,CAACC,SAAS,CAAC,CAAC,EAAE;IACjCZ,cAAc,CACX,sDAAqDH,KAAK,CAACgB,QAAQ,CAAC,CAAE,MACzE,CAAC;IACD,MAAMC,aAAa,GAAG,MAAMlB,KAAK,CAACmB,KAAK,CAACC,OAAO,CAACC,iBAAiB,CAAC,CAAC;IACnE,IAAIH,aAAa,CAACI,MAAM,GAAG,CAAC,EAAE;MAC5B,MAAMC,EAAE,GAAG,MAAMrB,KAAK,CAAC;QACrBsB,QAAQ,EAAE;MACZ,CAAC,CAAC;MACF,IAAID,EAAE,EAAE;QACN,MAAMvB,KAAK,CAACmB,KAAK,CAACC,OAAO,CAACK,mBAAmB,CAACP,aAAa,CAAC;MAC9D;IACF,CAAC,MAAM;MACLf,YAAY,CAAC,0BAA0B,CAAC;IAC1C;EACF,CAAC,MAAM;IACLuB,OAAO,CAACC,QAAQ,GAAG,CAAC;EACtB;AACF;AACA;AACF,CAAC;;AAEHtB,OAAO,CAACuB,KAAK,CAAC,CAAC"}
+{"version":3,"file":"journey-prune.js","names":["frodo","state","yesno","printMessage","verboseMessage","FrodoCommand","getTokens","login","findOrphanedNodes","removeOrphanedNodes","authn","node","program","description","action","host","realm","user","password","options","command","handleDefaultArgsAndOpts","getRealm","orphanedNodes","length","ok","question","error","message","process","exitCode","parse"],"sources":["../../../src/cli/journey/journey-prune.ts"],"sourcesContent":["import { frodo, state } from '@rockcarver/frodo-lib';\nimport yesno from 'yesno';\n\nimport { printMessage, verboseMessage } from '../../utils/Console';\nimport { FrodoCommand } from '../FrodoCommand';\n\nconst { getTokens } = frodo.login;\nconst { findOrphanedNodes, removeOrphanedNodes } = frodo.authn.node;\n\nconst program = new FrodoCommand('frodo journey prune');\n\nprogram\n  .description(\n    'Prune orphaned configuration artifacts left behind after deleting authentication trees. You will be prompted before any destructive operations are performed.'\n  )\n  .action(\n    // implement command logic inside action handler\n    async (host, realm, user, password, options, command) => {\n      command.handleDefaultArgsAndOpts(\n        host,\n        realm,\n        user,\n        password,\n        options,\n        command\n      );\n      if (await getTokens()) {\n        verboseMessage(\n          `Pruning orphaned configuration artifacts in realm \"${state.getRealm()}\"...`\n        );\n        try {\n          const orphanedNodes = await findOrphanedNodes();\n          if (orphanedNodes.length > 0) {\n            const ok = await yesno({\n              question: 'Prune (permanently delete) orphaned nodes? (y|n):',\n            });\n            if (ok) {\n              await removeOrphanedNodes(orphanedNodes);\n            }\n          } else {\n            printMessage('No orphaned nodes found.');\n          }\n        } catch (error) {\n          printMessage(\n            `Error pruning orphaned nodes: ${error.message}`,\n            'error'\n          );\n        }\n      } else {\n        process.exitCode = 1;\n      }\n    }\n    // end command logic inside action handler\n  );\n\nprogram.parse();\n"],"mappings":"AAAA,SAASA,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AACpD,OAAOC,KAAK,MAAM,OAAO;AAEzB,SAASC,YAAY,EAAEC,cAAc,QAAQ,qBAAqB;AAClE,SAASC,YAAY,QAAQ,iBAAiB;AAE9C,MAAM;EAAEC;AAAU,CAAC,GAAGN,KAAK,CAACO,KAAK;AACjC,MAAM;EAAEC,iBAAiB;EAAEC;AAAoB,CAAC,GAAGT,KAAK,CAACU,KAAK,CAACC,IAAI;AAEnE,MAAMC,OAAO,GAAG,IAAIP,YAAY,CAAC,qBAAqB,CAAC;AAEvDO,OAAO,CACJC,WAAW,CACV,+JACF,CAAC,CACAC,MAAM;AACL;AACA,OAAOC,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,KAAK;EACvDA,OAAO,CAACC,wBAAwB,CAC9BN,IAAI,EACJC,KAAK,EACLC,IAAI,EACJC,QAAQ,EACRC,OAAO,EACPC,OACF,CAAC;EACD,IAAI,MAAMd,SAAS,CAAC,CAAC,EAAE;IACrBF,cAAc,CACX,sDAAqDH,KAAK,CAACqB,QAAQ,CAAC,CAAE,MACzE,CAAC;IACD,IAAI;MACF,MAAMC,aAAa,GAAG,MAAMf,iBAAiB,CAAC,CAAC;MAC/C,IAAIe,aAAa,CAACC,MAAM,GAAG,CAAC,EAAE;QAC5B,MAAMC,EAAE,GAAG,MAAMvB,KAAK,CAAC;UACrBwB,QAAQ,EAAE;QACZ,CAAC,CAAC;QACF,IAAID,EAAE,EAAE;UACN,MAAMhB,mBAAmB,CAACc,aAAa,CAAC;QAC1C;MACF,CAAC,MAAM;QACLpB,YAAY,CAAC,0BAA0B,CAAC;MAC1C;IACF,CAAC,CAAC,OAAOwB,KAAK,EAAE;MACdxB,YAAY,CACT,iCAAgCwB,KAAK,CAACC,OAAQ,EAAC,EAChD,OACF,CAAC;IACH;EACF,CAAC,MAAM;IACLC,OAAO,CAACC,QAAQ,GAAG,CAAC;EACtB;AACF;AACA;AACF,CAAC;;AAEHlB,OAAO,CAACmB,KAAK,CAAC,CAAC"}

package/esm/cli/journey/journey.js

@@ -1,6 +1,6 @@
-import { FrodoStubCommand } from '../FrodoCommand';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import { FrodoStubCommand } from '../FrodoCommand';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 export default function setup() {
   const program = new FrodoStubCommand('journey').description('Manage journeys/trees.').executableDir(__dirname);
@@ -14,4 +14,4 @@ export default function setup() {
   program.command('disable', 'Disable journeys/trees.');
   return program;
 }
-//# sourceMappingURL=journey.js.map
+//# sourceMappingURL=journey.js.map

package/esm/cli/journey/journey.js.map

@@ -1 +1 @@
-{"version":3,"file":"journey.js","names":["FrodoStubCommand","path","fileURLToPath","__dirname","dirname","import","meta","url","setup","program","description","executableDir","command"],"sources":["cli/journey/journey.ts"],"sourcesContent":["import { FrodoStubCommand } from '../FrodoCommand';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default function setup() {\n  const program = new FrodoStubCommand('journey')\n    .description('Manage journeys/trees.')\n    .executableDir(__dirname);\n\n  program.command('list', 'List journeys/trees.');\n\n  program.command(\n    'describe',\n    'If host argument is supplied, describe the journey/tree indicated by -t, or all journeys/trees in the realm if no -t is supplied, otherwise describe the journey/tree export file indicated by -f.'\n  );\n\n  program.command('export', 'Export journeys/trees.');\n\n  program.command('import', 'Import journeys/trees.');\n\n  program.command('delete', 'Delete journeys/trees.');\n\n  program.command(\n    'prune',\n    'Prune orphaned configuration artifacts left behind after deleting authentication trees. You will be prompted before any destructive operations are performed.'\n  );\n\n  program.command('enable', 'Enable journeys/trees.');\n\n  program.command('disable', 'Disable journeys/trees.');\n\n  return program;\n}\n"],"mappings":"AAAA,SAASA,gBAAgB,QAAQ,iBAAiB;AAClD,OAAOC,IAAI,MAAM,MAAM;AACvB,SAASC,aAAa,QAAQ,KAAK;AAEnC,MAAMC,SAAS,GAAGF,IAAI,CAACG,OAAO,CAACF,aAAa,CAACG,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC;AAE9D,eAAe,SAASC,KAAKA,CAAA,EAAG;EAC9B,MAAMC,OAAO,GAAG,IAAIT,gBAAgB,CAAC,SAAS,CAAC,CAC5CU,WAAW,CAAC,wBAAwB,CAAC,CACrCC,aAAa,CAACR,SAAS,CAAC;EAE3BM,OAAO,CAACG,OAAO,CAAC,MAAM,EAAE,sBAAsB,CAAC;EAE/CH,OAAO,CAACG,OAAO,CACb,UAAU,EACV,oMACF,CAAC;EAEDH,OAAO,CAACG,OAAO,CAAC,QAAQ,EAAE,wBAAwB,CAAC;EAEnDH,OAAO,CAACG,OAAO,CAAC,QAAQ,EAAE,wBAAwB,CAAC;EAEnDH,OAAO,CAACG,OAAO,CAAC,QAAQ,EAAE,wBAAwB,CAAC;EAEnDH,OAAO,CAACG,OAAO,CACb,OAAO,EACP,+JACF,CAAC;EAEDH,OAAO,CAACG,OAAO,CAAC,QAAQ,EAAE,wBAAwB,CAAC;EAEnDH,OAAO,CAACG,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC;EAErD,OAAOH,OAAO;AAChB"}
+{"version":3,"file":"journey.js","names":["path","fileURLToPath","FrodoStubCommand","__dirname","dirname","import","meta","url","setup","program","description","executableDir","command"],"sources":["../../../src/cli/journey/journey.ts"],"sourcesContent":["import path from 'path';\nimport { fileURLToPath } from 'url';\n\nimport { FrodoStubCommand } from '../FrodoCommand';\n\nconst __dirname = path.dirname(fileURLToPath(import.meta.url));\n\nexport default function setup() {\n  const program = new FrodoStubCommand('journey')\n    .description('Manage journeys/trees.')\n    .executableDir(__dirname);\n\n  program.command('list', 'List journeys/trees.');\n\n  program.command(\n    'describe',\n    'If host argument is supplied, describe the journey/tree indicated by -t, or all journeys/trees in the realm if no -t is supplied, otherwise describe the journey/tree export file indicated by -f.'\n  );\n\n  program.command('export', 'Export journeys/trees.');\n\n  program.command('import', 'Import journeys/trees.');\n\n  program.command('delete', 'Delete journeys/trees.');\n\n  program.command(\n    'prune',\n    'Prune orphaned configuration artifacts left behind after deleting authentication trees. You will be prompted before any destructive operations are performed.'\n  );\n\n  program.command('enable', 'Enable journeys/trees.');\n\n  program.command('disable', 'Disable journeys/trees.');\n\n  return program;\n}\n"],"mappings":"AAAA,OAAOA,IAAI,MAAM,MAAM;AACvB,SAASC,aAAa,QAAQ,KAAK;AAEnC,SAASC,gBAAgB,QAAQ,iBAAiB;AAElD,MAAMC,SAAS,GAAGH,IAAI,CAACI,OAAO,CAACH,aAAa,CAACI,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC;AAE9D,eAAe,SAASC,KAAKA,CAAA,EAAG;EAC9B,MAAMC,OAAO,GAAG,IAAIP,gBAAgB,CAAC,SAAS,CAAC,CAC5CQ,WAAW,CAAC,wBAAwB,CAAC,CACrCC,aAAa,CAACR,SAAS,CAAC;EAE3BM,OAAO,CAACG,OAAO,CAAC,MAAM,EAAE,sBAAsB,CAAC;EAE/CH,OAAO,CAACG,OAAO,CACb,UAAU,EACV,oMACF,CAAC;EAEDH,OAAO,CAACG,OAAO,CAAC,QAAQ,EAAE,wBAAwB,CAAC;EAEnDH,OAAO,CAACG,OAAO,CAAC,QAAQ,EAAE,wBAAwB,CAAC;EAEnDH,OAAO,CAACG,OAAO,CAAC,QAAQ,EAAE,wBAAwB,CAAC;EAEnDH,OAAO,CAACG,OAAO,CACb,OAAO,EACP,+JACF,CAAC;EAEDH,OAAO,CAACG,OAAO,CAAC,QAAQ,EAAE,wBAAwB,CAAC;EAEnDH,OAAO,CAACG,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC;EAErD,OAAOH,OAAO;AAChB"}

package/esm/cli/{logging/logs-fetch.js → log/log-fetch.js}

@@ -1,49 +1,75 @@
-import { FrodoCommand } from '../FrodoCommand';
-import { sourcesOptionM } from './logs';
-import { Option } from 'commander';
 import { frodo, state } from '@rockcarver/frodo-lib';
-import * as config from '../../utils/Config';
-import { printMessage } from '../../utils/Console';
+import { Option } from 'commander';
 import { fetchLogs, provisionCreds } from '../../ops/LogOps';
+import * as config from '../../utils/Config';
+import { printMessage, verboseMessage } from '../../utils/Console';
+import { FrodoCommand } from '../FrodoCommand';
+import { sourcesOptionM } from './log';
+const {
+  getTokens
+} = frodo.login;
+const {
+  resolveLevel
+} = frodo.cloud.log;
+const {
+  getConnectionProfile,
+  saveConnectionProfile
+} = frodo.conn;
 const SECONDS_IN_30_DAYS = 2592000;
 const SECONDS_IN_1_HOUR = 3600;
 const LOG_TIME_WINDOW_MAX = SECONDS_IN_30_DAYS;
 const LOG_TIME_WINDOW_INCREMENT = 1;
-const program = new FrodoCommand('frodo logs fetch', ['realm', 'type']);
+const program = new FrodoCommand('frodo log fetch', ['realm', 'type']);
 program.description('Fetch Identity Cloud logs between a specified begin and end time period.\
  WARNING: depending on filters and time period specified, this could take substantial time to complete.').addOption(sourcesOptionM).addOption(new Option('-l, --level <level>', 'Set log level filter. You can specify the level as a number or a string. \
 Following values are possible (values on the same line are equivalent): \
 \n0, SEVERE, FATAL, or ERROR\n1, WARNING, WARN or CONFIG\
 \n2, INFO or INFORMATION\n3, DEBUG, FINE, FINER or FINEST\
-\n4 or ALL').default('ERROR', `${frodo.cloud.log.resolveLevel('ERROR')}`)).addOption(new Option('-t, --transaction-id <txid>', 'Filter by transactionId')).addOption(new Option('-b, --begin-timestamp <beginTs>', 'Begin timestamp for period (in ISO8601, example: "2022-10-13T19:06:28Z", or "2022-09.30". \
+\n4 or ALL').default('ERROR', `${resolveLevel('ERROR')}`)).addOption(new Option('-t, --transaction-id <txid>', 'Filter by transactionId')).addOption(new Option('-b, --begin-timestamp <beginTs>', 'Begin timestamp for period (in ISO8601, example: "2022-10-13T19:06:28Z", or "2022-09.30". \
 Cannot be more than 30 days in the past. If not specified, logs from one hour ago are fetched \
 (-e is ignored)')).addOption(new Option('-e, --end-timestamp <endTs>', 'End timestamp for period. Default: "now"')).addOption(new Option('-s, --search-string <ss>', 'Filter by a specific string (ANDed with transactionID filter)')).addOption(new Option('-d, --defaults', 'Use default logging noise filters').default(false, `Use custom logging noise filters defined in $HOME/${config.FRODO_LOG_NOISEFILTER_FILENAME}`)).action(async (host, user, password, options, command) => {
   command.handleDefaultArgsAndOpts(host, user, password, options, command);
-  let credsFromParameters = true;
-  const conn = await frodo.conn.getConnectionProfile();
-  if (conn) {
-    state.setHost(conn.tenant);
-    if (conn.logApiKey != null && conn.logApiSecret != null) {
-      credsFromParameters = false;
-      state.setLogApiKey(conn.logApiKey);
-      state.setLogApiSecret(conn.logApiSecret);
-    } else {
-      if (conn.username == null && conn.password == null) {
-        if (!state.getUsername() && !state.getPassword()) {
-          credsFromParameters = false;
-          printMessage('User credentials not specified as parameters and no saved API key and secret found!', 'warn');
-          return;
-        }
-      } else {
-        state.setUsername(conn.username);
-        state.setPassword(conn.password);
-      }
-      if (await frodo.login.getTokens(true)) {
-        const creds = await provisionCreds();
-        state.setLogApiKey(creds.api_key_id);
-        state.setLogApiSecret(creds.api_key_secret);
-      }
+  let foundCredentials = false;
+  const conn = await getConnectionProfile();
+  if (conn) state.setHost(conn.tenant);
+
+  // log api creds have been supplied as username and password arguments
+  if (state.getUsername() && state.getPassword()) {
+    verboseMessage(`Using log api credentials from command line.`);
+    state.setLogApiKey(state.getUsername());
+    state.setLogApiSecret(state.getPassword());
+    foundCredentials = true;
+  }
+  // log api creds from connection profile
+  else if (conn && conn.logApiKey != null && conn.logApiSecret != null) {
+    verboseMessage(`Using log api credentials from connection profile.`);
+    state.setLogApiKey(conn.logApiKey);
+    state.setLogApiSecret(conn.logApiSecret);
+    foundCredentials = true;
+  }
+  // log api creds have been supplied via env variables
+  else if (state.getLogApiKey() && state.getLogApiSecret()) {
+    verboseMessage(`Using log api credentials from environment variables.`);
+    foundCredentials = true;
+  }
+  // no log api creds but got username and password, so can try to create them
+  else if (conn && conn.username && conn.password) {
+    printMessage(`Found admin credentials in connection profile, attempting to create log api credentials...`);
+    state.setUsername(conn.username);
+    state.setPassword(conn.password);
+    if (await getTokens(true)) {
+      const creds = await provisionCreds();
+      state.setLogApiKey(creds.api_key_id);
+      state.setLogApiSecret(creds.api_key_secret);
+      await saveConnectionProfile(state.getHost());
+      foundCredentials = true;
+    }
+    // unable to create credentials
+    else {
+      printMessage(`Unable to create log api credentials.`);
     }
+  }
+  if (foundCredentials) {
     const now = Date.now() / 1000;
     const nowString = new Date(now * 1000).toISOString();
     if (typeof options.beginTimestamp === 'undefined' || !options.beginTimestamp) {
@@ -66,26 +92,32 @@ Cannot be more than 30 days in the past. If not specified, logs from one hour ag
     const endTs = Date.parse(options.endTimestamp) / 1000;
     if (endTs < beginTs) {
       printMessage('End timestamp can not be before begin timestamp', 'error');
+      process.exitCode = 1;
       return;
     }
     if (now - beginTs > LOG_TIME_WINDOW_MAX) {
       printMessage('Begin timestamp can not be more than 30 days in the past', 'error');
+      process.exitCode = 1;
       return;
     }
     let intermediateEndTs = 0;
-    printMessage(`Fetching ID Cloud logs from the following sources: ${command.opts().sources} and levels [${frodo.cloud.log.resolveLevel(command.opts().level)}] of ${conn.tenant}...`);
-    if (credsFromParameters) await frodo.conn.saveConnectionProfile(host); // save new values if they were specified on CLI
-
+    printMessage(`Fetching ID Cloud logs from the following sources: ${command.opts().sources} and levels [${resolveLevel(command.opts().level)}] of ${conn.tenant}...`);
     let timeIncrement = LOG_TIME_WINDOW_INCREMENT;
     if (endTs - beginTs > 30) {
       timeIncrement = timeIncrement * 30;
     }
     do {
       intermediateEndTs = beginTs + timeIncrement;
-      await fetchLogs(command.opts().sources, new Date(beginTs * 1000).toISOString(), new Date(intermediateEndTs * 1000).toISOString(), frodo.cloud.log.resolveLevel(command.opts().level), command.opts().transactionId, command.opts().searchString, null, config.getNoiseFilters(options.defaults));
+      await fetchLogs(command.opts().sources, new Date(beginTs * 1000).toISOString(), new Date(intermediateEndTs * 1000).toISOString(), resolveLevel(command.opts().level), command.opts().transactionId, command.opts().searchString, null, config.getNoiseFilters(options.defaults));
       beginTs = intermediateEndTs;
     } while (intermediateEndTs < endTs);
   }
+  // no log api credentials
+  else {
+    printMessage('No log api credentials found!');
+    program.help();
+    process.exitCode = 1;
+  }
 });
 program.parse();
-//# sourceMappingURL=logs-fetch.js.map
+//# sourceMappingURL=log-fetch.js.map