mobbdev 0.0.10 → 0.0.11

package/.env

@@ -1,4 +1,5 @@
-# production@v3
+# production@v5
 WEB_LOGIN_URL="https://app.mobb.dev/cli-login"
 WEB_REPORT_URL="https://app.mobb.dev/report/"
-API_URL="https://api.mobb.dev/v1/graphql"
+API_URL="https://api.mobb.dev/v1/graphql"
+WEB_APP_URL="https://app.mobb.dev"

package/package.json

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

package/src/constants.mjs

@@ -9,7 +9,7 @@ dotenv.config({ path: path.join(__dirname, '../.env') });
 const envVariablesSchema = z
     .object({
         WEB_LOGIN_URL: z.string(),
-        WEB_REPORT_URL: z.string(),
+        WEB_APP_URL: z.string(),
         API_URL: z.string(),
     })
     .required();
@@ -17,5 +17,5 @@ const envVariablesSchema = z
 const envVariables = envVariablesSchema.parse(process.env);
 
 export const WEB_LOGIN_URL = envVariables.WEB_LOGIN_URL;
-export const WEB_REPORT_URL = envVariables.WEB_REPORT_URL;
+export const WEB_APP_URL = envVariables.WEB_APP_URL;
 export const API_URL = envVariables.API_URL;

package/src/gql.mjs

@@ -2,18 +2,28 @@ import fetch from 'node-fetch';
 import { API_URL } from './constants.mjs';
 
 const ME = `
-query me {
-  me {
+query Me {
+  user {
+    id
     email
-    projectId
+    userOrganizations {
+      organization {
+        id
+        projects {
+          id
+        }
+      }
+    }
   }
 }
 `;
 
 const CREATE_COMMUNITY_USER = `
 mutation CreateCommunityUser {
-  createCommunityUser {
-    status
+ initOrganizationAndProject {
+    userId
+    projectId
+    organizationId
   }
 }
 `;
@@ -34,13 +44,13 @@ mutation uploadS3BucketInfo($fileName: String!) {
 `;
 
 const SUBMIT_VULNERABILITY_REPORT = `
-mutation SubmitVulnerabilityReport($vulnerabilityReportFileName: String!, $fixReportId: String!, $repoUrl: String!, $reference: String!) {
+mutation SubmitVulnerabilityReport($vulnerabilityReportFileName: String!, $fixReportId: String!, $repoUrl: String!, $reference: String!, $projectId: String!) {
   submitVulnerabilityReport(
     fixReportId: $fixReportId
     repoUrl: $repoUrl
     reference: $reference
     vulnerabilityReportFileName: $vulnerabilityReportFileName
-    githubAuthToken: null
+    projectId: $projectId
   ) {
     __typename
   }
@@ -50,6 +60,8 @@ mutation SubmitVulnerabilityReport($vulnerabilityReportFileName: String!, $fixRe
 export class GQLClient {
     constructor(token) {
         this._token = token;
+        this._projectId = undefined;
+        this._organizationId = undefined;
     }
 
     async _apiCall(query, variables = {}) {
@@ -81,11 +93,30 @@ export class GQLClient {
         return data.data;
     }
 
+    getOrganizationId() {
+        return this._organizationId;
+    }
+
+    getProjectId() {
+        return this._projectId;
+    }
+
     async verifyToken() {
         await this.createCommunityUser();
 
         try {
-            await this._apiCall(ME);
+            const userInfo = await this._apiCall(ME);
+            const {
+                user: [{ userOrganizations }],
+            } = userInfo;
+            const [
+                {
+                    organization: { id: organizationId, projects },
+                },
+            ] = userOrganizations;
+            const [{ id: projectId }] = projects;
+            this._projectId = projectId;
+            this._organizationId = organizationId;
         } catch (e) {
             return false;
         }
@@ -121,6 +152,7 @@ export class GQLClient {
             repoUrl,
             reference,
             vulnerabilityReportFileName: 'report.json',
+            projectId: this._projectId,
         });
     }
 }

package/src/index.mjs

@@ -9,7 +9,7 @@ import { webLogin } from './web-login.mjs';
 import { downloadRepo, getDefaultBranch } from './github.mjs';
 import { getSnykReport } from './snyk.mjs';
 import { uploadFile } from './upload-file.mjs';
-import { WEB_REPORT_URL } from './constants.mjs';
+import { WEB_APP_URL } from './constants.mjs';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const packageJson = JSON.parse(
@@ -82,6 +82,10 @@ export async function main(dirname, repoUrl) {
         console.log(
             'You will be redirected to our report page, please wait until the analysis is finished and enjoy your fixes.'
         );
-        await open(`${WEB_REPORT_URL}${uploadData.fixReportId}`);
+        const projectId = gqlClient.getProjectId();
+        const organizationId = gqlClient.getOrganizationId();
+        await open(
+            `${WEB_APP_URL}/organization/${organizationId}/project/${projectId}/report/${uploadData.fixReportId}`
+        );
     }
 }