From a3b05e26b718db4969884e642416b2eac119f506 Mon Sep 17 00:00:00 2001
From: Tiago vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 10 Oct 2022 12:23:19 +0100
Subject: [PATCH] cleanup and typing fix for data

---
 lnbits/extensions/admin/models.py             | 12 +++++-----
 .../admin/templates/admin/index.html          | 22 ++-----------------
 lnbits/extensions/admin/views_api.py          |  1 -
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/lnbits/extensions/admin/models.py b/lnbits/extensions/admin/models.py
index 45cd990d4..94fa56bb7 100644
--- a/lnbits/extensions/admin/models.py
+++ b/lnbits/extensions/admin/models.py
@@ -1,13 +1,15 @@
+from typing import List
+
 from fastapi import Query
 from pydantic import BaseModel
 
 
 class UpdateSettings(BaseModel):
     lnbits_backend_wallet_class: str = Query(None)
-    lnbits_admin_users: str = Query(None) #this should be List[str] ??
-    lnbits_allowed_users: str = Query(None) #this should be List[str] ??
-    lnbits_admin_ext: str = Query(None) #this should be List[str] ??
-    lnbits_disabled_ext: str = Query(None) #this should be List[str] ??
+    lnbits_admin_users: List[str] = Query(None) 
+    lnbits_allowed_users: List[str] = Query(None) 
+    lnbits_admin_ext: List[str] = Query(None) 
+    lnbits_disabled_ext: List[str] = Query(None) 
     lnbits_funding_source: str = Query(None)
     lnbits_force_https: bool = Query(None)
     lnbits_reserve_fee_min: int = Query(None, ge=0)
@@ -21,4 +23,4 @@ class UpdateSettings(BaseModel):
     lnbits_denomination: str = Query(None)
     lnbits_theme: str = Query(None)
     lnbits_custom_logo: str = Query(None)
-    lnbits_ad_space: str = Query(None) #this should be List[str] ??
+    lnbits_ad_space: List[str] = Query(None) 
diff --git a/lnbits/extensions/admin/templates/admin/index.html b/lnbits/extensions/admin/templates/admin/index.html
index 4e401cb40..d8111595f 100644
--- a/lnbits/extensions/admin/templates/admin/index.html
+++ b/lnbits/extensions/admin/templates/admin/index.html
@@ -209,26 +209,8 @@
           })
       },
       updateSettings() {
-        let data = {
-          lnbits_backend_wallet_class: this.formData.lnbits_backend_wallet_class,
-          lnbits_admin_users: this.formData.lnbits_admin_users.toString(),
-          lnbits_allowed_users: this.formData.lnbits_allowed_users.toString(),
-          lnbits_admin_ext: this.formData.lnbits_admin_ext,
-          lnbits_disabled_ext: this.formData.lnbits_disabled_ext,
-          lnbits_funding_source: this.formData.lnbits_funding_source,
-          lnbits_force_https: this.formData.lnbits_force_https,
-          lnbits_reserve_fee_min: this.formData.lnbits_reserve_fee_min,
-          lnbits_reserve_fee_percent: this.formData.lnbits_reserve_fee_percent,
-          lnbits_service_fee: this.formData.lnbits_service_fee,
-          lnbits_hide_api: this.formData.lnbits_hide_api,
-          lnbits_site_title: this.formData.lnbits_site_title,
-          lnbits_site_tagline: this.formData.lnbits_site_tagline,
-          lnbits_site_description: this.formData.lnbits_site_description,
-          lnbits_default_wallet_name: this.formData.lnbits_default_wallet_name,
-          lnbits_denomination: this.formData.lnbits_denomination,
-          lnbits_theme: this.formData.lnbits_theme,
-          lnbits_custom_logo: this.formData.lnbits_custom_logo,
-          lnbits_ad_space: this.formData.lnbits_ad_space.toString()
+        let data = {          
+          ...this.formData
         }
         LNbits.api
           .request(
diff --git a/lnbits/extensions/admin/views_api.py b/lnbits/extensions/admin/views_api.py
index c2079e377..19b52e352 100644
--- a/lnbits/extensions/admin/views_api.py
+++ b/lnbits/extensions/admin/views_api.py
@@ -44,7 +44,6 @@ async def api_update_settings(
     data: UpdateSettings = Body(...),
 ):
     settings = await update_settings(data)
-    logger.debug(settings)
     return {"status": "Success", "settings": settings.dict()}