@rockcarver/frodo-cli 0.10.4 → 0.11.1-2

package/src/cli/admin/admin-add-autoid-static-user-mapping.js

@@ -1,9 +1,9 @@
 import { Command } from 'commander';
+import { Authenticate, Admin, 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 { addAutoIdStaticUserMapping } from '../../ops/AdminOps.js';
+
+const { getTokens } = Authenticate;
+const { addAutoIdStaticUserMapping } = Admin;
 
 const program = new Command('frodo admin add-autoid-static-user-mapping');
 
@@ -22,16 +22,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()) {
-        printMessage(`Adding AutoId static user mapping...`);
+        console.log(`Adding AutoId static user mapping...`);
         await addAutoIdStaticUserMapping();
-        printMessage('Done.');
+        console.log('Done.');
       }
     }
     // end command logic inside action handler

package/src/cli/admin/admin-create-oauth2-client-with-admin-privileges.js

@@ -1,14 +1,11 @@
 import { Command, Option } from 'commander';
 import { v4 as uuidv4 } from 'uuid';
 import Table from 'cli-table3';
+import { Authenticate, Admin, 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 {
-  createLongLivedToken,
-  createOAuth2ClientWithAdminPrivileges,
-} from '../../ops/AdminOps.js';
+
+const { getTokens } = Authenticate;
+const { createLongLivedToken, createOAuth2ClientWithAdminPrivileges } = Admin;
 
 const program = new Command(
   'frodo admin create-oauth2-client-with-admin-privileges'
@@ -53,15 +50,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(
-          `Creating oauth2 client with admin privileges in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Creating oauth2 client with admin privileges in realm "${state.default.session.getRealm()}"...`
         );
         let clientId = uuidv4();
         let clientSecret = uuidv4();
@@ -74,7 +71,7 @@ program
         try {
           await createOAuth2ClientWithAdminPrivileges(clientId, clientSecret);
         } catch (error) {
-          printMessage(error, 'error');
+          console.log(error, 'error');
         }
         const table = new Table({
           chars: {
@@ -110,12 +107,12 @@ program
             // table.push(['Token Lifetime'.brightCyan, response.expires_in]);
             table.push(['Expires'.brightCyan, response.expires_on]);
           } catch (error) {
-            printMessage(error, 'error');
+            console.log(error, 'error');
           }
         }
         table.push(['Client ID'.brightCyan, clientId]);
         table.push(['Client Secret'.brightCyan, clientSecret]);
-        printMessage(table.toString());
+        console.log(table.toString());
       }
     }
     // end command logic inside action handler

package/src/cli/admin/admin-get-access-token.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, OAuth2OIDCApi, 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 { clientCredentialsGrant } from '../../api/OAuth2OIDCApi.js';
+
+const { clientCredentialsGrant } = OAuth2OIDCApi;
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo admin get-access-token');
 
@@ -33,14 +33,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(
+        console.log(
           `Getting an access token using client "${options.clientId}"...`
         );
         const response = (
@@ -50,7 +50,7 @@ program
             options.scope
           )
         ).data;
-        printMessage(`Token: ${response.access_token}`);
+        console.log(`Token: ${response.access_token}`);
       }
     }
     // end command logic inside action handler

package/src/cli/admin/admin-grant-oauth2-client-admin-privileges.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Admin, 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 { grantOAuth2ClientAdminPrivileges } from '../../ops/AdminOps.js';
+
+const { getTokens } = Authenticate;
+const { grantOAuth2ClientAdminPrivileges } = Admin;
 
 const program = new Command('frodo admin grant-oauth2-client-admin-privileges');
 
@@ -23,20 +23,20 @@ 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(
           `Granting oauth2 client "${
             options.target
-          }" in realm "${storage.session.getRealm()}" admin privileges...`
+          }" in realm "${state.default.session.getRealm()}" admin privileges...`
         );
         await grantOAuth2ClientAdminPrivileges(options.target);
-        printMessage('Done.');
+        console.log('Done.');
       }
     }
     // end command logic inside action handler

package/src/cli/admin/admin-hide-generic-extension-attributes.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Admin, 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 { hideGenericExtensionAttributes } from '../../ops/AdminOps.js';
+
+const { getTokens } = Authenticate;
+const { hideGenericExtensionAttributes } = Admin;
 
 const program = new Command('frodo admin hide-generic-extension-attributes');
 
@@ -24,21 +24,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()) {
-        printMessage(
-          `Hiding generic extension attributes in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Hiding generic extension attributes in realm "${state.default.session.getRealm()}"...`
         );
         await hideGenericExtensionAttributes(
           options.includeCustomized,
           options.dryRun
         );
-        printMessage('Done.');
+        console.log('Done.');
       }
     }
     // end command logic inside action handler

package/src/cli/admin/admin-list-oauth2-clients-with-admin-privileges.js

@@ -1,9 +1,9 @@
 import { Command } from 'commander';
+import { Authenticate, Admin, 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 { listOAuth2AdminClients } from '../../ops/AdminOps.js';
+
+const { listOAuth2AdminClients } = Admin;
+const { getTokens } = Authenticate;
 
 const program = new Command(
   'frodo admin list-oauth2-clients-with-admin-privileges'
@@ -22,20 +22,20 @@ 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 clients with admin privileges in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Listing oauth2 clients with admin privileges in realm "${state.default.session.getRealm()}"...`
         );
         const adminClients = await listOAuth2AdminClients();
         adminClients.sort((a, b) => a.localeCompare(b));
         adminClients.forEach((item) => {
-          printMessage(`${item}`);
+          console.log(`${item}`);
         });
       }
     }

package/src/cli/admin/admin-list-oauth2-clients-with-custom-privileges.js

@@ -1,9 +1,10 @@
 import { Command } from 'commander';
+import { Authenticate, Admin, 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 { listOAuth2CustomClients } from '../../ops/AdminOps.js';
+
+const { listOAuth2CustomClients } = Admin;
+
+const { getTokens } = Authenticate;
 
 const program = new Command(
   'frodo admin list-oauth2-clients-with-custom-privileges'
@@ -22,20 +23,20 @@ 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 clients with custom privileges in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Listing oauth2 clients with custom privileges in realm "${state.default.session.getRealm()}"...`
         );
         const adminClients = await listOAuth2CustomClients();
         adminClients.sort((a, b) => a.localeCompare(b));
         adminClients.forEach((item) => {
-          printMessage(`${item}`);
+          console.log(`${item}`);
         });
       }
     }

package/src/cli/admin/admin-list-static-user-mappings.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Admin, 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 { listNonOAuth2AdminStaticUserMappings } from '../../ops/AdminOps.js';
+
+const { getTokens } = Authenticate;
+const { listNonOAuth2AdminStaticUserMappings } = Admin;
 
 const program = new Command('frodo admin list-static-user-mappings');
 
@@ -28,14 +28,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(
+        console.log(
           'Listing all non-oauth2 client subjects of static user mappings...'
         );
         const subjects = await listNonOAuth2AdminStaticUserMappings(
@@ -43,7 +43,7 @@ program
         );
         subjects.sort((a, b) => a.localeCompare(b));
         subjects.forEach((item) => {
-          printMessage(`${item}`);
+          console.log(`${item}`);
         });
       }
     }

package/src/cli/admin/admin-remove-static-user-mapping.js

@@ -1,9 +1,9 @@
 import { Command } from 'commander';
+import { Authenticate, Admin, 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 { removeStaticUserMapping } from '../../ops/AdminOps.js';
+
+const { getTokens } = Authenticate;
+const { removeStaticUserMapping } = Admin;
 
 const program = new Command('frodo admin remove-static-user-mapping');
 
@@ -20,16 +20,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()) {
-        printMessage("Removing a subject's static user mapping...");
+        console.log("Removing a subject's static user mapping...");
         await removeStaticUserMapping(options.subject);
-        printMessage('Done.');
+        console.log('Done.');
       }
     }
     // end command logic inside action handler

package/src/cli/admin/admin-repair-org-model.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Admin, 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 { repairOrgModel } from '../../ops/AdminOps.js';
+
+const { getTokens } = Authenticate;
+const { repairOrgModel } = Admin;
 
 const program = new Command('frodo admin repair-org-model');
 
@@ -27,18 +27,18 @@ 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(
-          `Repairing org model in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Repairing org model in realm "${state.default.session.getRealm()}"...`
         );
         await repairOrgModel(options.extendPermissions, options.dryRun);
-        printMessage('Done.');
+        console.log('Done.');
       }
     }
     // end command logic inside action handler

package/src/cli/admin/admin-revoke-oauth2-client-admin-privileges.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Admin, 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 { revokeOAuth2ClientAdminPrivileges } from '../../ops/AdminOps.js';
+
+const { getTokens } = Authenticate;
+const { revokeOAuth2ClientAdminPrivileges } = Admin;
 
 const program = new Command(
   'frodo admin revoke-oauth2-client-admin-privileges'
@@ -25,20 +25,20 @@ 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(
           `Revoking admin privileges from oauth2 client "${
             options.target
-          }" in realm "${storage.session.getRealm()}"...`
+          }" in realm "${state.default.session.getRealm()}"...`
         );
         await revokeOAuth2ClientAdminPrivileges(options.target);
-        printMessage('Done.');
+        console.log('Done.');
       }
     }
     // end command logic inside action handler

package/src/cli/admin/admin-show-generic-extension-attributes.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Admin, 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 { showGenericExtensionAttributes } from '../../ops/AdminOps.js';
+
+const { showGenericExtensionAttributes } = Admin;
+const { getTokens } = Authenticate;
 
 const program = new Command('frodo admin show-generic-extension-attributes');
 
@@ -32,21 +32,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()) {
-        printMessage(
-          `Showing generic extension attributes in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Showing generic extension attributes in realm "${state.default.session.getRealm()}"...`
         );
         await showGenericExtensionAttributes(
           options.includeCustomized,
           options.dryRun
         );
-        printMessage('Done.');
+        console.log('Done.');
       }
     }
     // end command logic inside action handler

package/src/cli/app/app-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/app/app-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 app 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
       }