diff options
author | Florian Dold <florian@dold.me> | 2021-02-04 17:13:31 +0100 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2021-02-04 17:13:31 +0100 |
commit | f262b288123d4198223274a3382b9a1110d3ca33 (patch) | |
tree | c94f505c0e4f3a4695f23138ed3b6a76c5befb1d /packages/taler-wallet-core/src/operations | |
parent | 83937a7198c17b267714b159f0e616a2536264d3 (diff) | |
download | wallet-core-f262b288123d4198223274a3382b9a1110d3ca33.tar.xz |
use new auth token for merchant in integration tests
Diffstat (limited to 'packages/taler-wallet-core/src/operations')
-rw-r--r-- | packages/taler-wallet-core/src/operations/testing.ts | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts index 0a83773ab..162e23b31 100644 --- a/packages/taler-wallet-core/src/operations/testing.ts +++ b/packages/taler-wallet-core/src/operations/testing.ts @@ -31,8 +31,6 @@ import { createTalerWithdrawReserve } from "./reserves"; import { URL } from "../util/url"; import { Wallet } from "../wallet"; import { Amounts } from "../util/amounts"; -import { NodeHttpLib } from "../headless/NodeHttpLib"; -import { getDefaultNodeWallet } from "../headless/helpers"; import { TestPayArgs, PreparePayResultType, @@ -53,7 +51,7 @@ interface BankWithdrawalResponse { interface MerchantBackendInfo { baseUrl: string; - apikey: string; + authToken?: string; } /** @@ -109,6 +107,15 @@ export async function withdrawTestBalance( ); } +function getMerchantAuthHeader(m: MerchantBackendInfo): Record<string, string> { + if (m.authToken) { + return { + "Authorization": `Bearer ${m.authToken}`, + } + } + return {}; +} + async function createBankWithdrawalUri( http: HttpRequestLibrary, bankBaseUrl: string, @@ -190,9 +197,7 @@ async function refund( refund: refundAmount, }; const resp = await http.postJson(reqUrl.href, refundReq, { - headers: { - Authorization: `ApiKey ${merchantBackend.apikey}`, - }, + headers: getMerchantAuthHeader(merchantBackend), }); const r = await readSuccessResponseJsonOrThrow(resp, codecForAny()); const refundUri = r.taler_refund_uri; @@ -221,9 +226,7 @@ async function createOrder( }, }; const resp = await http.postJson(reqUrl, orderReq, { - headers: { - Authorization: `ApiKey ${merchantBackend.apikey}`, - }, + headers: getMerchantAuthHeader(merchantBackend), }); const r = await readSuccessResponseJsonOrThrow(resp, codecForAny()); const orderId = r.order_id; @@ -241,9 +244,7 @@ async function checkPayment( const reqUrl = new URL(`/private/orders/${orderId}`, merchantBackend.baseUrl); reqUrl.searchParams.set("order_id", orderId); const resp = await http.get(reqUrl.href, { - headers: { - Authorization: `ApiKey ${merchantBackend.apikey}`, - }, + headers: getMerchantAuthHeader(merchantBackend), }); return readSuccessResponseJsonOrThrow(resp, codecForCheckPaymentResponse()); } @@ -337,7 +338,7 @@ export async function runIntegrationTest( const myMerchant: MerchantBackendInfo = { baseUrl: args.merchantBaseUrl, - apikey: args.merchantApiKey, + authToken: args.merchantAuthToken, }; await makePayment( @@ -415,7 +416,7 @@ export async function testPay( ) { logger.trace("creating order"); const merchant = { - apikey: args.merchantApiKey, + authToken: args.merchantAuthToken, baseUrl: args.merchantBaseUrl, }; const orderResp = await createOrder( |