From c4a63e0f2e754a01c7a3dc19cf76cafac858090e Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Mon, 25 Oct 2021 12:42:24 +0100 Subject: [PATCH] fix create aditional wallet --- lnbits/extensions/usermanager/crud.py | 9 +++++++-- lnbits/extensions/usermanager/models.py | 5 +++++ lnbits/extensions/usermanager/views_api.py | 10 ++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lnbits/extensions/usermanager/crud.py b/lnbits/extensions/usermanager/crud.py index 4272d7266..1ce66d4fa 100644 --- a/lnbits/extensions/usermanager/crud.py +++ b/lnbits/extensions/usermanager/crud.py @@ -1,7 +1,12 @@ from typing import List, Optional -from lnbits.core.crud import (create_account, create_wallet, delete_wallet, - get_payments, get_user) +from lnbits.core.crud import ( + create_account, + create_wallet, + delete_wallet, + get_payments, + get_user, +) from lnbits.core.models import Payment from . import db diff --git a/lnbits/extensions/usermanager/models.py b/lnbits/extensions/usermanager/models.py index a08452333..1dc7b85af 100644 --- a/lnbits/extensions/usermanager/models.py +++ b/lnbits/extensions/usermanager/models.py @@ -11,6 +11,11 @@ class CreateUserData(BaseModel): email: str = Query("") password: str = Query("") +class CreateUserWallet(BaseModel): + user_id: str = Query(...) + wallet_name: str = Query(...) + admin_id: str = Query(...) + class Users(BaseModel): id: str diff --git a/lnbits/extensions/usermanager/views_api.py b/lnbits/extensions/usermanager/views_api.py index 7bdee8fc9..d4808a6b6 100644 --- a/lnbits/extensions/usermanager/views_api.py +++ b/lnbits/extensions/usermanager/views_api.py @@ -21,7 +21,7 @@ from .crud import ( get_usermanager_wallet_transactions, get_usermanager_wallets, ) -from .models import CreateUserData +from .models import CreateUserData, CreateUserWallet ### Users @@ -93,12 +93,10 @@ async def api_usermanager_activate_extension( @usermanager_ext.post("/api/v1/wallets") async def api_usermanager_wallets_create( - wallet: WalletTypeInfo = Depends(get_key_type), - user_id: str = Query(...), - wallet_name: str = Query(...), - admin_id: str = Query(...), + data: CreateUserWallet, + wallet: WalletTypeInfo = Depends(get_key_type) ): - user = await create_usermanager_wallet(user_id, wallet_name, admin_id) + user = await create_usermanager_wallet(user_id=data.user_id, wallet_name=data.wallet_name, admin_id=data.admin_id) return user.dict()