@contrast/contrast 1.0.4 → 1.0.7

package/dist/scan/autoDetection.js

@@ -1,6 +1,8 @@
 "use strict";
 const i18n = require('i18n');
 const fileFinder = require('./fileUtils');
+const languageResolver = require('../audit/languageAnalysisEngine/reduceIdentifiedLanguages');
+const rootFile = require('../audit/languageAnalysisEngine/getProjectRootFilenames');
 const autoDetectFileAndLanguage = async (configToUse) => {
     const entries = await fileFinder.findFile();
     if (entries.length === 1) {
@@ -9,6 +11,10 @@ const autoDetectFileAndLanguage = async (configToUse) => {
             console.log(i18n.__('fileHasWhiteSpacesError'));
             process.exit(1);
         }
+        if (fileFinder.fileIsEmpty(entries[0])) {
+            console.log(i18n.__('scanFileIsEmpty'));
+            process.exit(1);
+        }
         configToUse.file = entries[0];
         if (configToUse.name === undefined) {
             configToUse.name = entries[0];
@@ -18,6 +24,31 @@ const autoDetectFileAndLanguage = async (configToUse) => {
         errorOnFileDetection(entries);
     }
 };
+const autoDetectAuditFilesAndLanguages = async () => {
+    let languagesFound = [];
+    console.log(i18n.__('searchingAuditFileDirectory', process.cwd()));
+    await fileFinder.findFilesJava(languagesFound);
+    await fileFinder.findFilesJavascript(languagesFound);
+    await fileFinder.findFilesPython(languagesFound);
+    await fileFinder.findFilesGo(languagesFound);
+    await fileFinder.findFilesPhp(languagesFound);
+    await fileFinder.findFilesRuby(languagesFound);
+    if (languagesFound.length === 1) {
+        return languagesFound;
+    }
+    else {
+        console.log('found multiple languages, please specify one using --file to run SCA analysis');
+    }
+};
+const manualDetectAuditFilesAndLanguages = projectPath => {
+    let projectRootFilenames = rootFile.getProjectRootFilenames(projectPath);
+    let identifiedLanguages = languageResolver.deduceLanguageScaAnalysis(projectRootFilenames);
+    if (Object.keys(identifiedLanguages).length === 0) {
+        console.log(i18n.__('languageAnalysisNoLanguage', projectPath));
+        return [];
+    }
+    return [identifiedLanguages];
+};
 const hasWhiteSpace = s => {
     const filename = s.split('/').pop();
     return filename.indexOf(' ') >= 0;
@@ -38,7 +69,25 @@ const errorOnFileDetection = entries => {
     }
     process.exit(1);
 };
+const errorOnAuditFileDetection = entries => {
+    if (entries.length > 1) {
+        console.log(i18n.__('searchingDirectoryScan'));
+        for (let file in entries) {
+            console.log('-', entries[file]);
+        }
+        console.log('');
+        console.log(i18n.__('specifyFileAuditNotFound'));
+    }
+    else {
+        console.log(i18n.__('noFileFoundScan'));
+        console.log('');
+        console.log(i18n.__('specifyFileAuditNotFound'));
+    }
+};
 module.exports = {
     autoDetectFileAndLanguage,
-    errorOnFileDetection
+    errorOnFileDetection,
+    autoDetectAuditFilesAndLanguages,
+    errorOnAuditFileDetection,
+    manualDetectAuditFilesAndLanguages
 };

package/dist/scan/fileUtils.js

@@ -10,6 +10,72 @@ const findFile = async () => {
         onlyFiles: true
     });
 };
+const findFilesJava = async (languagesFound) => {
+    const result = await fg(['**/pom.xml', '**/build.gradle', '**/build.gradle.kts'], {
+        dot: false,
+        deep: 1,
+        onlyFiles: true
+    });
+    if (result.length > 0) {
+        return languagesFound.push({ JAVA: result });
+    }
+    return languagesFound;
+};
+const findFilesJavascript = async (languagesFound) => {
+    const result = await fg(['**/package.json', '**/yarn.lock', '**/package.lock.json'], {
+        dot: false,
+        deep: 1,
+        onlyFiles: true
+    });
+    if (result.length > 0) {
+        return languagesFound.push({ JAVASCRIPT: result });
+    }
+    return languagesFound;
+};
+const findFilesPython = async (languagesFound) => {
+    const result = await fg(['**/Pipfile.lock', '**/Pipfile'], {
+        dot: false,
+        deep: 3,
+        onlyFiles: true
+    });
+    if (result.length > 0) {
+        return languagesFound.push({ PYTHON: result });
+    }
+    return languagesFound;
+};
+const findFilesGo = async (languagesFound) => {
+    const result = await fg(['**/go.mod'], {
+        dot: false,
+        deep: 3,
+        onlyFiles: true
+    });
+    if (result.length > 0) {
+        return languagesFound.push({ GO: result });
+    }
+    return languagesFound;
+};
+const findFilesRuby = async (languagesFound) => {
+    const result = await fg(['**/Gemfile', '**/Gemfile.lock'], {
+        dot: false,
+        deep: 3,
+        onlyFiles: true
+    });
+    if (result.length > 0) {
+        return languagesFound.push({ RUBY: result });
+    }
+    return languagesFound;
+};
+const findFilesPhp = async (languagesFound) => {
+    const result = await fg(['**/composer.json', '**/composer.lock'], {
+        dot: false,
+        deep: 3,
+        onlyFiles: true
+    });
+    if (result.length > 0) {
+        return languagesFound.push({ PHP: result });
+    }
+    return languagesFound;
+};
 const checkFilePermissions = file => {
     let readableFile = false;
     try {
@@ -24,8 +90,21 @@ const checkFilePermissions = file => {
 const fileExists = path => {
     return fs.existsSync(path);
 };
+const fileIsEmpty = path => {
+    if (fileExists(path) && checkFilePermissions(path)) {
+        return fs.readFileSync(path).length === 0;
+    }
+    return false;
+};
 module.exports = {
     findFile,
     fileExists,
-    checkFilePermissions
+    checkFilePermissions,
+    findFilesJava,
+    findFilesJavascript,
+    findFilesPython,
+    findFilesGo,
+    findFilesPhp,
+    findFilesRuby,
+    fileIsEmpty
 };

package/dist/scan/formatScanOutput.js

@@ -0,0 +1,213 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assignBySeverity = exports.stripTags = exports.getCodeFlowInfo = exports.getSourceLineNumber = exports.getLocationsSyncInfo = exports.editVulName = exports.getDefaultView = exports.formatLinks = exports.getProjectOverview = exports.formatScanOutput = void 0;
+const i18n_1 = __importDefault(require("i18n"));
+const chalk_1 = __importDefault(require("chalk"));
+const groupedResultsModel_1 = require("./models/groupedResultsModel");
+const lodash_1 = require("lodash");
+const cli_table3_1 = __importDefault(require("cli-table3"));
+const constants_1 = require("../constants/constants");
+function formatScanOutput(scanResults) {
+    const { scanResultsInstances } = scanResults;
+    const projectOverview = getProjectOverview(scanResultsInstances);
+    if (scanResultsInstances.content.length === 0) {
+        console.log(i18n_1.default.__('scanNoVulnerabilitiesFound'));
+        console.log(i18n_1.default.__('scanNoVulnerabilitiesFoundSecureCode'));
+        console.log(i18n_1.default.__('scanNoVulnerabilitiesFoundGoodWork'));
+    }
+    else {
+        const message = projectOverview.critical || projectOverview.high
+            ? 'Here are your top priorities to fix'
+            : "No major issues, here's what we found";
+        console.log(chalk_1.default.bold(message));
+        console.log();
+        let defaultView = getDefaultView(scanResultsInstances.content);
+        let count = defaultView.length;
+        defaultView.forEach(entry => {
+            let table = new cli_table3_1.default({
+                chars: {
+                    top: '',
+                    'top-mid': '',
+                    'top-left': '',
+                    'top-right': '',
+                    bottom: '',
+                    'bottom-mid': '',
+                    'bottom-left': '',
+                    'bottom-right': '',
+                    left: '',
+                    'left-mid': '',
+                    mid: '',
+                    'mid-mid': '',
+                    right: '',
+                    'right-mid': '',
+                    middle: ' '
+                },
+                style: { 'padding-left': 0, 'padding-right': 0 },
+                colAligns: ['right'],
+                wordWrap: true,
+                colWidths: [12, 1, 100]
+            });
+            let learnRow = [];
+            let adviceRow = [];
+            const headerRow = [
+                chalk_1.default
+                    .hex(entry.colour)
+                    .bold(`CONTRAST-${count.toString().padStart(3, '0')}`),
+                chalk_1.default.hex(entry.colour).bold('-'),
+                chalk_1.default.hex(entry.colour).bold(`[${entry.severity}] ${entry.ruleId}`) +
+                    entry.message
+            ];
+            const codePath = entry.codePath?.replace(/^@/, '');
+            const codeRow = [
+                chalk_1.default.hex('#F6F5F5').bold(`Code`),
+                chalk_1.default.hex('#F6F5F5').bold(`:`),
+                chalk_1.default.hex('#F6F5F5').bold(`${codePath}`)
+            ];
+            const issueRow = [chalk_1.default.bold(`Issue`), chalk_1.default.bold(`:`), `${entry.issue}`];
+            table.push(headerRow, codeRow, issueRow);
+            if (entry?.advice) {
+                adviceRow = [
+                    chalk_1.default.bold('Advice'),
+                    chalk_1.default.bold(`:`),
+                    stripTags(entry.advice)
+                ];
+                table.push(adviceRow);
+            }
+            if (entry?.learn && entry?.learn.length > 0) {
+                learnRow = [
+                    chalk_1.default.bold('Learn'),
+                    chalk_1.default.bold(`:`),
+                    chalk_1.default.hex('#97f7f7').bold.underline(entry.learn[0])
+                ];
+                table.push(learnRow);
+            }
+            count--;
+            console.log(table.toString());
+            console.log();
+        });
+    }
+    printVulnInfo(projectOverview);
+}
+exports.formatScanOutput = formatScanOutput;
+function printVulnInfo(projectOverview) {
+    const totalVulnerabilities = projectOverview.total;
+    const vulMessage = totalVulnerabilities === 1 ? `vulnerability` : `vulnerabilities`;
+    console.log(chalk_1.default.bold(`Found ${totalVulnerabilities} ${vulMessage}`));
+    console.log(i18n_1.default.__('foundDetailedVulnerabilities', String(projectOverview.critical), String(projectOverview.high), String(projectOverview.medium), String(projectOverview.low), String(projectOverview.note)));
+}
+function getProjectOverview(scanResultsInstances) {
+    const acc = {
+        critical: 0,
+        high: 0,
+        medium: 0,
+        low: 0,
+        note: 0,
+        total: 0
+    };
+    if (scanResultsInstances?.content &&
+        scanResultsInstances.content.length > 0) {
+        scanResultsInstances.content.forEach((i) => {
+            acc[i.severity.toLowerCase()] += 1;
+            acc.total += 1;
+            return acc;
+        });
+    }
+    return acc;
+}
+exports.getProjectOverview = getProjectOverview;
+function formatLinks(objName, entry) {
+    const line = chalk_1.default.bold(objName + '  : ');
+    if (entry.length === 1) {
+        console.log(line + chalk_1.default.hex('#97DCF7').bold.underline(entry[0]));
+    }
+    else {
+        console.log(line);
+        entry.forEach(link => {
+            console.log(chalk_1.default.hex('#97DCF7').bold.underline(link));
+        });
+    }
+}
+exports.formatLinks = formatLinks;
+function getDefaultView(content) {
+    const groupTypeResults = [];
+    content.forEach(resultEntry => {
+        const groupResultsObj = new groupedResultsModel_1.GroupedResultsModel(resultEntry.ruleId);
+        groupResultsObj.severity = resultEntry.severity;
+        groupResultsObj.ruleId = resultEntry.ruleId;
+        groupResultsObj.issue = stripTags(resultEntry.issue);
+        groupResultsObj.advice = resultEntry.advice;
+        groupResultsObj.learn = resultEntry.learn;
+        groupResultsObj.message = resultEntry.message?.text
+            ? editVulName(resultEntry.message.text) +
+                ':' +
+                getSourceLineNumber(resultEntry)
+            : '';
+        groupResultsObj.codePath = getLocationsSyncInfo(resultEntry);
+        groupTypeResults.push(groupResultsObj);
+        assignBySeverity(resultEntry, groupResultsObj);
+    });
+    return (0, lodash_1.sortBy)(groupTypeResults, ['priority']).reverse();
+}
+exports.getDefaultView = getDefaultView;
+function editVulName(message) {
+    return message.substring(message.indexOf(' in '));
+}
+exports.editVulName = editVulName;
+function getLocationsSyncInfo(resultEntry) {
+    const locationsMessage = resultEntry.locations[0]?.physicalLocation?.artifactLocation?.uri || '';
+    const locationsLineNumber = resultEntry.locations[0]?.physicalLocation?.region?.startLine || '';
+    if (!locationsLineNumber) {
+        return '@' + locationsMessage;
+    }
+    return '@' + locationsMessage + ':' + locationsLineNumber;
+}
+exports.getLocationsSyncInfo = getLocationsSyncInfo;
+function getSourceLineNumber(resultEntry) {
+    const locationsLineNumber = resultEntry.locations[0]?.physicalLocation?.region?.startLine || '';
+    let codeFlowLineNumber = getCodeFlowInfo(resultEntry);
+    return codeFlowLineNumber ? codeFlowLineNumber : locationsLineNumber;
+}
+exports.getSourceLineNumber = getSourceLineNumber;
+function getCodeFlowInfo(resultEntry) {
+    let result;
+    resultEntry.codeFlows[0]?.threadFlows.forEach((i) => {
+        return (result = i.locations.find((locations) => locations.importance === 'essential'));
+    });
+    return result?.location?.physicalLocation?.region?.startLine;
+}
+exports.getCodeFlowInfo = getCodeFlowInfo;
+function stripTags(oldString) {
+    return oldString.replace(/\n/g, ' ').replace(/\s+/g, ' ').trim();
+}
+exports.stripTags = stripTags;
+function assignBySeverity(entry, assignedObj) {
+    if (entry.severity.toUpperCase() === 'CRITICAL') {
+        assignedObj.priority = 1;
+        assignedObj.colour = constants_1.CRITICAL_COLOUR;
+        return assignedObj;
+    }
+    else if (entry.severity.toUpperCase() === 'HIGH') {
+        assignedObj.priority = 2;
+        assignedObj.colour = constants_1.HIGH_COLOUR;
+        return assignedObj;
+    }
+    else if (entry.severity.toUpperCase() === 'MEDIUM') {
+        assignedObj.priority = 3;
+        assignedObj.colour = constants_1.MEDIUM_COLOUR;
+        return assignedObj;
+    }
+    else if (entry.severity.toUpperCase() === 'LOW') {
+        assignedObj.priority = 4;
+        assignedObj.colour = constants_1.LOW_COLOUR;
+        return assignedObj;
+    }
+    else if (entry.severity.toUpperCase() === 'NOTE') {
+        assignedObj.priority = 5;
+        assignedObj.colour = constants_1.NOTE_COLOUR;
+        return assignedObj;
+    }
+}
+exports.assignBySeverity = assignBySeverity;

package/dist/scan/help.js

@@ -30,7 +30,9 @@ const scanUsageGuide = commandLineUsage([
             'ff',
             'ignore-cert-errors',
             'verbose',
-            'debug'
+            'debug',
+            'experimental',
+            'application-name'
         ]
     },
     {

package/dist/scan/models/groupedResultsModel.js

@@ -4,7 +4,8 @@ exports.GroupedResultsModel = void 0;
 class GroupedResultsModel {
     constructor(ruleId) {
         this.ruleId = ruleId;
-        this.lineInfoSet = new Set;
+        this.colour = '#999999';
+        this.codePathSet = new Set();
     }
 }
 exports.GroupedResultsModel = GroupedResultsModel;

package/dist/scan/models/scanResultsModel.js

@@ -5,7 +5,9 @@ class ScanResultsModel {
     constructor(scan) {
         this.projectOverview = scan.projectOverview;
         this.scanDetail = scan.scanDetail;
-        this.scanResultsInstances = scan.scanResultsInstances;
+        this.scanResultsInstances =
+            scan.scanResultsInstances;
+        this.newProject = scan.newProject;
     }
 }
 exports.ScanResultsModel = ScanResultsModel;

package/dist/scan/populateProjectIdAndProjectName.js

@@ -8,8 +8,9 @@ const populateProjectId = async (config) => {
         proj = await getExistingProjectIdByName(config, client).then(res => {
             return res;
         });
+        return { projectId: proj, isNewProject: false };
     }
-    return proj;
+    return { projectId: proj, isNewProject: true };
 };
 const createProjectId = async (config, client) => {
     return client

package/dist/scan/scan.js

@@ -3,13 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stripMustacheTags = exports.getMessage = exports.getGroups = exports.formatLinks = exports.formatScanOutput = exports.sendScan = exports.isFileAllowed = exports.allowedFileTypes = void 0;
+exports.sendScan = exports.isFileAllowed = exports.allowedFileTypes = void 0;
 const commonApi_js_1 = __importDefault(require("../utils/commonApi.js"));
 const fileUtils_1 = __importDefault(require("../scan/fileUtils"));
 const i18n_1 = __importDefault(require("i18n"));
 const oraWrapper_1 = __importDefault(require("../utils/oraWrapper"));
-const chalk_1 = __importDefault(require("chalk"));
-const groupedResultsModel_1 = require("./models/groupedResultsModel");
 exports.allowedFileTypes = ['.jar', '.war', '.js', '.zip', '.exe'];
 const isFileAllowed = (scanOption) => {
     let valid = false;
@@ -43,114 +41,23 @@ const sendScan = async (config) => {
             }
             else {
                 if (config.debug) {
-                    console.log(res.statusCode);
                     console.log(config);
+                    oraWrapper_1.default.failSpinner(startUploadSpinner, i18n_1.default.__('uploadingScanFail'));
+                    console.log(i18n_1.default.__('genericServiceError', res.statusCode));
                 }
-                oraWrapper_1.default.failSpinner(startUploadSpinner, i18n_1.default.__('uploadingScanFail'));
                 if (res.statusCode === 403) {
                     console.log(i18n_1.default.__('permissionsError'));
                     process.exit(1);
                 }
-                console.log(i18n_1.default.__('genericServiceError', res.statusCode));
+                oraWrapper_1.default.stopSpinner(startUploadSpinner);
+                console.log('Contrast Scan Finished');
                 process.exit(1);
             }
         })
             .catch(err => {
+            oraWrapper_1.default.stopSpinner(startUploadSpinner);
             console.log(err);
         });
     }
 };
 exports.sendScan = sendScan;
-function formatScanOutput(scanResults) {
-    const { projectOverview, scanResultsInstances } = scanResults;
-    if (scanResultsInstances.content.length === 0) {
-        console.log(i18n_1.default.__('scanNoVulnerabilitiesFound'));
-    }
-    else {
-        const message = projectOverview.critical || projectOverview.high
-            ? 'Here are your top priorities to fix'
-            : "No major issues, here's what we found";
-        console.log(chalk_1.default.bold(message));
-        console.log();
-        const groups = getGroups(scanResultsInstances.content);
-        groups.forEach(entry => {
-            console.log(chalk_1.default.bold(`[ ${entry.severity} ] | ${entry.ruleId} (${entry.lineInfoSet.size}) - ` +
-                `${entry.message}`));
-            let count = 1;
-            entry.lineInfoSet.forEach(lineInfo => {
-                console.log(`\t ${count}. ${lineInfo}`);
-                count++;
-            });
-            if (entry?.issue) {
-                console.log(chalk_1.default.bold('Issue' + ': ') + entry.issue);
-            }
-            if (entry?.advice) {
-                console.log(chalk_1.default.bold('Advice' + ': ') + entry.advice);
-            }
-            if (entry?.learn && entry?.learn.length > 0) {
-                formatLinks('Learn', entry.learn);
-            }
-            console.log();
-        });
-        printVulnInfo(projectOverview);
-    }
-}
-exports.formatScanOutput = formatScanOutput;
-function printVulnInfo(projectOverview) {
-    const totalVulnerabilities = getTotalVulns(projectOverview);
-    const vulMessage = totalVulnerabilities === 1 ? `vulnerability` : `vulnerabilities`;
-    console.log(chalk_1.default.bold(`Found ${totalVulnerabilities} ${vulMessage}`));
-    console.log(i18n_1.default.__('foundDetailedVulnerabilities', String(projectOverview.critical), String(projectOverview.high), String(projectOverview.medium), String(projectOverview.low), String(projectOverview.note)));
-}
-function getTotalVulns(projectOverview) {
-    return (projectOverview.critical +
-        projectOverview.high +
-        projectOverview.medium +
-        projectOverview.low +
-        projectOverview.note);
-}
-function formatLinks(objName, entry) {
-    console.log(chalk_1.default.bold(objName + ':'));
-    entry.forEach(link => {
-        console.log(link);
-    });
-}
-exports.formatLinks = formatLinks;
-function getGroups(content) {
-    const groupTypeSet = new Set(content.map(({ ruleId }) => ruleId));
-    const groupTypeResults = [];
-    groupTypeSet.forEach(groupName => {
-        const groupResultsObj = new groupedResultsModel_1.GroupedResultsModel(groupName);
-        content.forEach(resultEntry => {
-            if (resultEntry.ruleId === groupName) {
-                groupResultsObj.severity = resultEntry.severity;
-                groupResultsObj.issue = stripMustacheTags(resultEntry.issue);
-                groupResultsObj.advice = resultEntry.advice;
-                groupResultsObj.learn = resultEntry.learn;
-                groupResultsObj.message = resultEntry.message?.text;
-                groupResultsObj.lineInfoSet.add(getMessage(resultEntry.locations));
-            }
-        });
-        groupTypeResults.push(groupResultsObj);
-    });
-    return groupTypeResults;
-}
-exports.getGroups = getGroups;
-function getMessage(locations) {
-    const message = locations[0]?.physicalLocation?.artifactLocation?.uri || '';
-    const lineNumber = locations[0]?.physicalLocation?.region?.startLine || '';
-    if (!lineNumber) {
-        return '@' + message;
-    }
-    return '@' + message + ':' + lineNumber;
-}
-exports.getMessage = getMessage;
-function stripMustacheTags(oldString) {
-    return oldString
-        .replace(/\n/g, ' ')
-        .replace(/{{.*?}}/g, '\n')
-        .replace(/\$\$LINK_DELIM\$\$/g, '\n')
-        .replace(/\s+/g, ' ')
-        .trim();
-}
-exports.stripMustacheTags = stripMustacheTags;

package/dist/scan/scanConfig.js

@@ -21,10 +21,15 @@ const getScanConfig = argv => {
             process.exit(1);
         }
     }
+    let projectNameSource;
     if (!scanParams.name && scanParams.file) {
         scanParams.name = getFileName(scanParams.file);
+        projectNameSource = 'AUTO';
     }
-    return { ...paramsAuth, ...scanParams };
+    else {
+        projectNameSource = 'USER';
+    }
+    return { ...paramsAuth, ...scanParams, projectNameSource };
 };
 const getFileName = file => {
     return file.split(path.sep).pop();

package/dist/scan/scanController.js

@@ -1,6 +1,6 @@
 "use strict";
 const i18n = require('i18n');
-const { returnOra, startSpinner, succeedSpinner } = require('../utils/oraWrapper');
+const { returnOra, startSpinner, succeedSpinner, stopSpinner } = require('../utils/oraWrapper');
 const populateProjectIdAndProjectName = require('./populateProjectIdAndProjectName');
 const scan = require('./scan');
 const scanResults = require('./scanResults');
@@ -24,6 +24,10 @@ const fileAndLanguageLogic = async (configToUse) => {
             console.log(i18n.__('fileNotExist'));
             process.exit(1);
         }
+        if (fileFunctions.fileIsEmpty(configToUse.file)) {
+            console.log(i18n.__('scanFileIsEmpty'));
+            process.exit(1);
+        }
         return configToUse;
     }
     else {
@@ -35,21 +39,36 @@ const fileAndLanguageLogic = async (configToUse) => {
 const startScan = async (configToUse) => {
     const startTime = performance.now();
     await fileAndLanguageLogic(configToUse);
+    let newProject;
     if (!configToUse.projectId) {
-        configToUse.projectId = await populateProjectIdAndProjectName.populateProjectId(configToUse);
+        const { projectId, isNewProject } = await populateProjectIdAndProjectName.populateProjectId(configToUse);
+        configToUse.projectId = projectId;
+        newProject = isNewProject;
+    }
+    else {
+        newProject = false;
     }
     const codeArtifactId = await scan.sendScan(configToUse);
     if (!configToUse.ff) {
         const startScanSpinner = returnOra('🚀 Contrast Scan started');
         startSpinner(startScanSpinner);
-        const scanDetail = await scanResults.returnScanResults(configToUse, codeArtifactId, getTimeout(configToUse), startScanSpinner);
+        const scanDetail = await scanResults.returnScanResults(configToUse, codeArtifactId, newProject, getTimeout(configToUse), startScanSpinner);
         const scanResultsInstances = await scanResults.returnScanResultsInstances(configToUse, scanDetail.id);
         const endTime = performance.now();
         const scanDurationMs = endTime - startTime;
-        succeedSpinner(startScanSpinner, 'Contrast Scan complete');
-        console.log(`----- Scan completed in ${(scanDurationMs / 1000).toFixed(2)}s -----`);
-        const projectOverview = await scanResults.returnScanProjectById(configToUse);
-        return { projectOverview, scanDetail, scanResultsInstances };
+        if (scanResultsInstances.statusCode !== 200) {
+            stopSpinner(startScanSpinner);
+            console.log('Result Service is unavailable, please try again later');
+            process.exit(1);
+        }
+        else {
+            succeedSpinner(startScanSpinner, 'Contrast Scan complete');
+            console.log(`----- Scan completed in ${(scanDurationMs / 1000).toFixed(2)}s -----`);
+            return {
+                scanDetail,
+                scanResultsInstances: scanResultsInstances.body
+            };
+        }
     }
 };
 module.exports = {