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

only query tip status on first call to prepare

Browse Source
This commit is contained in:
Florian Dold 2020-11-16 16:17:26 +01:00
parent eaae2d4ca8
commit af5a35def0
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/taler-wallet-core/src/operations/tip.ts
View File

@ -59,26 +59,26 @@ export async function prepareTip(
throw Error("invalid taler://tip URI"); throw Error("invalid taler://tip URI");
} }
const tipStatusUrl = new URL(
`tips/${res.merchantTipId}`,
res.merchantBaseUrl,
);
logger.trace("checking tip status from", tipStatusUrl.href);
const merchantResp = await ws.http.get(tipStatusUrl.href);
const tipPickupStatus = await readSuccessResponseJsonOrThrow(
merchantResp,
codecForTipPickupGetResponse(),
);
logger.trace(`status ${j2s(tipPickupStatus)}`);
const amount = Amounts.parseOrThrow(tipPickupStatus.tip_amount);
let tipRecord = await ws.db.getIndexed( let tipRecord = await ws.db.getIndexed(
Stores.tips.byMerchantTipIdAndBaseUrl, Stores.tips.byMerchantTipIdAndBaseUrl,
[res.merchantTipId, res.merchantBaseUrl], [res.merchantTipId, res.merchantBaseUrl],
); );
if (!tipRecord) { if (!tipRecord) {
const tipStatusUrl = new URL(
`tips/${res.merchantTipId}`,
res.merchantBaseUrl,
);
logger.trace("checking tip status from", tipStatusUrl.href);
const merchantResp = await ws.http.get(tipStatusUrl.href);
const tipPickupStatus = await readSuccessResponseJsonOrThrow(
merchantResp,
codecForTipPickupGetResponse(),
);
logger.trace(`status ${j2s(tipPickupStatus)}`);
const amount = Amounts.parseOrThrow(tipPickupStatus.tip_amount);
logger.trace("new tip, creating tip record"); logger.trace("new tip, creating tip record");
await updateExchangeFromUrl(ws, tipPickupStatus.exchange_url); await updateExchangeFromUrl(ws, tipPickupStatus.exchange_url);
const withdrawDetails = await getExchangeWithdrawalInfo( const withdrawDetails = await getExchangeWithdrawalInfo(
@ -119,9 +119,9 @@ export async function prepareTip(
const tipStatus: PrepareTipResult = { const tipStatus: PrepareTipResult = {
accepted: !!tipRecord && !!tipRecord.acceptedTimestamp, accepted: !!tipRecord && !!tipRecord.acceptedTimestamp,
tipAmountRaw: Amounts.stringify(tipPickupStatus.tip_amount), tipAmountRaw: Amounts.stringify(tipRecord.tipAmountRaw),
exchangeBaseUrl: tipPickupStatus.exchange_url, exchangeBaseUrl: tipRecord.exchangeBaseUrl,
expirationTimestamp: tipPickupStatus.expiration, expirationTimestamp: tipRecord.tipExpiration,
tipAmountEffective: Amounts.stringify(tipRecord.tipAmountEffective), tipAmountEffective: Amounts.stringify(tipRecord.tipAmountEffective),
walletTipId: tipRecord.walletTipId, walletTipId: tipRecord.walletTipId,
}; };