Skip to content

Commit

Permalink
fix: encode wallet name param in url path (#389)
Browse files Browse the repository at this point in the history
  • Loading branch information
@theborakompanioni
theborakompanioni committed Jul 11, 2022
1 parent e0f51fa commit a98317b
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions src/libs/JmWalletApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,14 @@ const getSession = async ({ token, signal }: ApiRequestContext & { token?: ApiTo
}

const getAddressNew = async ({ token, signal, walletName, mixdepth }: WalletRequestContext & WithMixdepth) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/address/new/${mixdepth}`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/address/new/${mixdepth}`, {
headers: { ...Authorization(token) },
signal,
})
}

const getAddressTimelockNew = async ({ token, signal, walletName, lockdate }: WalletRequestContext & WithLockdate) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/address/timelock/new/${lockdate}`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/address/timelock/new/${lockdate}`, {
headers: { ...Authorization(token) },
signal,
})
Expand All @@ -174,14 +174,14 @@ const postWalletCreate = async (req: CreateWalletRequest) => {
}

const getWalletDisplay = async ({ token, signal, walletName }: WalletRequestContext) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/display`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/display`, {
headers: { ...Authorization(token) },
signal,
})
}

const getWalletSeed = async ({ token, signal, walletName }: WalletRequestContext) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/getseed`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/getseed`, {
headers: { ...Authorization(token) },
signal,
})
Expand All @@ -194,7 +194,7 @@ const getWalletSeed = async ({ token, signal, walletName }: WalletRequestContext
* Note: Performs a non-idempotent GET request.
*/
const getWalletLock = async ({ token, signal, walletName }: WalletRequestContext) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/lock`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/lock`, {
headers: { ...Authorization(token) },
signal,
})
Expand All @@ -204,22 +204,22 @@ const postWalletUnlock = async (
{ signal, walletName }: ApiRequestContext & WithWalletName,
{ password }: WalletUnlockRequest
) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/unlock`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/unlock`, {
method: 'POST',
body: JSON.stringify({ password }),
signal,
})
}

const getWalletUtxos = async ({ token, signal, walletName }: WalletRequestContext) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/utxos`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/utxos`, {
headers: { ...Authorization(token) },
signal,
})
}

const postMakerStart = async ({ token, signal, walletName }: WalletRequestContext, req: StartMakerRequest) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/maker/start`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/maker/start`, {
method: 'POST',
headers: { ...Authorization(token) },
body: JSON.stringify({ ...req, txfee: '0' }),
Expand All @@ -233,14 +233,14 @@ const postMakerStart = async ({ token, signal, walletName }: WalletRequestContex
* Note: Performs a non-idempotent GET request.
*/
const getMakerStop = async ({ token, signal, walletName }: WalletRequestContext) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/maker/stop`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/maker/stop`, {
headers: { ...Authorization(token) },
signal,
})
}

const postDirectSend = async ({ token, signal, walletName }: WalletRequestContext, req: DirectSendRequest) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/taker/direct-send`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/direct-send`, {
method: 'POST',
headers: { ...Authorization(token) },
// docs say "integer", but "midxdepth" must serialize as string!
Expand All @@ -250,7 +250,7 @@ const postDirectSend = async ({ token, signal, walletName }: WalletRequestContex
}

const postCoinjoin = async ({ token, signal, walletName }: WalletRequestContext, req: DoCoinjoinRequest) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/taker/coinjoin`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/coinjoin`, {
method: 'POST',
headers: { ...Authorization(token) },
// docs say "integer", but "midxdepth" must serialize as string!
Expand All @@ -269,7 +269,7 @@ const postFreeze = async (
{ token, signal, walletName }: WalletRequestContext,
{ utxo, freeze = true }: FreezeRequest
) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/freeze`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/freeze`, {
method: 'POST',
headers: { ...Authorization(token) },
body: JSON.stringify({
Expand All @@ -281,7 +281,7 @@ const postFreeze = async (
}

const postSchedulerStart = async ({ token, signal, walletName }: WalletRequestContext, req: StartSchedulerRequest) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/taker/schedule`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/schedule`, {
method: 'POST',
headers: { ...Authorization(token) },
body: JSON.stringify({ ...req }),
Expand All @@ -290,14 +290,14 @@ const postSchedulerStart = async ({ token, signal, walletName }: WalletRequestCo
}

const getSchedulerStop = async ({ token, signal, walletName }: WalletRequestContext) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/taker/stop`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/stop`, {
headers: { ...Authorization(token) },
signal,
})
}

const getSchedule = async ({ token, signal, walletName }: WalletRequestContext) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/taker/schedule`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/schedule`, {
headers: { ...Authorization(token) },
signal,
})
Expand All @@ -309,7 +309,7 @@ const getSchedule = async ({ token, signal, walletName }: WalletRequestContext)
* @returns an object with property `configvalue` as string
*/
const postConfigGet = async ({ token, signal, walletName }: WalletRequestContext, req: ConfigSetRequest) => {
return await fetch(`${basePath()}/v1/wallet/${walletName}/configget`, {
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/configget`, {
method: 'POST',
headers: { ...Authorization(token) },
body: JSON.stringify(req),
Expand Down

0 comments on commit a98317b

Please sign in to comment.