Skip to content

Release: develop -> master #2863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TaprootFreak merged 1 commit into from
Jan 6, 2026
Merged

Release: develop -> master #2863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/subdomains/core/history/controllers/transaction.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,15 @@ export class TransactionController {
if (transaction.refundTargetEntity instanceof BankTx) {
// Unassigned transaction
if (!BankTxTypeUnassigned(transaction.bankTx.type)) throw new NotFoundException('Transaction not found');
const txOwner = await this.bankTxService.getUserDataForBankTx(transaction.bankTx, jwt.account);
if (jwt.account !== transaction.userData?.id || txOwner.id !== jwt.account)

// Check ownership (consistent with requestRefund logic)
if (transaction.userData && jwt.account !== transaction.userData.id)
throw new ForbiddenException('You can only refund your own transaction');
if (!transaction.userData) {
const txOwner = await this.bankTxService.getUserDataForBankTx(transaction.bankTx, jwt.account);
if (txOwner?.id !== jwt.account) throw new ForbiddenException('You can only refund your own transaction');
}

if (transaction.refundTargetEntity.bankTxReturn)
throw new BadRequestException('You can only refund a transaction once');

Expand Down Expand Up @@ -421,7 +427,7 @@ export class TransactionController {
throw new ForbiddenException('You can only refund your own transaction');
if (!transaction.targetEntity && !transaction.userData) {
const txOwner = await this.bankTxService.getUserDataForBankTx(transaction.bankTx, jwt.account);
if (txOwner.id !== jwt.account) throw new ForbiddenException('You can only refund your own transaction');
if (txOwner?.id !== jwt.account) throw new ForbiddenException('You can only refund your own transaction');
}

const refundData = this.refundList.get(transaction.id);
Expand Down
Loading