diff --git a/lnbits/extensions/usermanager/models.py b/lnbits/extensions/usermanager/models.py index e65bdb52c..67facec68 100644 --- a/lnbits/extensions/usermanager/models.py +++ b/lnbits/extensions/usermanager/models.py @@ -2,6 +2,7 @@ from sqlite3 import Row from fastapi.param_functions import Query from pydantic import BaseModel +from typing import Optional class CreateUserData(BaseModel): @@ -22,8 +23,8 @@ class Users(BaseModel): id: str name: str admin: str - email: str - password: str + email: Optional[str] = None + password: Optional[str] = None class Wallets(BaseModel): diff --git a/lnbits/extensions/usermanager/views_api.py b/lnbits/extensions/usermanager/views_api.py index ecbfcb25b..8c6523859 100644 --- a/lnbits/extensions/usermanager/views_api.py +++ b/lnbits/extensions/usermanager/views_api.py @@ -23,7 +23,7 @@ from .crud import ( ) from .models import CreateUserData, CreateUserWallet -### Users +# Users @usermanager_ext.get("/api/v1/users", status_code=HTTPStatus.OK) @@ -63,7 +63,7 @@ async def api_usermanager_users_delete( raise HTTPException(status_code=HTTPStatus.NO_CONTENT) -###Activate Extension +# Activate Extension @usermanager_ext.post("/api/v1/extensions") @@ -79,7 +79,7 @@ async def api_usermanager_activate_extension( return {"extension": "updated"} -###Wallets +# Wallets @usermanager_ext.post("/api/v1/wallets") @@ -98,7 +98,7 @@ async def api_usermanager_wallets(wallet: WalletTypeInfo = Depends(get_key_type) return [wallet.dict() for wallet in await get_usermanager_wallets(admin_id)] -@usermanager_ext.get("/api/v1/wallets/{wallet_id}") +@usermanager_ext.get("/api/v1/transactions/{wallet_id}") async def api_usermanager_wallet_transactions( wallet_id, wallet: WalletTypeInfo = Depends(get_key_type) ): diff --git a/lnbits/jinja2_templating.py b/lnbits/jinja2_templating.py index f74f05c05..5abcd0bff 100644 --- a/lnbits/jinja2_templating.py +++ b/lnbits/jinja2_templating.py @@ -23,7 +23,7 @@ class Jinja2Templates(templating.Jinja2Templates): def get_environment(self, loader: "jinja2.BaseLoader") -> "jinja2.Environment": @jinja2.contextfunction def url_for(context: dict, name: str, **path_params: typing.Any) -> str: - request: Request = context["request"] # type: starlette.requests.Request + request: Request = context["request"] return request.app.url_path_for(name, **path_params) def url_params_update(init: QueryParams, **new: typing.Any) -> QueryParams: diff --git a/mypy.ini b/mypy.ini index b991c7cc2..f8b1844b6 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,2 +1 @@ [mypy] -plugins = trio_typing.plugin