highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-10-11 04:52:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix delete wallet

Browse Source
This commit is contained in:
Tiago vasconcelos
2021-10-25 19:26:21 +01:00
parent 8bf14ca2c7
commit 55023fa85b
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lnbits/core/views/generic.py
View File

@@ -1,5 +1,4 @@
import asyncio import asyncio
from http import HTTPStatus from http import HTTPStatus
from typing import Optional from typing import Optional
@@ -13,10 +12,10 @@ from pydantic.types import UUID4
from starlette.responses import HTMLResponse from starlette.responses import HTMLResponse
from lnbits.core import db from lnbits.core import db
from lnbits.helpers import template_renderer, url_for
from lnbits.requestvars import g
from lnbits.core.models import User from lnbits.core.models import User
from lnbits.decorators import check_user_exists from lnbits.decorators import check_user_exists
from lnbits.helpers import template_renderer, url_for
from lnbits.requestvars import g
from lnbits.settings import LNBITS_ALLOWED_USERS, LNBITS_SITE_TITLE, SERVICE_FEE from lnbits.settings import LNBITS_ALLOWED_USERS, LNBITS_SITE_TITLE, SERVICE_FEE
from ..crud import ( from ..crud import (
@@ -189,21 +188,20 @@ async def lnurl_full_withdraw_callback(request: Request):
@core_html_routes.get("/deletewallet") @core_html_routes.get("/deletewallet")
# @validate_uuids(["usr", "wal"], required=True) async def deletewallet(request: Request, wal: str = Query(...), usr: str = Query(...)):
# @check_user_exists() user = await get_user(usr)
async def deletewallet(request: Request): user_wallet_ids = [u.id for u in user.wallets]
wallet_id = request.path_params.get("wal", type=str) print("USR", user_wallet_ids)
user_wallet_ids = g().user.wallet_ids
if wallet_id not in user_wallet_ids: if wal not in user_wallet_ids:
raise HTTPException(HTTPStatus.FORBIDDEN, "Not your wallet.") raise HTTPException(HTTPStatus.FORBIDDEN, "Not your wallet.")
else: else:
await delete_wallet(user_id=g().user.id, wallet_id=wallet_id) await delete_wallet(user_id=user.id, wallet_id=wal)
user_wallet_ids.remove(wallet_id) user_wallet_ids.remove(wal)
if user_wallet_ids: if user_wallet_ids:
return RedirectResponse( return RedirectResponse(
url_for("/wallet", usr=g().user.id, wal=user_wallet_ids[0]), url_for("/wallet", usr=user.id, wal=user_wallet_ids[0]),
status_code=status.HTTP_307_TEMPORARY_REDIRECT, status_code=status.HTTP_307_TEMPORARY_REDIRECT,
) )