@rockcarver/frodo-cli 0.10.4 → 0.11.1-0

package/.github/README.md

@@ -1,132 +1,63 @@
 <!-- README.md for GitHub; the one for NPM is ../README.md. -->
-# Frodo - ForgeROck DO
 
-This is the ForgeROck DO - or short frodo - command line interface, a CLI to manage ForgeRock platform deployments. Frodo supports Identity Cloud tenants, ForgeOps deployments, and classic deployments.
+# Frodo CLI - @rockcarver/frodo-cli
 
-Frodo is the successor to field tools like [amtree.sh](https://github.com/vscheuber/AM-treetool), [fidc-debug-tools](https://github.com/vscheuber/fidc-debug-tools), and ForgeRock-internal utilities.
-
-## Quick start
-
-1. Download the platform specific binary archive from the [release page](https://github.com/rockcarver/frodo/releases) and unzip it to a directory.
-2. Open a terminal and change to the above directory.
-3. Run `frodo conn add` (example below) to setup `frodo` for your ForgeRock environment. If all parameters are correct, `frodo` creates a new [connection profile](#connection-profiles). If you are offline and don't want to validate the data you enter, you can use the --no-validate paramter and frodo stores the [connection profile](#connection-profiles) without validating it.
-    ```console
-    $ frodo conn add https://openam-tenant-name.forgeblocks.com/am john.doe@company.com '5uP3r-53cr3t!'
-    ForgeRock Identity Cloud detected.
-    Connected to ForgeRock Access Management 7.2.0-2022-6-SNAPSHOT Build ee394dde039e790642653a516d498c16759876c1 (2022-July-07 19:49)
-    Saving creds in /Users/john.doe/.frodo/.frodorc...
-    ```
-    **NOTE: MacOS and Windows may not let you run `frodo` right after you download (and unzip) and execute it for the very first time. Please refer to [this page](../docs/BINARIES.md) if this happens.**
-
-4. Test your connection profile using a simple convenience feature in frodo:
-    ```console
-    $ frodo info tenant-name
-    Printing versions and tokens...
-    ForgeRock Identity Cloud detected.
-    Connected to ForgeRock Access Management 7.2.0-2022-6-SNAPSHOT Build ee394dde039e790642653a516d498c16759876c1 (2022-July-07 19:49)
-    Cookie name: 6ac6499e9da2071
-    Session token: g9CMhj7k9Asq...
-    Bearer token: eyJ0eXAiOiJKV...
-    ```
-    Note how the command does not specify the complete tenant URL nor username nor password. I only uses a unique substring that matches the tenant URL and frodo looks up and uses the right [connection profile](#connection-profiles).
-
-5. Now you can use other frodo commands, like `journey`, `logs`, `applications` etc. as desired. **For detailed usage, refer to [this](#usage)**
+ForgeROck DO Command Line Interface, frodo-cli, a CLI to manage ForgeRock platform deployments supporting Identity Cloud tenants, ForgeOps deployments, and classic deployments.
 
 ## Quick Nav
 
-- [Features](#features)
-- [Limitations](#limitations)
+- [Quick start](#quick-start)
 - [Installing](#installing)
 - [Usage](#usage)
 - [Request features or report issues](#feature-requests)
 - [Contributing](#contributing)
 - [Maintaining](#maintaining)
 
-## Features
-
-Frodo allows an administrator to easily connect to and manage any number of Identity Cloud tenants, ForgeOps deployment instances, or classic deployment instances from the command line. The following tasks are currently supported:
-
-- User mode
-
-  Install and run pre-compiled single binaries without any dependencies for MacOS, Windows, and Linux.
-
-- Manage journeys/trees.
-
-  Export, import and pruning of journeys. Frodo handles referenced scripts and email templates.
-
-- Manage applications.
-
-  List, export, and import applications (OAuth2 clients).
-
-- Manage connection profiles.
-
-  Saving and reading credentials (for multiple ForgeRock deployments) from a configuration file.
-
-- Manage email templates.
-
-  List, export, and import email templates.
-
-- Manage IDM configuration.
-
-  Export of IDM configuration. Import is coming.
-
-- Print versions and tokens.
-
-  Obtain ForgeRock session token and admin access_tokens for a ForgeRock Identity Cloud or platform (ForgeOps) deployment
-
-- View Identity Cloud logs.
-
-  List available log sources and tail them.
-
-- Manage realms.
-
-  List realms and show realm details. Allow adding and removing of custom DNS names.
-
-- Manage scripts.
-
-  List, export, and import scripts.
-
-- Manage Identity Cloud environment specific variables and secrets.
-
-  List and view details of secrets and variables in Identity Cloud.
+## Quick start
 
-- Platform admin tasks.
+1. Download the platform specific binary archive from the [release page](https://github.com/rockcarver/frodo-cli/releases) and unzip it to a directory.
+2. Open a terminal and change to the above directory.
+3. Run `frodo conn add` (example below) to setup `frodo` for your ForgeRock environment. If all parameters are correct, `frodo` creates a new [connection profile](#connection-profiles). If you are offline and don't want to validate the data you enter, you can use the --no-validate paramter and frodo stores the [connection profile](#connection-profiles) without validating it.
 
-  Common tasks administrators need to perform daily that are tedious and repetitive. Advanced tasks, which used to be involved and potentially dangerous if performed manually, now made easy and safe.
+   ```console
+   $ frodo conn add https://openam-tenant-name.forgeblocks.com/am john.doe@company.com '5uP3r-53cr3t!'
+   ForgeRock Identity Cloud detected.
+   Connected to ForgeRock Access Management 7.2.0-2022-6-SNAPSHOT Build ee394dde039e790642653a516d498c16759876c1 (2022-July-07 19:49)
+   Saving creds in /Users/john.doe/.frodo/.frodorc...
+   ```
 
-  - Create an oauth2 client with admin privileges.
-  - Get an access token using client credentials grant type.
-  - List oauth2 clients with admin privileges.
-  - Grant an oauth2 client admin privileges.
-  - Revoke admin privileges from an oauth2 client.
-  - List oauth2 clients with custom privileges.
-  - List all subjects of static user mappings that are not oauth2 clients.
-  - Remove a subject's static user mapping.
-  - Add AutoId static user mapping to enable dashboards and other AutoId-based functionality.
-  - Hide generic extension attributes.
-  - Show generic extension attributes.
-  - Repair org model (beta).
+   **NOTE: MacOS and Windows may not let you run `frodo` right after you download (and unzip) and execute it for the very first time. Please refer to [this page](../docs/BINARIES.md) if this happens.**
 
-- Developer mode
+4. Test your connection profile using a simple convenience feature in frodo:
 
-  Install and run in developer mode (npm i -g)
+   ```console
+   $ frodo info tenant-name
+   Printing versions and tokens...
+   ForgeRock Identity Cloud detected.
+   Connected to ForgeRock Access Management 7.2.0-2022-6-SNAPSHOT Build ee394dde039e790642653a516d498c16759876c1 (2022-July-07 19:49)
+   Cookie name: 6ac6499e9da2071
+   Session token: g9CMhj7k9Asq...
+   Bearer token: eyJ0eXAiOiJKV...
+   ```
 
-## Limitations
+   Note how the command does not specify the complete tenant URL nor username nor password. I only uses a unique substring that matches the tenant URL and frodo looks up and uses the right [connection profile](#connection-profiles).
 
-`frodo` can't export passwords (including API secrets, etc), so these need to be manually added back to imported configuration or alternatively, edit the export file to add the missing fields before importing.
+5. Now you can use other frodo commands, like `journey`, `logs`, `applications` etc. as desired. **For detailed usage, refer to [this](#usage)**
 
 ## Installing
 
 ### User Mode
+
 Individuals who do not intend to develop or contribute to frodo should use this method. Please refer to [Quick Start](#quick-start)
 
 ### Developer Mode
+
 For those who want to contribute or are just curious about the build process.
 
-- Make sure you have Node.js v18 (the version used by developers) or newer and npm.
+- Make sure you have Node.js v14 or newer installed.
 - Clone this repo
   ```console
-  git clone https://github.com/rockcarver/frodo.git
+  git clone https://github.com/rockcarver/frodo-cli.git
   ```
 - Install via NPM
   ```console
@@ -136,6 +67,7 @@ For those who want to contribute or are just curious about the build process.
   ```
 
 ### NPM package
+
 If you are a node developer and want to use frodo as a cli tool or as a library for your own applications, you can install the npm package:
 
 - To install the latest version as a cli tool:
@@ -158,25 +90,30 @@ You can invoke `frodo` from the terminal as long as you're in the directory or s
 To get started, refer to [Quick Start](#quick-start).
 
 ### Connection Profiles
+
 A connection profile is a set of ForgeRock environment URL (Access Management base URL), admin username and admin password. It can optionally contain log API key and secret for a ForgeRock Identity Cloud environment. All connection profiless are stored in `~/.frodo/.frodorc`. Passwords are stored encrypted. `.frodorc` can house information for multiple connections.
 
 Use the `frodo conn` sub-commands to manage connections:
--   `frodo conn list` to list all the connections frodo currently knows about for the current machine and user.
--   `frodo conn add` to add a new connection profile.
--   `frodo conn describe` to see all the details of a connection profile.
--   `frodo conn delete` to remove a connection profile.
+
+- `frodo conn list` to list all the connections frodo currently knows about for the current machine and user.
+- `frodo conn add` to add a new connection profile.
+- `frodo conn describe` to see all the details of a connection profile.
+- `frodo conn delete` to remove a connection profile.
 
 Once `frodo` saves a connection, you don't have to provide the `host`, `username`, and `password` arguments. You can reference your connection using any unique substring from your host. This is the most common way users would run frodo. For example, if `https://openam-example-use1-dev.id.forgerock.io/am` and `https://openam-example-use1-staging.id.forgerock.io/am` are two saved ForgeRock connections from previous commands, one would simply use:
 
 ```console
 frodo info example-use1-dev
 ```
+
 OR
+
 ```console
 frodo info example-use1-staging
 ```
 
 ### cli options
+
 You interact with `frodo` using commands and options. You can see the list of options by using the `help` command
 
 ```console
@@ -264,10 +201,13 @@ Options:
 ```
 
 ## Feature requests
+
 Please use the repository's [issues](https://github.com/rockcarver/frodo/issues) to request new features/enhancements or report bugs/issues.
 
 ## Contributing
+
 If you would like to contribute to frodo, please refer to the [contributing instructions](../docs/CONTRIBUTE.md).
 
 ## Maintaining
-If you are a maintainer of this repository, please refer to the [pipeline and release process instructions](../docs/PIPELINE.md).
+
+If you are a maintainer of this repository, please refer to the [pipeline and release process instructions](../docs/PIPELINE.md).

package/.github/workflows/pipeline.yml

@@ -1,4 +1,4 @@
-name: 'Frodo Release Pipeline'
+name: 'Frodo CLI Release Pipeline'
 
 on:
   push:
@@ -47,6 +47,14 @@ jobs:
       #
       # Run tests.
       #
+      - name: Lint & Fix
+        run: |
+          npm run lint -- --fix
+
+      - name: CLI Help Test
+        run: |
+          npm test
+
       - name: Version Test
         run: |
           frodo -v

package/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.11.1-0] - 2022-08-19
+
 ## [0.10.4] - 2022-08-13
 
 ### Added
@@ -402,7 +404,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Fixed problem with adding connection profiles
 -   Miscellaneous bug fixes
 
-[Unreleased]: https://github.com/rockcarver/frodo/compare/v0.10.4...HEAD
+[Unreleased]: https://github.com/rockcarver/frodo-cli/compare/v0.11.1-0...HEAD
+
+[0.11.1-0]: https://github.com/rockcarver/frodo-cli/compare/v0.10.4...v0.11.1-0
 
 [0.10.4]: https://github.com/rockcarver/frodo/compare/v0.10.3...v0.10.4
 

package/README.md

@@ -1,8 +1,8 @@
 <!-- README.md for NPM; the one for GitHub is .github/README.md. -->
-# Frodo - ForgeROck DO
+# Frodo Command Line Interface
 
-This is the ForgeROck DO - or short frodo - command line interface, a CLI to manage ForgeRock platform deployments. Frodo supports Identity Cloud tenants, ForgeOps deployments, and classic deployments.
+ForgeROck DO Command Line Interface, frodo-cli, a CLI to manage ForgeRock platform deployments supporting Identity Cloud tenants, ForgeOps deployments, and classic deployments.
 
 Frodo is the successor to field tools like [amtree.sh](https://github.com/vscheuber/AM-treetool), [fidc-debug-tools](https://github.com/vscheuber/fidc-debug-tools), and ForgeRock-internal utilities.
 
-Please refer to the [GitHub README](https://github.com/rockcarver/frodo#readme) for full documentation.
+Please refer to the [GitHub README](https://github.com/rockcarver/frodo-cli#readme) for full documentation.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rockcarver/frodo-cli",
-  "version": "0.10.4",
+  "version": "0.11.1-0",
   "type": "module",
   "description": "This is the ForgeROck DO (FRODO) command line interface, a CLI to manage the ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
   "keywords": [
@@ -20,20 +20,18 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/rockcarver/frodo.git"
+    "url": "https://github.com/rockcarver/frodo-cli.git"
   },
   "bugs": {
-    "url": "https://github.com/rockcarver/frodo/issues"
+    "url": "https://github.com/rockcarver/frodo-cli/issues"
   },
   "main": "src/app.js",
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
     "test:list": "node --experimental-vm-modules node_modules/jest/bin/jest.js --listTests",
     "test:e2e": "node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand e2e",
-    "test:e2e:list": "node --experimental-vm-modules node_modules/jest/bin/jest.js --listTests e2e"
-  },
-  "jest": {
-    "globalSetup": "<rootDir>/test/global/setup.js"
+    "test:e2e:list": "node --experimental-vm-modules node_modules/jest/bin/jest.js --listTests e2e",
+    "lint": "eslint --ext .js --ignore-path .gitignore ."
   },
   "contributors": [
     {
@@ -81,6 +79,7 @@
   },
   "dependencies": {
     "@colors/colors": "^1.5.0",
+    "@rockcarver/frodo-lib": "^0.11.1-3",
     "axios": "^0.27.2",
     "axios-retry": "^3.3.1",
     "cli-progress": "^3.11.2",
@@ -119,6 +118,7 @@
     "gulp-sourcemaps": "^3.0.0",
     "jest": "^28.1.3",
     "map-stream": "^0.0.7",
-    "pkg": "^5.8.0"
+    "pkg": "^5.8.0",
+    "prettier": "^2.7.1"
   }
 }

package/src/app.js

@@ -1,10 +1,9 @@
 #!/usr/bin/env -S node --no-warnings --enable-source-maps
 
+import { ConnectionProfile } from '@rockcarver/frodo-lib';
 import fs from 'fs';
 import { Command } from 'commander';
-import { initConnectionProfiles } from './ops/ConnectionProfileOps.js';
 // import pkg from '../package.json' assert { type: 'json' };
-import { printMessage } from './ops/utils/Console.js';
 
 // commands
 import admin from './cli/admin/admin.js';
@@ -26,7 +25,9 @@ const pkg = JSON.parse(
   fs.readFileSync(new URL('../package.json', import.meta.url))
 );
 
-const program = new Command(pkg.name).version(
+const { initConnectionProfiles } = ConnectionProfile;
+
+const program = new Command('frodo').version(
   `v${pkg.version} [${process.version}]`,
   '-v, --version'
 );
@@ -54,6 +55,6 @@ const program = new Command(pkg.name).version(
     program.enablePositionalOptions();
     program.parse();
   } catch (e) {
-    printMessage(`ERROR: exception running frodo - ${e}`, 'error');
+    console.log(`ERROR: exception running frodo - ${e}`, 'error');
   }
 })();

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

package/src/cli/_template/cmd-list.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 list');
 
@@ -21,12 +22,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/_template/cmd-sub1-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 sub1 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/_template/cmd-sub1-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 sub1 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/_template/cmd-sub1-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 cmd sub1 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/_template/cmd-sub1-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 cmd sub1 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
       }