@backstage/integration 1.3.0-next.0 → 1.3.1-next.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @backstage/integration
 
+## 1.3.1-next.0
+
+### Patch Changes
+
+- bf5e9030eb: Updated dependency `msw` to `^0.45.0`.
+
+## 1.3.0
+
+### Minor Changes
+
+- 593dea6710: Add support for Basic Auth for Bitbucket Server.
+- ad35364e97: feat(techdocs): add edit button support for bitbucketServer
+
+### Patch Changes
+
+- 163243a4d1: Handle incorrect return type from Octokit paginate plugin to resolve reading URLs from GitHub
+- c4b460a47d: Avoid double encoding of the file path in `getBitbucketDownloadUrl`
+- 29f782eb37: Updated dependency `@types/luxon` to `^3.0.0`.
+- 1f27d83933: Fixed bug in getGitLabFileFetchUrl where a target whose path did not contain the
+  `/-/` scope would result in a fetch URL that did not support
+  private-token-based authentication.
+
+## 1.3.0-next.1
+
+### Minor Changes
+
+- ad35364e97: feat(techdocs): add edit button support for bitbucketServer
+
+### Patch Changes
+
+- 1f27d83933: Fixed bug in getGitLabFileFetchUrl where a target whose path did not contain the
+  `/-/` scope would result in a fetch URL that did not support
+  private-token-based authentication.
+
 ## 1.3.0-next.0
 
 ### Minor Changes

package/dist/index.cjs.js

@@ -8,7 +8,6 @@ var fetch = require('cross-fetch');
 var authApp = require('@octokit/auth-app');
 var rest = require('@octokit/rest');
 var luxon = require('luxon');
-var errors = require('@backstage/errors');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -742,19 +741,16 @@ const _BitbucketServerIntegration = class {
     const resolved = defaultScmResolveUrl(options);
     if (options.lineNumber) {
       const url = new URL(resolved);
-      const filename = url.pathname.split("/").slice(-1)[0];
-      url.hash = `${filename}-${options.lineNumber}`;
+      url.hash = options.lineNumber.toString();
       return url.toString();
     }
     return resolved;
   }
   resolveEditUrl(url) {
-    const urlData = parseGitUrl__default["default"](url);
-    const editUrl = new URL(url);
-    editUrl.searchParams.set("mode", "edit");
-    editUrl.searchParams.set("spa", "0");
-    editUrl.searchParams.set("at", urlData.ref);
-    return editUrl.toString();
+    if (url.includes("?")) {
+      return url.substring(0, url.indexOf("?"));
+    }
+    return url;
   }
 };
 let BitbucketServerIntegration = _BitbucketServerIntegration;
@@ -1367,11 +1363,8 @@ function getGitLabIntegrationRelativePath(config) {
 }
 
 async function getGitLabFileFetchUrl(url, config) {
-  if (url.includes("/-/blob/")) {
-    const projectID = await getProjectId(url, config);
-    return buildProjectUrl(url, projectID, config).toString();
-  }
-  return buildRawUrl(url).toString();
+  const projectID = await getProjectId(url, config);
+  return buildProjectUrl(url, projectID, config).toString();
 }
 function getGitLabRequestOptions(config) {
   const { token = "" } = config;
@@ -1381,29 +1374,10 @@ function getGitLabRequestOptions(config) {
     }
   };
 }
-function buildRawUrl(target) {
-  try {
-    const url = new URL(target);
-    const splitPath = url.pathname.split("/").filter(Boolean);
-    const blobIndex = splitPath.indexOf("blob", 2);
-    if (blobIndex < 2 || blobIndex === splitPath.length - 1) {
-      throw new errors.InputError("Wrong GitLab URL");
-    }
-    const repoPath = splitPath.slice(0, blobIndex);
-    const restOfPath = splitPath.slice(blobIndex + 1);
-    if (!restOfPath.join("/").match(/\.(yaml|yml)$/)) {
-      throw new errors.InputError("Wrong GitLab URL");
-    }
-    url.pathname = [...repoPath, "raw", ...restOfPath].join("/");
-    return url;
-  } catch (e) {
-    throw new errors.InputError(`Incorrect url: ${target}, ${e}`);
-  }
-}
 function buildProjectUrl(target, projectID, config) {
   try {
     const url = new URL(target);
-    const branchAndFilePath = url.pathname.split("/-/blob/")[1];
+    const branchAndFilePath = url.pathname.split("/blob/").slice(1).join("/blob/");
     const [branch, ...filePath] = branchAndFilePath.split("/");
     const relativePath = getGitLabIntegrationRelativePath(config);
     url.pathname = [
@@ -1422,11 +1396,11 @@ function buildProjectUrl(target, projectID, config) {
 }
 async function getProjectId(target, config) {
   const url = new URL(target);
-  if (!url.pathname.includes("/-/blob/")) {
+  if (!url.pathname.includes("/blob/")) {
     throw new Error("Please provide full path to yaml file from GitLab");
   }
   try {
-    let repo = url.pathname.split("/-/blob/")[0];
+    let repo = url.pathname.split("/-/blob/")[0].split("/blob/")[0];
     const relativePath = getGitLabIntegrationRelativePath(config);
     if (relativePath) {
       repo = repo.replace(relativePath, "");
@@ -1545,7 +1519,16 @@ class ScmIntegrations {
     );
   }
   byUrl(url) {
-    return Object.values(this.byType).map((i) => i.byUrl(url)).find(Boolean);
+    let candidates = Object.values(this.byType).map((i) => i.byUrl(url)).filter(Boolean);
+    if (candidates.length > 1) {
+      const filteredCandidates = candidates.filter(
+        (x) => !(x instanceof BitbucketIntegration)
+      );
+      if (filteredCandidates.length !== 0) {
+        candidates = filteredCandidates;
+      }
+    }
+    return candidates[0];
   }
   byHost(host) {
     return Object.values(this.byType).map((i) => i.byHost(host)).find(Boolean);