aiolabs/lnurlp
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: do not validate username inside crud

Browse source 
check username on api level not inside crud. adds better error reporting for the api user also in frontend
This commit is contained in:
dni ⚡ 2024-03-31 10:48:55 +02:00
commit 4de7c1a4c0
No known key found for this signature in database
GPG key ID: 886317704CC4E618
2 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crud.py
View file

@ -5,7 +5,6 @@ from lnbits.helpers import urlsafe_short_hash, insert_query, update_query
from . import db
from .models import CreatePayLinkData, LnurlpSettings, PayLink
from .nostr.key import PrivateKey
from .services import check_lnaddress_format
async def get_or_create_lnurlp_settings() -> LnurlpSettings:
@ -33,21 +32,14 @@ async def delete_lnurlp_settings() -> None:
await db.execute("DELETE FROM lnurlp.settings")
async def check_lnaddress_not_exists(username: str) -> bool:
# check if lnaddress username exists in the database when creating a new entry
row = await db.fetchall(
"SELECT username FROM lnurlp.pay_links WHERE username = ?", (username,)
async def get_pay_link_by_username(username: str) -> Optional[PayLink]:
row = await db.fetchone(
"SELECT * FROM lnurlp.pay_links WHERE username = ?", (username,)
)
if row:
raise Exception("Username already exists. Try a different one.")
else:
return True
return PayLink.from_row(row) if row else None
async def create_pay_link(data: CreatePayLinkData, wallet_id: str) -> PayLink:
if data.username:
await check_lnaddress_format(data.username)
await check_lnaddress_not_exists(data.username)
link_id = urlsafe_short_hash()[:6]
@ -128,9 +120,6 @@ async def get_pay_links(wallet_ids: Union[str, List[str]]) -> List[PayLink]:
async def update_pay_link(link_id: str, **kwargs) -> Optional[PayLink]:
if "username" in kwargs and len(kwargs["username"] or "") > 0:
await check_lnaddress_format(kwargs["username"])
await check_lnaddress_not_exists(kwargs["username"])
q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
await db.execute(