From f3b720b690c533b4b28793209f5a71fd01b9af6e Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Sat, 12 Nov 2022 17:11:24 +0000
Subject: [PATCH] Fix usermanager API keys (#1117)

* fix wrong API keys on examples

* add hability to keep wallet after user delete #344

* make format
---
 lnbits/extensions/usermanager/crud.py               |  9 +++++----
 .../templates/usermanager/_api_docs.html            | 13 ++++++-------
 lnbits/extensions/usermanager/views_api.py          | 10 ++++++----
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/lnbits/extensions/usermanager/crud.py b/lnbits/extensions/usermanager/crud.py
index 1ce66d4f..649888a8 100644
--- a/lnbits/extensions/usermanager/crud.py
+++ b/lnbits/extensions/usermanager/crud.py
@@ -63,10 +63,11 @@ async def get_usermanager_users(user_id: str) -> List[Users]:
     return [Users(**row) for row in rows]
 
 
-async def delete_usermanager_user(user_id: str) -> None:
-    wallets = await get_usermanager_wallets(user_id)
-    for wallet in wallets:
-        await delete_wallet(user_id=user_id, wallet_id=wallet.id)
+async def delete_usermanager_user(user_id: str, delete_core: bool = True) -> None:
+    if delete_core:
+        wallets = await get_usermanager_wallets(user_id)
+        for wallet in wallets:
+            await delete_wallet(user_id=user_id, wallet_id=wallet.id)
 
     await db.execute("DELETE FROM usermanager.users WHERE id = ?", (user_id,))
     await db.execute("""DELETE FROM usermanager.wallets WHERE "user" = ?""", (user_id,))
diff --git a/lnbits/extensions/usermanager/templates/usermanager/_api_docs.html b/lnbits/extensions/usermanager/templates/usermanager/_api_docs.html
index 36593d74..ff3ba85a 100644
--- a/lnbits/extensions/usermanager/templates/usermanager/_api_docs.html
+++ b/lnbits/extensions/usermanager/templates/usermanager/_api_docs.html
@@ -44,7 +44,7 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
           >curl -X GET {{ request.base_url }}usermanager/api/v1/users -H
-          "X-Api-Key: {{ user.wallets[0].inkey }}"
+          "X-Api-Key: {{ user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
@@ -81,7 +81,7 @@
       <q-card-section>
         <code
           ><span class="text-light-blue">GET</span>
-          /usermanager/api/v1/wallets/&lt;user_id&gt;</code
+          /usermanager/api/v1/wallets</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;string&gt;}</code>
@@ -92,9 +92,8 @@
         <code>JSON wallet data</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
-          >curl -X GET {{ request.base_url
-          }}usermanager/api/v1/wallets/&lt;user_id&gt; -H "X-Api-Key: {{
-          user.wallets[0].inkey }}"
+          >curl -X GET {{ request.base_url }}usermanager/api/v1/wallets -H
+          "X-Api-Key: {{ user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
@@ -221,7 +220,7 @@
         <code
           >curl -X DELETE {{ request.base_url
           }}usermanager/api/v1/users/&lt;user_id&gt; -H "X-Api-Key: {{
-          user.wallets[0].inkey }}"
+          user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
@@ -239,7 +238,7 @@
         <code
           >curl -X DELETE {{ request.base_url
           }}usermanager/api/v1/wallets/&lt;wallet_id&gt; -H "X-Api-Key: {{
-          user.wallets[0].inkey }}"
+          user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
diff --git a/lnbits/extensions/usermanager/views_api.py b/lnbits/extensions/usermanager/views_api.py
index 7e7b7653..b1bf8ef8 100644
--- a/lnbits/extensions/usermanager/views_api.py
+++ b/lnbits/extensions/usermanager/views_api.py
@@ -52,15 +52,17 @@ async def api_usermanager_users_create(
 
 @usermanager_ext.delete("/api/v1/users/{user_id}")
 async def api_usermanager_users_delete(
-    user_id, wallet: WalletTypeInfo = Depends(require_admin_key)
+    user_id,
+    delete_core: bool = Query(True),
+    wallet: WalletTypeInfo = Depends(require_admin_key),
 ):
     user = await get_usermanager_user(user_id)
     if not user:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="User does not exist."
         )
-    await delete_usermanager_user(user_id)
-    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+    await delete_usermanager_user(user_id, delete_core)
+    return "", HTTPStatus.NO_CONTENT
 
 
 # Activate Extension
@@ -124,4 +126,4 @@ async def api_usermanager_wallets_delete(
             status_code=HTTPStatus.NOT_FOUND, detail="Wallet does not exist."
         )
     await delete_usermanager_wallet(wallet_id, get_wallet.user)
-    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
+    return "", HTTPStatus.NO_CONTENT