initial work

lnbits/extensions/usermanager/__init__.py

@@ -1,10 +1,23 @@
-from quart import Blueprint
+import asyncio
+
+from fastapi import APIRouter
+
 from lnbits.db import Database
+from lnbits.helpers import template_renderer
 
 db = Database("ext_usermanager")
 
-usermanager_ext: Blueprint = Blueprint(
+usermanager_ext: APIRouter = APIRouter(
-    "usermanager", __name__, static_folder="static", template_folder="templates"
+    prefix="/usermanager",
+    tags=["usermanager"]
+    #"usermanager", __name__, static_folder="static", template_folder="templates"
+)
+
+def usermanager_renderer():
+    return template_renderer(
+        [
+            "lnbits/extensions/usermanager/templates",
+        ]
     )
 
 

lnbits/extensions/usermanager/models.py

@@ -1,8 +1,16 @@
-from typing import NamedTuple
+from pydantic import BaseModel
+from fastapi.param_functions import Query
 from sqlite3 import Row
 
+class CreateUserData(BaseModel):
+    user_name: str = Query(...)
+    wallet_name: str = Query(...)
+    admin_id: str = Query(...)
+    email: str = Query(None)
+    password: str = Query(None)
 
-class Users(NamedTuple):
+
+class Users(BaseModel):
     id: str
     name: str
     admin: str
@@ -10,7 +18,7 @@ class Users(NamedTuple):
     password: str
 
 
-class Wallets(NamedTuple):
+class Wallets(BaseModel):
     id: str
     admin: str
     name: str

lnbits/extensions/usermanager/views.py

@@ -1,12 +1,13 @@
-from quart import g, render_template
+from fastapi import FastAPI, Request
+from fastapi.params import Depends
+from fastapi.templating import Jinja2Templates
+from starlette.responses import HTMLResponse
 
-from lnbits.decorators import check_user_exists, validate_uuids
+from lnbits.core.models import User
+from lnbits.decorators import check_user_exists
 
-from . import usermanager_ext
+from . import usermanager_ext, usermanager_renderer
 
-
+@usermanager_ext.get("/", response_class=HTMLResponse)
-@usermanager_ext.route("/")
+async def index(request: Request, user: User = Depends(check_user_exists)):
-@validate_uuids(["usr"], required=True)
+    return await render_template("usermanager/index.html", user=user.dict())
-@check_user_exists()
-async def index():
-    return await render_template("usermanager/index.html", user=g.user)

lnbits/extensions/usermanager/views_api.py

@@ -1,10 +1,15 @@
-from quart import g, jsonify
 from http import HTTPStatus
+from starlette.exceptions import HTTPException
+
+from fastapi import Query
+from fastapi.params import Depends
 
 from lnbits.core.crud import get_user
 from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+from lnbits.decorators import WalletTypeInfo, get_key_type
 
 from . import usermanager_ext
+from .models import CreateUserData
 from .crud import (
     create_usermanager_user,
     get_usermanager_user,
@@ -23,74 +28,62 @@ from lnbits.core import update_user_extension
 ### Users
 
 
-@usermanager_ext.route("/api/v1/users", methods=["GET"])
+@usermanager_ext.get("/api/v1/users", status_code=HTTPStatus.OK)
-@api_check_wallet_key(key_type="invoice")
+async def api_usermanager_users(wallet: WalletTypeInfo = Depends(get_key_type)):
-async def api_usermanager_users():
+    user_id = wallet.wallet.user
-    user_id = g.wallet.user
+    return [user.dict() for user in await get_usermanager_users(user_id)]
-    return (
-        jsonify([user._asdict() for user in await get_usermanager_users(user_id)]),
-        HTTPStatus.OK,
-    )
 
 
-@usermanager_ext.route("/api/v1/users/<user_id>", methods=["GET"])
+@usermanager_ext.get("/api/v1/users/{user_id}", status_code=HTTPStatus.OK)
-@api_check_wallet_key(key_type="invoice")
+async def api_usermanager_user(user_id, wallet: WalletTypeInfo = Depends(get_key_type)):
-async def api_usermanager_user(user_id):
     user = await get_usermanager_user(user_id)
-    return (
+    return user.dict()
-        jsonify(user._asdict()),
-        HTTPStatus.OK,
-    )
 
 
-@usermanager_ext.route("/api/v1/users", methods=["POST"])
+@usermanager_ext.post("/api/v1/users", status_code=HTTPStatus.CREATED)
-@api_check_wallet_key(key_type="invoice")
+# @api_validate_post_request(
-@api_validate_post_request(
+#     schema={
-    schema={
+#         "user_name": {"type": "string", "empty": False, "required": True},
-        "user_name": {"type": "string", "empty": False, "required": True},
+#         "wallet_name": {"type": "string", "empty": False, "required": True},
-        "wallet_name": {"type": "string", "empty": False, "required": True},
+#         "admin_id": {"type": "string", "empty": False, "required": True},
-        "admin_id": {"type": "string", "empty": False, "required": True},
+#         "email": {"type": "string", "required": False},
-        "email": {"type": "string", "required": False},
+#         "password": {"type": "string", "required": False},
-        "password": {"type": "string", "required": False},
+#     }
-    }
+# )
-)
+async def api_usermanager_users_create(data: CreateUserData, wallet: WalletTypeInfo = Depends(get_key_type)):
-async def api_usermanager_users_create():
+    user = await create_usermanager_user(**data)
-    user = await create_usermanager_user(**g.data)
+    full = user.dict()
-    full = user._asdict()
+    full["wallets"] = [wallet.dict() for wallet in await get_usermanager_users_wallets(user.id)]
-    full["wallets"] = [wallet._asdict() for wallet in await get_usermanager_users_wallets(user.id)]
+    return full
-    return jsonify(full), HTTPStatus.CREATED
 
 
-@usermanager_ext.route("/api/v1/users/<user_id>", methods=["DELETE"])
+@usermanager_ext.delete("/api/v1/users/{user_id}")
-@api_check_wallet_key(key_type="invoice")
+async def api_usermanager_users_delete(user_id, wallet: WalletTypeInfo = Depends(get_key_type)):
-async def api_usermanager_users_delete(user_id):
     user = await get_usermanager_user(user_id)
     if not user:
-        return jsonify({"message": "User does not exist."}), HTTPStatus.NOT_FOUND
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND,
+            detail="User does not exist."
+        )
     await delete_usermanager_user(user_id)
-    return "", HTTPStatus.NO_CONTENT
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
 ###Activate Extension
 
 
-@usermanager_ext.route("/api/v1/extensions", methods=["POST"])
+@usermanager_ext.post("/api/v1/extensions")
-@api_check_wallet_key(key_type="invoice")
+async def api_usermanager_activate_extension(extension: str = Query(...), userid: str = Query(...), active: bool = Query(...)):
-@api_validate_post_request(
+    user = await get_user(userid)
-    schema={
-        "extension": {"type": "string", "empty": False, "required": True},
-        "userid": {"type": "string", "empty": False, "required": True},
-        "active": {"type": "boolean", "required": True},
-    }
-)
-async def api_usermanager_activate_extension():
-    user = await get_user(g.data["userid"])
     if not user:
-        return jsonify({"message": "no such user"}), HTTPStatus.NOT_FOUND
+        raise HTTPException(
-    update_user_extension(
+            status_code=HTTPStatus.NOT_FOUND,
-        user_id=g.data["userid"], extension=g.data["extension"], active=g.data["active"]
+            detail="User does not exist."
         )
-    return jsonify({"extension": "updated"}), HTTPStatus.CREATED
+    update_user_extension(
+        user_id=userid, extension=extension, active=active
+    )
+    return {"extension": "updated"}
 
 
 ###Wallets