Merge branch 'FastAPI' of github.com:arcbtc/lnbits into FastAPI

This commit is contained in:
Stefan Stammberger 2021-08-20 21:02:40 +02:00
commit da20280fd3
No known key found for this signature in database
GPG Key ID: 645FA807E935D9D5
2 changed files with 9 additions and 7 deletions

View File

@ -27,6 +27,10 @@ async def api_tposs(all_wallets: bool = Query(None)):
return [tpos._asdict() for tpos in await get_tposs(wallet_ids)], HTTPStatus.OK return [tpos._asdict() for tpos in await get_tposs(wallet_ids)], HTTPStatus.OK
class CreateData(BaseModel):
name: str
currency: str
@tpos_ext.post("/api/v1/tposs") @tpos_ext.post("/api/v1/tposs")
@api_check_wallet_key("invoice") @api_check_wallet_key("invoice")
# @api_validate_post_request( # @api_validate_post_request(
@ -35,8 +39,8 @@ async def api_tposs(all_wallets: bool = Query(None)):
# "currency": {"type": "string", "empty": False, "required": True}, # "currency": {"type": "string", "empty": False, "required": True},
# } # }
# ) # )
async def api_tpos_create(name: str = Query(...), currency: str = Query(...)): async def api_tpos_create(data: CreateData):
tpos = await create_tpos(wallet_id=g.wallet.id, **g.data) tpos = await create_tpos(wallet_id=g.wallet.id, **data)
return tpos._asdict(), HTTPStatus.CREATED return tpos._asdict(), HTTPStatus.CREATED
@ -60,7 +64,7 @@ async def api_tpos_delete(tpos_id: str):
# @api_validate_post_request( # @api_validate_post_request(
# schema={"amount": {"type": "integer", "min": 1, "required": True}} # schema={"amount": {"type": "integer", "min": 1, "required": True}}
# ) # )
async def api_tpos_create_invoice(tpos_id: str, amount: int = Query(..., ge=1)): async def api_tpos_create_invoice(amount: int = Query(..., ge=1), tpos_id: str = None):
tpos = await get_tpos(tpos_id) tpos = await get_tpos(tpos_id)
if not tpos: if not tpos:

View File

@ -24,15 +24,13 @@ from .crud import (
###################WALLETS############################# ###################WALLETS#############################
@watchonly_ext.route("/api/v1/wallet", methods=["GET"]) @watchonly_ext.get("/api/v1/wallet")
@api_check_wallet_key("invoice") @api_check_wallet_key("invoice")
async def api_wallets_retrieve(): async def api_wallets_retrieve():
try: try:
return ( return (
jsonify( [wallet._asdict() for wallet in await get_watch_wallets(g.wallet.user)],
[wallet._asdict() for wallet in await get_watch_wallets(g.wallet.user)]
),
HTTPStatus.OK, HTTPStatus.OK,
) )
except: except: