commit a79fcf47b867994f773e2196c6d040cc34f825f3 parent 6d9b300703d82093f340e6498aeb970fd811beba Author: Antoine A <> Date: Mon, 21 Oct 2024 19:38:27 +0200 test: longer passwords and better libeufin-bank config Diffstat:
41 files changed, 176 insertions(+), 145 deletions(-)
diff --git a/packages/taler-harness/src/env-full.ts b/packages/taler-harness/src/env-full.ts @@ -57,7 +57,7 @@ export async function runEnvFull(t: GlobalTestState): Promise<void> { const exchangeBankAccount = await bank.createExchangeAccount( "myexchange", - "x", + "password", ); console.log("exchange bank account", j2s(exchangeBankAccount)); exchange.addBankAccount("1", exchangeBankAccount); diff --git a/packages/taler-harness/src/env1.ts b/packages/taler-harness/src/env1.ts @@ -51,7 +51,7 @@ export async function runEnv1(t: GlobalTestState): Promise<void> { exchange.addBankAccount("1", { accountName: "exchange", - accountPassword: "x", + accountPassword: "password", wireGatewayApiBaseUrl: new URL("/exchange/", bank.baseUrl).href, accountPaytoUri: "payto://x-taler-bank/localhost/exchange", }); diff --git a/packages/taler-harness/src/harness/environments.ts b/packages/taler-harness/src/harness/environments.ts @@ -231,7 +231,7 @@ export async function useSharedTestkudosEnvironment(t: GlobalTestState) { const exchangeBankAccount = await bank.createExchangeAccount( "myexchange", - "x", + "password", ); logger.info("creating exchange bank account"); @@ -355,7 +355,7 @@ export async function createSimpleTestkudosEnvironmentV2( const exchangeBankAccount = await bank.createExchangeAccount( "myexchange", - "x", + "password", ); await exchange.addBankAccount("1", exchangeBankAccount); @@ -481,7 +481,7 @@ export async function createSimpleTestkudosEnvironmentV3( const receiverName = "Exchange"; const exchangeBankUsername = "exchange"; - const exchangeBankPassword = "mypw"; + const exchangeBankPassword = "mypw-password"; const exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); const wireGatewayApiBaseUrl = new URL( `accounts/${exchangeBankUsername}/taler-wire-gateway/`, @@ -511,7 +511,7 @@ export async function createSimpleTestkudosEnvironmentV3( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); @@ -716,7 +716,7 @@ export async function createFaultInjectedMerchantTestkudosEnvironment( const exchangeBankAccount = await bank.createExchangeAccount( "myexchange", - "x", + "password", ); exchange.addBankAccount("1", exchangeBankAccount); @@ -1144,7 +1144,7 @@ export async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); const wireGatewayApiBaseUrl = new URL( @@ -1168,7 +1168,7 @@ export async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts @@ -851,8 +851,10 @@ export class LibeufinBankService `${bc.currency}:100`, ); config.setString("libeufin-bank", "ALLOW_REGISTRATION", "yes"); + config.setString("libeufin-bank", "PWD_HASH_CONFIG", '{ "cost": 4 }'); const cfgFilename = testDir + "/bank.conf"; config.writeTo(cfgFilename, { excludeDefaults: true }); + console.log("conf WTD " + cfgFilename); return new LibeufinBankService(gc, bc, cfgFilename); } @@ -864,6 +866,7 @@ export class LibeufinBankService const testDir = opts.overridePath ?? gc.testDir; const cfgFilename = testDir + `/bank.conf`; const config = Configuration.load(cfgFilename); + console.log("conf THERE " + cfgFilename); const bc: BankConfig = { allowRegistrations: config.getYesNo("libeufin-bank", "allow_registrations").orUndefined() ?? @@ -921,7 +924,7 @@ export class LibeufinBankService await sh( this.globalTestState, "libeufin-bank-passwd", - `libeufin-bank passwd -c "${this.configFile}" admin adminpw`, + `libeufin-bank passwd -c "${this.configFile}" admin admin-password`, ); await sh( @@ -1053,10 +1056,6 @@ export class ExchangeService implements ExchangeServiceInterface { } async runWirewatchOnce() { - if (useLibeufinBank) { - // Not even 2 seconds showed to be enough! - await waitMs(4000); - } await runCommand( this.globalState, `exchange-${this.name}-wirewatch-once`, @@ -2425,7 +2424,3 @@ export function generateRandomTestIban(salt: string | null = null): string { export function getTestHarnessPaytoForLabel(label: string): string { return `payto://x-taler-bank/localhost/${label}?receiver-name=${label}`; } - -function waitMs(ms: number): Promise<void> { - return new Promise((resolve) => setTimeout(resolve, ms)); -} diff --git a/packages/taler-harness/src/integrationtests/test-bank-api.ts b/packages/taler-harness/src/integrationtests/test-bank-api.ts @@ -65,10 +65,13 @@ export async function runBankApiTest(t: GlobalTestState) { let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); - let wireGatewayApiBaseUrl = new URL("accounts/exchange/taler-wire-gateway/", bank.baseUrl).href; + let wireGatewayApiBaseUrl = new URL( + "accounts/exchange/taler-wire-gateway/", + bank.baseUrl, + ).href; await exchange.addBankAccount("1", { accountName: exchangeBankUsername, accountPassword: exchangeBankPassword, @@ -109,7 +112,7 @@ export async function runBankApiTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); @@ -121,12 +124,12 @@ export async function runBankApiTest(t: GlobalTestState) { payto_uri: exchangePaytoUri, }); - const bankUser = await bankClient.registerAccount("user1", "pw1"); + const bankUser = await bankClient.registerAccount("user1", "password1"); // Make sure that registering twice results in a 409 Conflict { const e = await t.assertThrowsTalerErrorAsync(async () => { - await bankClient.registerAccount("user1", "pw2"); + await bankClient.registerAccount("user1", "password2"); }); t.assertTrue(e.errorDetail.httpStatusCode === 409); } @@ -143,15 +146,12 @@ export async function runBankApiTest(t: GlobalTestState) { const res = createEddsaKeyPair(); - const wireGatewayApiClient = new WireGatewayApiClient( - wireGatewayApiBaseUrl, - { - auth: { - username: "admin", - password: "adminpw", - }, + const wireGatewayApiClient = new WireGatewayApiClient(wireGatewayApiBaseUrl, { + auth: { + username: "admin", + password: "admin-password", }, - ); + }); await wireGatewayApiClient.adminAddIncoming({ amount: "TESTKUDOS:115", @@ -166,4 +166,4 @@ export async function runBankApiTest(t: GlobalTestState) { ); } -runBankApiTest.suites = ["fakebank"] +runBankApiTest.suites = ["fakebank"]; diff --git a/packages/taler-harness/src/integrationtests/test-currency-scope.ts b/packages/taler-harness/src/integrationtests/test-currency-scope.ts @@ -80,7 +80,7 @@ export async function runCurrencyScopeTest(t: GlobalTestState) { bank.corebankApiBaseUrl, ).href, accountName: "myexchange", - accountPassword: "x", + accountPassword: "password", accountPaytoUri: getTestHarnessPaytoForLabel("myexchange"), }; @@ -90,7 +90,7 @@ export async function runCurrencyScopeTest(t: GlobalTestState) { bank.corebankApiBaseUrl, ).href, accountName: "myexchange2", - accountPassword: "x", + accountPassword: "password", accountPaytoUri: getTestHarnessPaytoForLabel("myexchange2"), }; @@ -106,7 +106,7 @@ export async function runCurrencyScopeTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-exchange-management-fault.ts b/packages/taler-harness/src/integrationtests/test-exchange-management-fault.ts @@ -31,7 +31,7 @@ import { FaultInjectionResponseContext, } from "../harness/faultInjection.js"; import { - BankService, + BankService, ExchangeService, GlobalTestState, MerchantService, @@ -73,13 +73,16 @@ export async function runExchangeManagementFaultTest( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { accountName: exchangeBankUsername, accountPassword: exchangeBankPassword, - wireGatewayApiBaseUrl: new URL("accounts/exchange/taler-wire-gateway/", bank.baseUrl).href, + wireGatewayApiBaseUrl: new URL( + "accounts/exchange/taler-wire-gateway/", + bank.baseUrl, + ).href, accountPaytoUri: exchangePaytoUri, }); @@ -89,10 +92,7 @@ export async function runExchangeManagementFaultTest( config.setString("exchange", "base_url", "http://localhost:8091/"); }); - bank.setSuggestedExchange( - faultyExchange, - exchangePaytoUri, - ); + bank.setSuggestedExchange(faultyExchange, exchangePaytoUri); await bank.start(); @@ -271,7 +271,7 @@ export async function runExchangeManagementFaultTest( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-exchange-timetravel.ts b/packages/taler-harness/src/integrationtests/test-exchange-timetravel.ts @@ -33,7 +33,7 @@ import { } from "@gnu-taler/taler-util/http"; import { makeNoFeeCoinConfig } from "../harness/denomStructures.js"; import { - BankService, + BankService, ExchangeService, getTestHarnessPaytoForLabel, GlobalTestState, @@ -127,13 +127,16 @@ export async function runExchangeTimetravelTest(t: GlobalTestState) { let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { accountName: exchangeBankUsername, accountPassword: exchangeBankPassword, - wireGatewayApiBaseUrl: new URL("accounts/exchange/taler-wire-gateway/", bank.baseUrl).href, + wireGatewayApiBaseUrl: new URL( + "accounts/exchange/taler-wire-gateway/", + bank.baseUrl, + ).href, accountPaytoUri: exchangePaytoUri, }); @@ -146,7 +149,7 @@ export async function runExchangeTimetravelTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-fee-regression.ts b/packages/taler-harness/src/integrationtests/test-fee-regression.ts @@ -69,7 +69,7 @@ export async function createMyTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -91,7 +91,7 @@ export async function createMyTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-balance-withdrawal.ts b/packages/taler-harness/src/integrationtests/test-kyc-balance-withdrawal.ts @@ -83,7 +83,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -105,7 +105,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate.ts b/packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate.ts @@ -78,7 +78,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -100,7 +100,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-deposit-deposit-kyctransfer.ts b/packages/taler-harness/src/integrationtests/test-kyc-deposit-deposit-kyctransfer.ts @@ -84,7 +84,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); const wireGatewayApiBaseUrl = new URL( @@ -108,7 +108,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); @@ -272,7 +272,7 @@ export async function runKycDepositDepositKyctransferTest(t: GlobalTestState) { { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }, ); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-deposit-deposit.ts b/packages/taler-harness/src/integrationtests/test-kyc-deposit-deposit.ts @@ -81,7 +81,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -103,7 +103,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-exchange-wallet.ts b/packages/taler-harness/src/integrationtests/test-kyc-exchange-wallet.ts @@ -76,7 +76,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -98,7 +98,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-form-withdrawal.ts b/packages/taler-harness/src/integrationtests/test-kyc-form-withdrawal.ts @@ -83,7 +83,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -105,7 +105,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-merchant-aggregate.ts b/packages/taler-harness/src/integrationtests/test-kyc-merchant-aggregate.ts @@ -77,7 +77,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -97,7 +97,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit.ts b/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit.ts @@ -96,7 +96,7 @@ export async function runKycMerchantDepositTest(t: GlobalTestState) { { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }, ); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-new-measure.ts b/packages/taler-harness/src/integrationtests/test-kyc-new-measure.ts @@ -88,7 +88,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -110,7 +110,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); @@ -318,7 +318,10 @@ export async function runKycNewMeasureTest(t: GlobalTestState) { }, ); - const decisions = await readResponseJsonOrThrow(decisionsResp, codecForAny()); + const decisions = await readResponseJsonOrThrow( + decisionsResp, + codecForAny(), + ); console.log(j2s(decisions)); t.assertDeepEqual(decisionsResp.status, 200); @@ -349,7 +352,6 @@ export async function runKycNewMeasureTest(t: GlobalTestState) { }, }); - { const decisionsResp = await harnessHttpLib.fetch( new URL(`aml/${amlKeypair.pub}/decisions`, exchange.baseUrl).href, @@ -360,7 +362,10 @@ export async function runKycNewMeasureTest(t: GlobalTestState) { }, ); - const decisions = await readResponseJsonOrThrow(decisionsResp, codecForAny()); + const decisions = await readResponseJsonOrThrow( + decisionsResp, + codecForAny(), + ); console.log(j2s(decisions)); t.assertDeepEqual(decisionsResp.status, 200); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-peer-pull.ts b/packages/taler-harness/src/integrationtests/test-kyc-peer-pull.ts @@ -85,7 +85,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -107,7 +107,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-peer-push.ts b/packages/taler-harness/src/integrationtests/test-kyc-peer-push.ts @@ -84,7 +84,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -106,7 +106,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-kyc.ts b/packages/taler-harness/src/integrationtests/test-kyc.ts @@ -43,7 +43,10 @@ import { harnessHttpLib, setupDb, } from "../harness/harness.js"; -import { EnvOptions, SimpleTestEnvironmentNg3 } from "../harness/environments.js"; +import { + EnvOptions, + SimpleTestEnvironmentNg3, +} from "../harness/environments.js"; const logger = new Logger("test-kyc.ts"); @@ -77,7 +80,7 @@ async function createKycTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -99,7 +102,7 @@ async function createKycTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-libeufin-bank.ts b/packages/taler-harness/src/integrationtests/test-libeufin-bank.ts @@ -73,7 +73,7 @@ export async function runLibeufinBankTest(t: GlobalTestState) { }); const exchangeBankUsername = "exchange"; - const exchangeBankPw = "mypw"; + const exchangeBankPw = "mypw-password"; const exchangePayto = getTestHarnessPaytoForLabel(exchangeBankUsername); const wireGatewayApiBaseUrl = new URL( "accounts/exchange/taler-wire-gateway/", @@ -126,7 +126,7 @@ export async function runLibeufinBankTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); @@ -139,16 +139,16 @@ export async function runLibeufinBankTest(t: GlobalTestState) { payto_uri: exchangePayto, }); - const bankUser = await bankClient.registerAccount("user1", "pw1"); + const bankUser = await bankClient.registerAccount("user1", "password1"); bankClient.setAuth({ username: "user1", - password: "pw1", + password: "password1", }); // Make sure that registering twice results in a 409 Conflict // { // const e = await t.assertThrowsTalerErrorAsync(async () => { - // await bankClient.registerAccount("user1", "pw2"); + // await bankClient.registerAccount("user1", "password2"); // }); // t.assertTrue(e.errorDetail.httpStatusCode === 409); // } @@ -172,7 +172,7 @@ export async function runLibeufinBankTest(t: GlobalTestState) { { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }, ); diff --git a/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts b/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts @@ -89,7 +89,7 @@ export async function createConfusedMerchantTestkudosEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -111,7 +111,7 @@ export async function createConfusedMerchantTestkudosEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-multiexchange.ts b/packages/taler-harness/src/integrationtests/test-multiexchange.ts @@ -17,11 +17,15 @@ /** * Imports. */ -import { Duration, TalerCorebankApiClient, TalerMerchantApi } from "@gnu-taler/taler-util"; +import { + Duration, + TalerCorebankApiClient, + TalerMerchantApi, +} from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { defaultCoinConfig } from "../harness/denomStructures.js"; import { - BankService, + BankService, ExchangeService, GlobalTestState, HarnessExchangeBankAccount, @@ -81,7 +85,7 @@ export async function runMultiExchangeTest(t: GlobalTestState) { bank.corebankApiBaseUrl, ).href, accountName: "myexchange", - accountPassword: "x", + accountPassword: "password", accountPaytoUri: getTestHarnessPaytoForLabel("myexchange"), }; @@ -91,7 +95,7 @@ export async function runMultiExchangeTest(t: GlobalTestState) { bank.corebankApiBaseUrl, ).href, accountName: "myexchange2", - accountPassword: "x", + accountPassword: "password", accountPaytoUri: getTestHarnessPaytoForLabel("myexchange2"), }; @@ -107,7 +111,7 @@ export async function runMultiExchangeTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-payment-fault.ts b/packages/taler-harness/src/integrationtests/test-payment-fault.ts @@ -70,7 +70,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) { let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -98,7 +98,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-payment-multiple.ts b/packages/taler-harness/src/integrationtests/test-payment-multiple.ts @@ -17,7 +17,10 @@ /** * Imports. */ -import { MerchantApiClient, TalerCorebankApiClient } from "@gnu-taler/taler-util"; +import { + MerchantApiClient, + TalerCorebankApiClient, +} from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { coin_ct10, coin_u1 } from "../harness/denomStructures.js"; import { @@ -58,13 +61,16 @@ async function setupTest(t: GlobalTestState): Promise<{ let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { accountName: exchangeBankUsername, accountPassword: exchangeBankPassword, - wireGatewayApiBaseUrl: new URL("accounts/exchange/taler-wire-gateway/", bank.baseUrl).href, + wireGatewayApiBaseUrl: new URL( + "accounts/exchange/taler-wire-gateway/", + bank.baseUrl, + ).href, accountPaytoUri: exchangePaytoUri, }); @@ -77,7 +83,7 @@ async function setupTest(t: GlobalTestState): Promise<{ const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-revocation.ts b/packages/taler-harness/src/integrationtests/test-revocation.ts @@ -92,7 +92,7 @@ async function createTestEnvironment( let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -114,7 +114,7 @@ async function createTestEnvironment( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-timetravel-autorefresh.ts b/packages/taler-harness/src/integrationtests/test-timetravel-autorefresh.ts @@ -73,7 +73,7 @@ export async function runTimetravelAutorefreshTest(t: GlobalTestState) { let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -95,7 +95,7 @@ export async function runTimetravelAutorefreshTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); @@ -150,14 +150,13 @@ export async function runTimetravelAutorefreshTest(t: GlobalTestState) { }); t.logStep("wait"); await wres.withdrawalFinishedCond; - const exchangeUpdated1Cond = walletClient.waitForNotificationCond( - (x) => - { - t.logStep(`EXCHANGE UPDATE, ${j2s(x)}`) - return x.type === NotificationType.ExchangeStateTransition && - x.exchangeBaseUrl === exchange.baseUrl - } - ); + const exchangeUpdated1Cond = walletClient.waitForNotificationCond((x) => { + t.logStep(`EXCHANGE UPDATE, ${j2s(x)}`); + return ( + x.type === NotificationType.ExchangeStateTransition && + x.exchangeBaseUrl === exchange.baseUrl + ); + }); t.logStep("waiting tx"); await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {}); diff --git a/packages/taler-harness/src/integrationtests/test-wallet-dd48.ts b/packages/taler-harness/src/integrationtests/test-wallet-dd48.ts @@ -63,7 +63,7 @@ export async function runWalletDd48Test(t: GlobalTestState) { let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -85,7 +85,7 @@ export async function runWalletDd48Test(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-wallet-exchange-update.ts b/packages/taler-harness/src/integrationtests/test-wallet-exchange-update.ts @@ -82,13 +82,13 @@ export async function runWalletExchangeUpdateTest( const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); // const exchangeBankAccount = await bank.createExchangeAccount( // "myexchange", - // "x", + // "password", // ); let exchangeBankAccount: HarnessExchangeBankAccount = { @@ -97,7 +97,7 @@ export async function runWalletExchangeUpdateTest( bank.corebankApiBaseUrl, ).href, accountName: "myexchange", - accountPassword: "x", + accountPassword: "password", accountPaytoUri: getTestHarnessPaytoForLabel("myexchange"), }; diff --git a/packages/taler-harness/src/integrationtests/test-wallet-insufficient-balance.ts b/packages/taler-harness/src/integrationtests/test-wallet-insufficient-balance.ts @@ -62,7 +62,7 @@ export async function runWalletInsufficientBalanceTest(t: GlobalTestState) { { const receiverName = "Exchange2"; const exchangeBankUsername = "exchange2"; - const exchangeBankPassword = "mypw"; + const exchangeBankPassword = "mypw-password"; const exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); const wireGatewayApiBaseUrl = new URL( `accounts/${exchangeBankUsername}/taler-wire-gateway/`, diff --git a/packages/taler-harness/src/integrationtests/test-wallet-notifications.ts b/packages/taler-harness/src/integrationtests/test-wallet-notifications.ts @@ -26,7 +26,7 @@ import { import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js"; import { - BankService, + BankService, ExchangeService, GlobalTestState, MerchantService, @@ -61,7 +61,7 @@ export async function runWalletNotificationsTest(t: GlobalTestState) { let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); const merchant = await MerchantService.create(t, { @@ -74,7 +74,10 @@ export async function runWalletNotificationsTest(t: GlobalTestState) { await exchange.addBankAccount("1", { accountName: exchangeBankUsername, accountPassword: exchangeBankPassword, - wireGatewayApiBaseUrl: new URL("accounts/exchange/taler-wire-gateway/", bank.baseUrl).href, + wireGatewayApiBaseUrl: new URL( + "accounts/exchange/taler-wire-gateway/", + bank.baseUrl, + ).href, accountPaytoUri: exchangePaytoUri, }); @@ -87,7 +90,7 @@ export async function runWalletNotificationsTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); @@ -116,7 +119,9 @@ export async function runWalletNotificationsTest(t: GlobalTestState) { id: "default", name: "Default Instance", paytoUris: [ - `payto://iban/SANDBOXX/${generateRandomTestIban(label)}?receiver-name=${label}`, + `payto://iban/SANDBOXX/${generateRandomTestIban( + label, + )}?receiver-name=${label}`, ], defaultWireTransferDelay: Duration.toTalerProtocolDuration( Duration.fromSpec({ minutes: 1 }), @@ -144,8 +149,8 @@ export async function runWalletNotificationsTest(t: GlobalTestState) { config: { testing: { skipDefaults: true, - } - } + }, + }, }); const user = await bankClient.createRandomBankUser(); diff --git a/packages/taler-harness/src/integrationtests/test-wallet-observability.ts b/packages/taler-harness/src/integrationtests/test-wallet-observability.ts @@ -17,7 +17,11 @@ /** * Imports. */ -import { NotificationType, TalerCorebankApiClient, WalletNotification } from "@gnu-taler/taler-util"; +import { + NotificationType, + TalerCorebankApiClient, + WalletNotification, +} from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js"; import { @@ -52,13 +56,16 @@ export async function runWalletObservabilityTest(t: GlobalTestState) { let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { accountName: exchangeBankUsername, accountPassword: exchangeBankPassword, - wireGatewayApiBaseUrl: new URL("accounts/exchange/taler-wire-gateway/", bank.baseUrl).href, + wireGatewayApiBaseUrl: new URL( + "accounts/exchange/taler-wire-gateway/", + bank.baseUrl, + ).href, accountPaytoUri: exchangePaytoUri, }); @@ -71,7 +78,7 @@ export async function runWalletObservabilityTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-wallet-wirefees.ts b/packages/taler-harness/src/integrationtests/test-wallet-wirefees.ts @@ -73,7 +73,7 @@ export async function runWalletWirefeesTest(t: GlobalTestState) { let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -95,7 +95,7 @@ export async function runWalletWirefeesTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-amount.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-amount.ts @@ -43,7 +43,7 @@ export async function runWithdrawalAmountTest(t: GlobalTestState) { { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }, ); diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-conversion.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-conversion.ts @@ -163,7 +163,7 @@ export async function runWithdrawalConversionTest(t: GlobalTestState) { bank.corebankApiBaseUrl, ).href, accountName: "myexchange", - accountPassword: "x", + accountPassword: "password", accountPaytoUri: getTestHarnessPaytoForLabel("myexchange"), conversionUrl: "http://localhost:8071/", }; @@ -176,7 +176,7 @@ export async function runWithdrawalConversionTest(t: GlobalTestState) { const bankClientAuth = { username: "admin", - password: "adminpw", + password: "admin-password", }; const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-fakebank.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-fakebank.ts @@ -53,7 +53,7 @@ export async function runWithdrawalFakebankTest(t: GlobalTestState) { exchange.addBankAccount("1", { accountName: "exchange", - accountPassword: "x", + accountPassword: "password", wireGatewayApiBaseUrl: new URL( "/accounts/exchange/taler-wire-gateway/", bank.baseUrl, @@ -62,7 +62,7 @@ export async function runWithdrawalFakebankTest(t: GlobalTestState) { "payto://x-taler-bank/localhost/exchange?receiver-name=Exchange", }); - await bank.createExchangeAccount("exchange", "x"); + await bank.createExchangeAccount("exchange", "password"); await bank.start(); diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-fees.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-fees.ts @@ -84,7 +84,7 @@ export async function runWithdrawalFeesTest(t: GlobalTestState) { let receiverName = "Exchange"; let exchangeBankUsername = "exchange"; - let exchangeBankPassword = "mypw"; + let exchangeBankPassword = "mypw-password"; let exchangePaytoUri = getTestHarnessPaytoForLabel(exchangeBankUsername); await exchange.addBankAccount("1", { @@ -106,7 +106,7 @@ export async function runWithdrawalFeesTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }); @@ -138,7 +138,7 @@ export async function runWithdrawalFeesTest(t: GlobalTestState) { bankClient.setAuth(user); const wop = await bankClient.createWithdrawalOperation(user.username, amount); - t.logStep("Hand it to the wallet") + t.logStep("Hand it to the wallet"); const details = await wallet.client.call( WalletApiOperation.GetWithdrawalDetailsForUri, @@ -165,25 +165,25 @@ export async function runWithdrawalFeesTest(t: GlobalTestState) { t.assertAmountEquals(amountDetails.amountEffective, "TESTKUDOS:5"); t.assertAmountEquals(amountDetails.amountRaw, "TESTKUDOS:7.5"); - t.logStep("Complete all pending operations") + t.logStep("Complete all pending operations"); await wallet.runPending(); - t.logStep("Withdraw (AKA select)") + t.logStep("Withdraw (AKA select)"); await wallet.client.call(WalletApiOperation.AcceptBankIntegratedWithdrawal, { exchangeBaseUrl: exchange.baseUrl, talerWithdrawUri: wop.taler_withdraw_uri, }); - t.logStep("Confirm it") + t.logStep("Confirm it"); await bankClient.confirmWithdrawalOperation(user.username, { withdrawalOperationId: wop.withdrawal_id, }); await wallet.runUntilDone(); - t.logStep("Check balance") + t.logStep("Check balance"); const balResp = await wallet.client.call(WalletApiOperation.GetBalances, {}); console.log(j2s(balResp)); diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts @@ -65,8 +65,11 @@ export async function runWithdrawalHugeTest(t: GlobalTestState) { await exchange.addBankAccount("1", { accountName: "exchange", - accountPassword: "x", - wireGatewayApiBaseUrl: new URL("accounts/exchange/taler-wire-gateway/", bank.baseUrl).href, + accountPassword: "password", + wireGatewayApiBaseUrl: new URL( + "accounts/exchange/taler-wire-gateway/", + bank.baseUrl, + ).href, accountPaytoUri: paytoUri, }); @@ -79,13 +82,13 @@ export async function runWithdrawalHugeTest(t: GlobalTestState) { const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, { auth: { username: "admin", - password: "adminpw", - } + password: "admin-password", + }, }); await bankClient.registerAccountExtended({ name: "Exchange", - password: "x", + password: "password", username: "exchange", is_taler_exchange: true, payto_uri: paytoUri, diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts @@ -77,7 +77,7 @@ export async function runWithdrawalManualTest(t: GlobalTestState) { { auth: { username: "admin", - password: "adminpw", + password: "admin-password", }, }, ); diff --git a/packages/taler-util/src/bank-api-client.ts b/packages/taler-util/src/bank-api-client.ts @@ -288,6 +288,7 @@ export class TalerCorebankApiClient { */ async registerAccount(username: string, password: string): Promise<BankUser> { const url = new URL("accounts", this.baseUrl); + console.log(username, password); const resp = await this.httpLib.fetch(url.href, { method: "POST", body: {