From fa23be765747d03927e9a113f8a959f324eaa6af Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Fri, 3 Dec 2021 00:17:32 +0000
Subject: [PATCH] Added check fixed LNURL decode

---
 lnbits/core/views/api.py                        |  7 ++++---
 .../templates/lnurlpayout/index.html            | 14 +-------------
 lnbits/extensions/lnurlpayout/views_api.py      | 17 +++++++++++------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index c919821f..ead17891 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -466,11 +466,12 @@ async def api_lnurlscan(code: str):
 @core_app.post("/api/v1/payments/decode")
 async def api_payments_decode(data: str = Query(None)):
     try:
-        if g.data["data"][:5] == "LNURL":
-            url = lnurl.decode(g.data["data"])
+        print(data["data"][:5])
+        if data["data"][:5] == "LNURL":
+            url = lnurl.decode(data["data"])
             return {"domain": url}
         else:
-            invoice = bolt11.decode(g.data["data"])
+            invoice = bolt11.decode(data["data"])
             return {
                 "payment_hash": invoice.payment_hash,
                 "amount_msat": invoice.amount_msat,
diff --git a/lnbits/extensions/lnurlpayout/templates/lnurlpayout/index.html b/lnbits/extensions/lnurlpayout/templates/lnurlpayout/index.html
index 977dda06..d8d8de2d 100644
--- a/lnbits/extensions/lnurlpayout/templates/lnurlpayout/index.html
+++ b/lnbits/extensions/lnurlpayout/templates/lnurlpayout/index.html
@@ -41,18 +41,6 @@
 
           <template v-slot:body="props">
             <q-tr :props="props">
-              <q-td auto-width>
-                <q-btn
-                  unelevated
-                  dense
-                  size="xs"
-                  icon="launch"
-                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-                  type="a"
-                  :href="props.row.lnurlpayout"
-                  target="_blank"
-                ></q-btn>
-              </q-td>
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 {{ col.value }}
               </q-td>
@@ -213,7 +201,7 @@
             data
           )
           .then(function (response) {
-            console.log(data)
+            console.log(response.data)
             self.lnurlpayouts.push(maplnurlpayout(response.data))
             self.formDialog.show = false
           })
diff --git a/lnbits/extensions/lnurlpayout/views_api.py b/lnbits/extensions/lnurlpayout/views_api.py
index 1906cd12..4a23f2cc 100644
--- a/lnbits/extensions/lnurlpayout/views_api.py
+++ b/lnbits/extensions/lnurlpayout/views_api.py
@@ -28,12 +28,17 @@ async def api_lnurlpayouts(
 @lnurlpayout_ext.post("/api/v1/lnurlpayouts", status_code=HTTPStatus.CREATED)
 async def api_lnurlpayout_create(
     data: CreateLnurlPayoutData, wallet: WalletTypeInfo = Depends(get_key_type)
-):
-    url = api_payments_decode(data.lnurlpay)
-    if url[0:4] != "http":
-        raise PermissionError("Not valid LNURL")
-    lnurlpayout = await create_lnurlpayout(wallet_id=wallet.wallet.id, data=data)
-    return lnurlpayout.dict()
+):  
+    try:
+        url = await api_payments_decode({"data": data.lnurlpay})
+
+        if str(url["domain"])[0:4] != "http":
+            raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail="Failed to save LNURLPayout")
+        lnurlpayout = await create_lnurlpayout(wallet_id=wallet.wallet.id, data=data)
+        return lnurlpayout.dict()
+    except Exception:
+        raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail="Failed to save LNURLPayout")
+    
 
 
 @lnurlpayout_ext.delete("/api/v1/lnurlpayouts/{lnurlpayout_id}")