fix: accept soft deleted wallets (#3179)

This commit is contained in:
Vlad Stan 2025-05-30 18:48:23 +03:00 committed by GitHub
parent 27fd510142
commit 63e728710d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 74 additions and 15 deletions

View file

@ -15,19 +15,36 @@
</q-card>
</div>
<div v-else-if="activeWallet.show">
<div class="row q-mb-lg">
<div class="col">
<q-btn
icon="arrow_back_ios"
@click="backToUsersPage()"
:label="$t('back')"
></q-btn>
<q-btn
@click="createWalletDialog.show = true"
:label="$t('create_new_wallet')"
color="primary"
class="q-ml-md"
></q-btn>
<div class="row q-col-gutter-md q-mb-md">
<div class="col-12">
<q-card>
<div class="q-pa-sm">
<div class="row">
<div class="q-pa-xs">
<q-btn
icon="arrow_back_ios"
@click="backToUsersPage()"
:label="$t('back')"
></q-btn>
</div>
<div class="q-pa-xs">
<q-btn
@click="createWalletDialog.show = true"
:label="$t('create_new_wallet')"
color="primary"
></q-btn>
</div>
<div class="q-pa-xs">
<q-btn
@click="deleteAllUserWallets(activeWallet.userId)"
:label="$t('delete_all_wallets')"
icon="delete"
color="negative"
></q-btn>
</div>
</div>
</div>
</q-card>
</div>
</div>
<q-card class="q-pa-md">

View file

@ -148,7 +148,7 @@ async def api_update_user(
async def api_users_delete_user(
user_id: str, user: User = Depends(check_admin)
) -> SimpleStatus:
wallets = await get_wallets(user_id)
wallets = await get_wallets(user_id, deleted=False)
if len(wallets) > 0:
raise HTTPException(
status_code=HTTPStatus.BAD_REQUEST,
@ -257,6 +257,28 @@ async def api_users_undelete_user_wallet(user_id: str, wallet: str) -> SimpleSta
return SimpleStatus(success=True, message="Wallet is already active.")
@users_router.delete(
"/user/{user_id}/wallets",
name="Delete all wallets for user",
summary="Soft delete (only sets a flag) all user wallets.",
)
async def api_users_delete_all_user_wallet(user_id: str) -> SimpleStatus:
if user_id == settings.super_user:
raise HTTPException(
status_code=HTTPStatus.BAD_REQUEST,
detail="Action not allowed.",
)
wallets = await get_wallets(user_id, deleted=False)
for wallet in wallets:
await delete_wallet(user_id=user_id, wallet_id=wallet.id)
return SimpleStatus(
success=True,
message=f"Deleted '{len(wallets)}' wallets. ",
)
@users_router.delete(
"/user/{user_id}/wallet/{wallet}",
name="Delete wallet by id",

File diff suppressed because one or more lines are too long

View file

@ -308,6 +308,9 @@ window.localisation.en = {
login_with_user_id: 'Login with user ID',
or: 'or',
create_new_wallet: 'Create New Wallet',
delete_all_wallets: 'Delete All Wallets',
confirm_delete_all_wallets:
'Are you sure you want to delete ALL wallets for this user?',
login_to_account: 'Login to your account',
create_account: 'Create account',
account_settings: 'Account Settings',

View file

@ -312,6 +312,23 @@ window.UsersPageLogic = {
.catch(LNbits.utils.notifyApiError)
})
},
deleteAllUserWallets(userId) {
LNbits.utils
.confirmDialog(this.$t('confirm_delete_all_wallets'))
.onOk(() => {
LNbits.api
.request('DELETE', `/users/api/v1/user/${userId}/wallets`)
.then(response => {
Quasar.Notify.create({
type: 'positive',
message: response.data.message,
icon: null
})
this.fetchWallets(userId)
})
.catch(LNbits.utils.notifyApiError)
})
},
copyWalletLink(walletId) {
const url = `${window.location.origin}/wallet?usr=${this.activeWallet.userId}&wal=${walletId}`
this.copyText(url)