From 5a078f2bfcad7f522ed2cb3906df3faa52401e82 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 11 Dec 2025 17:32:22 +0200
Subject: [PATCH] fix: fetch wallets for admin (#51)

---
 templates/nostrclient/index.html | 29 ++++++++---------------------
 views.py                         |  8 ++++++--
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/templates/nostrclient/index.html b/templates/nostrclient/index.html
index 0c9b468..ca44f1b 100644
--- a/templates/nostrclient/index.html
+++ b/templates/nostrclient/index.html
@@ -476,11 +476,7 @@
       getRelays: function () {
         var self = this
         LNbits.api
-          .request(
-            'GET',
-            '/nostrclient/api/v1/relays?usr=' + this.g.user.id,
-            this.g.user.wallets[0].adminkey
-          )
+          .request('GET', '/nostrclient/api/v1/relays')
           .then(function (response) {
             if (response.data) {
               response.data.map(maplrelays)
@@ -508,12 +504,9 @@
         console.log('ADD RELAY ' + this.relayToAdd)
         let that = this
         LNbits.api
-          .request(
-            'POST',
-            '/nostrclient/api/v1/relay?usr=' + this.g.user.id,
-            this.g.user.wallets[0].adminkey,
-            {url: this.relayToAdd}
-          )
+          .request('POST', '/nostrclient/api/v1/relay', null, {
+            url: this.relayToAdd
+          })
           .then(function (response) {
             console.log('response:', response)
             if (response.data) {
@@ -540,12 +533,7 @@
       },
       deleteRelay(url) {
         LNbits.api
-          .request(
-            'DELETE',
-            '/nostrclient/api/v1/relay?usr=' + this.g.user.id,
-            this.g.user.wallets[0].adminkey,
-            {url: url}
-          )
+          .request('DELETE', '/nostrclient/api/v1/relay', null, {url: url})
           .then(response => {
             const relayIndex = this.nostrrelayLinks.indexOf(r => r.url === url)
             if (relayIndex !== -1) {
@@ -561,8 +549,7 @@
         try {
           const {data} = await LNbits.api.request(
             'GET',
-            '/nostrclient/api/v1/config',
-            this.g.user.wallets[0].adminkey
+            '/nostrclient/api/v1/config'
           )
           this.config.data = data
         } catch (error) {
@@ -574,7 +561,7 @@
           const {data} = await LNbits.api.request(
             'PUT',
             '/nostrclient/api/v1/config',
-            this.g.user.wallets[0].adminkey,
+            null,
             this.config.data
           )
           this.config.data = data
@@ -623,7 +610,7 @@
           const {data} = await LNbits.api.request(
             'PUT',
             '/nostrclient/api/v1/relay/test',
-            this.g.user.wallets[0].adminkey,
+            null,
             {
               sender_private_key: this.testData.senderPrivateKey,
               reciever_public_key: this.testData.recieverPublicKey,
diff --git a/views.py b/views.py
index cb2dd89..3d90198 100644
--- a/views.py
+++ b/views.py
@@ -1,6 +1,7 @@
 from fastapi import APIRouter, Depends, Request
 from fastapi.responses import HTMLResponse
-from lnbits.core.models import User
+from lnbits.core.crud.users import get_user_from_account
+from lnbits.core.models.users import Account
 from lnbits.decorators import check_admin
 from lnbits.helpers import template_renderer
 
@@ -12,7 +13,10 @@ def nostr_renderer():
 
 
 @nostrclient_generic_router.get("/", response_class=HTMLResponse)
-async def index(request: Request, user: User = Depends(check_admin)):
+async def index(request: Request, account: Account = Depends(check_admin)):
+    user = await get_user_from_account(account)
+    if not user:
+        return HTMLResponse("No user found", status_code=404)
     return nostr_renderer().TemplateResponse(
         "nostrclient/index.html", {"request": request, "user": user.json()}
     )