From befd1149c54294f24cb4f0f667d24ae46e22f689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 12 Sep 2023 11:28:32 +0200
Subject: [PATCH] fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/silent-numbers-retire.md           |  4 ++--
 plugins/vault-backend/src/service/vaultApi.ts | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.changeset/silent-numbers-retire.md b/.changeset/silent-numbers-retire.md
index b386d04b14..ff5f11ecee 100644
--- a/.changeset/silent-numbers-retire.md
+++ b/.changeset/silent-numbers-retire.md
@@ -1,6 +1,6 @@
 ---
-'@backstage/plugin-vault-backend': minor
-'@backstage/plugin-vault': minor
+'@backstage/plugin-vault-backend': patch
+'@backstage/plugin-vault': patch
 ---
 
 Added ability to override vault secret engine value on catalog entity level using annotation `vault.io/secrets-engine`
diff --git a/plugins/vault-backend/src/service/vaultApi.ts b/plugins/vault-backend/src/service/vaultApi.ts
index d785e135df..7c3ccc1d00 100644
--- a/plugins/vault-backend/src/service/vaultApi.ts
+++ b/plugins/vault-backend/src/service/vaultApi.ts
@@ -133,8 +133,8 @@ export class VaultClient implements VaultApi {
 
     const listUrl =
       this.vaultConfig.kvVersion === 2
-        ? `v1/${mount}/metadata/${secretPath}`
-        : `v1/${mount}/${secretPath}`;
+        ? `v1/${encodeURIComponent(mount)}/metadata/${secretPath}`
+        : `v1/${encodeURIComponent(mount)}/${secretPath}`;
     const result = await this.limit(() =>
       this.callApi<VaultSecretList>(listUrl, { list: true }),
     );
@@ -157,8 +157,12 @@ export class VaultClient implements VaultApi {
           secrets.push({
             name: secret,
             path: secretPath,
-            editUrl: `${vaultUrl}/ui/vault/secrets/${mount}/edit/${secretPath}/${secret}`,
-            showUrl: `${vaultUrl}/ui/vault/secrets/${mount}/show/${secretPath}/${secret}`,
+            editUrl: `${vaultUrl}/ui/vault/secrets/${encodeURIComponent(
+              mount,
+            )}/edit/${secretPath}/${secret}`,
+            showUrl: `${vaultUrl}/ui/vault/secrets/${encodeURIComponent(
+              mount,
+            )}/show/${secretPath}/${secret}`,
           });
         }
       }),