mobbdev 0.0.20 → 0.0.22

package/index.mjs

@@ -6,13 +6,16 @@ async function run() {
     const args = await parseArgs(hideBin(process.argv));
     const [command] = args._;
     if (command === 'scan') {
-        const { repo, branch, yes, scanner } = args;
-        await scan({ repoUrl: repo, branch, scanner }, { skipPrompts: yes });
+        const { repo, branch, yes, scanner, apiKey } = args;
+        await scan(
+            { repoUrl: repo, branch, scanner, apiKey },
+            { skipPrompts: yes }
+        );
     }
     if (command === 'analyze') {
-        const { repo, scanFile, branch, yes } = args;
+        const { repo, scanFile, branch, yes, apiKey } = args;
         await analyze(
-            { repoUrl: repo, scanFilePath: scanFile, branch },
+            { repoUrl: repo, scanFilePath: scanFile, branch, apiKey },
             { skipPrompts: yes }
         );
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobbdev",
-    "version": "0.0.20",
+    "version": "0.0.22",
     "description": "Automated secure code remediation tool",
     "main": "index.mjs",
     "scripts": {

package/src/commands/index.mjs

@@ -32,7 +32,7 @@ function handleScanErrorMessage({ error, repoUrl, command }) {
 }
 
 export async function analyze(
-    { repoUrl, scanFilePath, branch },
+    { repoUrl, scanFilePath, branch, apiKey },
     { skipPrompts = false } = {}
 ) {
     const { success, error } = UrlZ.safeParse(repoUrl);
@@ -49,11 +49,14 @@ export async function analyze(
         return;
     }
     await showWelcomeMessage(skipPrompts);
-    await runAnalysis({ repoUrl, scanFilePath, branch }, { skipPrompts });
+    await runAnalysis(
+        { repoUrl, scanFilePath, branch, apiKey },
+        { skipPrompts }
+    );
 }
 
 export async function scan(
-    { repoUrl, scanner, branch },
+    { repoUrl, scanner, branch, apiKey },
     { skipPrompts = false } = {}
 ) {
     const { success, error } = UrlZ.safeParse(repoUrl);
@@ -68,7 +71,7 @@ export async function scan(
         );
         return;
     }
-    await runAnalysis({ repoUrl, scanner, branch }, { skipPrompts });
+    await runAnalysis({ repoUrl, scanner, branch, apiKey }, { skipPrompts });
 }
 async function showWelcomeMessage(skipPrompts = false) {
     console.log(mobbAscii);

package/src/feature/analysis/gql.mjs

@@ -68,9 +68,13 @@ mutation SubmitVulnerabilityReport($vulnerabilityReportFileName: String!, $fixRe
 `;
 
 export class GQLClient {
-    constructor(token) {
-        debug('init with token %s', token);
+    constructor(args) {
+        const { token, apiKey } = args;
+        apiKey
+            ? debug('init with apiKey %s', apiKey)
+            : debug('init with token %s', token);
         this._token = token;
+        this._apiKey = apiKey;
     }
     async getUserInfo() {
         const { me } = await this._apiCall(ME);
@@ -79,11 +83,15 @@ export class GQLClient {
 
     async _apiCall(query, variables = {}) {
         debug('api call %o %s', variables, query);
+        const headers = this._apiKey
+            ? { 'x-mobb-key': this._apiKey }
+            : {
+                  authorization: `Bearer ${this._token}`,
+              };
+        debug('headers %o', headers);
         const response = await fetch(API_URL, {
             method: 'POST',
-            headers: {
-                authorization: `Bearer ${this._token}`,
-            },
+            headers,
             body: JSON.stringify({
                 query,
                 variables,

package/src/feature/analysis/index.mjs

@@ -51,12 +51,19 @@ const config = new Configstore(packageJson.name, { token: '' });
 debug('config %o', config);
 
 export async function runAnalysis(
-    { repoUrl, scanner, scanFilePath, branch },
+    { repoUrl, scanner, scanFilePath, branch, apiKey },
     { skipPrompts }
 ) {
     try {
         await _scan(
-            { dirname: tmpObj.name, repoUrl, scanner, scanFilePath, branch },
+            {
+                dirname: tmpObj.name,
+                repoUrl,
+                scanner,
+                scanFilePath,
+                branch,
+                apiKey,
+            },
             { skipPrompts }
         );
     } catch (err) {
@@ -70,14 +77,15 @@ export async function runAnalysis(
 }
 
 export async function _scan(
-    { dirname, repoUrl, scanFilePath, branch },
+    { dirname, repoUrl, scanFilePath, branch, apiKey },
     { skipPrompts = false } = {}
 ) {
     debug('start %s %s', dirname, repoUrl);
 
     let token = config.get('token');
     debug('token %s', token);
-    let gqlClient = new GQLClient(token);
+    apiKey ?? debug('token %s', apiKey);
+    let gqlClient = new GQLClient(apiKey ? { apiKey } : { token });
     await handleMobbLogin();
     const userInfo = await gqlClient.getUserInfo();
     let { githubToken } = userInfo;
@@ -167,10 +175,21 @@ export async function _scan(
     }
 
     async function handleMobbLogin() {
-        if (token && (await gqlClient.verifyToken())) {
+        if (
+            (token && (await gqlClient.verifyToken())) ||
+            (apiKey && (await gqlClient.verifyToken()))
+        ) {
             createSpinner().start().success({
                 text: '🔓 Logged in to Mobb successfully',
             });
+
+            return;
+        }
+        if (apiKey && !(await gqlClient.verifyToken())) {
+            createSpinner().start().error({
+                text: '🔓 Logged in to Mobb failed - check your api-key',
+            });
+            process.exit(1);
             return;
         }
         const mobbLoginSpinner = createSpinner().start();
@@ -189,7 +208,7 @@ export async function _scan(
         );
         token = loginResponse.token;
 
-        gqlClient = new GQLClient(token);
+        gqlClient = new GQLClient({ token });
 
         if (!(await gqlClient.verifyToken())) {
             mobbLoginSpinner.error({

package/src/yargs.mjs

@@ -21,7 +21,6 @@ const yesOption = {
 };
 
 const apiKeyOption = {
-    alias: 'api-key',
     describe: chalk.bold('Mobb authentication api-key'),
     type: 'string',
 };
@@ -60,7 +59,7 @@ export const parseArgs = (args) => {
                         describe: chalk.bold('Select the scanner to use'),
                     },
                     y: yesOption,
-                    k: apiKeyOption,
+                    ['api-key']: apiKeyOption,
                 });
             },
         })
@@ -79,8 +78,9 @@ export const parseArgs = (args) => {
                         ),
                     },
                     r: repoOption,
+                    b: branchOption,
                     y: yesOption,
-                    k: apiKeyOption,
+                    ['api-key']: apiKeyOption,
                 });
             },
         })