feat: improve user admin (#2777)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
from uuid import UUID, uuid4
|
||||
from uuid import uuid4
|
||||
|
||||
from loguru import logger
|
||||
|
||||
@@ -15,13 +15,16 @@ from lnbits.settings import (
|
||||
from ..crud import (
|
||||
create_account,
|
||||
create_admin_settings,
|
||||
create_user_extension,
|
||||
create_wallet,
|
||||
get_account,
|
||||
get_account_by_email,
|
||||
get_account_by_pubkey,
|
||||
get_account_by_username,
|
||||
get_super_settings,
|
||||
get_user_extensions,
|
||||
get_user_from_account,
|
||||
update_account,
|
||||
update_super_user,
|
||||
update_user_extension,
|
||||
)
|
||||
@@ -39,7 +42,16 @@ async def create_user_account(
|
||||
) -> User:
|
||||
if not settings.new_accounts_allowed:
|
||||
raise ValueError("Account creation is disabled.")
|
||||
|
||||
return await create_user_account_no_ckeck(account, wallet_name)
|
||||
|
||||
|
||||
async def create_user_account_no_ckeck(
|
||||
account: Optional[Account] = None, wallet_name: Optional[str] = None
|
||||
) -> User:
|
||||
|
||||
if account:
|
||||
account.validate_fields()
|
||||
if account.username and await get_account_by_username(account.username):
|
||||
raise ValueError("Username already exists.")
|
||||
|
||||
@@ -49,10 +61,7 @@ async def create_user_account(
|
||||
if account.pubkey and await get_account_by_pubkey(account.pubkey):
|
||||
raise ValueError("Pubkey already exists.")
|
||||
|
||||
if account.id:
|
||||
user_uuid4 = UUID(hex=account.id, version=4)
|
||||
assert user_uuid4.hex == account.id, "User ID is not valid UUID4 hex string"
|
||||
else:
|
||||
if not account.id:
|
||||
account.id = uuid4().hex
|
||||
|
||||
account = await create_account(account)
|
||||
@@ -71,6 +80,58 @@ async def create_user_account(
|
||||
return user
|
||||
|
||||
|
||||
async def update_user_account(account: Account) -> Account:
|
||||
account.validate_fields()
|
||||
|
||||
existing_account = await get_account(account.id)
|
||||
if not existing_account:
|
||||
raise ValueError("User does not exist.")
|
||||
|
||||
account.password_hash = existing_account.password_hash
|
||||
|
||||
if existing_account.username and not account.username:
|
||||
raise ValueError("Cannot remove username.")
|
||||
|
||||
if account.username:
|
||||
existing_account = await get_account_by_username(account.username)
|
||||
if existing_account and existing_account.id != account.id:
|
||||
raise ValueError("Username already exists.")
|
||||
elif existing_account.username:
|
||||
raise ValueError("Cannot remove username.")
|
||||
|
||||
if account.email:
|
||||
existing_account = await get_account_by_email(account.email)
|
||||
if existing_account and existing_account.id != account.id:
|
||||
raise ValueError("Email already exists.")
|
||||
|
||||
if account.pubkey:
|
||||
existing_account = await get_account_by_pubkey(account.pubkey)
|
||||
if existing_account and existing_account.id != account.id:
|
||||
raise ValueError("Pubkey already exists.")
|
||||
|
||||
return await update_account(account)
|
||||
|
||||
|
||||
async def update_user_extensions(user_id: str, extensions: list[str]):
|
||||
user_extensions = await get_user_extensions(user_id)
|
||||
for user_ext in user_extensions:
|
||||
if user_ext.active:
|
||||
if user_ext.extension not in extensions:
|
||||
user_ext.active = False
|
||||
await update_user_extension(user_ext)
|
||||
else:
|
||||
if user_ext.extension in extensions:
|
||||
user_ext.active = True
|
||||
await update_user_extension(user_ext)
|
||||
|
||||
user_extension_ids = [ue.extension for ue in user_extensions]
|
||||
for ext in extensions:
|
||||
if ext in user_extension_ids:
|
||||
continue
|
||||
user_extension = UserExtension(user=user_id, extension=ext, active=True)
|
||||
await create_user_extension(user_extension)
|
||||
|
||||
|
||||
async def check_admin_settings():
|
||||
if settings.super_user:
|
||||
settings.super_user = to_valid_user_id(settings.super_user).hex
|
||||
|
||||
Reference in New Issue
Block a user