From 8b06874f42715b0397a6735ff330e5f75eb0cb86 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 6 Jul 2023 20:17:59 +0200
Subject: wallet-core: support passing transactionId to confirmPay

---
 packages/taler-wallet-core/src/wallet.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'packages/taler-wallet-core/src/wallet.ts')

diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts
index ca86cbb14..e457ba003 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -1260,7 +1260,20 @@ async function dispatchRequestInternal<Op extends WalletApiOperation>(
     }
     case WalletApiOperation.ConfirmPay: {
       const req = codecForConfirmPayRequest().decode(payload);
-      return await confirmPay(ws, req.proposalId, req.sessionId);
+      let proposalId;
+      if (req.proposalId) {
+        // legacy client support
+        proposalId = req.proposalId;
+      } else if (req.transactionId) {
+        const txIdParsed = parseTransactionIdentifier(req.transactionId);
+        if (txIdParsed?.tag != TransactionType.Payment) {
+          throw Error("payment transaction ID required");
+        }
+        proposalId = txIdParsed.proposalId;
+      } else {
+        throw Error("transactionId or (deprecated) proposalId required");
+      }
+      return await confirmPay(ws, proposalId, req.sessionId);
     }
     case WalletApiOperation.AbortTransaction: {
       const req = codecForAbortTransaction().decode(payload);
-- 
cgit v1.2.3