@backstage/integration 1.2.2-next.3 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @backstage/integration
 
+## 1.2.2
+
+### Patch Changes
+
+- 9de15a41d7: Upgrade @octokit/rest to 19.0.3
+- a70869e775: Updated dependency `msw` to `^0.43.0`.
+- 4e9a90e307: Updated dependency `luxon` to `^3.0.0`.
+- 8006d0f9bf: Updated dependency `msw` to `^0.44.0`.
+- 1f29047bad: Updated dependency `@octokit/auth-app` to `^4.0.0`.
+- e2d7b76f43: Upgrade git-url-parse to 12.0.0.
+
+  Motivation for upgrade is transitively upgrading parse-url which is vulnerable
+  to several CVEs detected by Snyk.
+
+  - SNYK-JS-PARSEURL-2935944
+  - SNYK-JS-PARSEURL-2935947
+  - SNYK-JS-PARSEURL-2936249
+
+- 8829e175f2: Allow frontend visibility for `integrations` itself.
+- 954a94f52f: Support self-hosted gitlab installations with relative URL.
+- 4df3390795: Avoid double encoding of the file path in `getBitbucketServerDownloadUrl`
+- Updated dependencies
+  - @backstage/errors@1.1.0
+
 ## 1.2.2-next.3
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -1047,7 +1047,7 @@ class GithubAppManager {
           auth: result.data.token
         });
         const repos = await installationClient.paginate(installationClient.apps.listReposAccessibleToInstallation);
-        const hasRepo = repos.some((repository) => {
+        const hasRepo = repos.repositories.some((repository) => {
           return repository.name === repo;
         });
         if (!hasRepo) {
@@ -1227,11 +1227,18 @@ function readGitLabIntegrationConfigs(configs) {
   }
   return result;
 }
+function getGitLabIntegrationRelativePath(config) {
+  let relativePath = "";
+  if (config.host !== GITLAB_HOST) {
+    relativePath = new URL(config.baseUrl).pathname;
+  }
+  return lodash.trimEnd(relativePath, "/");
+}
 
 async function getGitLabFileFetchUrl(url, config) {
   if (url.includes("/-/blob/")) {
     const projectID = await getProjectId(url, config);
-    return buildProjectUrl(url, projectID).toString();
+    return buildProjectUrl(url, projectID, config).toString();
   }
   return buildRawUrl(url).toString();
 }
@@ -1262,13 +1269,15 @@ function buildRawUrl(target) {
     throw new errors.InputError(`Incorrect url: ${target}, ${e}`);
   }
 }
-function buildProjectUrl(target, projectID) {
+function buildProjectUrl(target, projectID, config) {
   try {
     const url = new URL(target);
     const branchAndFilePath = url.pathname.split("/-/blob/")[1];
     const [branch, ...filePath] = branchAndFilePath.split("/");
+    const relativePath = getGitLabIntegrationRelativePath(config);
     url.pathname = [
-      "/api/v4/projects",
+      ...relativePath ? [relativePath] : [],
+      "api/v4/projects",
       projectID,
       "repository/files",
       encodeURIComponent(decodeURIComponent(filePath.join("/"))),
@@ -1286,8 +1295,12 @@ async function getProjectId(target, config) {
     throw new Error("Please provide full path to yaml file from GitLab");
   }
   try {
-    const repo = url.pathname.split("/-/blob/")[0];
-    const repoIDLookup = new URL(`${url.origin}/api/v4/projects/${encodeURIComponent(repo.replace(/^\//, ""))}`);
+    let repo = url.pathname.split("/-/blob/")[0];
+    const relativePath = getGitLabIntegrationRelativePath(config);
+    if (relativePath) {
+      repo = repo.replace(relativePath, "");
+    }
+    const repoIDLookup = new URL(`${url.origin}${relativePath}/api/v4/projects/${encodeURIComponent(repo.replace(/^\//, ""))}`);
     const response = await fetch__default["default"](repoIDLookup.toString(), getGitLabRequestOptions(config));
     const data = await response.json();
     if (!response.ok) {
@@ -1443,6 +1456,7 @@ exports.getGerritRequestOptions = getGerritRequestOptions;
 exports.getGitHubFileFetchUrl = getGitHubFileFetchUrl;
 exports.getGitHubRequestOptions = getGitHubRequestOptions;
 exports.getGitLabFileFetchUrl = getGitLabFileFetchUrl;
+exports.getGitLabIntegrationRelativePath = getGitLabIntegrationRelativePath;
 exports.getGitLabRequestOptions = getGitLabRequestOptions;
 exports.parseGerritGitilesUrl = parseGerritGitilesUrl;
 exports.parseGerritJsonResponse = parseGerritJsonResponse;