Michilis/lnbits
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run black on everything.

Browse Source
This commit is contained in:
fiatjaf
2020-08-30 23:19:43 -03:00
parent 2cecaa229b
commit 660d56d400
31 changed files with 397 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lnbits/extensions/usermanager/crud.py
+12 -12
View File
@@ -13,11 +13,9 @@ from ...core.crud import (
)
###Users
def create_usermanager_user(user_name: str, wallet_name: str, admin_id: str) -> Users:
user = get_user(create_account().id)
@@ -37,7 +35,7 @@ def create_usermanager_user(user_name: str, wallet_name: str, admin_id: str) ->
INSERT INTO wallets (id, admin, name, user, adminkey, inkey)
VALUES (?, ?, ?, ?, ?, ?)
""",
(wallet.id, admin_id, wallet_name, user.id, wallet.adminkey, wallet.inkey)
(wallet.id, admin_id, wallet_name, user.id, wallet.adminkey, wallet.inkey),
)
return get_usermanager_user(user.id)
@@ -47,7 +45,6 @@ def get_usermanager_user(user_id: str) -> Users:
with open_ext_db("usermanager") as db:
row = db.fetchone("SELECT * FROM users WHERE id = ?", (user_id,))
return Users(**row) if row else None
@@ -67,12 +64,14 @@ def delete_usermanager_user(user_id: str) -> None:
db.execute("DELETE FROM users WHERE id = ?", (user_id,))
row
for r in row:
delete_wallet( user_id=user_id, wallet_id=r.id)
delete_wallet(user_id=user_id, wallet_id=r.id)
with open_ext_db("usermanager") as dbb:
dbb.execute("DELETE FROM wallets WHERE user = ?", (user_id,))
###Wallets
def create_usermanager_wallet(user_id: str, wallet_name: str, admin_id: str) -> Wallets:
wallet = create_wallet(user_id=user_id, wallet_name=wallet_name)
with open_ext_db("usermanager") as db:
@@ -82,11 +81,12 @@ def create_usermanager_wallet(user_id: str, wallet_name: str, admin_id: str) ->
INSERT INTO wallets (id, admin, name, user, adminkey, inkey)
VALUES (?, ?, ?, ?, ?, ?)
""",
(wallet.id, admin_id, wallet_name, user_id, wallet.adminkey, wallet.inkey)
(wallet.id, admin_id, wallet_name, user_id, wallet.adminkey, wallet.inkey),
)
return get_usermanager_wallet(wallet.id)
def get_usermanager_wallet(wallet_id: str) -> Optional[Wallets]:
with open_ext_db("usermanager") as db:
row = db.fetchone("SELECT * FROM wallets WHERE id = ?", (wallet_id,))
@@ -103,15 +103,15 @@ def get_usermanager_wallets(user_id: str) -> Wallets:
def get_usermanager_wallet_transactions(wallet_id: str) -> Users:
return get_wallet_payments(wallet_id=wallet_id,include_all_pending=False)
return get_wallet_payments(wallet_id=wallet_id, include_all_pending=False)
def get_usermanager_wallet_balances(user_id: str) -> Users:
user = get_user(user_id)
return (user.wallets)
return user.wallets
def delete_usermanager_wallet(wallet_id: str, user_id: str) -> None:
delete_wallet( user_id=user_id, wallet_id=wallet_id)
delete_wallet(user_id=user_id, wallet_id=wallet_id)
with open_ext_db("usermanager") as db:
db.execute("DELETE FROM wallets WHERE id = ?", (wallet_id,))
lnbits/extensions/usermanager/migrations.py
+9 -6
View File
@@ -5,7 +5,8 @@ def m001_initial(db):
"""
Initial users table.
"""
db.execute("""
db.execute(
"""
CREATE TABLE IF NOT EXISTS users (
id TEXT PRIMARY KEY,
name TEXT NOT NULL,
@@ -13,13 +14,14 @@ def m001_initial(db):
email TEXT,
password TEXT
);
""")
"""
)
"""
Initial wallets table.
"""
db.execute("""
db.execute(
"""
CREATE TABLE IF NOT EXISTS wallets (
id TEXT PRIMARY KEY,
admin TEXT NOT NULL,
@@ -28,9 +30,10 @@ def m001_initial(db):
adminkey TEXT NOT NULL,
inkey TEXT NOT NULL
);
""")
"""
)
def migrate():
with open_ext_db("usermanager") as db:
m001_initial(db)
lnbits/extensions/usermanager/models.py
+2 -2
View File
@@ -1,5 +1,6 @@
from typing import NamedTuple
class Users(NamedTuple):
id: str
name: str
@@ -7,6 +8,7 @@ class Users(NamedTuple):
email: str
password: str
class Wallets(NamedTuple):
id: str
admin: str
@@ -14,5 +16,3 @@ class Wallets(NamedTuple):
user: str
adminkey: str
inkey: str
lnbits/extensions/usermanager/views.py
+1 -1
View File
@@ -10,4 +10,4 @@ from lnbits.db import open_ext_db
@check_user_exists()
def index():
return render_template("usermanager/index.html", user=g.user)
return render_template("usermanager/index.html", user=g.user)
lnbits/extensions/usermanager/views_api.py
+40 -20
View File
@@ -5,19 +5,29 @@ from lnbits.core.crud import get_user
from lnbits.decorators import api_check_wallet_key, api_validate_post_request
from lnbits.extensions.usermanager import usermanager_ext
from .crud import create_usermanager_user, get_usermanager_user, get_usermanager_users, get_usermanager_wallet_transactions, get_usermanager_wallet_balances, delete_usermanager_user, create_usermanager_wallet, get_usermanager_wallet, get_usermanager_wallets, delete_usermanager_wallet
from .crud import (
create_usermanager_user,
get_usermanager_user,
get_usermanager_users,
get_usermanager_wallet_transactions,
get_usermanager_wallet_balances,
delete_usermanager_user,
create_usermanager_wallet,
get_usermanager_wallet,
get_usermanager_wallets,
delete_usermanager_wallet,
)
from lnbits.core.services import create_invoice
from base64 import urlsafe_b64encode
from uuid import uuid4
from lnbits.db import open_ext_db
from ...core import (
update_user_extension,
)
from ...core import update_user_extension
###Users
@usermanager_ext.route("/api/v1/users", methods=["GET"])
@api_check_wallet_key(key_type="invoice")
def api_usermanager_users():
@@ -27,11 +37,13 @@ def api_usermanager_users():
@usermanager_ext.route("/api/v1/users", methods=["POST"])
@api_check_wallet_key(key_type="invoice")
@api_validate_post_request(schema={
"admin_id": {"type": "string", "empty": False, "required": True},
"user_name": {"type": "string", "empty": False, "required": True},
"wallet_name": {"type": "string", "empty": False, "required": True}
})
@api_validate_post_request(
schema={
"admin_id": {"type": "string", "empty": False, "required": True},
"user_name": {"type": "string", "empty": False, "required": True},
"wallet_name": {"type": "string", "empty": False, "required": True},
}
)
def api_usermanager_users_create():
user = create_usermanager_user(g.data["user_name"], g.data["wallet_name"], g.data["admin_id"])
return jsonify(user._asdict()), HTTPStatus.CREATED
@@ -46,15 +58,19 @@ def api_usermanager_users_delete(user_id):
delete_usermanager_user(user_id)
return "", HTTPStatus.NO_CONTENT
###Activate Extension
@usermanager_ext.route("/api/v1/extensions", methods=["POST"])
@api_check_wallet_key(key_type="invoice")
@api_validate_post_request(schema={
"extension": {"type": "string", "empty": False, "required": True},
"userid": {"type": "string", "empty": False, "required": True},
"active": {"type": "boolean", "required": True}
})
@api_validate_post_request(
schema={
"extension": {"type": "string", "empty": False, "required": True},
"userid": {"type": "string", "empty": False, "required": True},
"active": {"type": "boolean", "required": True},
}
)
def api_usermanager_activate_extension():
user = get_user(g.data["userid"])
if not user:
@@ -62,8 +78,10 @@ def api_usermanager_activate_extension():
update_user_extension(user_id=g.data["userid"], extension=g.data["extension"], active=g.data["active"])
return jsonify({"extension": "updated"}), HTTPStatus.CREATED
###Wallets
@usermanager_ext.route("/api/v1/wallets", methods=["GET"])
@api_check_wallet_key(key_type="invoice")
def api_usermanager_wallets():
@@ -73,12 +91,13 @@ def api_usermanager_wallets():
@usermanager_ext.route("/api/v1/wallets", methods=["POST"])
@api_check_wallet_key(key_type="invoice")
@api_validate_post_request(schema={
"user_id": {"type": "string", "empty": False, "required": True},
"wallet_name": {"type": "string", "empty": False, "required": True},
"admin_id": {"type": "string", "empty": False, "required": True}
})
@api_validate_post_request(
schema={
"user_id": {"type": "string", "empty": False, "required": True},
"wallet_name": {"type": "string", "empty": False, "required": True},
"admin_id": {"type": "string", "empty": False, "required": True},
}
)
def api_usermanager_wallets_create():
user = create_usermanager_wallet(g.data["user_id"], g.data["wallet_name"], g.data["admin_id"])
return jsonify(user._asdict()), HTTPStatus.CREATED
@@ -90,6 +109,7 @@ def api_usermanager_wallet_transactions(wallet_id):
return jsonify(get_usermanager_wallet_transactions(wallet_id)), HTTPStatus.OK
@usermanager_ext.route("/api/v1/wallets/<user_id>", methods=["GET"])
@api_check_wallet_key(key_type="invoice")
def api_usermanager_wallet_balances(user_id):