@rockcarver/frodo-cli 0.10.4 → 0.11.1-2

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

@@ -1,13 +1,13 @@
 import { Command, Option } from 'commander';
+import { Authenticate, OAuth2Client, 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 {
   exportOAuth2ClientsToFile,
   exportOAuth2ClientsToFiles,
   exportOAuth2ClientToFile,
-} from '../../ops/OAuth2ClientOps.js';
+} = OAuth2Client;
 
 const program = new Command('frodo app export');
 
@@ -43,31 +43,31 @@ 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
         if (options.appId) {
-          printMessage('Exporting OAuth2 application...');
+          console.log('Exporting OAuth2 application...');
           exportOAuth2ClientToFile(options.appId, options.file);
         }
         // -a/--all
         else if (options.all) {
-          printMessage('Exporting all OAuth2 applications to file...');
+          console.log('Exporting all OAuth2 applications to file...');
           exportOAuth2ClientsToFile(options.file);
         }
         // -A/--all-separate
         else if (options.allSeparate) {
-          printMessage('Exporting all applications to separate files...');
+          console.log('Exporting all applications to separate files...');
           exportOAuth2ClientsToFiles();
         }
         // 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/app/app-import.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, OAuth2Client, 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 { importOAuth2ClientsFromFile } from '../../ops/OAuth2ClientOps.js';
+
+const { getTokens } = Authenticate;
+const { importOAuth2ClientsFromFile } = OAuth2Client;
 
 const program = new Command('frodo app import');
 
@@ -39,14 +39,14 @@ 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 OAuth2 application(s) ...`);
+        console.log(`Importing OAuth2 application(s) ...`);
         importOAuth2ClientsFromFile(options.file);
       }
     }

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

@@ -1,10 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, OAuth2Client, 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 { getOAuth2Clients } from '../../api/OAuth2ClientApi.js';
-import { listOAuth2Clients } from '../../ops/OAuth2ClientOps.js';
+
+const { getTokens } = Authenticate;
+const { listOAuth2Clients } = OAuth2Client;
 
 const program = new Command('frodo app list');
 
@@ -24,14 +23,14 @@ 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 OAuth2 applications...`);
+        console.log(`Listing OAuth2 applications...`);
         listOAuth2Clients(options.long);
       }
     }

package/src/cli/conn/conn-add.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, ConnectionProfile, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import storage from '../../storage/SessionStorage.js';
-import { saveConnectionProfile } from '../../ops/ConnectionProfileOps.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import { printMessage } from '../../ops/utils/Console.js';
+
+const { getTokens } = Authenticate;
+const { saveConnectionProfile } = ConnectionProfile;
 
 const program = new Command('frodo conn add');
 
@@ -24,13 +24,13 @@ program
   .action(
     // implement command logic inside action handler
     async (host, user, password, key, secret, options) => {
-      storage.session.setTenant(host);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setLogApiKey(key);
-      storage.session.setLogApiSecret(secret);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setLogApiKey(key);
+      state.default.session.setLogApiSecret(secret);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if ((options.validate && (await getTokens())) || !options.validate) {
         saveConnectionProfile();
       } else {

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

@@ -1,6 +1,8 @@
 import { Command } from 'commander';
+import { ConnectionProfile } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { deleteConnectionProfile } from '../../ops/ConnectionProfileOps.js';
+
+const { deleteConnectionProfile } = ConnectionProfile;
 
 const program = new Command('frodo conn delete');
 

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

@@ -1,6 +1,8 @@
 import { Command, Option } from 'commander';
+import { ConnectionProfile } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { describeConnectionProfile } from '../../ops/ConnectionProfileOps.js';
+
+const { describeConnectionProfile } = ConnectionProfile;
 
 const program = new Command('frodo conn describe');
 

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

@@ -1,8 +1,7 @@
 import { Command, Option } from 'commander';
-import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { listConnectionProfiles } from '../../ops/ConnectionProfileOps.js';
+import { ConnectionProfile } from '@rockcarver/frodo-lib';
+
+const { listConnectionProfiles } = ConnectionProfile;
 
 const program = new Command('frodo conn list');
 

package/src/cli/email/email-template-export.js

@@ -1,13 +1,13 @@
 import { Command, Option } from 'commander';
+import { Authenticate, EmailTemplate, 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 {
   exportEmailTemplatesToFile,
   exportEmailTemplatesToFiles,
   exportEmailTemplateToFile,
-} from '../../ops/EmailTemplateOps.js';
+} = EmailTemplate;
 
 const program = new Command('frodo email template export');
 
@@ -48,35 +48,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.templateId) {
-          printMessage(
+          console.log(
             `Exporting email template "${
               options.templateId
-            }" from realm "${storage.session.getRealm()}"...`
+            }" from realm "${state.default.session.getRealm()}"...`
           );
           exportEmailTemplateToFile(options.templateId, options.file);
         }
         // --all -a
         else if (options.all) {
-          printMessage('Exporting all email templates to a single file...');
+          console.log('Exporting all email templates to a single file...');
           exportEmailTemplatesToFile(options.file);
         }
         // --all-separate -A
         else if (options.allSeparate) {
-          printMessage('Exporting all email templates to separate files...');
+          console.log('Exporting all email templates to separate files...');
           exportEmailTemplatesToFiles();
         }
         // unrecognized combination of options or no options
         else {
-          printMessage(
+          console.log(
             'Unrecognized combination of options or no options...',
             'error'
           );

package/src/cli/email/email-template-import.js

@@ -1,14 +1,14 @@
 import { Command, Option } from 'commander';
+import { Authenticate, EmailTemplate, 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 {
   importEmailTemplateFromFile,
   importEmailTemplatesFromFile,
   importEmailTemplatesFromFiles,
   importFirstEmailTemplateFromFile,
-} from '../../ops/EmailTemplateOps.js';
+} = EmailTemplate;
 
 const program = new Command('frodo email template import');
 
@@ -44,42 +44,42 @@ 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.templateId) {
-          printMessage(`Importing email template "${options.templateId}"...`);
+          console.log(`Importing email template "${options.templateId}"...`);
           importEmailTemplateFromFile(options.templateId, options.file);
         }
         // --all -a
         else if (options.all && options.file) {
-          printMessage(
+          console.log(
             `Importing all email templates from a single file (${options.file})...`
           );
           importEmailTemplatesFromFile(options.file);
         }
         // --all-separate -A
         else if (options.allSeparate && !options.file) {
-          printMessage(
+          console.log(
             'Importing all email templates from separate files (*.template.email.json) in current directory...'
           );
           importEmailTemplatesFromFiles();
         }
         // import first template from file
         else if (options.file) {
-          printMessage(
+          console.log(
             `Importing first email template from file "${options.file}"...`
           );
           importFirstEmailTemplateFromFile(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/email/email-template-list.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, EmailTemplate, 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 { listEmailTemplates } from '../../ops/EmailTemplateOps.js';
+
+const { getTokens } = Authenticate;
+const { listEmailTemplates } = EmailTemplate;
 
 const program = new Command('frodo email template list');
 
@@ -23,14 +23,14 @@ 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 email templates ...`);
+        console.log(`Listing email templates ...`);
         listEmailTemplates(options.long);
       }
     }

package/src/cli/esv/esv-apply.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Startup, 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 { applyUpdates, checkForUpdates } from '../../ops/StartupOps.js';
+
+const { getTokens } = Authenticate;
+const { applyUpdates, checkForUpdates } = Startup;
 
 const program = new Command('frodo esv apply');
 
@@ -41,21 +41,21 @@ 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()) {
         // check for updates only
         if (options.checkOnly) {
-          printMessage(`Checking for updates...`);
+          console.log(`Checking for updates...`);
           await checkForUpdates();
         }
         // apply updates
         else {
-          printMessage(`Applying updates...`);
+          console.log(`Applying updates...`);
           await applyUpdates(options.force, options.wait, options.yes);
         }
       }

package/src/cli/esv/esv-secret-create.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Secrets, 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 { createSecret } from '../../ops/SecretsOps.js';
+
+const { getTokens } = Authenticate;
+const { createSecret } = Secrets;
 
 const program = new Command('frodo esv secret create');
 
@@ -41,14 +41,14 @@ 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('Creating secret...');
+        console.log('Creating secret...');
         createSecret(
           options.secretId,
           options.value,

package/src/cli/esv/esv-secret-delete.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Secrets, 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 { deleteSecretCmd, deleteSecretsCmd } from '../../ops/SecretsOps.js';
+
+const { getTokens } = Authenticate;
+const { deleteSecretCmd, deleteSecretsCmd } = Secrets;
 
 const program = new Command('frodo esv secret delete');
 
@@ -35,26 +35,26 @@ 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()) {
         // delete by id
         if (options.secretId) {
-          printMessage('Deleting secret...');
+          console.log('Deleting secret...');
           deleteSecretCmd(options.secretId);
         }
         // --all -a
         else if (options.all) {
-          printMessage('Deleting all secrets...');
+          console.log('Deleting all secrets...');
           deleteSecretsCmd();
         }
         // 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/esv/esv-secret-describe.js

@@ -1,9 +1,9 @@
 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';
-import { printMessage } from '../../ops/utils/Console.js';
-import { describeSecret, listSecretVersionsCmd } from '../../ops/SecretsOps.js';
+
+const { getTokens, Secrets } = Authenticate;
+const { describeSecret } = Secrets;
 
 const program = new Command('frodo esv secret describe');
 
@@ -21,14 +21,14 @@ 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(`Describing secret ${options.secretId}...`);
+        console.log(`Describing secret ${options.secretId}...`);
         describeSecret(options.secretId);
       }
     }

package/src/cli/esv/esv-secret-export.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 esv secret export');
 
@@ -37,12 +38,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/esv/esv-secret-import.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 esv secret import');
 
@@ -37,12 +38,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
       }