opal-security 3.1.1-beta.778ef29 → 3.1.1-beta.7e1cc21

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/flags.js

@@ -7,7 +7,7 @@ exports.SHARED_FLAGS = {
     id: core_1.Flags.string({
         multiple: false,
         char: "i",
-        description: "The Opal ID of the resource. You can find this from the URL, e.g. https://opal.dev/resources/[ID]",
+        description: "The Opal ID of the asset. You can find this from the URL, e.g. https://opal.dev/resources/[ID]",
     }),
     accessLevelRemoteId: core_1.Flags.string({
         multiple: false,

package/lib/lib/requests.d.ts

@@ -1,22 +1,53 @@
 import type { NormalizedCacheObject } from "@apollo/client/core";
 import type { ApolloClient } from "@apollo/client/core/ApolloClient";
 import type { Command } from "@oclif/core/lib/command";
-export interface AppNode {
+import { type AppType, type ConnectionType, EntityType } from "../graphql/graphql";
+type AppNode = {
+    appId: string;
     appName: string;
-    assets: Map<string, AssetNode>;
-}
-export interface AssetNode {
+    appType?: AppType | ConnectionType;
+    assets: Record<string, AssetNode>;
+};
+type AssetNode = {
+    assetId: string;
     assetName: string;
-    roles?: Map<string, RoleNode>;
-}
-export interface RoleNode {
+    type: EntityType;
+    roles?: Record<string, RoleNode>;
+};
+type RoleNode = {
+    roleId: string;
     roleName: string;
-}
-export type RequestMap = Map<string, AppNode>;
+};
+export type RequestMap = Record<string, AppNode>;
+export declare const DISPLAY_LABELS: Partial<Record<EntityType, string>>;
+type DurationOption = {
+    durationInMinutes: number;
+    label: string;
+};
+type RequestDefaults = {
+    durationOptions?: DurationOption[];
+    recommendedDurationInMinutes?: number | null;
+    defaultDurationInMinutes?: number;
+    maxDurationInMinutes?: number | null;
+    requireSupportTicket?: boolean;
+    reasonOptional?: boolean;
+    requesterIsAdmin?: boolean;
+};
+export type RequestMetadata = {
+    requestMap: RequestMap;
+    requestDefaults: RequestDefaults;
+    durationLabel: string;
+    durationInMinutes?: number;
+    reason: string;
+};
+export declare function initEmptyRequestMetadata(): RequestMetadata;
 export declare function selectRequestableItems(cmd: Command, client: ApolloClient<NormalizedCacheObject>, requestMap: RequestMap): Promise<void>;
-export declare function chooseAssets(cmd: Command, client: ApolloClient<NormalizedCacheObject>, appId: string, requestMap: RequestMap): Promise<void>;
-export declare function chooseRoles(cmd: Command, client: ApolloClient<NormalizedCacheObject>, appId: string, assetId: string, requestMap: RequestMap): Promise<void>;
 export declare function doneSelectingAssets(): Promise<boolean>;
-export declare function promptForReason(): Promise<any>;
-export declare function promptForExpiration(): Promise<any>;
-export declare function submitFinalRequest(cmd: Command): Promise<void>;
+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>, flagValue: string[], metadata: RequestMetadata): Promise<void>;
+export declare function bypassDuration(cmd: Command, duration: number, metadata: RequestMetadata): void;
+export {};