diff options
author | Florian Dold <florian@dold.me> | 2024-05-02 14:29:30 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2024-05-02 14:29:34 +0200 |
commit | 8e1ccefedd48f0076a53a14ecc2e2d5d094b90a9 (patch) | |
tree | 63e586e3ca631d8e6a831401d4ba95718d1f9406 /packages/taler-wallet-core/src/withdraw.ts | |
parent | 6bcd1c4537d83d6b83113483f3c872ab40e74074 (diff) | |
download | wallet-core-8e1ccefedd48f0076a53a14ecc2e2d5d094b90a9.tar.xz |
wallet-core: require canonicalized base URLs in requests
Diffstat (limited to 'packages/taler-wallet-core/src/withdraw.ts')
-rw-r--r-- | packages/taler-wallet-core/src/withdraw.ts | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/packages/taler-wallet-core/src/withdraw.ts b/packages/taler-wallet-core/src/withdraw.ts index 106bd93a4..fd23fef5b 100644 --- a/packages/taler-wallet-core/src/withdraw.ts +++ b/packages/taler-wallet-core/src/withdraw.ts @@ -78,7 +78,6 @@ import { WithdrawalType, addPaytoQueryParams, assertUnreachable, - canonicalizeBaseUrl, checkDbInvariant, checkLogicInvariant, codeForBankWithdrawalOperationPostResponse, @@ -2568,7 +2567,7 @@ export async function internalPrepareCreateWithdrawalGroup( args.reserveKeyPair ?? (await wex.cryptoApi.createEddsaKeypair({})); const now = AbsoluteTime.toPreciseTimestamp(AbsoluteTime.now()); const secretSeed = encodeCrock(getRandomBytes(32)); - const canonExchange = canonicalizeBaseUrl(args.exchangeBaseUrl); + const exchangeBaseUrl = args.exchangeBaseUrl; const amount = args.amount; const currency = Amounts.currencyOf(amount); @@ -2595,10 +2594,10 @@ export async function internalPrepareCreateWithdrawalGroup( withdrawalGroupId = encodeCrock(getRandomBytes(32)); } - await updateWithdrawalDenoms(wex, canonExchange); + await updateWithdrawalDenoms(wex, exchangeBaseUrl); const denoms = await getCandidateWithdrawalDenoms( wex, - canonExchange, + exchangeBaseUrl, currency, ); @@ -2623,7 +2622,7 @@ export async function internalPrepareCreateWithdrawalGroup( const withdrawalGroup: WithdrawalGroupRecord = { denomSelUid, denomsSel: initialDenomSel, - exchangeBaseUrl: canonExchange, + exchangeBaseUrl: exchangeBaseUrl, instructedAmount: Amounts.stringify(amount), timestampStart: timestampPreciseToDb(now), rawWithdrawalAmount: initialDenomSel.totalWithdrawCost, @@ -2639,7 +2638,7 @@ export async function internalPrepareCreateWithdrawalGroup( wgInfo: args.wgInfo, }; - await fetchFreshExchange(wex, canonExchange); + await fetchFreshExchange(wex, exchangeBaseUrl); const transactionId = constructTransactionIdentifier({ tag: TransactionType.Withdrawal, withdrawalGroupId: withdrawalGroup.withdrawalGroupId, @@ -2649,7 +2648,7 @@ export async function internalPrepareCreateWithdrawalGroup( withdrawalGroup, transactionId, creationInfo: { - canonExchange, + canonExchange: exchangeBaseUrl, amount, }, }; @@ -2822,7 +2821,7 @@ export async function prepareBankIntegratedWithdrawal( }; } - const selectedExchange = canonicalizeBaseUrl(req.selectedExchange); + const selectedExchange = req.selectedExchange; const exchange = await fetchFreshExchange(wex, selectedExchange); const withdrawInfo = await getBankWithdrawalInfo( @@ -2934,7 +2933,7 @@ export async function acceptWithdrawalFromUri( restrictAge?: number; }, ): Promise<AcceptWithdrawalResponse> { - const selectedExchange = canonicalizeBaseUrl(req.selectedExchange); + const selectedExchange = req.selectedExchange; logger.info( `accepting withdrawal via ${req.talerWithdrawUri}, canonicalized selected exchange ${selectedExchange}`, ); |