use node16 for wallet-core, delete unused taler-config-lib package
This commit is contained in:
parent
b0223d662a
commit
83d4a1addc
@ -1,3 +0,0 @@
|
||||
# @gnu-taler/taler-config-lib
|
||||
|
||||
This package deploys Taler according to TypeScript instructions.
|
@ -1,40 +0,0 @@
|
||||
{
|
||||
"name": "@gnu-taler/taler-config-lib",
|
||||
"version": "0.9.0-dev.1",
|
||||
"description": "GNU Taler Configuration engine.",
|
||||
"module": "./lib/index.node.js",
|
||||
"main": "./lib/index.node.js",
|
||||
"type": "commonjs",
|
||||
"types": "./lib/index.node.d.ts",
|
||||
"typesVersions": {
|
||||
"*": {
|
||||
"lib/index.node.d.ts": [
|
||||
"lib/index.node.d.ts"
|
||||
],
|
||||
"src/*": [],
|
||||
"*": []
|
||||
}
|
||||
},
|
||||
"author": "MS",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"private": false,
|
||||
"scripts": {
|
||||
"prepare": "tsc",
|
||||
"compile": "tsc",
|
||||
"clean": "rimraf dist lib tsconfig.tsbuildinfo",
|
||||
"pretty": "prettier --write src"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^18.8.5",
|
||||
"ava": "^4.3.3",
|
||||
"esbuild": "^0.14.21",
|
||||
"prettier": "^2.5.1",
|
||||
"rimraf": "^3.0.2",
|
||||
"typescript": "^4.8.4"
|
||||
},
|
||||
"dependencies": {
|
||||
"big-integer": "^1.6.51",
|
||||
"jed": "^1.1.1",
|
||||
"tslib": "^2.4.0"
|
||||
}
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
module.exports = function(subject: any) {
|
||||
console.log("Hello, World!");
|
||||
};
|
@ -1,27 +0,0 @@
|
||||
{
|
||||
"compileOnSave": true,
|
||||
"compilerOptions": {
|
||||
"composite": true,
|
||||
"declaration": true,
|
||||
"declarationMap": false,
|
||||
"target": "ES6",
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "node",
|
||||
"sourceMap": true,
|
||||
"lib": ["es6"],
|
||||
"types": ["node"],
|
||||
"noImplicitReturns": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"strict": true,
|
||||
"strictPropertyInitialization": false,
|
||||
"outDir": "lib",
|
||||
"noImplicitAny": true,
|
||||
"noImplicitThis": true,
|
||||
"incremental": true,
|
||||
"esModuleInterop": true,
|
||||
"importHelpers": true,
|
||||
"rootDir": "./src",
|
||||
"typeRoots": ["./node_modules/@types"]
|
||||
},
|
||||
"include": ["src/**/*"]
|
||||
}
|
@ -20,13 +20,6 @@
|
||||
|
||||
import test from "ava";
|
||||
import { clk } from "./clk.js";
|
||||
import {
|
||||
Codec,
|
||||
buildCodecForObject,
|
||||
codecForConstString,
|
||||
codecForString,
|
||||
buildCodecForUnion,
|
||||
} from "./codec.js";
|
||||
|
||||
test("bla", (t) => {
|
||||
const prog = clk.program("foo", {
|
||||
|
@ -15,6 +15,7 @@
|
||||
"bin": {
|
||||
"taler-wallet-cli": "./bin/taler-wallet-cli"
|
||||
},
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"prepare": "tsc && rollup -c",
|
||||
"compile": "tsc && rollup -c",
|
||||
|
@ -31,6 +31,7 @@ export default {
|
||||
plugins: [
|
||||
replace({
|
||||
__VERSION__: `"${printedVersion}"`,
|
||||
preventAssignment: true,
|
||||
}),
|
||||
|
||||
nodeResolve({
|
||||
|
@ -55,7 +55,7 @@ import {
|
||||
WalletCoreApiClient,
|
||||
} from "@gnu-taler/taler-wallet-core";
|
||||
import { deepStrictEqual } from "assert";
|
||||
import axios, { AxiosError } from "axios";
|
||||
import axiosImp, { AxiosError } from "axios";
|
||||
import { ChildProcess, spawn } from "child_process";
|
||||
import * as fs from "fs";
|
||||
import * as http from "http";
|
||||
@ -79,6 +79,8 @@ import {
|
||||
|
||||
const exec = util.promisify(require("child_process").exec);
|
||||
|
||||
const axios = axiosImp.default;
|
||||
|
||||
export async function delayMs(ms: number): Promise<void> {
|
||||
return new Promise((resolve, reject) => {
|
||||
setTimeout(() => resolve(), ms);
|
||||
|
@ -1,4 +1,3 @@
|
||||
|
||||
/**
|
||||
* This file defines most of the API calls offered
|
||||
* by Nexus and Sandbox. They don't have state,
|
||||
@ -6,8 +5,8 @@
|
||||
* the services get actually started and managed.
|
||||
*/
|
||||
|
||||
|
||||
import axios from "axios";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
import { URL } from "@gnu-taler/taler-util";
|
||||
|
||||
export interface LibeufinSandboxServiceInterface {
|
||||
@ -80,7 +79,6 @@ export interface PostNexusPermissionRequest {
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
export interface CreateAnastasisFacadeRequest {
|
||||
name: string;
|
||||
connectionName: string;
|
||||
@ -135,7 +133,6 @@ export interface SimulateIncomingTransactionRequest {
|
||||
amount: string;
|
||||
}
|
||||
|
||||
|
||||
export interface CreateEbicsBankAccountRequest {
|
||||
subscriber: {
|
||||
hostID: string;
|
||||
@ -171,7 +168,6 @@ function getRandomString(): string {
|
||||
}
|
||||
|
||||
export namespace LibeufinSandboxApi {
|
||||
|
||||
/**
|
||||
* Return balance and payto-address of 'accountLabel'.
|
||||
* Note: the demobank serving the request is hard-coded
|
||||
@ -182,14 +178,17 @@ export namespace LibeufinSandboxApi {
|
||||
username: string,
|
||||
password: string,
|
||||
libeufinSandboxService: LibeufinSandboxServiceInterface,
|
||||
accountLabel: string
|
||||
accountLabel: string,
|
||||
) {
|
||||
let url = new URL(`accounts/${accountLabel}`,libeufinSandboxService.baseUrl);
|
||||
let url = new URL(
|
||||
`accounts/${accountLabel}`,
|
||||
libeufinSandboxService.baseUrl,
|
||||
);
|
||||
return await axios.get(url.href, {
|
||||
auth: {
|
||||
username: username,
|
||||
password: password
|
||||
}
|
||||
password: password,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@ -202,7 +201,7 @@ export namespace LibeufinSandboxApi {
|
||||
let url = new URL("testing/register", libeufinSandboxService.baseUrl);
|
||||
await axios.post(url.href, {
|
||||
username: username,
|
||||
password: password
|
||||
password: password,
|
||||
});
|
||||
}
|
||||
|
||||
@ -215,17 +214,21 @@ export namespace LibeufinSandboxApi {
|
||||
) {
|
||||
// baseUrl should already be pointed to one demobank.
|
||||
let url = new URL("ebics/subscribers", libeufinSandboxService.baseUrl);
|
||||
await axios.post(url.href, {
|
||||
userID: req.userID,
|
||||
hostID: req.hostID,
|
||||
partnerID: req.partnerID,
|
||||
demobankAccountLabel: demobankAccountLabel,
|
||||
}, {
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
await axios.post(
|
||||
url.href,
|
||||
{
|
||||
userID: req.userID,
|
||||
hostID: req.hostID,
|
||||
partnerID: req.partnerID,
|
||||
demobankAccountLabel: demobankAccountLabel,
|
||||
},
|
||||
});
|
||||
{
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
},
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
export async function rotateKeys(
|
||||
@ -234,12 +237,16 @@ export namespace LibeufinSandboxApi {
|
||||
) {
|
||||
const baseUrl = libeufinSandboxService.baseUrl;
|
||||
let url = new URL(`admin/ebics/hosts/${hostID}/rotate-keys`, baseUrl);
|
||||
await axios.post(url.href, {}, {
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
await axios.post(
|
||||
url.href,
|
||||
{},
|
||||
{
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
},
|
||||
},
|
||||
});
|
||||
);
|
||||
}
|
||||
export async function createEbicsHost(
|
||||
libeufinSandboxService: LibeufinSandboxServiceInterface,
|
||||
@ -247,16 +254,19 @@ export namespace LibeufinSandboxApi {
|
||||
) {
|
||||
const baseUrl = libeufinSandboxService.baseUrl;
|
||||
let url = new URL("admin/ebics/hosts", baseUrl);
|
||||
await axios.post(url.href, {
|
||||
hostID,
|
||||
ebicsVersion: "2.5",
|
||||
},
|
||||
{
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
await axios.post(
|
||||
url.href,
|
||||
{
|
||||
hostID,
|
||||
ebicsVersion: "2.5",
|
||||
},
|
||||
});
|
||||
{
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
},
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
export async function createBankAccount(
|
||||
@ -347,16 +357,19 @@ export namespace LibeufinSandboxApi {
|
||||
): Promise<any> {
|
||||
const baseUrl = libeufinSandboxService.baseUrl;
|
||||
let url = new URL("admin/payments/camt", baseUrl);
|
||||
return await axios.post(url.href, {
|
||||
bankaccount: accountLabel,
|
||||
type: 53,
|
||||
},
|
||||
{
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
return await axios.post(
|
||||
url.href,
|
||||
{
|
||||
bankaccount: accountLabel,
|
||||
type: 53,
|
||||
},
|
||||
});
|
||||
{
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "secret",
|
||||
},
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
export async function getAccountInfoWithBalance(
|
||||
@ -364,10 +377,7 @@ export namespace LibeufinSandboxApi {
|
||||
accountLabel: string,
|
||||
): Promise<any> {
|
||||
const baseUrl = libeufinSandboxService.baseUrl;
|
||||
let url = new URL(
|
||||
`admin/bank-accounts/${accountLabel}`,
|
||||
baseUrl,
|
||||
);
|
||||
let url = new URL(`admin/bank-accounts/${accountLabel}`, baseUrl);
|
||||
return await axios.get(url.href, {
|
||||
auth: {
|
||||
username: "admin",
|
||||
@ -439,22 +449,15 @@ export namespace LibeufinNexusApi {
|
||||
accountName: string,
|
||||
): Promise<any> {
|
||||
const baseUrl = libeufinNexusService.baseUrl;
|
||||
let url = new URL(
|
||||
`bank-accounts/${accountName}`,
|
||||
baseUrl,
|
||||
);
|
||||
return await axios.get(
|
||||
url.href,
|
||||
{
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "test",
|
||||
},
|
||||
let url = new URL(`bank-accounts/${accountName}`, baseUrl);
|
||||
return await axios.get(url.href, {
|
||||
auth: {
|
||||
username: "admin",
|
||||
password: "test",
|
||||
},
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
export async function submitInitiatedPayment(
|
||||
libeufinNexusService: LibeufinNexusServiceInterface,
|
||||
accountName: string,
|
||||
@ -582,7 +585,8 @@ export namespace LibeufinNexusApi {
|
||||
password: string = "test",
|
||||
): Promise<any> {
|
||||
let url = new URL("history/incoming", anastasisBaseUrl);
|
||||
let response = await axios.get(url.href, { params: params,
|
||||
let response = await axios.get(url.href, {
|
||||
params: params,
|
||||
auth: {
|
||||
username: username,
|
||||
password: password,
|
||||
@ -854,4 +858,3 @@ export namespace LibeufinNexusApi {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -59,7 +59,7 @@ import {
|
||||
WalletCoreApiClient,
|
||||
walletCoreDebugFlags,
|
||||
} from "@gnu-taler/taler-wallet-core";
|
||||
import type { TalerCryptoInterface } from "@gnu-taler/taler-wallet-core/src/crypto/cryptoImplementation";
|
||||
import type { TalerCryptoInterface } from "@gnu-taler/taler-wallet-core";
|
||||
import { TextDecoder, TextEncoder } from "util";
|
||||
import { runBench1 } from "./bench1.js";
|
||||
import { runBench2 } from "./bench2.js";
|
||||
@ -68,7 +68,6 @@ import { runEnv1 } from "./env1.js";
|
||||
import { GlobalTestState, runTestWithState } from "./harness/harness.js";
|
||||
import { getTestInfo, runTests } from "./integrationtests/testrunner.js";
|
||||
import { lintExchangeDeployment } from "./lint.js";
|
||||
import { checkLogicInvariant } from "@gnu-taler/taler-wallet-core/src/util/invariants.js";
|
||||
// @ts-ignore
|
||||
global.TextEncoder = TextEncoder;
|
||||
// @ts-ignore
|
||||
|
@ -27,7 +27,7 @@ import {
|
||||
getPayto,
|
||||
} from "../harness/harness.js";
|
||||
import { createEddsaKeyPair, encodeCrock } from "@gnu-taler/taler-util";
|
||||
import { defaultCoinConfig } from "../harness/denomStructures";
|
||||
import { defaultCoinConfig } from "../harness/denomStructures.js";
|
||||
import {
|
||||
BankApi,
|
||||
BankAccessApi,
|
||||
|
@ -28,7 +28,7 @@ import {
|
||||
NodeHttpLib,
|
||||
readSuccessResponseJsonOrThrow,
|
||||
} from "@gnu-taler/taler-wallet-core";
|
||||
import { makeNoFeeCoinConfig } from "../harness/denomStructures";
|
||||
import { makeNoFeeCoinConfig } from "../harness/denomStructures.js";
|
||||
import {
|
||||
BankService,
|
||||
ExchangeService,
|
||||
|
@ -25,7 +25,7 @@ import {
|
||||
LibeufinSandboxService,
|
||||
LibeufinSandboxApi,
|
||||
findNexusPayment,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Run basic test with LibEuFin.
|
||||
|
@ -18,14 +18,7 @@
|
||||
* Imports.
|
||||
*/
|
||||
import { GlobalTestState } from "../harness/harness.js";
|
||||
import {
|
||||
NexusUserBundle,
|
||||
LibeufinNexusApi,
|
||||
LibeufinNexusService,
|
||||
LibeufinSandboxService,
|
||||
LibeufinSandboxApi,
|
||||
findNexusPayment,
|
||||
} from "../harness/libeufin";
|
||||
import { LibeufinNexusApi, LibeufinNexusService } from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Run basic test with LibEuFin.
|
||||
|
@ -17,18 +17,18 @@
|
||||
/**
|
||||
* Imports.
|
||||
*/
|
||||
import axios from "axios";
|
||||
import { URL } from "@gnu-taler/taler-util";
|
||||
import axiosImp from "axios";
|
||||
import { GlobalTestState } from "../harness/harness.js";
|
||||
import {
|
||||
SandboxUserBundle,
|
||||
NexusUserBundle,
|
||||
launchLibeufinServices,
|
||||
LibeufinNexusApi,
|
||||
} from "../harness/libeufin";
|
||||
NexusUserBundle,
|
||||
SandboxUserBundle,
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
const axios = axiosImp.default;
|
||||
|
||||
export async function runLibeufinApiFacadeBadRequestTest(t: GlobalTestState) {
|
||||
|
||||
/**
|
||||
* User saltetd "01"
|
||||
*/
|
||||
|
@ -23,7 +23,7 @@ import {
|
||||
NexusUserBundle,
|
||||
launchLibeufinServices,
|
||||
LibeufinNexusApi,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Run basic test with LibEuFin.
|
||||
|
@ -22,7 +22,7 @@ import {
|
||||
NexusUserBundle,
|
||||
LibeufinNexusApi,
|
||||
LibeufinNexusService,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Run basic test with LibEuFin.
|
||||
|
@ -19,19 +19,14 @@
|
||||
*/
|
||||
import { GlobalTestState } from "../harness/harness.js";
|
||||
import {
|
||||
NexusUserBundle,
|
||||
LibeufinNexusApi,
|
||||
LibeufinNexusService,
|
||||
LibeufinSandboxService,
|
||||
LibeufinSandboxApi,
|
||||
findNexusPayment,
|
||||
} from "../harness/libeufin";
|
||||
LibeufinSandboxService,
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
// This test only checks that LibEuFin doesn't fail when
|
||||
// it generates Camt statements - no assertions take place.
|
||||
// Furthermore, it prints the Camt.053 being generated.
|
||||
export async function runLibeufinApiSandboxCamtTest(t: GlobalTestState) {
|
||||
|
||||
const sandbox = await LibeufinSandboxService.create(t, {
|
||||
httpPort: 5012,
|
||||
databaseJdbcUri: `jdbc:sqlite:${t.testDir}/libeufin-sandbox.sqlite3`,
|
||||
@ -50,10 +45,30 @@ export async function runLibeufinApiSandboxCamtTest(t: GlobalTestState) {
|
||||
name: "Mock Name",
|
||||
label: "mock-account-1",
|
||||
});
|
||||
await sandbox.makeTransaction("mock-account-0", "mock-account-1", "EUR:1", "+1");
|
||||
await sandbox.makeTransaction("mock-account-0", "mock-account-1", "EUR:1", "+1");
|
||||
await sandbox.makeTransaction("mock-account-0", "mock-account-1", "EUR:1", "+1");
|
||||
await sandbox.makeTransaction("mock-account-1", "mock-account-0", "EUR:5", "minus 5");
|
||||
await sandbox.makeTransaction(
|
||||
"mock-account-0",
|
||||
"mock-account-1",
|
||||
"EUR:1",
|
||||
"+1",
|
||||
);
|
||||
await sandbox.makeTransaction(
|
||||
"mock-account-0",
|
||||
"mock-account-1",
|
||||
"EUR:1",
|
||||
"+1",
|
||||
);
|
||||
await sandbox.makeTransaction(
|
||||
"mock-account-0",
|
||||
"mock-account-1",
|
||||
"EUR:1",
|
||||
"+1",
|
||||
);
|
||||
await sandbox.makeTransaction(
|
||||
"mock-account-1",
|
||||
"mock-account-0",
|
||||
"EUR:5",
|
||||
"minus 5",
|
||||
);
|
||||
await sandbox.c53tick();
|
||||
let ret = await LibeufinSandboxApi.getCamt053(sandbox, "mock-account-1");
|
||||
console.log(ret);
|
||||
|
@ -19,16 +19,13 @@
|
||||
*/
|
||||
import { GlobalTestState } from "../harness/harness.js";
|
||||
import {
|
||||
NexusUserBundle,
|
||||
LibeufinNexusApi,
|
||||
LibeufinNexusService,
|
||||
LibeufinSandboxService,
|
||||
LibeufinSandboxApi,
|
||||
findNexusPayment,
|
||||
} from "../harness/libeufin";
|
||||
|
||||
export async function runLibeufinApiSandboxTransactionsTest(t: GlobalTestState) {
|
||||
LibeufinSandboxService,
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
export async function runLibeufinApiSandboxTransactionsTest(
|
||||
t: GlobalTestState,
|
||||
) {
|
||||
const sandbox = await LibeufinSandboxService.create(t, {
|
||||
httpPort: 5012,
|
||||
databaseJdbcUri: `jdbc:sqlite:${t.testDir}/libeufin-sandbox.sqlite3`,
|
||||
@ -45,27 +42,28 @@ export async function runLibeufinApiSandboxTransactionsTest(t: GlobalTestState)
|
||||
sandbox,
|
||||
"mock-account",
|
||||
{
|
||||
|
||||
debtorIban: "DE84500105176881385584",
|
||||
debtorBic: "BELADEBEXXX",
|
||||
debtorName: "mock2",
|
||||
subject: "mock subject",
|
||||
amount: "1" // EUR is default.
|
||||
}
|
||||
)
|
||||
amount: "1", // EUR is default.
|
||||
},
|
||||
);
|
||||
await LibeufinSandboxApi.simulateIncomingTransaction(
|
||||
sandbox,
|
||||
"mock-account",
|
||||
{
|
||||
|
||||
debtorIban: "DE84500105176881385584",
|
||||
debtorBic: "BELADEBEXXX",
|
||||
debtorName: "mock2",
|
||||
subject: "mock subject 2",
|
||||
amount: "1.1" // EUR is default.
|
||||
}
|
||||
)
|
||||
let ret = await LibeufinSandboxApi.getAccountInfoWithBalance(sandbox, "mock-account");
|
||||
amount: "1.1", // EUR is default.
|
||||
},
|
||||
);
|
||||
let ret = await LibeufinSandboxApi.getAccountInfoWithBalance(
|
||||
sandbox,
|
||||
"mock-account",
|
||||
);
|
||||
t.assertAmountEquals(ret.data.balance, "EUR:2.1");
|
||||
}
|
||||
runLibeufinApiSandboxTransactionsTest.suites = ["libeufin"];
|
||||
|
@ -17,15 +17,14 @@
|
||||
/**
|
||||
* Imports.
|
||||
*/
|
||||
import { GlobalTestState, setupDb } from "../harness/harness.js";
|
||||
import { GlobalTestState } from "../harness/harness.js";
|
||||
import {
|
||||
SandboxUserBundle,
|
||||
NexusUserBundle,
|
||||
launchLibeufinServices,
|
||||
LibeufinSandboxApi,
|
||||
LibeufinNexusApi,
|
||||
LibeufinNexusService,
|
||||
} from "../harness/libeufin";
|
||||
NexusUserBundle,
|
||||
SandboxUserBundle,
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Test Nexus scheduling API. It creates a task, check whether it shows
|
||||
|
@ -18,7 +18,7 @@
|
||||
* Imports.
|
||||
*/
|
||||
import { GlobalTestState } from "../harness/harness.js";
|
||||
import { LibeufinNexusApi, LibeufinNexusService } from "../harness/libeufin";
|
||||
import { LibeufinNexusApi, LibeufinNexusService } from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Run basic test with LibEuFin.
|
||||
|
@ -23,7 +23,7 @@ import {
|
||||
LibeufinNexusApi,
|
||||
LibeufinNexusService,
|
||||
LibeufinSandboxService,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Testing how Nexus reacts when the Sandbox is unreachable.
|
||||
|
@ -22,7 +22,7 @@ import {
|
||||
WalletApiOperation,
|
||||
HarnessExchangeBankAccount,
|
||||
} from "@gnu-taler/taler-wallet-core";
|
||||
import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures";
|
||||
import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js";
|
||||
import {
|
||||
DbInfo,
|
||||
ExchangeService,
|
||||
|
@ -17,14 +17,13 @@
|
||||
/**
|
||||
* Imports.
|
||||
*/
|
||||
import { GlobalTestState, delayMs } from "../harness/harness.js";
|
||||
import { GlobalTestState } from "../harness/harness.js";
|
||||
import {
|
||||
SandboxUserBundle,
|
||||
NexusUserBundle,
|
||||
launchLibeufinServices,
|
||||
LibeufinSandboxApi,
|
||||
LibeufinNexusApi,
|
||||
} from "../harness/libeufin";
|
||||
NexusUserBundle,
|
||||
SandboxUserBundle,
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* This test checks how the C52 and C53 coordinate. It'll test
|
||||
|
@ -24,7 +24,7 @@ import {
|
||||
launchLibeufinServices,
|
||||
LibeufinNexusApi,
|
||||
LibeufinSandboxApi,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Testing the Anastasis API, offered by the Anastasis facade.
|
||||
|
@ -24,7 +24,7 @@ import {
|
||||
launchLibeufinServices,
|
||||
LibeufinSandboxApi,
|
||||
LibeufinNexusApi,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Run basic test with LibEuFin.
|
||||
|
@ -23,7 +23,7 @@ import {
|
||||
NexusUserBundle,
|
||||
launchLibeufinServices,
|
||||
LibeufinNexusApi,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* This test checks how the C52 and C53 coordinate. It'll test
|
||||
|
@ -24,7 +24,7 @@ import {
|
||||
launchLibeufinServices,
|
||||
LibeufinSandboxApi,
|
||||
LibeufinNexusApi,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* User 01 expects a refund from user 02, and expectedly user 03
|
||||
|
@ -24,7 +24,7 @@ import {
|
||||
launchLibeufinServices,
|
||||
LibeufinSandboxApi,
|
||||
LibeufinNexusApi,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Run basic test with LibEuFin.
|
||||
|
@ -19,16 +19,13 @@
|
||||
*/
|
||||
import { GlobalTestState } from "../harness/harness.js";
|
||||
import {
|
||||
NexusUserBundle,
|
||||
LibeufinNexusApi,
|
||||
LibeufinNexusService,
|
||||
LibeufinSandboxService,
|
||||
LibeufinSandboxApi,
|
||||
findNexusPayment,
|
||||
} from "../harness/libeufin";
|
||||
|
||||
export async function runLibeufinSandboxWireTransferCliTest(t: GlobalTestState) {
|
||||
LibeufinSandboxService,
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
export async function runLibeufinSandboxWireTransferCliTest(
|
||||
t: GlobalTestState,
|
||||
) {
|
||||
const sandbox = await LibeufinSandboxService.create(t, {
|
||||
httpPort: 5012,
|
||||
databaseJdbcUri: `jdbc:sqlite:${t.testDir}/libeufin-sandbox.sqlite3`,
|
||||
@ -49,22 +46,40 @@ export async function runLibeufinSandboxWireTransferCliTest(t: GlobalTestState)
|
||||
label: "mock-account-2",
|
||||
});
|
||||
await sandbox.makeTransaction(
|
||||
"mock-account", "mock-account-2", "EUR:1", "one!"
|
||||
"mock-account",
|
||||
"mock-account-2",
|
||||
"EUR:1",
|
||||
"one!",
|
||||
);
|
||||
await sandbox.makeTransaction(
|
||||
"mock-account", "mock-account-2", "EUR:1", "two!"
|
||||
"mock-account",
|
||||
"mock-account-2",
|
||||
"EUR:1",
|
||||
"two!",
|
||||
);
|
||||
await sandbox.makeTransaction(
|
||||
"mock-account", "mock-account-2", "EUR:1", "three!"
|
||||
"mock-account",
|
||||
"mock-account-2",
|
||||
"EUR:1",
|
||||
"three!",
|
||||
);
|
||||
await sandbox.makeTransaction(
|
||||
"mock-account-2", "mock-account", "EUR:1", "Give one back."
|
||||
"mock-account-2",
|
||||
"mock-account",
|
||||
"EUR:1",
|
||||
"Give one back.",
|
||||
);
|
||||
await sandbox.makeTransaction(
|
||||
"mock-account-2", "mock-account", "EUR:0.11", "Give fraction back."
|
||||
"mock-account-2",
|
||||
"mock-account",
|
||||
"EUR:0.11",
|
||||
"Give fraction back.",
|
||||
);
|
||||
let ret = await LibeufinSandboxApi.getAccountInfoWithBalance(sandbox, "mock-account-2");
|
||||
console.log(ret.data.balance)
|
||||
t.assertTrue(ret.data.balance == "EUR:1.89")
|
||||
let ret = await LibeufinSandboxApi.getAccountInfoWithBalance(
|
||||
sandbox,
|
||||
"mock-account-2",
|
||||
);
|
||||
console.log(ret.data.balance);
|
||||
t.assertTrue(ret.data.balance == "EUR:1.89");
|
||||
}
|
||||
runLibeufinSandboxWireTransferCliTest.suites = ["libeufin"];
|
||||
|
@ -22,7 +22,7 @@ import {
|
||||
LibeufinNexusService,
|
||||
LibeufinSandboxService,
|
||||
LibeufinCli,
|
||||
} from "../harness/libeufin";
|
||||
} from "../harness/libeufin.js";
|
||||
|
||||
/**
|
||||
* Run basic test with LibEuFin.
|
||||
|
@ -17,35 +17,34 @@
|
||||
/**
|
||||
* Imports.
|
||||
*/
|
||||
import {
|
||||
codecForMerchantOrderStatusUnpaid,
|
||||
ConfirmPayResultType,
|
||||
PreparePayResultType,
|
||||
} from "@gnu-taler/taler-util";
|
||||
import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
import { URL } from "url";
|
||||
import { defaultCoinConfig } from "../harness/denomStructures.js";
|
||||
import {
|
||||
FaultInjectedExchangeService,
|
||||
FaultInjectedMerchantService,
|
||||
} from "../harness/faultInjection.js";
|
||||
import {
|
||||
BankService,
|
||||
ExchangeService,
|
||||
getPayto,
|
||||
GlobalTestState,
|
||||
MerchantPrivateApi,
|
||||
MerchantService,
|
||||
setupDb,
|
||||
WalletCli,
|
||||
getPayto
|
||||
} from "../harness/harness.js";
|
||||
import {
|
||||
withdrawViaBank,
|
||||
createFaultInjectedMerchantTestkudosEnvironment,
|
||||
FaultyMerchantTestEnvironment,
|
||||
withdrawViaBank,
|
||||
} from "../harness/helpers.js";
|
||||
import {
|
||||
PreparePayResultType,
|
||||
codecForMerchantOrderStatusUnpaid,
|
||||
ConfirmPayResultType,
|
||||
} from "@gnu-taler/taler-util";
|
||||
import axios from "axios";
|
||||
import {
|
||||
FaultInjectedExchangeService,
|
||||
FaultInjectedMerchantService,
|
||||
FaultInjectionRequestContext,
|
||||
} from "../harness/faultInjection";
|
||||
import { defaultCoinConfig } from "../harness/denomStructures";
|
||||
import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
import { URL } from "url";
|
||||
|
||||
/**
|
||||
* Run a test case with a simple TESTKUDOS Taler environment, consisting
|
||||
@ -115,7 +114,7 @@ export async function createConfusedMerchantTestkudosEnvironment(
|
||||
await merchant.addInstance({
|
||||
id: "minst1",
|
||||
name: "minst1",
|
||||
paytoUris: [getPayto("minst1")]
|
||||
paytoUris: [getPayto("minst1")],
|
||||
});
|
||||
|
||||
console.log("setup done!");
|
||||
@ -141,12 +140,8 @@ export async function createConfusedMerchantTestkudosEnvironment(
|
||||
export async function runMerchantExchangeConfusionTest(t: GlobalTestState) {
|
||||
// Set up test environment
|
||||
|
||||
const {
|
||||
wallet,
|
||||
bank,
|
||||
faultyExchange,
|
||||
faultyMerchant,
|
||||
} = await createConfusedMerchantTestkudosEnvironment(t);
|
||||
const { wallet, bank, faultyExchange, faultyMerchant } =
|
||||
await createConfusedMerchantTestkudosEnvironment(t);
|
||||
|
||||
// Withdraw digital cash into the wallet.
|
||||
|
||||
@ -214,7 +209,10 @@ export async function runMerchantExchangeConfusionTest(t: GlobalTestState) {
|
||||
const proposalId = preparePayResp.proposalId;
|
||||
|
||||
const orderUrlWithHash = new URL(publicOrderStatusUrl);
|
||||
orderUrlWithHash.searchParams.set("h_contract", preparePayResp.contractTermsHash);
|
||||
orderUrlWithHash.searchParams.set(
|
||||
"h_contract",
|
||||
preparePayResp.contractTermsHash,
|
||||
);
|
||||
|
||||
console.log("requesting", orderUrlWithHash.href);
|
||||
|
||||
|
@ -18,7 +18,8 @@
|
||||
* Imports.
|
||||
*/
|
||||
import { URL } from "@gnu-taler/taler-util";
|
||||
import axios from "axios";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
import {
|
||||
ExchangeService,
|
||||
GlobalTestState,
|
||||
|
@ -18,7 +18,8 @@
|
||||
* Imports.
|
||||
*/
|
||||
import { Duration } from "@gnu-taler/taler-util";
|
||||
import axios from "axios";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
import {
|
||||
ExchangeService,
|
||||
GlobalTestState,
|
||||
|
@ -18,7 +18,8 @@
|
||||
* Imports.
|
||||
*/
|
||||
import { URL } from "@gnu-taler/taler-util";
|
||||
import axios from "axios";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
import {
|
||||
ExchangeService,
|
||||
GlobalTestState,
|
||||
|
@ -25,7 +25,8 @@ import {
|
||||
ConfirmPayResultType,
|
||||
URL,
|
||||
} from "@gnu-taler/taler-util";
|
||||
import axios from "axios";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
|
||||
/**
|
||||
|
@ -34,7 +34,8 @@ import {
|
||||
PreparePayResultType,
|
||||
Duration,
|
||||
} from "@gnu-taler/taler-util";
|
||||
import axios from "axios";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
import {
|
||||
WalletApiOperation,
|
||||
BankServiceHandle,
|
||||
|
@ -28,8 +28,9 @@ import {
|
||||
ConfirmPayResultType,
|
||||
URL,
|
||||
} from "@gnu-taler/taler-util";
|
||||
import axios from "axios";
|
||||
import { FaultInjectionRequestContext } from "../harness/faultInjection";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
import { FaultInjectionRequestContext } from "../harness/faultInjection.js";
|
||||
import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
|
||||
/**
|
||||
@ -43,12 +44,8 @@ import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
export async function runPayPaidTest(t: GlobalTestState) {
|
||||
// Set up test environment
|
||||
|
||||
const {
|
||||
wallet,
|
||||
bank,
|
||||
faultyExchange,
|
||||
faultyMerchant,
|
||||
} = await createFaultInjectedMerchantTestkudosEnvironment(t);
|
||||
const { wallet, bank, faultyExchange, faultyMerchant } =
|
||||
await createFaultInjectedMerchantTestkudosEnvironment(t);
|
||||
|
||||
// Withdraw digital cash into the wallet.
|
||||
|
||||
|
@ -35,9 +35,9 @@ import {
|
||||
FaultInjectedExchangeService,
|
||||
FaultInjectionRequestContext,
|
||||
FaultInjectionResponseContext,
|
||||
} from "../harness/faultInjection";
|
||||
} from "../harness/faultInjection.js";
|
||||
import { CoreApiResponse } from "@gnu-taler/taler-util";
|
||||
import { defaultCoinConfig } from "../harness/denomStructures";
|
||||
import { defaultCoinConfig } from "../harness/denomStructures.js";
|
||||
import {
|
||||
WalletApiOperation,
|
||||
BankApi,
|
||||
|
@ -28,7 +28,7 @@ import {
|
||||
getPayto
|
||||
} from "../harness/harness.js";
|
||||
import { withdrawViaBank } from "../harness/helpers.js";
|
||||
import { coin_ct10, coin_u1 } from "../harness/denomStructures";
|
||||
import { coin_ct10, coin_u1 } from "../harness/denomStructures.js";
|
||||
import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
|
||||
async function setupTest(
|
||||
|
@ -22,11 +22,9 @@ import {
|
||||
withdrawViaBank,
|
||||
createFaultInjectedMerchantTestkudosEnvironment,
|
||||
} from "../harness/helpers.js";
|
||||
import axios from "axios";
|
||||
import {
|
||||
FaultInjectionRequestContext,
|
||||
FaultInjectionResponseContext,
|
||||
} from "../harness/faultInjection";
|
||||
} from "../harness/faultInjection.js";
|
||||
import {
|
||||
codecForMerchantOrderStatusUnpaid,
|
||||
ConfirmPayResultType,
|
||||
@ -36,6 +34,8 @@ import {
|
||||
URL,
|
||||
} from "@gnu-taler/taler-util";
|
||||
import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
|
||||
/**
|
||||
* Run test for a payment where the merchant has a transient
|
||||
|
@ -18,14 +18,18 @@
|
||||
* Imports.
|
||||
*/
|
||||
import { GlobalTestState, MerchantPrivateApi } from "../harness/harness.js";
|
||||
import { createSimpleTestkudosEnvironment, withdrawViaBank } from "../harness/helpers.js";
|
||||
import {
|
||||
createSimpleTestkudosEnvironment,
|
||||
withdrawViaBank,
|
||||
} from "../harness/helpers.js";
|
||||
import {
|
||||
PreparePayResultType,
|
||||
codecForMerchantOrderStatusUnpaid,
|
||||
ConfirmPayResultType,
|
||||
URL,
|
||||
} from "@gnu-taler/taler-util";
|
||||
import axios from "axios";
|
||||
import axiosImp from "axios";
|
||||
const axios = axiosImp.default;
|
||||
import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
|
||||
/**
|
||||
@ -34,12 +38,8 @@ import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
export async function runPaywallFlowTest(t: GlobalTestState) {
|
||||
// Set up test environment
|
||||
|
||||
const {
|
||||
wallet,
|
||||
bank,
|
||||
exchange,
|
||||
merchant,
|
||||
} = await createSimpleTestkudosEnvironment(t);
|
||||
const { wallet, bank, exchange, merchant } =
|
||||
await createSimpleTestkudosEnvironment(t);
|
||||
|
||||
// Withdraw digital cash into the wallet.
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
* Imports.
|
||||
*/
|
||||
import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
|
||||
import { CoinConfig } from "../harness/denomStructures";
|
||||
import { CoinConfig } from "../harness/denomStructures.js";
|
||||
import {
|
||||
GlobalTestState,
|
||||
ExchangeService,
|
||||
|
@ -27,7 +27,7 @@ import {
|
||||
PendingOperationsResponse,
|
||||
WalletApiOperation,
|
||||
} from "@gnu-taler/taler-wallet-core";
|
||||
import { makeNoFeeCoinConfig } from "../harness/denomStructures";
|
||||
import { makeNoFeeCoinConfig } from "../harness/denomStructures.js";
|
||||
import {
|
||||
BankService,
|
||||
ExchangeService,
|
||||
|
@ -24,7 +24,7 @@ import {
|
||||
createSimpleTestkudosEnvironment,
|
||||
withdrawViaBank,
|
||||
} from "../harness/helpers.js";
|
||||
import { SyncService } from "../harness/sync";
|
||||
import { SyncService } from "../harness/sync.js";
|
||||
|
||||
/**
|
||||
* Run test for basic, bank-integrated withdrawal.
|
||||
|
@ -29,7 +29,7 @@ import {
|
||||
makeTestPayment,
|
||||
withdrawViaBank,
|
||||
} from "../harness/helpers.js";
|
||||
import { SyncService } from "../harness/sync";
|
||||
import { SyncService } from "../harness/sync.js";
|
||||
|
||||
export async function runWalletBackupDoublespendTest(t: GlobalTestState) {
|
||||
// Set up test environment
|
||||
|
@ -56,7 +56,7 @@ import { runLibeufinSandboxWireTransferCliTest } from "./test-libeufin-sandbox-w
|
||||
import { runLibeufinTutorialTest } from "./test-libeufin-tutorial.js";
|
||||
import { runMerchantExchangeConfusionTest } from "./test-merchant-exchange-confusion.js";
|
||||
import { runMerchantInstancesTest } from "./test-merchant-instances.js";
|
||||
import { runMerchantInstancesDeleteTest } from "./test-merchant-instances-delete";
|
||||
import { runMerchantInstancesDeleteTest } from "./test-merchant-instances-delete.js";
|
||||
import { runMerchantInstancesUrlsTest } from "./test-merchant-instances-urls.js";
|
||||
import { runMerchantLongpollingTest } from "./test-merchant-longpolling.js";
|
||||
import { runMerchantRefundApiTest } from "./test-merchant-refund-api.js";
|
||||
|
@ -4,7 +4,7 @@
|
||||
"composite": true,
|
||||
"target": "ES2018",
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "node",
|
||||
"moduleResolution": "Node16",
|
||||
"sourceMap": true,
|
||||
"lib": ["es6"],
|
||||
"noImplicitReturns": true,
|
||||
|
@ -12,8 +12,8 @@
|
||||
"author": "Florian Dold",
|
||||
"license": "GPL-3.0",
|
||||
"scripts": {
|
||||
"prepare": "tsc && rollup -c",
|
||||
"compile": "tsc && rollup -c",
|
||||
"prepare": "tsc",
|
||||
"compile": "tsc",
|
||||
"pretty": "prettier --write src",
|
||||
"test": "tsc && ava",
|
||||
"coverage": "tsc && c8 --src src --all ava",
|
||||
@ -29,14 +29,15 @@
|
||||
"src/",
|
||||
"lib/"
|
||||
],
|
||||
"main": "./dist/taler-wallet-core.js",
|
||||
"browser": {
|
||||
"./dist/taler-wallet-core.js": "./dist/taler-wallet-core.browser.js",
|
||||
"./lib/index.node.js": "./lib/index.browser.js"
|
||||
},
|
||||
"module": "./lib/index.node.js",
|
||||
"type": "module",
|
||||
"types": "./lib/index.node.d.ts",
|
||||
"exports": {
|
||||
".": {
|
||||
"browser": "./lib/index.browser.js",
|
||||
"node": "./lib/index.node.js",
|
||||
"default": "./lib/index.js"
|
||||
}
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ava/typescript": "^3.0.1",
|
||||
"@gnu-taler/pogen": "workspace:*",
|
||||
@ -54,8 +55,6 @@
|
||||
"po2json": "^0.4.5",
|
||||
"prettier": "^2.5.1",
|
||||
"rimraf": "^3.0.2",
|
||||
"rollup": "^2.79.0",
|
||||
"rollup-plugin-sourcemaps": "^0.6.3",
|
||||
"source-map-resolve": "^0.6.0",
|
||||
"typedoc": "^0.23.16",
|
||||
"typescript": "^4.8.4"
|
||||
|
@ -27,7 +27,7 @@ import {
|
||||
HttpResponse,
|
||||
} from "../util/http.js";
|
||||
import { RequestThrottler } from "@gnu-taler/taler-util";
|
||||
import Axios, { AxiosResponse } from "axios";
|
||||
import axios, { AxiosResponse } from "axios";
|
||||
import { TalerError } from "../errors.js";
|
||||
import { Logger, bytesToString } from "@gnu-taler/taler-util";
|
||||
import { TalerErrorCode, URL } from "@gnu-taler/taler-util";
|
||||
@ -75,7 +75,7 @@ export class NodeHttpLib implements HttpRequestLibrary {
|
||||
// FIXME: Use AbortController / etc. to handle cancellation
|
||||
let resp: AxiosResponse;
|
||||
try {
|
||||
let respPromise = Axios({
|
||||
let respPromise = axios.default({
|
||||
method,
|
||||
url: url,
|
||||
responseType: "arraybuffer",
|
||||
|
@ -29,7 +29,7 @@ import {
|
||||
MemoryBackend,
|
||||
shimIndexedDB,
|
||||
} from "@gnu-taler/idb-bridge";
|
||||
import { AccessStats } from "@gnu-taler/idb-bridge/src/MemoryBackend";
|
||||
import { AccessStats } from "@gnu-taler/idb-bridge";
|
||||
import { Logger, WalletNotification } from "@gnu-taler/taler-util";
|
||||
import * as fs from "fs";
|
||||
import { NodeThreadCryptoWorkerFactory } from "../crypto/workers/nodeThreadWorker.js";
|
||||
|
@ -61,6 +61,7 @@ export {
|
||||
nativeCryptoR,
|
||||
nativeCrypto,
|
||||
nullCrypto,
|
||||
TalerCryptoInterface,
|
||||
} from "./crypto/cryptoImplementation.js";
|
||||
|
||||
export * from "./util/timer.js";
|
||||
|
@ -6,7 +6,7 @@
|
||||
"declarationMap": false,
|
||||
"target": "ES2017",
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "node",
|
||||
"moduleResolution": "Node16",
|
||||
"sourceMap": true,
|
||||
"lib": ["es6"],
|
||||
"types": ["node"],
|
||||
|
@ -12,6 +12,7 @@
|
||||
"main": "dist/taler-wallet-embedded.js",
|
||||
"author": "Florian Dold",
|
||||
"license": "GPL-3.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"compile": "tsc && rollup -c",
|
||||
"pretty": "prettier --write src",
|
||||
|
@ -6,7 +6,7 @@
|
||||
"declarationMap": true,
|
||||
"target": "ES6",
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "node",
|
||||
"moduleResolution": "Node16",
|
||||
"sourceMap": true,
|
||||
"lib": ["es6"],
|
||||
"noImplicitReturns": true,
|
||||
|
Loading…
Reference in New Issue
Block a user