@backstage/integration 1.7.0-next.0 → 1.7.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @backstage/integration
 
+## 1.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.1.0-next.1
+  - @backstage/errors@1.2.1
+
+## 1.7.0-next.1
+
+### Patch Changes
+
+- 2d2fc9d20ebb: Additional fix for Gitiles auth links
+- Updated dependencies
+  - @backstage/config@1.1.0-next.0
+  - @backstage/errors@1.2.1
+
 ## 1.7.0-next.0
 
 ### Minor Changes

package/dist/index.cjs.js

@@ -1282,13 +1282,23 @@ function getAuthenticationPrefix(config) {
   return config.password ? "/a/" : "/";
 }
 function getGitilesAuthenticationUrl(config) {
-  const parsedUrl = new URL(config.gitilesBaseUrl);
-  parsedUrl.pathname = parsedUrl.pathname.replace(/\/?$/, "");
-  parsedUrl.pathname = parsedUrl.pathname.replace(
-    /\/([^\/]*)$/,
-    `${getAuthenticationPrefix(config)}$1`
-  );
-  return parsedUrl.toString();
+  if (!config.baseUrl || !config.gitilesBaseUrl) {
+    throw new Error(
+      "Unexpected Gerrit config values. baseUrl or gitilesBaseUrl not set."
+    );
+  }
+  if (config.gitilesBaseUrl.startsWith(config.baseUrl)) {
+    return config.gitilesBaseUrl.replace(
+      config.baseUrl.concat("/"),
+      config.baseUrl.concat(getAuthenticationPrefix(config))
+    );
+  }
+  if (config.password) {
+    throw new Error(
+      "Since the baseUrl (Gerrit) is not part of the gitilesBaseUrl, an authentication URL could not be constructed."
+    );
+  }
+  return config.gitilesBaseUrl;
 }
 function getGerritBranchApiUrl(config, url) {
   const { branch, project } = parseGerritGitilesUrl(config, url);