From 9afe2702ab5c5ffd48f59a4ffffc096a4617333b Mon Sep 17 00:00:00 2001 From: ElaineDeMattosSilvaB Date: Tue, 3 Jun 2025 16:06:54 +0200 Subject: [PATCH 1/3] fix: pass OAuth token explicitly to avoid config token overwrite Signed-off-by: ElaineDeMattosSilvaB --- .../src/entrypoints/urlReader/lib/GitlabUrlReader.ts | 5 +---- packages/integration/src/gitlab/core.ts | 6 ++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts index 3e5497a307..a0521d6e23 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts @@ -340,10 +340,7 @@ export class GitlabUrlReader implements UrlReaderService { ); } // Default to the old behavior of assuming the url is for a file - return getGitLabFileFetchUrl(target, { - ...this.integration.config, - ...(token && { token }), - }); + return getGitLabFileFetchUrl(target, this.integration.config, token); } // convert urls of the form: diff --git a/packages/integration/src/gitlab/core.ts b/packages/integration/src/gitlab/core.ts index 4a17b2a15e..b25c50a583 100644 --- a/packages/integration/src/gitlab/core.ts +++ b/packages/integration/src/gitlab/core.ts @@ -40,8 +40,9 @@ import { export async function getGitLabFileFetchUrl( url: string, config: GitLabIntegrationConfig, + token?: string, ): Promise { - const projectID = await getProjectId(url, config); + const projectID = await getProjectId(url, config, token); return buildProjectUrl(url, projectID, config).toString(); } @@ -113,6 +114,7 @@ export function buildProjectUrl( export async function getProjectId( target: string, config: GitLabIntegrationConfig, + token?: string, ): Promise { const url = new URL(target); @@ -143,7 +145,7 @@ export async function getProjectId( const response = await fetch( repoIDLookup.toString(), - getGitLabRequestOptions(config), + getGitLabRequestOptions(config, token), ); const data = await response.json(); From d1e4a6d04f1416af4cf2a718c10743e04893aba9 Mon Sep 17 00:00:00 2001 From: ElaineDeMattosSilvaB Date: Wed, 4 Jun 2025 08:16:24 +0200 Subject: [PATCH 2/3] chore: add changeset Signed-off-by: ElaineDeMattosSilvaB --- .changeset/wise-frogs-talk.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/wise-frogs-talk.md diff --git a/.changeset/wise-frogs-talk.md b/.changeset/wise-frogs-talk.md new file mode 100644 index 0000000000..6a25abc246 --- /dev/null +++ b/.changeset/wise-frogs-talk.md @@ -0,0 +1,6 @@ +--- +'@backstage/backend-defaults': patch +'@backstage/integration': patch +--- + +Fixed bug where the GitLab user token and GitLab integration token were being merged together From 934df9a4750eae3f6e34a2e690ff12864691d73a Mon Sep 17 00:00:00 2001 From: ElaineDeMattosSilvaB Date: Wed, 4 Jun 2025 08:20:54 +0200 Subject: [PATCH 3/3] chore: add api report Signed-off-by: ElaineDeMattosSilvaB --- packages/integration/report.api.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/integration/report.api.md b/packages/integration/report.api.md index d700c13429..f07249bc13 100644 --- a/packages/integration/report.api.md +++ b/packages/integration/report.api.md @@ -588,6 +588,7 @@ export function getGitilesAuthenticationUrl( export function getGitLabFileFetchUrl( url: string, config: GitLabIntegrationConfig, + token?: string, ): Promise; // @public