snyk 1.1177.0 → 1.1179.0

package/dist/cli/784.index.js

@@ -1047,10 +1047,6 @@ async function resolveAndTestFacts(ecosystem, scans, options) {
     }
 }
 exports.resolveAndTestFacts = resolveAndTestFacts;
-async function getOrgDefaultContext() {
-    var _a;
-    return (_a = (await utils_1.getSelf())) === null || _a === void 0 ? void 0 : _a.data.attributes.default_org_context;
-}
 async function submitHashes(hashes, orgId) {
     const response = await polling_test_1.createDepGraph(hashes, orgId);
     return response.data.id;
@@ -1113,7 +1109,7 @@ async function resolveAndTestFactsUnmanagedDeps(scans, options) {
     const errors = [];
     const packageManager = 'Unmanaged (C/C++)';
     const displayTargetFile = '';
-    const orgId = options.org || (await getOrgDefaultContext()) || '';
+    const orgId = await utils_1.getOrg(options.org);
     const target_severity = options.severityThreshold || common_2.SEVERITY.LOW;
     if (orgId === '') {
         errors.push('organisation-id missing');
@@ -1377,11 +1373,12 @@ async function testDependencies(scans, options) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getUnmanagedDepGraph = exports.getSelf = exports.convertDepGraph = exports.convertObjectArrayCasing = exports.convertMapCasing = exports.convertToCamelCase = void 0;
+exports.getUnmanagedDepGraph = exports.getOrg = exports.isUUID = exports.getOrgDefaultContext = exports.getSelf = exports.getOrgIdFromSlug = exports.convertDepGraph = exports.convertObjectArrayCasing = exports.convertMapCasing = exports.convertToCamelCase = void 0;
 const camelCase = __webpack_require__(76884);
 const config_1 = __webpack_require__(25425);
 const promise_1 = __webpack_require__(90430);
 const resolve_test_facts_1 = __webpack_require__(85164);
+const api_token_1 = __webpack_require__(95181);
 function mapKey(object, iteratee) {
     object = Object(object);
     const result = {};
@@ -1419,6 +1416,22 @@ function convertDepGraph(depGraphOpenApi) {
     return depGraph;
 }
 exports.convertDepGraph = convertDepGraph;
+async function getOrgIdFromSlug(slug) {
+    const res = await promise_1.makeRequest({
+        method: 'GET',
+        headers: {
+            Authorization: api_token_1.getAuthHeader(),
+        },
+        url: config_1.default.API + '/orgs',
+    });
+    for (const org of res.orgs) {
+        if (org.slug === slug) {
+            return org.id;
+        }
+    }
+    return '';
+}
+exports.getOrgIdFromSlug = getOrgIdFromSlug;
 function getSelf() {
     return promise_1.makeRequestRest({
         method: 'GET',
@@ -1426,13 +1439,31 @@ function getSelf() {
     });
 }
 exports.getSelf = getSelf;
+async function getOrgDefaultContext() {
+    var _a;
+    return (_a = (await getSelf())) === null || _a === void 0 ? void 0 : _a.data.attributes.default_org_context;
+}
+exports.getOrgDefaultContext = getOrgDefaultContext;
+function isUUID(str) {
+    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    return uuidRegex.test(str);
+}
+exports.isUUID = isUUID;
+async function getOrg(org) {
+    let orgId = org || (await getOrgDefaultContext()) || '';
+    if (!isUUID(orgId)) {
+        orgId = await getOrgIdFromSlug(orgId);
+    }
+    return orgId;
+}
+exports.getOrg = getOrg;
 async function getUnmanagedDepGraph(scans) {
-    var _a, _b;
+    var _a;
     const results = [];
-    const orgId = (_a = (await getSelf())) === null || _a === void 0 ? void 0 : _a.data.attributes.default_org_context;
+    const orgId = await getOrgDefaultContext();
     for (const [, scanResults] of Object.entries(scans)) {
         for (const scanResult of scanResults) {
-            const taskId = await resolve_test_facts_1.submitHashes({ hashes: (_b = scanResult === null || scanResult === void 0 ? void 0 : scanResult.facts[0]) === null || _b === void 0 ? void 0 : _b.data }, orgId);
+            const taskId = await resolve_test_facts_1.submitHashes({ hashes: (_a = scanResult === null || scanResult === void 0 ? void 0 : scanResult.facts[0]) === null || _a === void 0 ? void 0 : _a.data }, orgId);
             const { dep_graph_data } = await resolve_test_facts_1.pollDepGraphAttributes(taskId, orgId);
             if (dep_graph_data) {
                 results.push(dep_graph_data);