opal-security 3.2.2 → 3.2.3

package/lib/lib/request/api/queries/assets.d.ts

@@ -1,6 +1,6 @@
-import type { ApolloClient, ApolloQueryResult, NormalizedCacheObject } from "@apollo/client";
+import type { ApolloClient } from "@apollo/client";
 import type { Command } from "@oclif/core";
 import type { GetCatalogItemQuery } from "../../../../graphql/graphql";
 import { type PromptChoice } from "../../types";
-export declare function queryRequestableAssets(cmd: Command, client: ApolloClient<NormalizedCacheObject>, appId: string, input: string | undefined): Promise<PromptChoice[] | undefined>;
-export declare function queryCatalogItems(cmd: Command, client: ApolloClient<NormalizedCacheObject>, assetId: string): Promise<ApolloQueryResult<GetCatalogItemQuery>>;
+export declare function queryRequestableAssets(cmd: Command, client: ApolloClient, appId: string, input: string | undefined): Promise<PromptChoice[] | undefined>;
+export declare function queryCatalogItems(cmd: Command, client: ApolloClient, assetId: string): Promise<ApolloClient.QueryResult<GetCatalogItemQuery>>;

package/lib/lib/request/api/queries/assets.js

@@ -41,7 +41,7 @@ const GET_ASSETS_QUERY = (0, graphql_1.graphql)(`
 }
 `);
 async function queryRequestableAssets(cmd, client, appId, input) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
         const resp = await client.query({
             query: GET_ASSETS_QUERY,
@@ -53,9 +53,9 @@ async function queryRequestableAssets(cmd, client, appId, input) {
         });
         // no fall through doesn't consider process.exit();
         let x;
-        switch (resp.data.app.__typename) {
+        switch ((_a = resp === null || resp === void 0 ? void 0 : resp.data) === null || _a === void 0 ? void 0 : _a.app.__typename) {
             case "App":
-                return (_d = (_c = (_b = (_a = resp.data) === null || _a === void 0 ? void 0 : _a.app) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c.items) === null || _d === void 0 ? void 0 : _d.map((item) => {
+                return (_e = (_d = (_c = (_b = resp.data) === null || _b === void 0 ? void 0 : _b.app) === null || _c === void 0 ? void 0 : _c.items) === null || _d === void 0 ? void 0 : _d.items) === null || _e === void 0 ? void 0 : _e.map((item) => {
                     var _a, _b, _c, _d, _e, _f, _g, _h;
                     const name = ((_a = item.resource) === null || _a === void 0 ? void 0 : _a.name) || ((_b = item.group) === null || _b === void 0 ? void 0 : _b.name);
                     const id = ((_c = item.resource) === null || _c === void 0 ? void 0 : _c.id) || ((_d = item.group) === null || _d === void 0 ? void 0 : _d.id);
@@ -70,7 +70,7 @@ async function queryRequestableAssets(cmd, client, appId, input) {
                     };
                 });
             case "AppNotFoundError":
-                x = cmd.error((_f = (_e = resp.data) === null || _e === void 0 ? void 0 : _e.app) === null || _f === void 0 ? void 0 : _f.message);
+                x = cmd.error((_g = (_f = resp.data) === null || _f === void 0 ? void 0 : _f.app) === null || _g === void 0 ? void 0 : _g.message);
                 break;
             default:
                 cmd.error(resp.error || "Unknown error occurred.");
@@ -131,6 +131,6 @@ async function queryCatalogItems(cmd, client, assetId) {
         });
     }
     catch (_a) {
-        cmd.error("Unknown error retreiving catalog items");
+        cmd.error("Error retrieving catalog items");
     }
 }

package/lib/lib/request/api/queries/request-defaults.d.ts

@@ -1,5 +1,5 @@
-import type { ApolloClient, NormalizedCacheObject } from "@apollo/client";
+import type { ApolloClient } from "@apollo/client";
 import type { Command } from "@oclif/core";
 import type { RequestConfigurationGroupInput, RequestConfigurationResourceInput } from "../../../../graphql/graphql";
 import type { RequestDefaults } from "../../types";
-export declare function queryRequestDefaults(cmd: Command, client: ApolloClient<NormalizedCacheObject>, requestedResources: RequestConfigurationResourceInput[], requestedGroups: RequestConfigurationGroupInput[]): Promise<RequestDefaults | undefined>;
+export declare function queryRequestDefaults(cmd: Command, client: ApolloClient, requestedResources: RequestConfigurationResourceInput[], requestedGroups: RequestConfigurationGroupInput[]): Promise<RequestDefaults | undefined>;

package/lib/lib/request/api/queries/request-defaults.js

@@ -32,6 +32,7 @@ const REQUEST_DEFAULTS_QUERY = (0, graphql_1.graphql)(`
     }
   }`);
 async function queryRequestDefaults(cmd, client, requestedResources, requestedGroups) {
+    var _a;
     try {
         const resp = await client.query({
             query: REQUEST_DEFAULTS_QUERY,
@@ -41,7 +42,7 @@ async function queryRequestDefaults(cmd, client, requestedResources, requestedGr
             },
             fetchPolicy: "network-only", // to avoid caching
         });
-        return resp.data.requestDefaults;
+        return (_a = resp === null || resp === void 0 ? void 0 : resp.data) === null || _a === void 0 ? void 0 : _a.requestDefaults;
     }
     catch (error) {
         if (error instanceof Error || typeof error === "string") {

package/lib/lib/request/api/queries/requests.d.ts

@@ -1,4 +1,4 @@
-import type { ApolloClient, NormalizedCacheObject } from "@apollo/client";
-export declare const queryRequest: (client: ApolloClient<NormalizedCacheObject>, requestId: string) => Promise<import("@apollo/client").ApolloQueryResult<import("../../../../graphql/graphql").GetRequestQuery>>;
-export declare const queryRequests: (client: ApolloClient<NormalizedCacheObject>, pageSize: number, showPendingOnly: boolean) => Promise<import("@apollo/client").ApolloQueryResult<import("../../../../graphql/graphql").GetRequestsQuery>>;
-export declare const queryBundle: (client: ApolloClient<NormalizedCacheObject>, bundleId: string) => Promise<import("@apollo/client").ApolloQueryResult<import("../../../../graphql/graphql").GetBundleQuery>>;
+import type { ApolloClient } from "@apollo/client";
+export declare const queryRequest: (client: ApolloClient, requestId: string) => Promise<ApolloClient.QueryResult<import("../../../../graphql/graphql").GetRequestQuery>>;
+export declare const queryRequests: (client: ApolloClient, pageSize: number, showPendingOnly: boolean) => Promise<ApolloClient.QueryResult<import("../../../../graphql/graphql").GetRequestsQuery>>;
+export declare const queryBundle: (client: ApolloClient, bundleId: string) => Promise<ApolloClient.QueryResult<import("../../../../graphql/graphql").GetBundleQuery>>;

package/lib/lib/request/api/queries/roles.d.ts

@@ -1,5 +1,5 @@
-import type { ApolloClient, NormalizedCacheObject } from "@apollo/client";
+import type { ApolloClient } from "@apollo/client";
 import type { Command } from "@oclif/core";
 import type { PromptChoice } from "../../types";
-export declare function queryAssetRoles(cmd: Command, client: ApolloClient<NormalizedCacheObject>, assetType: string, assetId: string): Promise<PromptChoice[] | undefined>;
-export declare function queryAssociatedItems(cmd: Command, client: ApolloClient<NormalizedCacheObject>, id: string, input: string | undefined): Promise<PromptChoice[] | undefined>;
+export declare function queryAssetRoles(cmd: Command, client: ApolloClient, assetType: string, assetId: string): Promise<PromptChoice[] | undefined>;
+export declare function queryAssociatedItems(cmd: Command, client: ApolloClient, id: string, input: string | undefined): Promise<PromptChoice[] | undefined>;

package/lib/lib/request/api/queries/roles.js

@@ -44,7 +44,7 @@ query GroupAccessLevels($groupId: GroupId!) {
 }
 `);
 async function queryAssetRoles(cmd, client, assetType, assetId) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     try {
         switch (assetType) {
             case graphql_2.EntityType.Resource: {
@@ -57,9 +57,9 @@ async function queryAssetRoles(cmd, client, assetType, assetId) {
                 });
                 // no fall through doesn't consider process.exit();
                 let x;
-                switch (resp.data.accessLevels.__typename) {
+                switch ((_a = resp === null || resp === void 0 ? void 0 : resp.data) === null || _a === void 0 ? void 0 : _a.accessLevels.__typename) {
                     case "ResourceAccessLevelsResult":
-                        return (_c = (_b = (_a = resp.data) === null || _a === void 0 ? void 0 : _a.accessLevels) === null || _b === void 0 ? void 0 : _b.accessLevels) === null || _c === void 0 ? void 0 : _c.map((role) => {
+                        return (_d = (_c = (_b = resp.data) === null || _b === void 0 ? void 0 : _b.accessLevels) === null || _c === void 0 ? void 0 : _c.accessLevels) === null || _d === void 0 ? void 0 : _d.map((role) => {
                             return {
                                 message: role.accessLevelName || "",
                                 value: {
@@ -69,7 +69,7 @@ async function queryAssetRoles(cmd, client, assetType, assetId) {
                             };
                         });
                     case "ResourceNotFoundError":
-                        x = cmd.error((_e = (_d = resp.data) === null || _d === void 0 ? void 0 : _d.accessLevels) === null || _e === void 0 ? void 0 : _e.message);
+                        x = cmd.error((_f = (_e = resp.data) === null || _e === void 0 ? void 0 : _e.accessLevels) === null || _f === void 0 ? void 0 : _f.message);
                         break;
                     default:
                         cmd.error(resp.error || "Unknown error occurred.");
@@ -86,9 +86,9 @@ async function queryAssetRoles(cmd, client, assetType, assetId) {
                 });
                 // no fall through doesn't consider process.exit();
                 let x;
-                switch (resp.data.groupAccessLevels.__typename) {
+                switch ((_g = resp === null || resp === void 0 ? void 0 : resp.data) === null || _g === void 0 ? void 0 : _g.groupAccessLevels.__typename) {
                     case "GroupAccessLevelsResult":
-                        return (_h = (_g = (_f = resp.data) === null || _f === void 0 ? void 0 : _f.groupAccessLevels) === null || _g === void 0 ? void 0 : _g.accessLevels) === null || _h === void 0 ? void 0 : _h.map((role) => {
+                        return (_k = (_j = (_h = resp.data) === null || _h === void 0 ? void 0 : _h.groupAccessLevels) === null || _j === void 0 ? void 0 : _j.accessLevels) === null || _k === void 0 ? void 0 : _k.map((role) => {
                             return {
                                 message: role.accessLevelName,
                                 value: {
@@ -205,7 +205,7 @@ function appRolesFromEdge(edge) {
     }
 }
 async function queryAssociatedItems(cmd, client, id, input) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
         const resp = await client.query({
             query: ASSOCIATED_ITEMS_QUERY,
@@ -215,7 +215,7 @@ async function queryAssociatedItems(cmd, client, id, input) {
             },
             fetchPolicy: "network-only", // to avoid caching
         });
-        switch (resp.data.resource.__typename) {
+        switch ((_a = resp === null || resp === void 0 ? void 0 : resp.data) === null || _a === void 0 ? void 0 : _a.resource.__typename) {
             case "ResourceResult": {
                 const associatedItems = resp.data.resource.resource.associatedItems.edges.filter((edge) => edge.__typename === "ResourceAssociatedItemEdge");
                 const initial = [];
@@ -225,7 +225,7 @@ async function queryAssociatedItems(cmd, client, id, input) {
                 return initial;
             }
             case "ResourceNotFoundError":
-                cmd.log((_b = (_a = resp.data) === null || _a === void 0 ? void 0 : _a.resource) === null || _b === void 0 ? void 0 : _b.message);
+                cmd.log((_c = (_b = resp.data) === null || _b === void 0 ? void 0 : _b.resource) === null || _c === void 0 ? void 0 : _c.message);
                 break;
             default:
                 cmd.error(resp.error || "Unknown error occurred.");

package/lib/lib/request/displays.d.ts

@@ -1,4 +1,4 @@
-import type { ApolloQueryResult } from "@apollo/client";
+import type { ApolloClient } from "@apollo/client";
 import type { Command } from "@oclif/core/lib/command";
 import type { GetRequestQuery, GetRequestsQuery } from "../../graphql/graphql";
 import type { RequestMap, RequestMetadata } from "./types";
@@ -6,7 +6,7 @@ export declare function headerMessage(cmd: Command): void;
 export declare function treeifyRequestMap(cmd: Command, requestMap: RequestMap): void;
 export declare function displayFinalRequestSummary(cmd: Command, metadata: RequestMetadata): void;
 export declare function getStyledStatus(status: string): string;
-export declare function displayRequestDetails(cmd: Command, requestResp: ApolloQueryResult<GetRequestQuery>): void;
-export declare function displayRequestListTable(cmd: Command, requestResp: ApolloQueryResult<GetRequestsQuery>): void;
+export declare function displayRequestDetails(cmd: Command, requestResp: ApolloClient.QueryResult<GetRequestQuery>): void;
+export declare function displayRequestListTable(cmd: Command, requestResp: ApolloClient.QueryResult<GetRequestsQuery>): void;
 export declare function formatDuration(durationInMinutes: number): string;
 export declare function displayRequestAgain(cmd: Command, id: string): void;

package/lib/lib/request/displays.js

@@ -84,8 +84,8 @@ function getStyledStatus(status) {
     }
 }
 function displayRequestDetails(cmd, requestResp) {
-    var _a, _b, _c, _d, _e, _f;
-    switch (requestResp.data.request.__typename) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    switch ((_a = requestResp.data) === null || _a === void 0 ? void 0 : _a.request.__typename) {
         case "RequestResult": {
             const request = requestResp.data.request.request;
             cmd.log("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
@@ -94,8 +94,8 @@ function displayRequestDetails(cmd, requestResp) {
             const status = request.status;
             cmd.log(getStyledStatus(status));
             // Request users "Requested by: <requester> -> Requested for: <targetUser>"
-            const requester = (_a = request.requester) === null || _a === void 0 ? void 0 : _a.displayName;
-            const targetUser = (_b = request.targetUser) === null || _b === void 0 ? void 0 : _b.displayName;
+            const requester = (_b = request.requester) === null || _b === void 0 ? void 0 : _b.displayName;
+            const targetUser = (_c = request.targetUser) === null || _c === void 0 ? void 0 : _c.displayName;
             if (requester && targetUser) {
                 cmd.log(`${chalk_1.default.bold("Requested by:")} ${requester} ${chalk_1.default.gray("->")} ${chalk_1.default.bold("Requested for:")} ${targetUser}`);
             }
@@ -106,20 +106,20 @@ function displayRequestDetails(cmd, requestResp) {
                 cmd.log(`${chalk_1.default.bold("Reason:")} "${chalk_1.default.italic(reason)}"`);
             }
             // Requested resources
-            const requestedResources = (_d = (_c = request.requestedResources) === null || _c === void 0 ? void 0 : _c.map((resource) => {
+            const requestedResources = (_e = (_d = request.requestedResources) === null || _d === void 0 ? void 0 : _d.map((resource) => {
                 var _a, _b;
                 if (((_a = resource.resource) === null || _a === void 0 ? void 0 : _a.__typename) === "Resource") {
                     const requestedResource = resource.resource;
                     return formatAssetName(requestedResource.displayName, ((_b = resource.accessLevel) === null || _b === void 0 ? void 0 : _b.accessLevelName) || "");
                 }
-            })) !== null && _d !== void 0 ? _d : [];
-            const requestedGroups = (_f = (_e = request.requestedGroups) === null || _e === void 0 ? void 0 : _e.map((group) => {
+            })) !== null && _e !== void 0 ? _e : [];
+            const requestedGroups = (_g = (_f = request.requestedGroups) === null || _f === void 0 ? void 0 : _f.map((group) => {
                 var _a, _b;
                 if (((_a = group.group) === null || _a === void 0 ? void 0 : _a.__typename) === "Group") {
                     const requestedGroup = group.group;
                     return formatAssetName(requestedGroup.name, ((_b = group.accessLevel) === null || _b === void 0 ? void 0 : _b.accessLevelName) || "");
                 }
-            })) !== null && _f !== void 0 ? _f : [];
+            })) !== null && _g !== void 0 ? _g : [];
             const requestedItems = [...requestedResources, ...requestedGroups].join(", ");
             if (requestedItems) {
                 cmd.log(`${chalk_1.default.bold("Requested Items:")} ${chalk_1.default.cyan(requestedItems)}`);
@@ -128,8 +128,8 @@ function displayRequestDetails(cmd, requestResp) {
     }
 }
 function displayRequestListTable(cmd, requestResp) {
-    var _a, _b, _c, _d, _e;
-    switch (requestResp.data.requests.__typename) {
+    var _a, _b, _c, _d, _e, _f;
+    switch ((_a = requestResp.data) === null || _a === void 0 ? void 0 : _a.requests.__typename) {
         case "RequestsResult": {
             const requests = requestResp.data.requests.requests;
             if (requests && requests.length > 0) {
@@ -148,26 +148,26 @@ function displayRequestListTable(cmd, requestResp) {
                 });
                 for (const req of requests) {
                     const request = req;
-                    const targetUser = (_a = request.targetUser) === null || _a === void 0 ? void 0 : _a.displayName;
+                    const targetUser = (_b = request.targetUser) === null || _b === void 0 ? void 0 : _b.displayName;
                     const reason = request.reason;
                     const status = request.status;
                     const formattedDuration = request.durationInMinutes
                         ? formatDuration(request.durationInMinutes)
                         : "Permanent";
-                    const requestedResources = (_c = (_b = request.requestedResources) === null || _b === void 0 ? void 0 : _b.map((resource) => {
+                    const requestedResources = (_d = (_c = request.requestedResources) === null || _c === void 0 ? void 0 : _c.map((resource) => {
                         var _a, _b;
                         if (((_a = resource.resource) === null || _a === void 0 ? void 0 : _a.__typename) === "Resource") {
                             const requestedResource = resource.resource;
                             return formatAssetName(requestedResource.displayName, ((_b = resource.accessLevel) === null || _b === void 0 ? void 0 : _b.accessLevelName) || "");
                         }
-                    })) !== null && _c !== void 0 ? _c : [];
-                    const requestedGroups = (_e = (_d = request.requestedGroups) === null || _d === void 0 ? void 0 : _d.map((group) => {
+                    })) !== null && _d !== void 0 ? _d : [];
+                    const requestedGroups = (_f = (_e = request.requestedGroups) === null || _e === void 0 ? void 0 : _e.map((group) => {
                         var _a, _b;
                         if (((_a = group.group) === null || _a === void 0 ? void 0 : _a.__typename) === "Group") {
                             const requestedGroup = group.group;
                             return formatAssetName(requestedGroup.name, ((_b = group.accessLevel) === null || _b === void 0 ? void 0 : _b.accessLevelName) || "");
                         }
-                    })) !== null && _e !== void 0 ? _e : [];
+                    })) !== null && _f !== void 0 ? _f : [];
                     const requestedItems = [
                         ...requestedResources,
                         ...requestedGroups,

package/lib/lib/request/prompts/apps-prompt.d.ts

@@ -1,4 +1,4 @@
-import type { ApolloClient, NormalizedCacheObject } from "@apollo/client";
+import type { ApolloClient } from "@apollo/client";
 import type { Command } from "@oclif/core";
 import type { RequestMap } from "../types";
-export declare function selectRequestableItems(cmd: Command, client: ApolloClient<NormalizedCacheObject>, requestMap: RequestMap): Promise<void>;
+export declare function selectRequestableItems(cmd: Command, client: ApolloClient, requestMap: RequestMap): Promise<void>;

package/lib/lib/request/prompts/asset-prompt.d.ts

@@ -1,5 +1,5 @@
-import type { ApolloClient, NormalizedCacheObject } from "@apollo/client";
+import type { ApolloClient } from "@apollo/client";
 import type { Command } from "@oclif/core";
 import { type EntityValue, type RequestMap } from "../types";
-export declare function chooseOktaAzureRoles(cmd: Command, client: ApolloClient<NormalizedCacheObject>, app: EntityValue, requestMap: RequestMap): Promise<void>;
-export declare function chooseAssets(cmd: Command, client: ApolloClient<NormalizedCacheObject>, appId: string, requestMap: RequestMap): Promise<void>;
+export declare function chooseOktaAzureRoles(cmd: Command, client: ApolloClient, app: EntityValue, requestMap: RequestMap): Promise<void>;
+export declare function chooseAssets(cmd: Command, client: ApolloClient, appId: string, requestMap: RequestMap): Promise<void>;

package/lib/lib/request/prompts/duration-prompt.js

@@ -96,6 +96,9 @@ async function setCustomDuration(metadata) {
         validate: (answer) => {
             var _a, _b, _c;
             const { d, h, m } = getDurationNumbers(answer);
+            if (m % 1 !== 0) {
+                return "Fractional minutes not supported.";
+            }
             const durationInMinutes = getDurationInMinutes(answer);
             if (d < 0 || h < 0 || m < 0 || d + h + m === 0 || (h > 23 && m > 59)) {
                 return "Please enter a valid duration.";

package/lib/lib/request/prompts/role-prompt.d.ts

@@ -1,4 +1,4 @@
-import type { ApolloClient, NormalizedCacheObject } from "@apollo/client";
+import type { ApolloClient } from "@apollo/client";
 import type { Command } from "@oclif/core";
 import type { RequestMap } from "../types";
-export declare function chooseRoles(cmd: Command, client: ApolloClient<NormalizedCacheObject>, appId: string, assetId: string, requestMap: RequestMap): Promise<void>;
+export declare function chooseRoles(cmd: Command, client: ApolloClient, appId: string, assetId: string, requestMap: RequestMap): Promise<void>;

package/lib/lib/request/request-utils.d.ts

@@ -1,15 +1,14 @@
-import type { ApolloClient, NormalizedCacheObject } from "@apollo/client";
+import type { ApolloClient } from "@apollo/client";
 import type { Command } from "@oclif/core";
-import { RequestMessageCode } from "../../graphql/graphql";
-import { type ConnectionType } from "../../types";
+import { type ConnectionType, RequestMessageCode } from "../../graphql/graphql";
 import { type RequestMap, type RequestMetadata } from "./types";
 export declare function initEmptyRequestMetadata(): RequestMetadata;
-export declare function setRequestDefaults(cmd: Command, client: ApolloClient<NormalizedCacheObject>, metadata: RequestMetadata): Promise<void>;
-export declare function submitFinalRequest(cmd: Command, client: ApolloClient<NormalizedCacheObject>, metadata: RequestMetadata): Promise<void>;
+export declare function setRequestDefaults(cmd: Command, client: ApolloClient, metadata: RequestMetadata): Promise<void>;
+export declare function submitFinalRequest(cmd: Command, client: ApolloClient, metadata: RequestMetadata): Promise<void>;
 export declare function getRequestLink(cmd: Command, id: string): string;
 export declare function generateRequestLink(cmd: Command, defaultDurationInMinutes: number): string;
-export declare function bypassRequestSelection(cmd: Command, client: ApolloClient<NormalizedCacheObject>, flagValue: string[], metadata: RequestMetadata): Promise<void>;
+export declare function bypassRequestSelection(cmd: Command, client: ApolloClient, flagValue: string[], metadata: RequestMetadata): Promise<void>;
 export declare function bypassDuration(cmd: Command, duration: number, metadata: RequestMetadata): void;
 export declare function getRequestMessageFromCode(cmd: Command, code: RequestMessageCode, connectionName: string | undefined, connectionType: ConnectionType | undefined, extraParams?: string, sourceGroupRedirect?: () => void): string;
-export declare function duplicateRequestTemplate(cmd: Command, client: ApolloClient<NormalizedCacheObject>, requestId: string, metadata: RequestMetadata): Promise<void>;
-export declare function copyBundleAssets(cmd: Command, client: ApolloClient<NormalizedCacheObject>, bundleId: string, requestMap: RequestMap): Promise<void>;
+export declare function duplicateRequestTemplate(cmd: Command, client: ApolloClient, requestId: string, metadata: RequestMetadata): Promise<void>;
+export declare function copyBundleAssets(cmd: Command, client: ApolloClient, bundleId: string, requestMap: RequestMap): Promise<void>;

package/lib/lib/request/request-utils.js

@@ -14,11 +14,10 @@ const chalk_1 = require("chalk");
 const graphql_1 = require("../../graphql/graphql");
 const labels_1 = require("../../labels");
 const config_1 = require("../../lib/config");
-const types_1 = require("../../types");
 const api_1 = require("./api");
 const requests_1 = require("./api/queries/requests");
 const displays_1 = require("./displays");
-const types_2 = require("./types");
+const types_1 = require("./types");
 /*
 Init Request Metadata
 This function initializes the request metadata with empty defaults and an empty request map.
@@ -197,7 +196,7 @@ function generateRequestLink(cmd, defaultDurationInMinutes) {
     return `${configData[config_1.urlKey]}/request-access?durationInMinutes=${defaultDurationInMinutes}`;
 }
 async function bypassRequestSelection(cmd, client, flagValue, metadata) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     try {
         // Query Catalog Item endpoint to identify what the id belongs to (resource or group)
         for (const val of flagValue) {
@@ -205,10 +204,10 @@ async function bypassRequestSelection(cmd, client, flagValue, metadata) {
             const assetId = delimiterIndex === -1 ? val : val.substring(0, delimiterIndex);
             const roleName = delimiterIndex === -1 ? "" : val.substring(delimiterIndex + 1);
             const resp = await (0, api_1.queryCatalogItems)(cmd, client, assetId);
-            switch (resp.data.catalogItem.__typename) {
+            switch ((_a = resp.data) === null || _a === void 0 ? void 0 : _a.catalogItem.__typename) {
                 case "Group":
                 case "Resource": {
-                    const item = resp.data.catalogItem;
+                    const item = (_b = resp.data) === null || _b === void 0 ? void 0 : _b.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
@@ -216,10 +215,10 @@ async function bypassRequestSelection(cmd, client, flagValue, metadata) {
                         id: role.accessLevelRemoteId,
                         name: role.accessLevelName,
                     }));
-                    const appId = ((_a = item.connection) === null || _a === void 0 ? void 0 : _a.id) || "";
+                    const appId = ((_c = item.connection) === null || _c === void 0 ? void 0 : _c.id) || "";
                     if (!(appId in metadata.requestMap)) {
                         metadata.requestMap[appId] = {
-                            appName: ((_b = item.connection) === null || _b === void 0 ? void 0 : _b.displayName) || "",
+                            appName: ((_d = item.connection) === null || _d === void 0 ? void 0 : _d.displayName) || "",
                             appId: appId,
                             assets: {},
                         };
@@ -229,7 +228,7 @@ async function bypassRequestSelection(cmd, client, flagValue, metadata) {
                         metadata.requestMap[appId].assets[assetId] = {
                             assetId: assetId,
                             assetName: assetName,
-                            type: (0, types_2.entityTypeFromString)(item.__typename),
+                            type: (0, types_1.entityTypeFromString)(item.__typename),
                             roles: {},
                         };
                     }
@@ -287,7 +286,7 @@ sourceGroupRedirect) {
                 // This case the connection has a third party provider such as GitLab,
                 // GitHub that requires the use to create a manual step into the end
                 // system.
-                const isThirdPartyProvider = Object.values(types_1.ThirdPartyProvider).find((v) => v === connectionType);
+                const isThirdPartyProvider = Object.values(graphql_1.ThirdPartyProvider).find((v) => v === connectionType);
                 if (isThirdPartyProvider) {
                     const configData = (0, config_1.getOrCreateConfigData)(cmd.config.configDir);
                     return `This item requires you to link your ${connectionLabel} account to Opal before requesting access.
@@ -315,7 +314,7 @@ function addRequestedResourcesToMetadata(requestedResources, requestMap) {
         if (!resource)
             continue;
         const { id: assetId, displayName: assetName, connection, connectionId, __typename, } = resource;
-        const type = (0, types_2.entityTypeFromString)(__typename);
+        const type = (0, types_1.entityTypeFromString)(__typename);
         const roleId = accessLevel.accessLevelRemoteId;
         const roleName = accessLevel.accessLevelName;
         if (!requestMap[connectionId]) {
@@ -347,7 +346,7 @@ function addRequestedGroupsToMetadata(requestedGroups, requestMap) {
         if (!group)
             continue;
         const { id: assetId, name: assetName, connection, connectionId, __typename, } = group;
-        const type = (0, types_2.entityTypeFromString)(__typename);
+        const type = (0, types_1.entityTypeFromString)(__typename);
         const roleId = accessLevel === null || accessLevel === void 0 ? void 0 : accessLevel.accessLevelRemoteId;
         const roleName = accessLevel === null || accessLevel === void 0 ? void 0 : accessLevel.accessLevelName;
         if (!requestMap[connectionId]) {
@@ -391,18 +390,19 @@ async function convertRequestToMetadata(cmd, request, metadata) {
     addRequestedGroupsToMetadata(requestedGroups, metadata.requestMap);
 }
 async function duplicateRequestTemplate(cmd, client, requestId, metadata) {
+    var _a, _b, _c, _d;
     cmd.log("Loading request template from ID: ", requestId);
     const resp = await (0, api_1.queryRequest)(client, requestId);
     // no fall through doesn't consider process.exit();
     let x;
-    switch (resp.data.request.__typename) {
+    switch ((_a = resp.data) === null || _a === void 0 ? void 0 : _a.request.__typename) {
         case "RequestResult": {
-            if (resp.data.request.request.status ===
+            if (((_b = resp.data) === null || _b === void 0 ? void 0 : _b.request.request).status ===
                 graphql_1.RequestStatus.Pending) {
                 cmd.error("⏳ Cannot duplicate a request that is still in progress");
             }
             cmd.log("Creating new request with same configuration...");
-            convertRequestToMetadata(cmd, resp.data.request.request, metadata);
+            convertRequestToMetadata(cmd, (_d = (_c = resp.data) === null || _c === void 0 ? void 0 : _c.request) === null || _d === void 0 ? void 0 : _d.request, metadata);
             break;
         }
         case "RequestNotFoundError":
@@ -448,14 +448,15 @@ async function convertBundleToMetadata(cmd, bundle, requestMap) {
     cmd.log("Added all requestable items in the bundle");
 }
 async function copyBundleAssets(cmd, client, bundleId, requestMap) {
+    var _a, _b;
     cmd.log("Loading assets from bundle: ", bundleId);
     const resp = await (0, requests_1.queryBundle)(client, bundleId);
     // no fall through doesn't consider process.exit();
     let x;
-    switch (resp.data.bundle.__typename) {
+    switch ((_a = resp.data) === null || _a === void 0 ? void 0 : _a.bundle.__typename) {
         case "BundleResult": {
             cmd.log("Creating new request with assets in the bundle...");
-            convertBundleToMetadata(cmd, resp.data.bundle.bundle, requestMap);
+            convertBundleToMetadata(cmd, (_b = resp.data) === null || _b === void 0 ? void 0 : _b.bundle.bundle, requestMap);
             break;
         }
         case "BundleNotFoundError":

package/lib/lib/resources.d.ts

@@ -1,5 +1,5 @@
 import type { Command } from "@oclif/core";
-import type { ResourceAccessLevel, ResourceAccessLevelInput } from "../types";
+import type { ResourceAccessLevel, ResourceAccessLevelInput } from "../graphql/graphql";
 export type ResourceInfo = {
     id: string;
     name: string;

package/lib/lib/sessions.d.ts

@@ -1,4 +1,4 @@
 import type { Command } from "@oclif/core";
-import type { ResourceAccessLevelInput } from "../types";
+import type { ResourceAccessLevelInput } from "../graphql/graphql";
 export declare const getOrCreateSession: (command: Command, resourceId: string, accessLevel: ResourceAccessLevelInput, sessionId: string | undefined, metadataFragment: string, wantNewSession?: boolean) => Promise<any>;
 export declare const getSessionExpirationMessage: (session: any) => string;

package/lib/lib/sessions.js

@@ -118,6 +118,7 @@ const openBrowserAndPollForSession = async (command, message, resourceId, access
     return session;
 };
 const createSession = async (command, resourceId, accessLevel, sessionId, metadataFragment, wantNewSession) => {
+    var _a, _b, _c, _d;
     const { resp, error } = await (0, handler_1.runMutation)({
         command: command,
         query: CreateSessionDocument.replace("METADATA_FRAGMENT", metadataFragment),
@@ -130,9 +131,9 @@ const createSession = async (command, resourceId, accessLevel, sessionId, metada
     if (error) {
         return (0, apollo_1.handleError)(command, error);
     }
-    switch (resp === null || resp === void 0 ? void 0 : resp.data.createSession.__typename) {
+    switch ((_b = (_a = resp === null || resp === void 0 ? void 0 : resp.data) === null || _a === void 0 ? void 0 : _a.createSession) === null || _b === void 0 ? void 0 : _b.__typename) {
         case "CreateSessionResult": {
-            return resp.data.createSession.session;
+            return (_d = (_c = resp.data) === null || _c === void 0 ? void 0 : _c.createSession) === null || _d === void 0 ? void 0 : _d.session;
         }
         case "MfaInvalidError": {
             return openBrowserAndPollForSession(command, "❗ MFA validation needed. Please connect via browser. Opening browser and awaiting validation...", resourceId, accessLevel.accessLevelRemoteId, sessionId, metadataFragment, wantNewSession);

package/oclif.manifest.json

@@ -1047,5 +1047,5 @@
       ]
     }
   },
-  "version": "3.2.2"
+  "version": "3.2.3"
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "opal-security",
   "description": "Opal allows you to centrally manage access to all of your sensitive systems.",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "author": "Stephen Cobbe",
   "bin": {
     "opal": "./bin/run"
   },
   "bugs": "https://github.com/opalsecurity/opal-cli/issues",
   "dependencies": {
-    "@apollo/client": "^3.13.5",
+    "@apollo/client": "^4.0.4",
     "@oclif/core": "^3.19.3",
     "@oclif/plugin-autocomplete": "^1.4.6",
     "@oclif/plugin-help": "^5.2.20",
@@ -17,7 +17,7 @@
     "chalk": "^2.4.2",
     "cli-table3": "^0.6.5",
     "enquirer": "^2.4.1",
-    "graphql": "^15.5.0",
+    "graphql": "^16.11.0",
     "inquirer": "^8.2.6",
     "inquirer-autocomplete-prompt": "^2.0.1",
     "keychain": "^1.5.0",
@@ -27,6 +27,7 @@
     "open": "^8.0.4",
     "openid-client": "^5.6.5",
     "prettyjson": "^1.2.1",
+    "rxjs": "^7.8.2",
     "semver": "^7.5.4",
     "tslib": "^2.8.1"
   },