mobbdev 0.0.112 → 0.0.114

package/dist/index.mjs

@@ -1107,6 +1107,7 @@ var parseScmURL = (scmURL, scmType) => {
       projectPath,
       repoName,
       projectName,
+      protocol: url.protocol,
       pathElements: projectPath.split("/")
     };
   } catch (e) {
@@ -2843,16 +2844,18 @@ var SCMLib = class {
     if (!accessToken) {
       return trimmedUrl;
     }
-    console.log(
-      "this instanceof BitbucketSCMLib",
-      this instanceof BitbucketSCMLib
-    );
     const scmLibType = this.getScmLibType();
     if (scmLibType === "ADO" /* ADO */) {
       return `https://${accessToken}@${trimmedUrl.toLowerCase().replace("https://", "")}`;
     }
     if (this instanceof BitbucketSCMLib) {
       const authData = this.getAuthData();
+      const parseScmURLRes = parseScmURL(trimmedUrl, "Bitbucket" /* Bitbucket */);
+      if (!parseScmURLRes) {
+        throw new InvalidRepoUrlError("invalid repo url");
+      }
+      const { protocol, hostname, organization, repoName } = parseScmURLRes;
+      const url = `${protocol}//${hostname}/${organization}/${repoName}`;
       switch (authData.authType) {
         case "public": {
           return trimmedUrl;
@@ -2861,14 +2864,14 @@ var SCMLib = class {
           const { token } = authData;
           const username2 = await this._getUsernameForAuthUrl();
           return buildAuthrizedRepoUrl({
-            url: trimmedUrl,
+            url,
             username: username2,
             password: token
           });
         }
         case "basic": {
           const { username: username2, password } = authData;
-          return buildAuthrizedRepoUrl({ url: trimmedUrl, username: username2, password });
+          return buildAuthrizedRepoUrl({ url, username: username2, password });
         }
       }
     }
@@ -3918,19 +3921,19 @@ function getBitbucketSdk(params) {
       ref,
       url
     }) {
-      try {
-        return await Promise.any([
-          this.getBranchRef({ repoUrl: url, branchName: ref }),
-          this.getTagRef({ repoUrl: url, tagName: ref }),
-          this.getCommitRef({ repoUrl: url, commitSha: ref })
-        ]);
-      } catch (e) {
-        console.log("e", e);
-        if (e instanceof AggregateError) {
+      return Promise.allSettled([
+        this.getTagRef({ repoUrl: url, tagName: ref }),
+        this.getBranchRef({ repoUrl: url, branchName: ref }),
+        this.getCommitRef({ repoUrl: url, commitSha: ref })
+      ]).then((promisesResult) => {
+        const [refPromise] = promisesResult.filter(
+          (promise) => promise.status === "fulfilled"
+        );
+        if (!refPromise) {
           throw new RefNotFoundError(`Invalid reference ${ref} for ${url}`);
         }
-        throw e;
-      }
+        return refPromise.value;
+      });
     },
     async getTagRef(params2) {
       const { tagName, repoUrl } = params2;
@@ -3984,7 +3987,6 @@ function getBitbucketSdk(params) {
 async function validateBitbucketParams(params) {
   const { bitbucketClient } = params;
   const authType = bitbucketClient.getAuthType();
-  console.log("authType", authType, params.url);
   try {
     if (authType !== "public") {
       await bitbucketClient.getUser();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "0.0.112",
+  "version": "0.0.114",
   "description": "Automated secure code remediation tool",
   "repository": "https://github.com/mobb-dev/bugsy",
   "main": "dist/index.js",