Skip to content
This repository has been archived by the owner on Mar 27, 2019. It is now read-only.

Remove trailing slashes in vault address before sending request #104

Merged
merged 1 commit into from
Jun 14, 2017
Merged

Remove trailing slashes in vault address before sending request #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions app/components/shared/VaultUtils.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,19 @@ function callVaultApi(method, path, query = {}, data, headers = {}, vaultToken =

var instance;

// Normalize vault address by removing trailing slashes
let normVaultAddr = vaultUrl || window.localStorage.getItem("vaultUrl");
normVaultAddr = normVaultAddr.replace(/\/*$/g, "");

if(WEBPACK_DEF_TARGET_WEB) {
instance = axios.create({
baseURL: '/v1/',
params: { "vaultaddr": vaultUrl || window.localStorage.getItem("vaultUrl") },
params: { "vaultaddr": normVaultAddr },
headers: { "X-Vault-Token": vaultToken || window.localStorage.getItem("vaultAccessToken") }
});
} else {
instance = axios.create({
baseURL: `${window.localStorage.getItem("vaultUrl")}/v1/`,
baseURL: `${normVaultAddr}/v1/`,
headers: { "X-Vault-Token": vaultToken || window.localStorage.getItem("vaultAccessToken") }
});
}
Expand Down