opal-security 3.1.1-beta.50f7f9f → 3.1.1-beta.5457bdf

package/README.md

@@ -22,7 +22,7 @@ $ npm install -g opal-security
 $ opal COMMAND
 running command...
 $ opal (--version)
-opal-security/3.1.1-beta.50f7f9f linux-x64 node-v20.19.2
+opal-security/3.1.1-beta.5457bdf linux-x64 node-v20.19.2
 $ opal --help [COMMAND]
 USAGE
   $ opal COMMAND
@@ -53,6 +53,7 @@ USAGE
 * [`opal ssh copyTo`](#opal-ssh-copyto)
 * [`opal ssh start`](#opal-ssh-start)
 * [`opal version`](#opal-version)
+* [`opal whoami`](#opal-whoami)
 
 ## `opal autocomplete [SHELL]`
 
@@ -101,7 +102,7 @@ EXAMPLES
   $ opal aws:identity
 ```
 
-_See code: [src/commands/aws/identity.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/aws/identity.ts)_
+_See code: [src/commands/aws/identity.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/aws/identity.ts)_
 
 ## `opal clear-auth-provider`
 
@@ -121,7 +122,7 @@ EXAMPLES
   $ opal clear-auth-provider
 ```
 
-_See code: [src/commands/clear-auth-provider.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/clear-auth-provider.ts)_
+_See code: [src/commands/clear-auth-provider.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/clear-auth-provider.ts)_
 
 ## `opal curl-example`
 
@@ -138,7 +139,7 @@ DESCRIPTION
   Prints out an example cURL command containing the parameters the CLI uses to query the Opal server.
 ```
 
-_See code: [src/commands/curl-example.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/curl-example.ts)_
+_See code: [src/commands/curl-example.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/curl-example.ts)_
 
 ## `opal groups get`
 
@@ -159,7 +160,7 @@ EXAMPLES
   $ opal groups:get --id 54052a3e-5375-4392-aeaf-0c6c44c131d4
 ```
 
-_See code: [src/commands/groups/get.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/groups/get.ts)_
+_See code: [src/commands/groups/get.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/groups/get.ts)_
 
 ## `opal help [COMMANDS]`
 
@@ -209,7 +210,7 @@ EXAMPLES
   $ opal iam-roles:start --id 51f7176b-0464-4a6f-8369-e951e187b398 --profileName "custom-profile"
 ```
 
-_See code: [src/commands/iam-roles/start.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/iam-roles/start.ts)_
+_See code: [src/commands/iam-roles/start.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/iam-roles/start.ts)_
 
 ## `opal kube-roles start`
 
@@ -240,7 +241,7 @@ EXAMPLES
   $ opal kube-roles:start --id 51f7176b-0464-4a6f-8369-e951e187b398 --accessLevelRemoteId "arn:aws:iam::712234975475:role/acme-eks-cluster-admin-role"
 ```
 
-_See code: [src/commands/kube-roles/start.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/kube-roles/start.ts)_
+_See code: [src/commands/kube-roles/start.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/kube-roles/start.ts)_
 
 ## `opal login`
 
@@ -261,7 +262,7 @@ EXAMPLES
   $ opal login
 ```
 
-_See code: [src/commands/login.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/login.ts)_
 
 ## `opal logout`
 
@@ -281,7 +282,7 @@ EXAMPLES
   $ opal logout
 ```
 
-_See code: [src/commands/logout.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/logout.ts)_
+_See code: [src/commands/logout.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/logout.ts)_
 
 ## `opal postgres-instances start`
 
@@ -318,7 +319,7 @@ EXAMPLES
   $ opal postgres-instances:start --id 51f7176b-0464-4a6f-8369-e951e187b398 --accessLevelRemoteId fullaccess --action view
 ```
 
-_See code: [src/commands/postgres-instances/start.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/postgres-instances/start.ts)_
+_See code: [src/commands/postgres-instances/start.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/postgres-instances/start.ts)_
 
 ## `opal resources get`
 
@@ -339,7 +340,7 @@ EXAMPLES
   $ opal resources:get --id 54052a3e-5375-4392-aeaf-0c6c44c131d4
 ```
 
-_See code: [src/commands/resources/get.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/resources/get.ts)_
+_See code: [src/commands/resources/get.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/resources/get.ts)_
 
 ## `opal set-auth-provider`
 
@@ -365,7 +366,7 @@ EXAMPLES
   $ opal set-auth-provider --clientID 1234asdf --issuerUrl https://auth.example.com
 ```
 
-_See code: [src/commands/set-auth-provider.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/set-auth-provider.ts)_
+_See code: [src/commands/set-auth-provider.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/set-auth-provider.ts)_
 
 ## `opal set-custom-header`
 
@@ -386,7 +387,7 @@ EXAMPLES
   $ opal set-custom-header --header 'cf-access-token: $TOKEN'
 ```
 
-_See code: [src/commands/set-custom-header.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/set-custom-header.ts)_
+_See code: [src/commands/set-custom-header.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/set-custom-header.ts)_
 
 ## `opal set-token`
 
@@ -406,7 +407,7 @@ EXAMPLES
   $ opal set-token
 ```
 
-_See code: [src/commands/set-token.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/set-token.ts)_
+_See code: [src/commands/set-token.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/set-token.ts)_
 
 ## `opal set-url [URL]`
 
@@ -430,7 +431,7 @@ EXAMPLES
   $ opal set-url
 ```
 
-_See code: [src/commands/set-url.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/set-url.ts)_
+_See code: [src/commands/set-url.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/set-url.ts)_
 
 ## `opal ssh copyFrom`
 
@@ -461,7 +462,7 @@ EXAMPLES
   $ opal ssh:copyFrom --src instance/dir --dest my/dir --id 51f7176b-0464-4a6f-8369-e951e187b398
 ```
 
-_See code: [src/commands/ssh/copyFrom.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/ssh/copyFrom.ts)_
+_See code: [src/commands/ssh/copyFrom.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/ssh/copyFrom.ts)_
 
 ## `opal ssh copyTo`
 
@@ -492,7 +493,7 @@ EXAMPLES
   $ opal ssh:copyTo --src my/dir --dest instance/dir --id 51f7176b-0464-4a6f-8369-e951e187b398
 ```
 
-_See code: [src/commands/ssh/copyTo.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/ssh/copyTo.ts)_
+_See code: [src/commands/ssh/copyTo.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/ssh/copyTo.ts)_
 
 ## `opal ssh start`
 
@@ -519,7 +520,7 @@ EXAMPLES
   $ opal ssh:start --id 51f7176b-0464-4a6f-8369-e951e187b398
 ```
 
-_See code: [src/commands/ssh/start.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.50f7f9f/src/commands/ssh/start.ts)_
+_See code: [src/commands/ssh/start.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/ssh/start.ts)_
 
 ## `opal version`
 
@@ -540,4 +541,21 @@ FLAG DESCRIPTIONS
 ```
 
 _See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v2.2.27/src/commands/version.ts)_
+
+## `opal whoami`
+
+Describes current url set, organization name, and logged in user if applicabled.
+
+```
+USAGE
+  $ opal whoami [-h]
+
+FLAGS
+  -h, --help  Show CLI help.
+
+DESCRIPTION
+  Describes current url set, organization name, and logged in user if applicabled.
+```
+
+_See code: [src/commands/whoami.ts](https://github.com/opalsecurity/opal-cli/blob/v3.1.1-beta.5457bdf/src/commands/whoami.ts)_
 <!-- commandsstop -->

package/lib/commands/login.js

@@ -88,12 +88,14 @@ class Login extends core_1.Command {
             const configData = (0, config_1.getOrCreateConfigData)(configDir);
             let email = flags.email;
             let organizationId;
+            let organizationName;
             let clientIDCandidate;
             const existingCreds = await (0, credentials_1.getOpalCredentials)(this, false);
             // Only use the previous email + organizationID if email isn't explicitly specified.
             if (!email) {
                 email = existingCreds.email;
                 organizationId = existingCreds.organizationID;
+                organizationName = existingCreds.organizationName;
                 clientIDCandidate = existingCreds.clientIDCandidate;
             }
             await (0, credentials_1.removeOpalCredentials)(this);
@@ -149,6 +151,7 @@ class Login extends core_1.Command {
                 if (signInOrganizations && signInOrganizations.length > 0) {
                     if (signInOrganizations.length === 1) {
                         organizationId = signInOrganizations[0].organizationId;
+                        organizationName = signInOrganizations[0].organizationName;
                         clientIDCandidate = signInOrganizations[0].cliClientId;
                     }
                     else {
@@ -164,6 +167,7 @@ class Login extends core_1.Command {
                             },
                         ]);
                         organizationId = responses.signInOrganization.organizationId;
+                        organizationName = responses.signInOrganization.organizationName;
                         clientIDCandidate = responses.signInOrganization.cliClientId;
                     }
                 }
@@ -238,10 +242,10 @@ class Login extends core_1.Command {
             if (tokenExchangeError) {
                 this.log("WARN: Failed to exchange access token for session in Opal. Falling back to using access token for authenticating requests\n");
                 // TODO: consider adding a warn line recommending upgrading Opal to version XYZ, once accompanying PR is pushed to prod
-                await (0, credentials_1.setOpalCredentials)(this, email, organizationId !== null && organizationId !== void 0 ? organizationId : "", clientIDCandidate, (tokenSet === null || tokenSet === void 0 ? void 0 : tokenSet.access_token) || "", credentials_1.SecretType.ApiToken);
+                await (0, credentials_1.setOpalCredentials)(this, email, organizationId !== null && organizationId !== void 0 ? organizationId : "", clientIDCandidate, (tokenSet === null || tokenSet === void 0 ? void 0 : tokenSet.access_token) || "", credentials_1.SecretType.ApiToken, organizationName);
             }
             else {
-                await (0, credentials_1.setOpalCredentials)(this, email, organizationId !== null && organizationId !== void 0 ? organizationId : "", clientIDCandidate, apollo_1.cookieStr, credentials_1.SecretType.Cookie);
+                await (0, credentials_1.setOpalCredentials)(this, email, organizationId !== null && organizationId !== void 0 ? organizationId : "", clientIDCandidate, apollo_1.cookieStr, credentials_1.SecretType.Cookie, organizationName);
             }
             // "Representative" authenticated call to check the log-in worked as expected.
             const { resp: authCheckResp, error: authCheckErr } = await (0, handler_1.runQueryDeprecated)({

package/lib/commands/request/create.d.ts

@@ -5,6 +5,8 @@ export default class RequestCreate extends Command {
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         id: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        reason: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        duration: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/request/create.js

@@ -14,7 +14,8 @@ class RequestCreate extends core_1.Command {
         const { flags } = await this.parse(RequestCreate);
         const metadata = (0, requests_1.initEmptyRequestMetadata)();
         if (flags.id) {
-            (0, requests_1.bypassRequestSelection)(this, client, flags.id, metadata);
+            // if IDs are provided, bypass the interactive selection process
+            await (0, requests_1.bypassRequestSelection)(this, client, flags.id, metadata);
         }
         else {
             (0, displays_1.headerMessage)(this);
@@ -32,13 +33,27 @@ class RequestCreate extends core_1.Command {
         // Step 4: Set Request Defaults
         await (0, requests_1.setRequestDefaults)(this, client, metadata);
         // Step 4: Prompt for request reason
-        await (0, requests_1.promptForReason)(metadata);
+        if (flags.reason) {
+            metadata.reason = flags.reason;
+        }
+        else if (!(metadata.requestDefaults.reasonOptional && flags.id && flags.duration)) {
+            await (0, requests_1.promptForReason)(metadata);
+        }
         // Step 5: Prompt for expiration
-        await (0, requests_1.promptForExpiration)(metadata);
+        if (flags.duration) {
+            (0, requests_1.bypassDuration)(this, flags.duration, metadata);
+        }
+        else {
+            await (0, requests_1.promptForExpiration)(metadata);
+        }
         // Step 6: Display final summary of request
-        (0, displays_1.displayFinalRequestSummary)(this, metadata);
-        // Step 7: Prompt for final submition
-        await (0, requests_1.submitFinalRequest)(this, client, metadata);
+        let canSubmit = true;
+        if (!(flags.id && flags.reason && flags.duration)) {
+            canSubmit = await (0, requests_1.promptRequestSubmission)(this, metadata);
+        }
+        // Step 7: Prompt for final submission
+        if (canSubmit)
+            await (0, requests_1.submitFinalRequest)(this, client, metadata);
     }
 }
 RequestCreate.hidden = true;
@@ -48,7 +63,16 @@ RequestCreate.flags = {
     id: core_1.Flags.string({
         char: "i",
         multiple: true,
-        description: "The id of the asset (resource, group) to request access to. Append a role ID using a colon if needed, e.g. `--id 123:456`.",
+        description: "The id of the asset (resource, group) to request access to. Append a role ID using a colon if needed, e.g. `--id 123:456`.\
+        \n If not provided, an interactive selection flow will be available to select assets to request.",
+    }),
+    reason: core_1.Flags.string({
+        char: "r",
+        description: "The reason for the request, contained in quotes. If not provided, you will be prompted.",
+    }),
+    duration: core_1.Flags.integer({
+        char: "d",
+        description: "The duration of access for the request in minutes. If not provided, you will be prompted.",
     }),
 };
 exports.default = RequestCreate;

package/lib/commands/whoami.d.ts

@@ -0,0 +1,8 @@
+import { Command } from "@oclif/core";
+export default class WhoAmI extends Command {
+    static description: string;
+    static flags: {
+        help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
+    };
+    run(): Promise<void>;
+}

package/lib/commands/whoami.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const config_1 = require("../lib/config");
+const credentials_1 = require("../lib/credentials");
+const flags_1 = require("../lib/flags");
+class WhoAmI extends core_1.Command {
+    async run() {
+        const opalCreds = await (0, credentials_1.getOpalCredentials)(this, false);
+        const organizationName = opalCreds === null || opalCreds === void 0 ? void 0 : opalCreds.organizationName;
+        const email = opalCreds === null || opalCreds === void 0 ? void 0 : opalCreds.email;
+        const configData = (0, config_1.getOrCreateConfigData)(this.config.configDir);
+        const url = configData[config_1.urlKey];
+        if (email) {
+            this.log(`User:         ${email}`);
+        }
+        if (organizationName) {
+            if (organizationName === "unset-org-id") {
+                this.log("Authenticated with Opal API Token.");
+            }
+            else {
+                this.log(`Organization: ${organizationName}`);
+            }
+        }
+        if (url) {
+            this.log(`Server:       ${url}`);
+        }
+    }
+}
+WhoAmI.description = "Describes current url set, organization name, and logged in user if applicabled.";
+WhoAmI.flags = {
+    help: flags_1.SHARED_FLAGS.help,
+};
+exports.default = WhoAmI;

package/lib/lib/apollo.js

@@ -155,7 +155,7 @@ const initClient = async (command, fetchAccessToken = true) => {
             return response;
         });
     });
-    const errorLink = (0, error_1.onError)(({ networkError, operation }) => {
+    const errorLink = (0, error_1.onError)(({ networkError, operation, forward }) => {
         var _a;
         // There's a few GQL operations where we don't want to use this error handler:
         const customErrorOperations = [
@@ -186,7 +186,7 @@ const initClient = async (command, fetchAccessToken = true) => {
                 case 401: {
                     command.log("Your session is invalid or expired. Authenticating now...\n");
                     const loginCommand = new login_1.default([], command.config);
-                    loginCommand.run().then(() => {
+                    return (0, core_1.fromPromise)(loginCommand.run().then(() => {
                         if (cmd_1.mostRecentCommandTime && cmd_1.mostRecentCommand) {
                             const lastCommandReexecutionDuration = moment.duration(2, "minutes");
                             const lastCommandReexecutionDurationHasElapsed = cmd_1.mostRecentCommandTime.add(lastCommandReexecutionDuration) >
@@ -195,8 +195,7 @@ const initClient = async (command, fetchAccessToken = true) => {
                                 cmd_1.mostRecentCommand.run();
                             }
                         }
-                    });
-                    break;
+                    })).flatMap(() => forward(operation));
                 }
                 default:
                     return (0, exports.handleError)(command, `Received status code ${networkError.statusCode} from server${errorMessage ? ` with message "${errorMessage}"` : ""}`);

package/lib/lib/credentials/index.d.ts

@@ -5,12 +5,13 @@ interface OpalCredentials {
     clientIDCandidate?: string;
     secret?: string;
     secretType?: SecretType;
+    organizationName?: string;
 }
 export declare enum SecretType {
     Cookie = "COOKIE",
     ApiToken = "API_TOKEN"
 }
-export declare const setOpalCredentials: (command: Command, email: string | undefined, organizationID: string, clientIDCandidate: string | undefined | null, secret: string, secretType: SecretType) => Promise<void>;
+export declare const setOpalCredentials: (command: Command, email: string | undefined, organizationID: string, clientIDCandidate: string | undefined | null, secret: string, secretType: SecretType, organizationName?: string) => Promise<void>;
 export declare const getOpalCredentials: (command: Command, includeAuthSecret?: boolean) => Promise<OpalCredentials>;
 export declare const removeOpalCredentials: (command: Command) => Promise<void>;
 export {};

package/lib/lib/credentials/index.js

@@ -9,13 +9,14 @@ var SecretType;
     SecretType["Cookie"] = "COOKIE";
     SecretType["ApiToken"] = "API_TOKEN";
 })(SecretType || (exports.SecretType = SecretType = {}));
-const setOpalCredentials = async (command, email, organizationID, clientIDCandidate, secret, secretType) => {
+const setOpalCredentials = async (command, email, organizationID, clientIDCandidate, secret, secretType, organizationName) => {
     const givenEmail = email || "email-unset";
     const configData = (0, config_1.getOrCreateConfigData)(command.config.configDir);
     configData.creds = {
         clientIDCandidate,
         email,
         organizationID,
+        organizationName,
         secretType,
     };
     (0, config_1.writeConfigData)(command.config.configDir, configData);

package/lib/lib/requests.d.ts

@@ -1,16 +1,17 @@
 import type { NormalizedCacheObject } from "@apollo/client/core";
 import type { ApolloClient } from "@apollo/client/core/ApolloClient";
 import type { Command } from "@oclif/core/lib/command";
+import { type AppType, type ConnectionType, EntityType } from "../graphql/graphql";
 type AppNode = {
     appId: string;
     appName: string;
-    appType?: string;
+    appType?: AppType | ConnectionType;
     assets: Record<string, AssetNode>;
 };
 type AssetNode = {
     assetId: string;
     assetName: string;
-    type: string;
+    type: EntityType;
     roles?: Record<string, RoleNode>;
 };
 type RoleNode = {
@@ -44,6 +45,8 @@ export declare function doneSelectingAssets(): Promise<boolean>;
 export declare function setRequestDefaults(cmd: Command, client: ApolloClient<NormalizedCacheObject>, metadata: RequestMetadata): Promise<void>;
 export declare function promptForReason(metadata: RequestMetadata): Promise<void>;
 export declare function promptForExpiration(metadata: RequestMetadata): Promise<void>;
+export declare function promptRequestSubmission(cmd: Command, metadata: RequestMetadata): Promise<boolean>;
 export declare function submitFinalRequest(cmd: Command, client: ApolloClient<NormalizedCacheObject>, metadata: RequestMetadata): Promise<void>;
-export declare function bypassRequestSelection(cmd: Command, client: ApolloClient<NormalizedCacheObject>, flagIds: string[], metadata: RequestMetadata): Promise<void>;
+export declare function bypassRequestSelection(cmd: Command, client: ApolloClient<NormalizedCacheObject>, flagValue: string[], metadata: RequestMetadata): Promise<void>;
+export declare function bypassDuration(cmd: Command, duration: number, metadata: RequestMetadata): void;
 export {};

package/lib/lib/requests.js

@@ -6,15 +6,27 @@ exports.doneSelectingAssets = doneSelectingAssets;
 exports.setRequestDefaults = setRequestDefaults;
 exports.promptForReason = promptForReason;
 exports.promptForExpiration = promptForExpiration;
+exports.promptRequestSubmission = promptRequestSubmission;
 exports.submitFinalRequest = submitFinalRequest;
 exports.bypassRequestSelection = bypassRequestSelection;
+exports.bypassDuration = bypassDuration;
 const chalk_1 = require("chalk");
-const inquirer = require("inquirer");
 const graphql_1 = require("../graphql");
 const graphql_2 = require("../graphql/graphql");
 const displays_1 = require("../utils/displays");
 const config_1 = require("./config");
-const { AutoComplete, Select, prompt, Form } = require("enquirer");
+const { AutoComplete, Select, prompt, Form, confirm } = require("enquirer");
+function entityTypeFromString(str) {
+    const capStr = str === null || str === void 0 ? void 0 : str.toLocaleUpperCase();
+    if (capStr === "RESOURCE") {
+        return graphql_2.EntityType.Resource;
+    }
+    if (capStr === "GROUP") {
+        return graphql_2.EntityType.Group;
+    }
+    // if type unknown, default to resource
+    return graphql_2.EntityType.Resource;
+}
 function initEmptyRequestMetadata() {
     // Initialize with empty defaults
     const requestDefaults = {
@@ -167,7 +179,7 @@ async function queryRequestableAssets(cmd, client, appId, input) {
                         value: {
                             name: name || "",
                             id: id || "",
-                            type: ((_g = item.resource) === null || _g === void 0 ? void 0 : _g.__typename) || ((_h = item.group) === null || _h === void 0 ? void 0 : _h.__typename) || "",
+                            type: entityTypeFromString(((_g = item.resource) === null || _g === void 0 ? void 0 : _g.__typename) || ((_h = item.group) === null || _h === void 0 ? void 0 : _h.__typename)),
                         },
                     };
                 });
@@ -611,11 +623,14 @@ async function queryAssociatedItems(cmd, client, id, input) {
     }
 }
 // Helper functions
+const selectInstructions = chalk_1.default.dim("[↑↓] Navigate · [Enter] Select · Type to filter");
+const multiSelectInstructions = chalk_1.default.dim("[↑↓] Navigate · [Space] Select · [Enter] Confirm · Type to filter");
 async function selectRequestableItems(cmd, client, requestMap) {
     const initial = (await queryRequestableApps(cmd, client, "")) || [];
     const appPrompt = new AutoComplete({
         name: "App",
-        message: "Select an app:",
+        message: "Select an app",
+        hint: selectInstructions,
         limit: 15,
         choices: initial,
         async suggest(input) {
@@ -643,6 +658,7 @@ async function chooseOktaAzureRoles(cmd, client, app, requestMap) {
     const rolePrompt = new AutoComplete({
         name: "Roles",
         message: `Select a role for ${app.name}:`,
+        hint: multiSelectInstructions,
         limit: 15,
         multiple: true,
         async choices(input) {
@@ -653,7 +669,7 @@ async function chooseOktaAzureRoles(cmd, client, app, requestMap) {
         },
         validate: (answer) => {
             if (answer.length !== 1) {
-                return "You must select only one item.";
+                return "Only one role is allowed to be requested for on Okta or Azure apps.";
             }
             return true;
         },
@@ -665,7 +681,7 @@ async function chooseOktaAzureRoles(cmd, client, app, requestMap) {
             entry.assets[role.id] = {
                 assetId: role.id,
                 assetName: role.name,
-                type: role.type || graphql_2.EntityType.Resource,
+                type: entityTypeFromString(role.type),
                 roles: {},
             };
         }
@@ -717,6 +733,7 @@ async function chooseAssets(cmd, client, appId, requestMap) {
     const assetPrompt = new AutoComplete({
         name: "Assets",
         message: "Select one or more assets:",
+        hint: multiSelectInstructions,
         limit: 15,
         multiple: true,
         async choices(input) {
@@ -766,6 +783,7 @@ async function chooseRoles(cmd, client, appId, assetId, requestMap) {
     const rolePrompt = new AutoComplete({
         name: "Roles",
         message: `Select one or more roles for ${assetEntry.assetName}:`,
+        hint: multiSelectInstructions,
         limit: 15,
         multiple: true,
         choices: assetRoles,
@@ -856,7 +874,7 @@ async function promptForReason(metadata) {
     const { reason } = await prompt([
         {
             name: "reason",
-            message: "I need access to this because...",
+            message: "Why do you need access?",
             type: "input",
             validate: (answer) => {
                 if (!metadata.requestDefaults.reasonOptional && answer.length < 1) {
@@ -978,148 +996,135 @@ async function setCustomDuration(metadata) {
         label: durationLabel,
     };
 }
-async function submitFinalRequest(cmd, client, metadata) {
-    var _a, _b, _c, _d;
+async function promptRequestSubmission(cmd, metadata) {
+    (0, displays_1.displayFinalRequestSummary)(cmd, metadata);
     const submitMessage = "✅ Yes, submit request";
     const cancelMessage = "❌ No, cancel request";
-    const { submit } = await inquirer.prompt([
-        {
-            name: "submit",
-            message: "Submit request?",
-            type: "list",
-            choices: [submitMessage, cancelMessage],
-        },
-    ]);
-    switch (submit) {
-        case submitMessage: {
-            // Build requested assets lists for the mutation
-            const requestedResources = [];
-            const requestedGroups = [];
-            for (const appNode of Object.values(metadata.requestMap)) {
-                // This extraction is different than the one in setRequestDefaults.
-                // Both extract the requestedResources and requestedGroups,
-                // use different formats.
-                for (const [assetId, assetNode] of Object.entries(appNode.assets)) {
-                    if (assetNode.roles !== undefined) {
-                        const mappedRoles = Object.entries(assetNode.roles).map(([roleId, _roleNode]) => {
-                            return roleId;
-                        });
-                        const roleIds = mappedRoles.length ? mappedRoles : [""];
-                        for (const roleId of roleIds) {
-                            switch (assetNode.type) {
-                                case graphql_2.EntityType.Resource: {
-                                    requestedResources.push({
-                                        resourceId: assetId,
-                                        accessLevel: {
-                                            accessLevelName: ((_b = (_a = assetNode.roles) === null || _a === void 0 ? void 0 : _a[roleId]) === null || _b === void 0 ? void 0 : _b.roleName) || "",
-                                            accessLevelRemoteId: roleId,
-                                        },
-                                    });
-                                    break;
-                                }
-                                case graphql_2.EntityType.Group: {
-                                    requestedGroups.push({
-                                        groupId: assetId,
-                                        accessLevel: {
-                                            accessLevelName: ((_d = (_c = assetNode.roles) === null || _c === void 0 ? void 0 : _c[roleId]) === null || _d === void 0 ? void 0 : _d.roleName) || "",
-                                            accessLevelRemoteId: roleId,
-                                        },
-                                    });
-                                    break;
-                                }
-                            }
+    const prompt = new Select({
+        name: "submitOrCancel",
+        message: "Is this all you want to request?",
+        choices: [submitMessage, cancelMessage],
+    });
+    const submitOrCancel = await prompt.run();
+    return submitOrCancel === submitMessage;
+}
+async function submitFinalRequest(cmd, client, metadata) {
+    var _a, _b, _c, _d;
+    // Build requested assets lists for the mutation
+    const requestedResources = [];
+    const requestedGroups = [];
+    for (const appNode of Object.values(metadata.requestMap)) {
+        // This extraction is different than the one in setRequestDefaults.
+        // Both extract the requestedResources and requestedGroups,
+        // use different formats.
+        for (const [assetId, assetNode] of Object.entries(appNode.assets)) {
+            if (assetNode.roles) {
+                const mappedRoles = Object.entries(assetNode.roles).map(([roleId, _roleNode]) => {
+                    return roleId;
+                });
+                const roleIds = mappedRoles.length > 0 ? mappedRoles : [""];
+                for (const roleId of roleIds) {
+                    switch (assetNode.type) {
+                        case graphql_2.EntityType.Resource: {
+                            requestedResources.push({
+                                resourceId: assetId,
+                                accessLevel: {
+                                    accessLevelName: ((_b = (_a = assetNode.roles) === null || _a === void 0 ? void 0 : _a[roleId]) === null || _b === void 0 ? void 0 : _b.roleName) || "",
+                                    accessLevelRemoteId: roleId,
+                                },
+                            });
+                            break;
+                        }
+                        case graphql_2.EntityType.Group: {
+                            requestedGroups.push({
+                                groupId: assetId,
+                                accessLevel: {
+                                    accessLevelName: ((_d = (_c = assetNode.roles) === null || _c === void 0 ? void 0 : _c[roleId]) === null || _d === void 0 ? void 0 : _d.roleName) || "",
+                                    accessLevelRemoteId: roleId,
+                                },
+                            });
+                            break;
                         }
                     }
                 }
             }
-            const resp = await createRequest(cmd, client, requestedResources, requestedGroups, metadata.reason, metadata.durationInMinutes);
-            // Build link to request
-            const configData = (0, config_1.getOrCreateConfigData)(cmd.config.configDir);
-            if (resp === null || resp === void 0 ? void 0 : resp.id) {
-                cmd.log("\n🎉 Your Access Request has been submitted!\n");
-                cmd.log(`${chalk_1.default.bold("ID: ")} ${chalk_1.default.cyan(resp === null || resp === void 0 ? void 0 : resp.id)}`);
-                if (resp === null || resp === void 0 ? void 0 : resp.status) {
-                    cmd.log((0, displays_1.getStyledStatus)(resp === null || resp === void 0 ? void 0 : resp.status));
-                }
-                const requestLink = `${configData[config_1.urlKey]}/requests/sent/${resp === null || resp === void 0 ? void 0 : resp.id}`;
-                cmd.log(`${chalk_1.default.bold("Link:")} ${chalk_1.default.underline(requestLink)}\n`);
-            }
-            return;
         }
-        case cancelMessage: {
-            cmd.log("🚫 Access Request has been cancelled.");
-            return;
-        }
-        default: {
-            cmd.error("Unknown error occurred.");
+    }
+    const resp = await createRequest(cmd, client, requestedResources, requestedGroups, metadata.reason, metadata.durationInMinutes);
+    // Build link to request
+    const configData = (0, config_1.getOrCreateConfigData)(cmd.config.configDir);
+    if (resp === null || resp === void 0 ? void 0 : resp.id) {
+        cmd.log("\n🎉 Your Access Request has been submitted!\n");
+        cmd.log(`${chalk_1.default.bold("ID: ")} ${chalk_1.default.cyan(resp === null || resp === void 0 ? void 0 : resp.id)}`);
+        if (resp === null || resp === void 0 ? void 0 : resp.status) {
+            cmd.log((0, displays_1.getStyledStatus)(resp === null || resp === void 0 ? void 0 : resp.status));
         }
+        const requestLink = `${configData[config_1.urlKey]}/requests/sent/${resp === null || resp === void 0 ? void 0 : resp.id}`;
+        cmd.log(`${chalk_1.default.bold("Link:")} ${chalk_1.default.underline(requestLink)}\n`);
     }
+    return;
 }
-async function bypassRequestSelection(cmd, client, flagIds, metadata) {
+async function bypassRequestSelection(cmd, client, flagValue, metadata) {
     var _a, _b;
     try {
-        for (const id of flagIds) {
+        // Query Catalog Item endpoint to identify what the id belongs to (resource or group)
+        for (const id of flagValue) {
+            const [assetId, roleName] = id.split(":");
             const resp = await client.query({
                 query: CATALOG_ITEM,
                 variables: {
-                    uuid: id || "",
+                    uuid: assetId || "",
                 },
                 fetchPolicy: "network-only", // to avoid caching
             });
             switch (resp.data.catalogItem.__typename) {
+                case "Group":
                 case "Resource": {
-                    const resourceName = resp.data.catalogItem.displayName;
-                    const roles = (resp.data.catalogItem.accessLevels || [])
+                    const item = resp.data.catalogItem;
+                    const assetName = item.__typename === "Resource" ? item.displayName : item.name;
+                    const requestableRoles = (item.accessLevels || [])
                         // TODO: Support okta azure apps ?.filter((role) => role.accessLevelName !== "") // This assumes length == 1
                         .map((role) => ({
                         id: role.accessLevelRemoteId,
                         name: role.accessLevelName,
                     }));
-                    if (roles.length > 0 &&
-                        !(roles.length === 1 && roles[0].name === "")) {
-                        cmd.log(`Roles not implemented yet for resource ${resourceName}. Skipping roles selection.`); //TODO: Implement roles support
-                        continue;
-                    }
-                    const appId = ((_a = resp.data.catalogItem.connection) === null || _a === void 0 ? void 0 : _a.id) || "";
+                    const appId = ((_a = item.connection) === null || _a === void 0 ? void 0 : _a.id) || "";
                     if (!(appId in metadata.requestMap)) {
                         metadata.requestMap[appId] = {
-                            appName: ((_b = resp.data.catalogItem.connection) === null || _b === void 0 ? void 0 : _b.displayName) || "",
+                            appName: ((_b = item.connection) === null || _b === void 0 ? void 0 : _b.displayName) || "",
                             appId: appId,
                             assets: {},
                         };
                     }
                     const assetEntry = metadata.requestMap[appId].assets[id];
                     if (!assetEntry) {
-                        metadata.requestMap[appId].assets[id] = {
-                            assetId: id,
-                            assetName: resourceName,
-                            type: "Resource",
+                        metadata.requestMap[appId].assets[assetId] = {
+                            assetId: assetId,
+                            assetName: assetName,
+                            type: entityTypeFromString(item.__typename),
                             roles: {},
                         };
                     }
-                    if (roles) {
-                        if (!metadata.requestMap[appId].assets[id].roles) {
-                            metadata.requestMap[appId].assets[id].roles = {};
-                        }
-                        for (const role of roles) {
-                            metadata.requestMap[appId].assets[id].roles[role.id] = {
-                                roleId: role.id,
-                                roleName: role.name,
+                    if (requestableRoles.length > 0 &&
+                        !(requestableRoles.length === 1 && requestableRoles[0].name === "")) {
+                        const selectedRole = requestableRoles.find((role) => role.name === roleName);
+                        if (selectedRole !== undefined) {
+                            if (!metadata.requestMap[appId].assets[assetId].roles) {
+                                metadata.requestMap[appId].assets[assetId].roles = {};
+                            }
+                            metadata.requestMap[appId].assets[assetId].roles[selectedRole.id] = {
+                                roleId: selectedRole.id,
+                                roleName: selectedRole.name,
                             };
                         }
+                        else {
+                            cmd.error(`Access level specified does not match one of ${assetName}'s defined access levels: ${requestableRoles.map((role) => `"${role.name}"`)}`);
+                        }
                     }
                     break;
                 }
-                case "Group": {
-                    //TODO
-                    break;
-                }
-                case "Connection": {
-                    //TODO
-                    break;
-                }
                 default:
-                    cmd.error("Unknown error occurred.");
+                    cmd.error("Invalid asset id was passed in using the --id flag.");
             }
         }
     }
@@ -1130,3 +1135,10 @@ async function bypassRequestSelection(cmd, client, flagIds, metadata) {
     }
     return;
 }
+function bypassDuration(cmd, duration, metadata) {
+    const maxDuration = metadata.requestDefaults.maxDurationInMinutes;
+    if (maxDuration && duration > maxDuration) {
+        cmd.error(`The requested duration exceeds the allowed limit of ${maxDuration}`);
+    }
+    metadata.durationInMinutes = duration;
+}

package/lib/utils/displays.js

@@ -35,8 +35,10 @@ function treeifyRequestMap(cmd, requestMap) {
                 assetsTree[assetKey] = {};
                 for (const [_roleId, roleNode] of Object.entries(assetNode.roles)) {
                     const roleName = roleNode.roleName;
-                    const roleKey = `${roleName} ${chalk_1.default.dim("[Role]")}`;
-                    assetsTree[assetKey][roleKey] = null;
+                    if (roleName !== "") {
+                        const roleKey = `${roleName} ${chalk_1.default.dim("[Role]")}`;
+                        assetsTree[assetKey][roleKey] = null;
+                    }
                 }
             }
             else {

package/oclif.manifest.json

@@ -316,6 +316,34 @@
         "set-url.js"
       ]
     },
+    "whoami": {
+      "aliases": [],
+      "args": {},
+      "description": "Describes current url set, organization name, and logged in user if applicabled.",
+      "flags": {
+        "help": {
+          "char": "h",
+          "description": "Show CLI help.",
+          "name": "help",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "whoami",
+      "pluginAlias": "opal-security",
+      "pluginName": "opal-security",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "whoami.js"
+      ]
+    },
     "aws:identity": {
       "aliases": [],
       "args": {},
@@ -608,11 +636,27 @@
         },
         "id": {
           "char": "i",
-          "description": "The id of the asset (resource, group) to request access to. Append a role ID using a colon if needed, e.g. `--id 123:456`.",
+          "description": "The id of the asset (resource, group) to request access to. Append a role ID using a colon if needed, e.g. `--id 123:456`.        \n If not provided, an interactive selection flow will be available to select assets to request.",
           "name": "id",
           "hasDynamicHelp": false,
           "multiple": true,
           "type": "option"
+        },
+        "reason": {
+          "char": "r",
+          "description": "The reason for the request, contained in quotes. If not provided, you will be prompted.",
+          "name": "reason",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "duration": {
+          "char": "d",
+          "description": "The duration of access for the request in minutes. If not provided, you will be prompted.",
+          "name": "duration",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -987,5 +1031,5 @@
       ]
     }
   },
-  "version": "3.1.1-beta.50f7f9f"
+  "version": "3.1.1-beta.5457bdf"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opal-security",
   "description": "Opal allows you to centrally manage access to all of your sensitive systems.",
-  "version": "3.1.1-beta.50f7f9f",
+  "version": "3.1.1-beta.5457bdf",
   "author": "Stephen Cobbe",
   "bin": {
     "opal": "./bin/run"