feat: usermanager (#2139)

* feat: usermanager

---------

Co-authored-by: Vlad Stan <stan.v.vlad@gmail.com>

lnbits/core/__init__.py

@@ -12,6 +12,7 @@ from .views.node_api import node_router, public_node_router, super_node_router
 from .views.payment_api import payment_router
 from .views.public_api import public_router
 from .views.tinyurl_api import tinyurl_router
+from .views.user_api import users_router
 from .views.wallet_api import wallet_router
 from .views.webpush_api import webpush_router
 from .views.websocket_api import websocket_router
@@ -36,3 +37,4 @@ def init_core_routers(app: FastAPI):
     app.include_router(websocket_router)
     app.include_router(tinyurl_router)
     app.include_router(webpush_router)
+    app.include_router(users_router)

lnbits/core/crud.py

@@ -20,6 +20,8 @@ from lnbits.settings import (
 )
 
 from .models import (
+    Account,
+    AccountFilters,
     CreateUser,
     Payment,
     PaymentFilters,
@@ -145,6 +147,46 @@ async def update_account(
     return user
 
 
+async def delete_account(user_id: str, conn: Optional[Connection] = None) -> None:
+    await (conn or db).execute(
+        "DELETE from accounts WHERE id = ?",
+        (user_id,),
+    )
+
+
+async def get_accounts(
+    filters: Optional[Filters[AccountFilters]] = None,
+    conn: Optional[Connection] = None,
+) -> Page[Account]:
+    return await (conn or db).fetch_page(
+        """
+        SELECT
+            accounts.id,
+            accounts.username,
+            accounts.email,
+            SUM(COALESCE((
+                SELECT balance FROM balances WHERE wallet = wallets.id
+            ), 0)) as balance_msat,
+            SUM((
+                SELECT COUNT(*) FROM apipayments WHERE wallet = wallets.id
+            )) as transaction_count,
+            (
+                SELECT COUNT(*) FROM wallets WHERE wallets.user = accounts.id
+            ) as wallet_count,
+            MAX((
+                SELECT time FROM apipayments
+                WHERE wallet = wallets.id ORDER BY time DESC LIMIT 1
+            )) as last_payment
+            FROM accounts LEFT JOIN wallets ON accounts.id = wallets.user
+        """,
+        [],
+        [],
+        filters=filters,
+        model=Account,
+        group_by=["accounts.id"],
+    )
+
+
 async def get_account(
     user_id: str, conn: Optional[Connection] = None
 ) -> Optional[User]:
@@ -498,16 +540,29 @@ async def update_wallet(
 
 
 async def delete_wallet(
-    *, user_id: str, wallet_id: str, conn: Optional[Connection] = None
+    *,
+    user_id: str,
+    wallet_id: str,
+    deleted: bool = True,
+    conn: Optional[Connection] = None,
 ) -> None:
     now = int(time())
     await (conn or db).execute(
         f"""
         UPDATE wallets
-        SET deleted = true, updated_at = {db.timestamp_placeholder}
+        SET deleted = ?, updated_at = {db.timestamp_placeholder}
         WHERE id = ? AND "user" = ?
         """,
-        (now, wallet_id, user_id),
+        (deleted, now, wallet_id, user_id),
+    )
+
+
+async def force_delete_wallet(
+    wallet_id: str, conn: Optional[Connection] = None
+) -> None:
+    await (conn or db).execute(
+        "DELETE FROM wallets WHERE id = ?",
+        (wallet_id,),
     )
 
 
@@ -559,6 +614,18 @@ async def get_wallet(
     return Wallet(**row) if row else None
 
 
+async def get_wallets(user_id: str, conn: Optional[Connection] = None) -> List[Wallet]:
+    rows = await (conn or db).fetchall(
+        """
+        SELECT *, COALESCE((SELECT balance FROM balances WHERE wallet = wallets.id), 0)
+        AS balance_msat FROM wallets WHERE "user" = ?
+        """,
+        (user_id,),
+    )
+
+    return [Wallet(**row) for row in rows]
+
+
 async def get_wallet_for_key(
     key: str,
     key_type: WalletType = WalletType.invoice,

lnbits/core/models.py

@@ -97,6 +97,37 @@ class UserConfig(BaseModel):
     provider: Optional[str] = "lnbits"  # auth provider
 
 
+class Account(FromRowModel):
+    id: str
+    is_super_user: Optional[bool] = False
+    is_admin: Optional[bool] = False
+    username: Optional[str] = None
+    email: Optional[str] = None
+    balance_msat: Optional[int] = 0
+    transaction_count: Optional[int] = 0
+    wallet_count: Optional[int] = 0
+    last_payment: Optional[datetime.datetime] = None
+
+
+class AccountFilters(FilterModel):
+    __search_fields__ = ["id", "email", "username"]
+    __sort_fields__ = [
+        "balance_msat",
+        "email",
+        "username",
+        "transaction_count",
+        "wallet_count",
+        "last_payment",
+    ]
+
+    id: str
+    last_payment: Optional[datetime.datetime] = None
+    transaction_count: Optional[int] = None
+    wallet_count: Optional[int] = None
+    username: Optional[str] = None
+    email: Optional[str] = None
+
+
 class User(BaseModel):
     id: str
     email: Optional[str] = None

lnbits/core/templates/admin/index.html

@@ -40,17 +40,6 @@
       />
     </q-btn>
 
-    <q-btn
-      v-if="isSuperUser"
-      :label="$t('topup')"
-      color="primary"
-      @click="topUpDialog.show = true"
-    >
-      <q-tooltip>
-        <span v-text="$t('add_funds_tooltip')"></span>
-      </q-tooltip>
-    </q-btn>
-
     <q-btn :label="$t('download_backup')" flat @click="downloadBackup"></q-btn>
 
     <q-btn
@@ -119,54 +108,6 @@
   </div>
 </div>
 
-<q-dialog v-if="isSuperUser" v-model="topUpDialog.show" position="top">
-  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-    <q-form class="q-gutter-md">
-      <p v-text="$t('topup_wallet')"></p>
-
-      <div class="row">
-        <div class="col-12">
-          <q-input
-            dense
-            type="text"
-            filled
-            v-model="wallet.id"
-            label="Wallet ID"
-            :hint="$t('topup_hint')"
-          ></q-input>
-
-          <br />
-        </div>
-
-        <div class="col-12">
-          <q-input
-            dense
-            type="number"
-            filled
-            v-model="wallet.amount"
-            :label="$t('amount')"
-          ></q-input>
-        </div>
-      </div>
-
-      <div class="row q-mt-lg">
-        <q-btn
-          :label="$t('topup')"
-          color="primary"
-          @click="topupWallet"
-        ></q-btn>
-
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          :label="$t('cancel')"
-        ></q-btn>
-      </div>
-    </q-form>
-  </q-card>
-</q-dialog>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script src="{{ static_url_for('static', 'js/admin.js') }}"></script>
 {% endblock %}

lnbits/core/templates/users/_createUserDialog.html

@@ -0,0 +1,23 @@
+<q-dialog v-model="createUserDialog.show">
+  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+    <p>Create User</p>
+    <div class="row">
+      <div class="col-12">
+        <q-form @submit="createUser">
+          <lnbits-dynamic-fields
+            :options="createUserDialog.fields"
+            v-model="createUserDialog.data"
+          ></lnbits-dynamic-fields>
+          <div class="row q-mt-lg">
+            <q-btn v-close-popup unelevated color="primary" type="submit"
+              >Create</q-btn
+            >
+            <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+              >Cancel</q-btn
+            >
+          </div>
+        </q-form>
+      </div>
+    </div>
+  </q-card>
+</q-dialog>

lnbits/core/templates/users/_createWalletDialog.html

@@ -0,0 +1,23 @@
+<q-dialog v-model="createWalletDialog.show">
+  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+    <p>Create Wallet</p>
+    <div class="row">
+      <div class="col-12">
+        <q-form @submit="createWallet">
+          <lnbits-dynamic-fields
+            :options="createWalletDialog.fields"
+            v-model="createUserDialog.data"
+          ></lnbits-dynamic-fields>
+          <div class="row q-mt-lg">
+            <q-btn v-close-popup unelevated color="primary" type="submit"
+              >Create</q-btn
+            >
+            <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+              >Cancel</q-btn
+            >
+          </div>
+        </q-form>
+      </div>
+    </div>
+  </q-card>
+</q-dialog>

lnbits/core/templates/users/_topupDialog.html

@@ -0,0 +1,49 @@
+<q-dialog v-model="topupDialog.show" position="top">
+  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+    <q-form class="q-gutter-md">
+      <p v-text="$t('topup_wallet')"></p>
+
+      <div class="row">
+        <div class="col-12">
+          <q-input
+            dense
+            type="text"
+            filled
+            v-model="wallet.id"
+            label="Wallet ID"
+            :hint="$t('topup_hint')"
+          ></q-input>
+
+          <br />
+        </div>
+
+        <div class="col-12">
+          <q-input
+            dense
+            type="number"
+            filled
+            v-model="wallet.amount"
+            :label="$t('amount')"
+          ></q-input>
+        </div>
+      </div>
+
+      <div class="row q-mt-lg">
+        <q-btn
+          :label="$t('topup')"
+          color="primary"
+          @click="topupWallet"
+          v-close-popup
+        ></q-btn>
+
+        <q-btn
+          v-close-popup
+          flat
+          color="grey"
+          class="q-ml-auto"
+          :label="$t('cancel')"
+        ></q-btn>
+      </div>
+    </q-form>
+  </q-card>
+</q-dialog>

lnbits/core/templates/users/_walletDialog.html

@@ -0,0 +1,92 @@
+<q-dialog v-model="walletDialog.show">
+  <q-card class="q-pa-lg" style="width: 700px; max-width: 80vw">
+    <h2 class="text-h6 q-mb-md">Wallets</h2>
+    <q-table :data="wallets" :columns="walletTable.columns">
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th auto-width></q-th>
+          <q-th
+            auto-width
+            v-for="col in props.cols"
+            v-text="col.label"
+            :key="col.name"
+            :props="props"
+          ></q-th>
+        </q-tr>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-td auto-width>
+            <q-btn
+              v-if="!props.row.deleted"
+              round
+              icon="content_copy"
+              size="sm"
+              color="primary"
+              @click="copyText(props.row.id)"
+            >
+              <q-tooltip>Copy Wallet ID</q-tooltip>
+            </q-btn>
+            <lnbits-update-balance
+              v-if="!props.row.deleted"
+              :wallet_id="props.row.id"
+              :callback="topupCallback"
+            ></lnbits-update-balance>
+            <q-btn
+              round
+              v-if="!props.row.deleted"
+              icon="vpn_key"
+              size="sm"
+              color="primary"
+              @click="copyText(props.row.adminkey)"
+            >
+              <q-tooltip>Copy Admin Key</q-tooltip>
+            </q-btn>
+            <q-btn
+              round
+              v-if="!props.row.deleted"
+              icon="vpn_key"
+              size="sm"
+              color="secondary"
+              @click="copyText(props.row.inkey)"
+            >
+              <q-tooltip>Copy Invoice Key</q-tooltip>
+            </q-btn>
+            <q-btn
+              round
+              v-if="props.row.deleted"
+              icon="toggle_off"
+              size="sm"
+              color="secondary"
+              @click="undeleteUserWallet(props.row.user, props.row.id)"
+            >
+              <q-tooltip>Undelete Wallet</q-tooltip>
+            </q-btn>
+            <q-btn
+              round
+              icon="delete"
+              size="sm"
+              color="negative"
+              @click="deleteUserWallet(props.row.user, props.row.id, props.row.deleted)"
+            >
+              <q-tooltip>Delete Wallet</q-tooltip>
+            </q-btn>
+          </q-td>
+          <q-td auto-width v-text="props.row.name"></q-td>
+          <q-td auto-width v-text="props.row.currency"></q-td>
+          <q-td auto-width v-text="formatSat(props.row.balance_msat)"></q-td>
+          <q-td auto-width v-text="props.row.deleted"></q-td>
+        </q-tr>
+      </template>
+    </q-table>
+    <div class="row q-mt-lg">
+      <q-btn
+        v-close-popup
+        flat
+        color="grey"
+        class="q-ml-auto"
+        :label="$t('close')"
+      ></q-btn>
+    </div>
+  </q-card>
+</q-dialog>

lnbits/core/templates/users/index.html

@@ -0,0 +1,116 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %} {% include "users/_walletDialog.html" %} {% include
+"users/_topupDialog.html" %} {% include "users/_createUserDialog.html" %} {%
+include "users/_createWalletDialog.html" %}
+
+<h3 class="text-subtitle q-my-none" v-text="$t('users')"></h3>
+
+<div class="row q-col-gutter-md justify-center">
+  <div class="col q-gutter-y-md" style="width: 300px">
+    <div style="width: 600px">
+      <canvas ref="chart1"></canvas>
+    </div>
+  </div>
+</div>
+<div class="row q-col-gutter-md justify-center">
+  <div class="col q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        <div class="row items-center no-wrap q-mb-sm">
+          <q-btn :label="$t('topup')" @click="topupDialog.show = true">
+            <q-tooltip
+              >{%raw%}{{ $t('add_funds_tooltip') }}{%endraw%}</q-tooltip
+            >
+          </q-btn>
+        </div>
+        <q-table
+          :data="users"
+          :row-key="usersTableRowKey"
+          :columns="usersTable.columns"
+          :pagination.sync="usersTable.pagination"
+          :no-data-label="$t('no_users')"
+          :filter="usersTable.search"
+          :loading="usersTable.loading"
+          @request="fetchUsers"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th auto-width></q-th>
+              <q-th
+                v-for="col in props.cols"
+                v-text="col.label"
+                :key="col.name"
+                :props="props"
+              ></q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr auto-width :props="props">
+              <q-td>
+                <q-btn
+                  round
+                  icon="menu"
+                  size="sm"
+                  color="secondary"
+                  @click="fetchWallets(props.row.id)"
+                >
+                  <q-tooltip>Show Wallets</q-tooltip>
+                </q-btn>
+                <q-btn
+                  round
+                  icon="content_copy"
+                  size="sm"
+                  color="primary"
+                  @click="copyText(props.row.id)"
+                >
+                  <q-tooltip>Copy User ID</q-tooltip>
+                </q-btn>
+                <q-btn
+                  round
+                  v-if="!props.row.is_super_user"
+                  icon="build"
+                  size="sm"
+                  :color="props.row.is_admin ? 'primary' : ''"
+                  @click="toggleAdmin(props.row.id)"
+                >
+                  <q-tooltip>Toggle Admin</q-tooltip>
+                </q-btn>
+                <q-btn
+                  round
+                  v-if="props.row.is_super_user"
+                  icon="build"
+                  size="sm"
+                  color="positive"
+                >
+                  <q-tooltip>Super User</q-tooltip>
+                </q-btn>
+                <q-btn
+                  round
+                  icon="delete"
+                  size="sm"
+                  color="negative"
+                  @click="deleteUser(props.row.id, props)"
+                >
+                  <q-tooltip>Delete User</q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td
+                auto-width
+                v-text="formatSat(props.row.balance_msat)"
+              ></q-td>
+              <q-td auto-width v-text="props.row.wallet_count"></q-td>
+              <q-td auto-width v-text="props.row.transaction_count"></q-td>
+              <q-td auto-width v-text="props.row.username"></q-td>
+              <q-td auto-width v-text="props.row.email"></q-td>
+              <q-td auto-width v-text="props.row.last_payment"></q-td>
+            </q-tr>
+          </template>
+        </q-table>
+      </q-card-section>
+    </q-card>
+  </div>
+</div>
+
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+<script src="{{ static_url_for('static', 'js/users.js') }}"></script>
+{% endblock %}

lnbits/core/views/admin_api.py

@@ -10,12 +10,10 @@ from fastapi import APIRouter, Depends
 from fastapi.responses import FileResponse
 from starlette.exceptions import HTTPException
 
-from lnbits.core.crud import get_wallet
-from lnbits.core.models import CreateTopup, User
+from lnbits.core.models import User
 from lnbits.core.services import (
     get_balance_delta,
     update_cached_settings,
-    update_wallet_balance,
 )
 from lnbits.core.tasks import api_invoice_listeners
 from lnbits.decorators import check_admin, check_super_user
@@ -104,30 +102,6 @@ async def api_restart_server() -> dict[str, str]:
     return {"status": "Success"}
 
 
-@admin_router.put(
-    "/api/v1/topup",
-    name="Topup",
-    status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_super_user)],
-)
-async def api_topup_balance(data: CreateTopup) -> dict[str, str]:
-    try:
-        await get_wallet(data.id)
-    except Exception as exc:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN, detail="wallet does not exist."
-        ) from exc
-
-    if settings.lnbits_backend_wallet_class == "VoidWallet":
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN, detail="VoidWallet active"
-        )
-
-    await update_wallet_balance(wallet_id=data.id, amount=int(data.amount))
-
-    return {"status": "Success"}
-
-
 @admin_router.get(
     "/api/v1/backup",
     status_code=HTTPStatus.OK,

lnbits/core/views/generic.py

@@ -374,7 +374,7 @@ async def node_public(request: Request):
 
 
 @generic_router.get("/admin", response_class=HTMLResponse)
-async def index(request: Request, user: User = Depends(check_admin)):
+async def admin_index(request: Request, user: User = Depends(check_admin)):
     if not settings.lnbits_admin_ui:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
@@ -393,6 +393,22 @@ async def index(request: Request, user: User = Depends(check_admin)):
     )
 
 
+@generic_router.get("/users", response_class=HTMLResponse)
+async def users_index(request: Request, user: User = Depends(check_admin)):
+    if not settings.lnbits_admin_ui:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
+
+    return template_renderer().TemplateResponse(
+        "users/index.html",
+        {
+            "request": request,
+            "user": user.dict(),
+            "settings": settings.dict(),
+            "currencies": list(currencies.keys()),
+        },
+    )
+
+
 @generic_router.get("/uuidv4/{hex_value}")
 async def hex_to_uuid4(hex_value: str):
     try:

lnbits/core/views/user_api.py

@@ -0,0 +1,147 @@
+from http import HTTPStatus
+from typing import List
+
+from fastapi import APIRouter, Depends
+from starlette.exceptions import HTTPException
+
+from lnbits.core.crud import (
+    delete_account,
+    delete_wallet,
+    force_delete_wallet,
+    get_accounts,
+    get_wallet,
+    get_wallets,
+    update_admin_settings,
+)
+from lnbits.core.models import Account, AccountFilters, CreateTopup, User, Wallet
+from lnbits.core.services import update_wallet_balance
+from lnbits.db import Filters, Page
+from lnbits.decorators import check_admin, check_super_user, parse_filters
+from lnbits.settings import EditableSettings, settings
+
+users_router = APIRouter(prefix="/users/api/v1", dependencies=[Depends(check_admin)])
+
+
+@users_router.get("/user")
+async def api_get_users(
+    filters: Filters = Depends(parse_filters(AccountFilters)),
+) -> Page[Account]:
+    try:
+        filtered = await get_accounts(filters=filters)
+        for user in filtered.data:
+            user.is_super_user = user.id == settings.super_user
+            user.is_admin = user.id in settings.lnbits_admin_users or user.is_super_user
+        return filtered
+    except Exception as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=f"Could not fetch users. {exc!s}",
+        ) from exc
+
+
+@users_router.delete("/user/{user_id}", status_code=HTTPStatus.OK)
+async def api_users_delete_user(
+    user_id: str, user: User = Depends(check_admin)
+) -> None:
+
+    try:
+        wallets = await get_wallets(user_id)
+        if len(wallets) > 0:
+            raise Exception("Cannot delete user with wallets.")
+        if user_id == settings.super_user:
+            raise Exception("Cannot delete super user.")
+
+        if user_id in settings.lnbits_admin_users and not user.super_user:
+            raise Exception("Only super_user can delete admin user.")
+
+        await delete_account(user_id)
+
+    except Exception as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=f"{exc!s}",
+        ) from exc
+
+
+@users_router.get("/user/{user_id}/admin", dependencies=[Depends(check_super_user)])
+async def api_users_toggle_admin(user_id: str) -> None:
+    try:
+        if user_id == settings.super_user:
+            raise Exception("Cannot change super user.")
+        if user_id in settings.lnbits_admin_users:
+            settings.lnbits_admin_users.remove(user_id)
+        else:
+            settings.lnbits_admin_users.append(user_id)
+            update_settings = EditableSettings(
+                lnbits_admin_users=settings.lnbits_admin_users
+            )
+            await update_admin_settings(update_settings)
+    except Exception as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=f"Could not update admin settings. {exc}",
+        ) from exc
+
+
+@users_router.get("/user/{user_id}/wallet")
+async def api_users_get_user_wallet(user_id: str) -> List[Wallet]:
+    try:
+        return await get_wallets(user_id)
+    except Exception as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=f"Could not fetch user wallets. {exc}",
+        ) from exc
+
+
+@users_router.get("/user/{user_id}/wallet/{wallet}/undelete")
+async def api_users_undelete_user_wallet(user_id: str, wallet: str) -> None:
+    try:
+        wal = await get_wallet(wallet)
+        if not wal:
+            raise Exception("Wallet does not exist.")
+        if user_id != wal.user:
+            raise Exception("Wallet does not belong to user.")
+        if wal.deleted:
+            await delete_wallet(user_id=user_id, wallet_id=wallet, deleted=False)
+    except Exception as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=f"{exc!s}",
+        ) from exc
+
+
+@users_router.delete("/user/{user_id}/wallet/{wallet}")
+async def api_users_delete_user_wallet(user_id: str, wallet: str) -> None:
+    try:
+        wal = await get_wallet(wallet)
+        if not wal:
+            raise Exception("Wallet does not exist.")
+        if wal.deleted:
+            await force_delete_wallet(wallet)
+        await delete_wallet(user_id=user_id, wallet_id=wallet)
+    except Exception as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=f"{exc!s}",
+        ) from exc
+
+
+@users_router.put(
+    "/topup",
+    name="Topup",
+    status_code=HTTPStatus.OK,
+    dependencies=[Depends(check_super_user)],
+)
+async def api_topup_balance(data: CreateTopup) -> dict[str, str]:
+    try:
+        await get_wallet(data.id)
+        if settings.lnbits_backend_wallet_class == "VoidWallet":
+            raise Exception("VoidWallet active")
+
+        await update_wallet_balance(wallet_id=data.id, amount=int(data.amount))
+        return {"status": "Success"}
+    except Exception as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=f"{exc!s}"
+        ) from exc

lnbits/static/i18n/en.js

@@ -9,6 +9,8 @@ window.localisation.en = {
   transactions: 'Transactions',
   dashboard: 'Dashboard',
   node: 'Node',
+  export_users: 'Export Users',
+  no_users: 'No users found',
   total_capacity: 'Total Capacity',
   avg_channel_size: 'Avg. Channel Size',
   biggest_channel_size: 'Biggest Channel Size',
@@ -245,5 +247,6 @@ window.localisation.en = {
   pay_from_wallet: 'Pay from Wallet',
   show_qr: 'Show QR',
   retry_install: 'Retry Install',
-  new_payment: 'Make New Payment'
+  new_payment: 'Make New Payment',
+  hide_empty_wallets: 'Hide empty wallets'
 }

lnbits/static/js/admin.js

@@ -56,9 +56,6 @@ new Vue({
         'yellow',
         'orange'
       ],
-      topUpDialog: {
-        show: false
-      },
       tab: 'funding',
       needsRestart: false
     }
@@ -80,31 +77,6 @@ new Vue({
     }
   },
   methods: {
-    addAdminUser() {
-      let addUser = this.formAddAdmin
-      let admin_users = this.formData.lnbits_admin_users
-      if (addUser && addUser.length && !admin_users.includes(addUser)) {
-        //admin_users = [...admin_users, addUser]
-        this.formData.lnbits_admin_users = [...admin_users, addUser]
-        this.formAddAdmin = ''
-      }
-    },
-    removeAdminUser(user) {
-      let admin_users = this.formData.lnbits_admin_users
-      this.formData.lnbits_admin_users = admin_users.filter(u => u !== user)
-    },
-    addAllowedUser() {
-      let addUser = this.formAddUser
-      let allowed_users = this.formData.lnbits_allowed_users
-      if (addUser && addUser.length && !allowed_users.includes(addUser)) {
-        this.formData.lnbits_allowed_users = [...allowed_users, addUser]
-        this.formAddUser = ''
-      }
-    },
-    removeAllowedUser(user) {
-      let allowed_users = this.formData.lnbits_allowed_users
-      this.formData.lnbits_allowed_users = allowed_users.filter(u => u !== user)
-    },
     addExtensionsManifest() {
       const addManifest = this.formAddExtensionsManifest.trim()
       const manifests = this.formData.lnbits_extensions_manifests
@@ -200,28 +172,6 @@ new Vue({
           LNbits.utils.notifyApiError(error)
         })
     },
-    topupWallet() {
-      LNbits.api
-        .request(
-          'PUT',
-          '/admin/api/v1/topup/',
-          this.g.user.wallets[0].adminkey,
-          this.wallet
-        )
-        .then(response => {
-          this.$q.notify({
-            type: 'positive',
-            message: this.$t('wallet_topup_ok', {
-              amount: this.wallet.amount
-            }),
-            icon: null
-          })
-          this.wallet = {}
-        })
-        .catch(function (error) {
-          LNbits.utils.notifyApiError(error)
-        })
-    },
     formatDate(date) {
       return moment(date * 1000).fromNow()
     },

lnbits/static/js/base.js

@@ -145,7 +145,7 @@ window.LNbits = {
       )
     },
     updateBalance: function (credit, wallet_id) {
-      return LNbits.api.request('PUT', '/admin/api/v1/topup/', null, {
+      return LNbits.api.request('PUT', '/users/api/v1/topup/', null, {
         amount: credit,
         id: wallet_id
       })

lnbits/static/js/components.js

@@ -170,7 +170,7 @@ Vue.component('lnbits-extension-list', {
 })
 
 Vue.component('lnbits-manage', {
-  props: ['showAdmin', 'showNode', 'showExtensions'],
+  props: ['showAdmin', 'showNode', 'showExtensions', 'showUsers'],
   methods: {
     isActive: function (path) {
       return window.location.pathname === path
@@ -211,6 +211,14 @@ Vue.component('lnbits-manage', {
           <q-item-label lines="1" v-text="$t('extensions')"></q-item-label>
         </q-item-section>
       </q-item>
+      <q-item v-if="showUsers" clickable tag="a" href="/users" :active="isActive('/users')">
+        <q-item-section side>
+          <q-icon name="groups" :color="isActive('/users') ? 'primary' : 'grey-5'" size="md"></q-icon>
+        </q-item-section>
+        <q-item-section>
+          <q-item-label lines="1" v-text="$t('users')"></q-item-label>
+        </q-item-section>
+      </q-item>
     </q-list>
   `,
 

lnbits/static/js/users.js

@@ -0,0 +1,374 @@
+new Vue({
+  el: '#vue',
+  mixins: [windowMixin],
+  data: function () {
+    return {
+      isSuperUser: false,
+      wallet: {},
+      cancel: {},
+      users: [],
+      wallets: [],
+      walletDialog: {
+        show: false
+      },
+      topupDialog: {
+        show: false
+      },
+      createUserDialog: {
+        data: {},
+        fields: [
+          {
+            description: 'Username',
+            name: 'username'
+          },
+          {
+            description: 'Email',
+            name: 'email'
+          },
+          {
+            type: 'password',
+            description: 'Password',
+            name: 'password'
+          }
+        ],
+        show: false
+      },
+      createWalletDialog: {
+        data: {},
+        fields: [
+          {
+            type: 'str',
+            description: 'Wallet Name',
+            name: 'name'
+          },
+          {
+            type: 'select',
+            values: ['', 'EUR', 'USD'],
+            description: 'Currency',
+            name: 'currency'
+          },
+          {
+            type: 'str',
+            description: 'Balance',
+            name: 'balance'
+          }
+        ],
+        show: false
+      },
+      walletTable: {
+        columns: [
+          {
+            name: 'name',
+            align: 'left',
+            label: 'Name',
+            field: 'name'
+          },
+          {
+            name: 'currency',
+            align: 'left',
+            label: 'Currency',
+            field: 'currency'
+          },
+          {
+            name: 'balance_msat',
+            align: 'left',
+            label: 'Balance',
+            field: 'balance_msat'
+          },
+          {
+            name: 'deleted',
+            align: 'left',
+            label: 'Deleted',
+            field: 'deleted'
+          }
+        ]
+      },
+      usersTable: {
+        columns: [
+          {
+            name: 'balance_msat',
+            align: 'left',
+            label: 'Balance',
+            field: 'balance_msat',
+            sortable: true
+          },
+          {
+            name: 'wallet_count',
+            align: 'left',
+            label: 'Wallet Count',
+            field: 'wallet_count',
+            sortable: true
+          },
+          {
+            name: 'transaction_count',
+            align: 'left',
+            label: 'Transaction Count',
+            field: 'transaction_count',
+            sortable: true
+          },
+          {
+            name: 'username',
+            align: 'left',
+            label: 'Username',
+            field: 'username',
+            sortable: true
+          },
+          {
+            name: 'email',
+            align: 'left',
+            label: 'Email',
+            field: 'email',
+            sortable: true
+          },
+          {
+            name: 'last_payment',
+            align: 'left',
+            label: 'Last Payment',
+            field: 'last_payment',
+            sortable: true
+          }
+        ],
+        pagination: {
+          sortBy: 'balance_msat',
+          rowsPerPage: 10,
+          page: 1,
+          descending: true,
+          rowsNumber: 10
+        },
+        search: null,
+        hideEmpty: true,
+        loading: false
+      }
+    }
+  },
+  watch: {
+    'usersTable.hideEmpty': function (newVal, _) {
+      if (newVal) {
+        this.usersTable.filter = {
+          'transaction_count[gt]': 0
+        }
+      } else {
+        this.usersTable.filter = {}
+      }
+      this.fetchUsers()
+    }
+  },
+  created() {
+    this.fetchUsers()
+  },
+  mounted() {
+    this.chart1 = new Chart(this.$refs.chart1.getContext('2d'), {
+      type: 'bubble',
+      options: {
+        layout: {
+          padding: 10
+        }
+      },
+      data: {
+        datasets: [
+          {
+            label: 'Balance - TX Count in million sats',
+            backgroundColor: 'rgb(255, 99, 132)',
+            data: []
+          }
+        ]
+      }
+    })
+  },
+  methods: {
+    formatSat: function (value) {
+      return LNbits.utils.formatSat(Math.floor(value / 1000))
+    },
+    usersTableRowKey: function (row) {
+      return row.id
+    },
+    createUser() {
+      LNbits.api
+        .request('POST', '/users/api/v1/user', null, this.createUserDialog.data)
+        .then(() => {
+          this.fetchUsers()
+          this.$q.notify({
+            type: 'positive',
+            message: 'Success! User created!',
+            icon: null
+          })
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    createWallet(user_id) {
+      LNbits.api
+        .request(
+          'POST',
+          `/users/api/v1/user/${user_id}/wallet`,
+          null,
+          this.createWalletDialog.data
+        )
+        .then(() => {
+          this.fetchUsers()
+          this.$q.notify({
+            type: 'positive',
+            message: 'Success! User created!',
+            icon: null
+          })
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteUser(user_id) {
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this user?')
+        .onOk(() => {
+          LNbits.api
+            .request('DELETE', `/users/api/v1/user/${user_id}`)
+            .then(() => {
+              this.fetchUsers()
+              this.$q.notify({
+                type: 'positive',
+                message: 'Success! User deleted!',
+                icon: null
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    undeleteUserWallet(user_id, wallet) {
+      LNbits.api
+        .request(
+          'GET',
+          `/users/api/v1/user/${user_id}/wallet/${wallet}/undelete`
+        )
+        .then(() => {
+          this.fetchWallets(user_id)
+          this.$q.notify({
+            type: 'positive',
+            message: 'Success! Undeleted user wallet!',
+            icon: null
+          })
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    deleteUserWallet(user_id, wallet, deleted) {
+      const dialogText = deleted
+        ? 'Wallet is already deleted, are you sure you want to permanently delete this user wallet?'
+        : 'Are you sure you want to delete this user wallet?'
+      LNbits.utils.confirmDialog(dialogText).onOk(() => {
+        LNbits.api
+          .request('DELETE', `/users/api/v1/user/${user_id}/wallet/${wallet}`)
+          .then(() => {
+            this.fetchWallets(user_id)
+            this.$q.notify({
+              type: 'positive',
+              message: 'Success! User wallet deleted!',
+              icon: null
+            })
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      })
+    },
+    updateChart(users) {
+      const filtered = users.filter(user => {
+        if (
+          user.balance_msat === null ||
+          user.balance_msat === 0 ||
+          user.wallet_count === 0
+        ) {
+          return false
+        }
+        return true
+      })
+
+      const data = filtered.map(user => {
+        return {
+          x: user.transaction_count,
+          y: user.balance_msat / 1000000000,
+          r: 3
+        }
+      })
+      this.chart1.data.datasets[0].data = data
+      this.chart1.update()
+    },
+    fetchUsers(props) {
+      const params = LNbits.utils.prepareFilterQuery(this.usersTable, props)
+      LNbits.api
+        .request('GET', `/users/api/v1/user?${params}`)
+        .then(res => {
+          this.usersTable.loading = false
+          this.usersTable.pagination.rowsNumber = res.data.total
+          this.users = res.data.data
+          this.updateChart(this.users)
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    fetchWallets(user_id) {
+      LNbits.api
+        .request('GET', `/users/api/v1/user/${user_id}/wallet`)
+        .then(res => {
+          this.wallets = res.data
+          this.walletDialog.show = this.wallets.length > 0
+          if (!this.walletDialog.show) {
+            this.fetchUsers()
+          }
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    toggleAdmin(user_id) {
+      LNbits.api
+        .request('GET', `/users/api/v1/user/${user_id}/admin`)
+        .then(() => {
+          this.fetchUsers()
+          this.$q.notify({
+            type: 'positive',
+            message: 'Success! Toggled admin!',
+            icon: null
+          })
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
+    exportUsers() {
+      console.log('export users')
+    },
+    topupCallback(res) {
+      this.wallets.forEach(wallet => {
+        if (res.wallet_id === wallet.id) {
+          wallet.balance_msat += res.value * 1000
+        }
+      })
+      this.fetchUsers()
+    },
+    topupWallet() {
+      LNbits.api
+        .request(
+          'PUT',
+          '/users/api/v1/topup',
+          this.g.user.wallets[0].adminkey,
+          this.wallet
+        )
+        .then(_ => {
+          this.$q.notify({
+            type: 'positive',
+            message: `Success! Added ${this.wallet.amount} to ${this.wallet.id}`,
+            icon: null
+          })
+          this.wallet = {}
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    }
+  }
+})

lnbits/templates/base.html

@@ -163,6 +163,7 @@
 
         <lnbits-manage
           :show-admin="'{{LNBITS_ADMIN_UI}}' == 'True'"
+          :show-users="'{{LNBITS_ADMIN_UI}}' == 'True'"
           :show-node="'{{LNBITS_NODE_UI}}' == 'True'"
           :show-extensions="'{{LNBITS_EXTENSIONS_DEACTIVATE_ALL}}' == 'False'"
         ></lnbits-manage>