From 6f7886424fec6150f856446a4f2e36439f1ac2c5 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 5 Jul 2022 11:19:35 +0200
Subject: [PATCH] chore: avoid double encoding of filepath

Signed-off-by: blam <ben@blam.sh>
---
 .../integration/src/bitbucketServer/core.test.ts   | 14 ++++++++++++++
 packages/integration/src/bitbucketServer/core.ts   |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/integration/src/bitbucketServer/core.test.ts b/packages/integration/src/bitbucketServer/core.test.ts
index 1c8f5d259c..076a2c7a4f 100644
--- a/packages/integration/src/bitbucketServer/core.test.ts
+++ b/packages/integration/src/bitbucketServer/core.test.ts
@@ -108,6 +108,20 @@ describe('bitbucketServer core', () => {
       );
     });
 
+    it('does not double encode the filepath', async () => {
+      const config: BitbucketServerIntegrationConfig = {
+        host: 'bitbucket.mycompany.net',
+        apiBaseUrl: 'https://api.bitbucket.mycompany.net/rest/api/1.0',
+      };
+      const result = await getBitbucketServerDownloadUrl(
+        'https://bitbucket.mycompany.net/projects/backstage/repos/mock/browse/%2Fdocs?at=some-branch',
+        config,
+      );
+      expect(result).toEqual(
+        'https://api.bitbucket.mycompany.net/rest/api/1.0/projects/backstage/repos/mock/archive?format=tgz&at=some-branch&prefix=backstage-mock&path=%2Fdocs',
+      );
+    });
+
     it('do not add path param if no path is specified for Bitbucket Server', async () => {
       const defaultBranchResponse = {
         displayId: 'main',
diff --git a/packages/integration/src/bitbucketServer/core.ts b/packages/integration/src/bitbucketServer/core.ts
index 80dbc0443f..0c57b0d3ed 100644
--- a/packages/integration/src/bitbucketServer/core.ts
+++ b/packages/integration/src/bitbucketServer/core.ts
@@ -83,7 +83,9 @@ export async function getBitbucketServerDownloadUrl(
   // path will limit the downloaded content
   // /docs will only download the docs folder and everything below it
   // /docs/index.md will download the docs folder and everything below it
-  const path = filepath ? `&path=${encodeURIComponent(filepath)}` : '';
+  const path = filepath
+    ? `&path=${encodeURIComponent(decodeURIComponent(filepath))}`
+    : '';
   return `${config.apiBaseUrl}/projects/${project}/repos/${repoName}/archive?format=tgz&at=${branch}&prefix=${project}-${repoName}${path}`;
 }