taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

wallet-core: return txid when starting refund via URI

Browse Source
This commit is contained in:
Florian Dold 2023-05-10 17:30:38 +02:00
parent cb53546035
commit 6308c7ea6b
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/taler-util/src/wallet-types.ts
View File

@ -1645,6 +1645,10 @@ export interface PrepareRefundRequest {
talerRefundUri: string;
}
export interface StartRefundQueryForUriResponse {
transactionId: string;
}
export const codecForPrepareRefundRequest = (): Codec<PrepareRefundRequest> =>
buildCodecForObject<PrepareRefundRequest>()
.property("talerRefundUri", codecForString())

13
packages/taler-wallet-core/src/operations/pay-merchant.ts
View File

@ -69,6 +69,7 @@ import {
PrepareRefundResult,
randomBytes,
RefreshReason,
StartRefundQueryForUriResponse,
TalerError,
TalerErrorCode,
TalerErrorDetail,
@ -2051,7 +2052,7 @@ async function processPurchaseAcceptRefund(
export async function startRefundQueryForUri(
ws: InternalWalletState,
talerUri: string,
): Promise<void> {
): Promise<StartRefundQueryForUriResponse> {
const parsedUri = parseTalerUri(talerUri);
if (!parsedUri) {
throw Error("invalid taler:// URI");
@ -2070,7 +2071,15 @@ export async function startRefundQueryForUri(
if (!purchaseRecord) {
throw Error("no purchase found, can't refund");
}
return startQueryRefund(ws, purchaseRecord.proposalId);
const proposalId = purchaseRecord.proposalId;
const transactionId = constructTransactionIdentifier({
tag: TransactionType.Payment,
proposalId,
});
await startQueryRefund(ws, proposalId);
return {
transactionId,
}
}
export async function startQueryRefund(

3
packages/taler-wallet-core/src/wallet-api-types.ts
View File

@ -110,6 +110,7 @@ import {
WithdrawFakebankRequest,
WithdrawTestBalanceRequest,
WithdrawUriInfoResponse,
StartRefundQueryForUriResponse,
} from "@gnu-taler/taler-util";
import { AuditorTrustRecord, WalletContractData } from "./db.js";
import {
@ -438,7 +439,7 @@ export type ConfirmPayOp = {
export type StartRefundQueryForUriOp = {
op: WalletApiOperation.StartRefundQueryForUri;
request: PrepareRefundRequest;
response: EmptyObject;
response: StartRefundQueryForUriResponse;
};
export type StartRefundQueryOp = {

3
packages/taler-wallet-core/src/wallet.ts
View File

@ -1288,8 +1288,7 @@ async function dispatchRequestInternal<Op extends WalletApiOperation>(
}
case WalletApiOperation.StartRefundQueryForUri: {
const req = codecForPrepareRefundRequest().decode(payload);
await startRefundQueryForUri(ws, req.talerRefundUri);
return {};
return await startRefundQueryForUri(ws, req.talerRefundUri);
}
case WalletApiOperation.StartRefundQuery: {
const req = codecForStartRefundQueryRequest().decode(payload);