escape user

lnbits/core/crud.py

@@ -332,55 +332,23 @@ async def create_wallet(
     conn: Optional[Connection] = None,
 ) -> Wallet:
     wallet_id = uuid4().hex
-    now = int(time())
-    now_ph = db.timestamp_placeholder("now")
-    await (conn or db).execute(
-        f"""
-        INSERT INTO wallets (id, name, "user", adminkey, inkey, created_at, updated_at)
-        VALUES (:wallet, :name, :user, :adminkey, :inkey, {now_ph}, {now_ph})
-        """,
-        {
-            "wallet": wallet_id,
-            "name": wallet_name or settings.lnbits_default_wallet_name,
-            "user": user_id,
-            "adminkey": uuid4().hex,
-            "inkey": uuid4().hex,
-            "now": now,
-        },
+    wallet = Wallet(
+        id=wallet_id,
+        name=wallet_name or settings.lnbits_default_wallet_name,
+        user=user_id,
+        adminkey=uuid4().hex,
+        inkey=uuid4().hex,
     )
-
-    new_wallet = await get_wallet(wallet_id=wallet_id, conn=conn)
-    assert new_wallet, "Newly created wallet couldn't be retrieved"
-
-    return new_wallet
+    await (conn or db).update("wallets", wallet)
+    return wallet
 
 
 async def update_wallet(
-    wallet_id: str,
-    name: Optional[str] = None,
-    currency: Optional[str] = None,
+    wallet: Wallet,
     conn: Optional[Connection] = None,
 ) -> Optional[Wallet]:
-    set_clause = []
-    set_clause.append(f"updated_at = {db.timestamp_placeholder('now')}")
-    values: dict = {
-        "wallet": wallet_id,
-        "now": int(time()),
-    }
-    if name:
-        set_clause.append("name = :name")
-        values["name"] = name
-    if currency is not None:
-        set_clause.append("currency = :currency")
-        values["currency"] = currency
-    await (conn or db).execute(
-        f"""
-        UPDATE wallets SET {', '.join(set_clause)} WHERE id = :wallet
-        """,
-        values,
-    )
-    wallet = await get_wallet(wallet_id=wallet_id, conn=conn)
-    assert wallet, "updated created wallet couldn't be retrieved"
+    wallet.updated_at = datetime.now(timezone.utc)
+    await (conn or db).update("wallets", wallet)
     return wallet
 
 

lnbits/core/models.py

@@ -4,7 +4,7 @@ import hashlib
 import hmac
 import time
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Callable, Optional
 
@@ -41,11 +41,15 @@ class Wallet(BaseModel):
     name: str
     adminkey: str
     inkey: str
-    currency: Optional[str]
     deleted: bool = False
-    created_at: Optional[int] = None
-    updated_at: Optional[int] = None
     balance_msat: int = 0
+    created_at: datetime = datetime.now(timezone.utc)
+    updated_at: datetime = datetime.now(timezone.utc)
+    currency: Optional[str] = None
+
+    # @property
+    # def balance_msat(self) -> int:
+    #     return self.balance_msat // 1000
 
     @property
     def balance(self) -> int:
@@ -73,11 +77,6 @@ class Wallet(BaseModel):
             linking_key, curve=SECP256k1, hashfunc=hashlib.sha256
         )
 
-    async def get_payment(self, payment_hash: str) -> Optional[Payment]:
-        from .crud import get_standalone_payment
-
-        return await get_standalone_payment(payment_hash)
-
 
 class KeyType(Enum):
     admin = 0
@@ -115,8 +114,8 @@ class Account(BaseModel):
     pubkey: Optional[str] = None
     email: Optional[str] = None
     extra: UserExtra = UserExtra()
-    created_at: datetime = datetime.now()
-    updated_at: datetime = datetime.now()
+    created_at: datetime = datetime.now(timezone.utc)
+    updated_at: datetime = datetime.now(timezone.utc)
 
     @property
     def is_super_user(self) -> bool:

lnbits/core/views/wallet_api.py

@@ -1,9 +1,11 @@
+from http import HTTPStatus
 from typing import Optional
 
 from fastapi import (
     APIRouter,
     Body,
     Depends,
+    HTTPException,
 )
 
 from lnbits.core.models import (
@@ -20,6 +22,7 @@ from lnbits.decorators import (
 from ..crud import (
     create_wallet,
     delete_wallet,
+    get_wallet,
     update_wallet,
 )
 
@@ -27,35 +30,45 @@ wallet_router = APIRouter(prefix="/api/v1/wallet", tags=["Wallet"])
 
 
 @wallet_router.get("")
-async def api_wallet(wallet: WalletTypeInfo = Depends(require_invoice_key)):
+async def api_wallet(key_info: WalletTypeInfo = Depends(require_invoice_key)):
     res = {
-        "name": wallet.wallet.name,
-        "balance": wallet.wallet.balance_msat,
+        "name": key_info.wallet.name,
+        "balance": key_info.wallet.balance_msat,
     }
-    if wallet.key_type == KeyType.admin:
-        res["id"] = wallet.wallet.id
+    if key_info.key_type == KeyType.admin:
+        res["id"] = key_info.wallet.id
     return res
 
 
 @wallet_router.put("/{new_name}")
 async def api_update_wallet_name(
-    new_name: str, wallet: WalletTypeInfo = Depends(require_admin_key)
+    new_name: str, key_info: WalletTypeInfo = Depends(require_admin_key)
 ):
-    await update_wallet(wallet.wallet.id, new_name)
+    wallet = await get_wallet(key_info.wallet.id)
+    if not wallet:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Wallet not found")
+    wallet.name = new_name
+    await update_wallet(wallet)
     return {
-        "id": wallet.wallet.id,
-        "name": wallet.wallet.name,
-        "balance": wallet.wallet.balance_msat,
+        "id": wallet.id,
+        "name": wallet.name,
+        "balance": wallet.balance_msat,
     }
 
 
-@wallet_router.patch("", response_model=Wallet)
+@wallet_router.patch("")
 async def api_update_wallet(
     name: Optional[str] = Body(None),
     currency: Optional[str] = Body(None),
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-):
-    return await update_wallet(wallet.wallet.id, name, currency)
+    key_info: WalletTypeInfo = Depends(require_admin_key),
+) -> Wallet:
+    wallet = await get_wallet(key_info.wallet.id)
+    if not wallet:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Wallet not found")
+    wallet.name = name or wallet.name
+    wallet.currency = currency or wallet.currency
+    await update_wallet(wallet)
+    return wallet
 
 
 @wallet_router.delete("")