@rockcarver/frodo-cli 0.10.4 → 0.11.1-2

package/src/cli/saml/saml-cot-import.js

@@ -1,14 +1,14 @@
 import { Command, Option } from 'commander';
+import { Authenticate, CirclesOfTrust, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import {
+
+const { getTokens } = Authenticate;
+const {
   importCircleOfTrust,
   importCirclesOfTrustFromFile,
   importCirclesOfTrustFromFiles,
   importFirstCircleOfTrust,
-} from '../../ops/CirclesOfTrustOps.js';
+} = CirclesOfTrust;
 
 const program = new Command('frodo saml cot import');
 
@@ -49,48 +49,48 @@ program
   .action(
     // implement program logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // import by id
         if (options.file && options.cotId) {
-          printMessage(
+          console.log(
             `Importing circle of trust "${
               options.cotId
-            }" into realm "${storage.session.getRealm()}"...`
+            }" into realm "${state.default.session.getRealm()}"...`
           );
           importCircleOfTrust(options.cotId, options.file);
         }
         // --all -a
         else if (options.all && options.file) {
-          printMessage(
+          console.log(
             `Importing all circles of trust from a single file (${options.file})...`
           );
           importCirclesOfTrustFromFile(options.file);
         }
         // --all-separate -A
         else if (options.allSeparate && !options.file) {
-          printMessage(
+          console.log(
             'Importing all circles of trust from separate files (*.saml.json) in current directory...'
           );
           importCirclesOfTrustFromFiles();
         }
         // import first provider from file
         else if (options.file) {
-          printMessage(
+          console.log(
             `Importing first circle of trust from file "${
               options.file
-            }" into realm "${storage.session.getRealm()}"...`
+            }" into realm "${state.default.session.getRealm()}"...`
           );
           importFirstCircleOfTrust(options.file);
         }
         // unrecognized combination of options or no options
         else {
-          printMessage('Unrecognized combination of options or no options...');
+          console.log('Unrecognized combination of options or no options...');
           program.help();
         }
       }

package/src/cli/saml/saml-cot-list.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, CirclesOfTrust, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import { listCirclesOfTrust } from '../../ops/CirclesOfTrustOps.js';
+
+const { getTokens } = Authenticate;
+const { listCirclesOfTrust } = CirclesOfTrust;
 
 const program = new Command('frodo saml cot list');
 
@@ -23,15 +23,15 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Listing SAML circles of trust in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Listing SAML circles of trust in realm "${state.default.session.getRealm()}"...`
         );
         listCirclesOfTrust(options.long);
       }

package/src/cli/saml/saml-describe.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Saml, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import { describeProvider } from '../../ops/SamlOps.js';
+
+const { getTokens } = Authenticate;
+const { describeProvider } = Saml;
 
 const program = new Command('frodo saml describe');
 
@@ -21,17 +21,17 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
+        console.log(
           `Describing SAML entity provider ${
             options.entityId
-          } in realm "${storage.session.getRealm()}"...`
+          } in realm "${state.default.session.getRealm()}"...`
         );
         describeProvider(options.entityId);
       }

package/src/cli/saml/saml-export.js

@@ -1,13 +1,10 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Saml, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import {
-  exportProvider,
-  exportProvidersToFile,
-  exportProvidersToFiles,
-} from '../../ops/SamlOps.js';
+
+const { getTokens } = Authenticate;
+
+const { exportProvider, exportProvidersToFile, exportProvidersToFiles } = Saml;
 
 const program = new Command('frodo saml export');
 
@@ -48,35 +45,35 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // export by id/name
         if (options.entityId) {
-          printMessage(
+          console.log(
             `Exporting provider "${
               options.entityId
-            }" from realm "${storage.session.getRealm()}"...`
+            }" from realm "${state.default.session.getRealm()}"...`
           );
           exportProvider(options.entityId, options.file);
         }
         // --all -a
         else if (options.all) {
-          printMessage('Exporting all providers to a single file...');
+          console.log('Exporting all providers to a single file...');
           exportProvidersToFile(options.file);
         }
         // --all-separate -A
         else if (options.allSeparate) {
-          printMessage('Exporting all providers to separate files...');
+          console.log('Exporting all providers to separate files...');
           exportProvidersToFiles();
         }
         // unrecognized combination of options or no options
         else {
-          printMessage(
+          console.log(
             'Unrecognized combination of options or no options...',
             'error'
           );

package/src/cli/saml/saml-import.js

@@ -1,14 +1,15 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Saml, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import {
+
+const { getTokens } = Authenticate;
+
+const {
   importProvider,
   importProvidersFromFile,
   importProvidersFromFiles,
   importFirstProvider,
-} from '../../ops/SamlOps.js';
+} = Saml;
 
 const program = new Command('frodo saml import');
 
@@ -49,48 +50,48 @@ program
   .action(
     // implement program logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // import by id
         if (options.file && options.entityId) {
-          printMessage(
+          console.log(
             `Importing provider "${
               options.entityId
-            }" into realm "${storage.session.getRealm()}"...`
+            }" into realm "${state.default.session.getRealm()}"...`
           );
           importProvider(options.entityId, options.file);
         }
         // --all -a
         else if (options.all && options.file) {
-          printMessage(
+          console.log(
             `Importing all providers from a single file (${options.file})...`
           );
           importProvidersFromFile(options.file);
         }
         // --all-separate -A
         else if (options.allSeparate && !options.file) {
-          printMessage(
+          console.log(
             'Importing all providers from separate files (*.saml.json) in current directory...'
           );
           importProvidersFromFiles();
         }
         // import first provider from file
         else if (options.file) {
-          printMessage(
+          console.log(
             `Importing first provider from file "${
               options.file
-            }" into realm "${storage.session.getRealm()}"...`
+            }" into realm "${state.default.session.getRealm()}"...`
           );
           importFirstProvider(options.file);
         }
         // unrecognized combination of options or no options
         else {
-          printMessage('Unrecognized combination of options or no options...');
+          console.log('Unrecognized combination of options or no options...');
           program.help();
         }
       }

package/src/cli/saml/saml-list.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Saml, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import { listProviders } from '../../ops/SamlOps.js';
+
+const { getTokens } = Authenticate;
+const { listProviders } = Saml;
 
 const program = new Command('frodo saml list');
 
@@ -23,15 +23,15 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Listing SAML entity providers in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Listing SAML entity providers in realm "${state.default.session.getRealm()}"...`
         );
         listProviders(options.long);
       }

package/src/cli/saml/saml-metadata-export.js

@@ -1,14 +1,10 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Saml, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import {
-  exportCircleOfTrust,
-  exportCirclesOfTrustToFile,
-  exportCirclesOfTrustToFiles,
-} from '../../ops/CirclesOfTrustOps.js';
-import { exportMetadata } from '../../ops/SamlOps.js';
+
+const { getTokens } = Authenticate;
+
+const { exportMetadata } = Saml;
 
 const program = new Command('frodo saml metadata export');
 
@@ -43,30 +39,30 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // export by id/name
         if (options.entityId) {
-          printMessage(
+          console.log(
             `Exporting metadata for provider "${
               options.entityId
-            }" from realm "${storage.session.getRealm()}"...`
+            }" from realm "${state.default.session.getRealm()}"...`
           );
           exportMetadata(options.entityId, options.file);
         }
         // // --all-separate -A
         // else if (options.allSeparate) {
-        //   printMessage('Exporting all providers to separate files...');
+        //   console.log('Exporting all providers to separate files...');
         //   exportProvidersToFiles();
         // }
         // unrecognized combination of options or no options
         else {
-          printMessage(
+          console.log(
             'Unrecognized combination of options or no options...',
             'error'
           );

package/src/cli/script/script-delete.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd delete');
 
@@ -39,12 +40,12 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // code goes here
       }

package/src/cli/script/script-describe.js

@@ -1,7 +1,8 @@
 import { Command, Option } from 'commander';
+import { Authenticate, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
+
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo cmd describe');
 
@@ -19,12 +20,12 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // code goes here
       }

package/src/cli/script/script-export.js

@@ -1,13 +1,11 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Script, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import {
-  exportScriptByName,
-  exportScriptsToFile,
-  exportScriptsToFiles,
-} from '../../ops/ScriptOps.js';
+
+const { getTokens } = Authenticate;
+const { exportScriptByName } = Script;
+const { exportScriptsToFile } = Script;
+const { exportScriptsToFiles } = Script;
 
 const program = new Command('frodo script export');
 
@@ -37,13 +35,13 @@ program
   .addOption(
     new Option(
       '-a, --all',
-      'Export all cmds to a single file. Ignored with -i.'
+      'Export all scripts to a single file. Ignored with -i.'
     )
   )
   .addOption(
     new Option(
       '-A, --all-separate',
-      'Export all cmds to separate files (*.cmd.json) in the current directory. Ignored with -i or -a.'
+      'Export all scripts to separate files (*.script.json) in the current directory. Ignored with -i or -a.'
     )
   )
   // deprecated option
@@ -56,16 +54,16 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // export by name
         if (options.scriptName || options.script) {
-          printMessage('Exporting script...');
+          console.log('Exporting script...');
           exportScriptByName(
             options.scriptName || options.script,
             options.file
@@ -73,17 +71,17 @@ program
         }
         // -a / --all
         else if (options.all) {
-          printMessage('Exporting all scripts to a single file...');
+          console.log('Exporting all scripts to a single file...');
           exportScriptsToFile(options.file);
         }
         // -A / --all-separate
         else if (options.allSeparate) {
-          printMessage('Exporting all scripts to separate files...');
+          console.log('Exporting all scripts to separate files...');
           exportScriptsToFiles();
         }
         // unrecognized combination of options or no options
         else {
-          printMessage(
+          console.log(
             'Unrecognized combination of options or no options...',
             'error'
           );

package/src/cli/script/script-import.js

@@ -1,9 +1,10 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Script, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import { importScriptsFromFile } from '../../ops/ScriptOps.js';
+
+const { getTokens } = Authenticate;
+
+const { importScriptsFromFile } = Script;
 
 const program = new Command('frodo script import');
 
@@ -40,15 +41,15 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Importing script(s) into realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Importing script(s) into realm "${state.default.session.getRealm()}"...`
         );
         importScriptsFromFile(
           options.scriptName || options.script,

package/src/cli/script/script-list.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Script, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import { listScripts } from '../../ops/ScriptOps.js';
+
+const { getTokens } = Authenticate;
+const { listScripts } = Script;
 
 const program = new Command('frodo script list');
 
@@ -23,15 +23,15 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Listing scripts in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Listing scripts in realm "${state.default.session.getRealm()}"...`
         );
         await listScripts(options.long);
       }