mobbdev 0.0.73 → 0.0.76

package/.env

@@ -1,6 +1,7 @@
-# production@v14
+# production@v15
 WEB_LOGIN_URL="https://app.mobb.ai/cli-login"
 API_URL="https://api.mobb.ai/v1/graphql"
 WEB_APP_URL="https://app.mobb.ai"
 GITLAB_API_TOKEN=""
-GITHUB_API_TOKEN=""
+GITHUB_API_TOKEN=""
+ADO_TEST_ACCESS_TOKEN=""

package/dist/index.mjs

@@ -1317,14 +1317,15 @@ async function getGithubBlameRanges({ ref, gitHubUrl, path: path8 }, options) {
 }
 async function createPr({
   sourceRepoUrl,
-  sourceFilePath,
-  targetFilePath,
+  filesPaths,
   userRepoUrl,
-  title
+  title,
+  body
 }, options) {
   const oktoKit = getOktoKit(options);
   const { owner: sourceOwner, repo: sourceRepo } = parseOwnerAndRepo(sourceRepoUrl);
   const { owner, repo } = parseOwnerAndRepo(userRepoUrl);
+  const [sourceFilePath, secondFilePath] = filesPaths;
   const sourceFileContentResponse = await oktoKit.rest.repos.getContent({
     owner: sourceOwner,
     repo: sourceRepo,
@@ -1345,18 +1346,40 @@ async function createPr({
     sourceFileContentResponse.data.content,
     "base64"
   ).toString("utf-8");
+  const tree = [
+    {
+      path: sourceFilePath,
+      mode: "100644",
+      type: "blob",
+      content: decodedContent
+    }
+  ];
+  if (secondFilePath) {
+    const secondFileContentResponse = await oktoKit.rest.repos.getContent({
+      owner: sourceOwner,
+      repo: sourceRepo,
+      path: "/" + secondFilePath
+    });
+    const secondDecodedContent = Buffer.from(
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      secondFileContentResponse.data.content,
+      "base64"
+    ).toString("utf-8");
+    tree.push({
+      path: secondFilePath,
+      mode: "100644",
+      type: "blob",
+      content: secondDecodedContent
+    });
+  }
   const createTreeResponse = await oktoKit.rest.git.createTree({
     owner,
     repo,
     base_tree: await oktoKit.rest.git.getRef({ owner, repo, ref: `heads/${defaultBranch}` }).then((response) => response.data.object.sha),
-    tree: [
-      {
-        path: targetFilePath,
-        mode: "100644",
-        type: "blob",
-        content: decodedContent
-      }
-    ]
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    tree
   });
   const createCommitResponse = await oktoKit.rest.git.createCommit({
     owner,
@@ -1377,6 +1400,7 @@ async function createPr({
     owner,
     repo,
     title,
+    body,
     head: newBranchName,
     base: "main"
   });
@@ -1680,7 +1704,7 @@ var GitlabSCMLib = class extends SCMLib {
     }
     throw new Error("not supported yet");
   }
-  async createPullRequestWithNewFile(_sourceRepoUrl, _sourceFilePath, _targetFilePath, _userRepoUrl, _title) {
+  async createPullRequestWithNewFile(_sourceRepoUrl, _filesPaths, _userRepoUrl, _title, _body) {
     throw new Error("not implemented");
   }
   async getRepoList() {
@@ -1867,14 +1891,14 @@ var GithubSCMLib = class extends SCMLib {
       repo
     });
   }
-  async createPullRequestWithNewFile(sourceRepoUrl, sourceFilePath, targetFilePath, userRepoUrl, title) {
+  async createPullRequestWithNewFile(sourceRepoUrl, filesPaths, userRepoUrl, title, body) {
     const { pull_request_url } = await createPr(
       {
         sourceRepoUrl,
-        sourceFilePath,
-        targetFilePath,
+        filesPaths,
         userRepoUrl,
-        title
+        title,
+        body
       },
       {
         githubAuthToken: this.accessToken
@@ -2097,7 +2121,7 @@ var StubSCMLib = class extends SCMLib {
     console.error("forkRepo() not implemented");
     throw new Error("forkRepo() not implemented");
   }
-  async createPullRequestWithNewFile(_sourceRepoUrl, _sourceFilePath, _targetFilePath, _userRepoUrl, _title) {
+  async createPullRequestWithNewFile(_sourceRepoUrl, _filesPaths, _userRepoUrl, _title, _body) {
     console.error("createPullRequestWithNewFile() not implemented");
     throw new Error("createPullRequestWithNewFile() not implemented");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "0.0.73",
+  "version": "0.0.76",
   "description": "Automated secure code remediation tool",
   "repository": "https://github.com/mobb-dev/bugsy",
   "main": "dist/index.js",
@@ -22,6 +22,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "@gitbeaker/core": "39.13.0",
+    "@gitbeaker/requester-utils": "39.13.0",
     "@gitbeaker/rest": "39.13.0",
     "@octokit/core": "5.0.2",
     "@octokit/graphql": "5.0.5",
@@ -29,7 +31,7 @@
     "@octokit/request-error": "3.0.3",
     "@types/libsodium-wrappers": "0.7.13",
     "adm-zip": "0.5.10",
-    "axios": "1.5.0",
+    "axios": "1.6.5",
     "chalk": "5.3.0",
     "chalk-animation": "2.0.3",
     "configstore": "6.0.0",