From 305c513c2bcc2b25fe57cf0ed9723781944f9f3f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 22 Nov 2023 15:20:06 -0300 Subject: more cashout ui --- packages/taler-util/src/http-client/bank-core.ts | 8 ++++---- packages/taler-util/src/http-client/types.ts | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'packages/taler-util/src/http-client') diff --git a/packages/taler-util/src/http-client/bank-core.ts b/packages/taler-util/src/http-client/bank-core.ts index d7bf6be29..273fb97c6 100644 --- a/packages/taler-util/src/http-client/bank-core.ts +++ b/packages/taler-util/src/http-client/bank-core.ts @@ -442,7 +442,7 @@ export class TalerCoreBankHttpClient { body, }); switch (resp.status) { - case HttpStatusCode.Accepted: return opSuccess(resp, codecForCashoutPending()) + case HttpStatusCode.Ok: return opSuccess(resp, codecForCashoutPending()) case HttpStatusCode.NotFound: return opKnownFailure("account-not-found", resp) case HttpStatusCode.Conflict: { const body = await resp.json() @@ -465,7 +465,7 @@ export class TalerCoreBankHttpClient { * https://docs.taler.net/core/api-corebank.html#post--accounts-$USERNAME-cashouts-$CASHOUT_ID-abort * */ - async abortCashoutById(auth: UserAndToken, cid: string) { + async abortCashoutById(auth: UserAndToken, cid: number) { const url = new URL(`accounts/${auth.username}/cashouts/${cid}/abort`, this.baseUrl); const resp = await this.httpLib.fetch(url.href, { method: "POST", @@ -487,7 +487,7 @@ export class TalerCoreBankHttpClient { * https://docs.taler.net/core/api-corebank.html#post--accounts-$USERNAME-cashouts-$CASHOUT_ID-confirm * */ - async confirmCashoutById(auth: UserAndToken, cid: string, body: TalerCorebankApi.CashoutConfirmRequest) { + async confirmCashoutById(auth: UserAndToken, cid: number, body: TalerCorebankApi.CashoutConfirmRequest) { const url = new URL(`accounts/${auth.username}/cashouts/${cid}/confirm`, this.baseUrl); const resp = await this.httpLib.fetch(url.href, { method: "POST", @@ -522,7 +522,7 @@ export class TalerCoreBankHttpClient { * https://docs.taler.net/core/api-corebank.html#get--accounts-$USERNAME-cashouts-$CASHOUT_ID * */ - async getCashoutById(auth: UserAndToken, cid: string) { + async getCashoutById(auth: UserAndToken, cid: number) { const url = new URL(`accounts/${auth.username}/cashouts/${cid}`, this.baseUrl); const resp = await this.httpLib.fetch(url.href, { method: "GET", diff --git a/packages/taler-util/src/http-client/types.ts b/packages/taler-util/src/http-client/types.ts index 0ecc08b33..4c8a146a6 100644 --- a/packages/taler-util/src/http-client/types.ts +++ b/packages/taler-util/src/http-client/types.ts @@ -404,7 +404,7 @@ export const codecForBankAccountGetWithdrawalResponse = export const codecForCashoutPending = (): Codec => buildCodecForObject() - .property("cashout_id", codecForString()) + .property("cashout_id", codecForNumber()) .build("TalerCorebankApi.CashoutPending"); export const codecForCashoutConversionResponse = @@ -428,7 +428,7 @@ export const codecForCashouts = (): Codec => export const codecForCashoutInfo = (): Codec => buildCodecForObject() - .property("cashout_id", codecForString()) + .property("cashout_id", codecForNumber()) .property( "status", codecForEither( @@ -448,7 +448,7 @@ export const codecForGlobalCashouts = export const codecForGlobalCashoutInfo = (): Codec => buildCodecForObject() - .property("cashout_id", codecForString()) + .property("cashout_id", codecForNumber()) .property("username", codecForString()) .property( "status", @@ -465,7 +465,7 @@ export const codecForCashoutStatusResponse = buildCodecForObject() .property("amount_credit", codecForAmountString()) .property("amount_debit", codecForAmountString()) - .property("confirmation_time", codecForTimestamp) + .property("confirmation_time", codecOptional(codecForTimestamp)) .property("creation_time", codecForTimestamp) // .property("credit_payto_uri", codecForPaytoString()) .property( @@ -1462,7 +1462,7 @@ export namespace TalerCorebankApi { export interface CashoutPending { // ID identifying the operation being created // and now waiting for the TAN confirmation. - cashout_id: string; + cashout_id: number; } export interface CashoutConfirmRequest { @@ -1476,7 +1476,7 @@ export namespace TalerCorebankApi { } export interface CashoutInfo { - cashout_id: string; + cashout_id: number; status: "pending" | "aborted" | "confirmed"; } export interface GlobalCashouts { @@ -1484,7 +1484,7 @@ export namespace TalerCorebankApi { cashouts: GlobalCashoutInfo[]; } export interface GlobalCashoutInfo { - cashout_id: string; + cashout_id: number; username: string; status: "pending" | "aborted" | "confirmed"; } -- cgit v1.2.3