diff options
| author | Florian Dold <florian.dold@gmail.com> | 2020-07-27 17:09:52 +0530 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2020-07-27 17:09:52 +0530 |
| commit | ae111663f412ad7bee9029110e3ab1594ec14576 (patch) | |
| tree | 7fc51632c328774c390b989e7f2e6dfd3c31751d /src/operations | |
| parent | 694d913d1f226b3d284258286c73a035fd43da7d (diff) | |
new taler:// URI syntax
Diffstat (limited to 'src/operations')
| -rw-r--r-- | src/operations/tip.ts | 6 | ||||
| -rw-r--r-- | src/operations/withdraw.ts | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/operations/tip.ts b/src/operations/tip.ts index d121b1cbb..17f7ee90d 100644 --- a/src/operations/tip.ts +++ b/src/operations/tip.ts @@ -66,9 +66,11 @@ export async function getTipStatus( const amount = Amounts.parseOrThrow(tipPickupStatus.amount); + const merchantOrigin = new URL(res.merchantBaseUrl).origin; + let tipRecord = await ws.db.get(Stores.tips, [ res.merchantTipId, - res.merchantOrigin, + merchantOrigin, ]); if (!tipRecord) { @@ -117,7 +119,7 @@ export async function getTipStatus( amountLeft: Amounts.parseOrThrow(tipPickupStatus.amount_left), exchangeUrl: tipPickupStatus.exchange_url, nextUrl: tipPickupStatus.extra.next_url, - merchantOrigin: res.merchantOrigin, + merchantOrigin: merchantOrigin, merchantTipId: res.merchantTipId, expirationTimestamp: tipPickupStatus.stamp_expire, timestamp: tipPickupStatus.stamp_created, diff --git a/src/operations/withdraw.ts b/src/operations/withdraw.ts index f7879dfec..9f6804b2b 100644 --- a/src/operations/withdraw.ts +++ b/src/operations/withdraw.ts @@ -141,7 +141,11 @@ export async function getBankWithdrawalInfo( if (!uriResult) { throw Error(`can't parse URL ${talerWithdrawUri}`); } - const resp = await ws.http.get(uriResult.statusUrl); + const reqUrl = new URL( + `api/withdraw-operations/${uriResult.withdrawalOperationId}`, + uriResult.bankIntegrationApiBaseUrl, + ); + const resp = await ws.http.get(reqUrl.href); const status = await readSuccessResponseJsonOrThrow( resp, codecForWithdrawOperationStatusResponse(), @@ -150,7 +154,7 @@ export async function getBankWithdrawalInfo( return { amount: Amounts.parseOrThrow(status.amount), confirmTransferUrl: status.confirm_transfer_url, - extractedStatusUrl: uriResult.statusUrl, + extractedStatusUrl: uriResult.bankIntegrationApiBaseUrl, selectionDone: status.selection_done, senderWire: status.sender_wire, suggestedExchange: status.suggested_exchange, |