Merge branch 'main' into diagon-alley

lnbits/core/static/js/wallet.js

@@ -668,7 +668,17 @@ new Vue({
       })
     },
     exportCSV: function () {
-      LNbits.utils.exportCSV(this.paymentsTable.columns, this.payments)
+      // status is important for export but it is not in paymentsTable
+      // because it is manually added with payment detail link and icons
+      // and would cause duplication in the list
+      let columns = this.paymentsTable.columns
+      columns.unshift({
+        name: 'pending',
+        align: 'left',
+        label: 'Pending',
+        field: 'pending'
+      })
+      LNbits.utils.exportCSV(columns, this.payments)
     }
   },
   watch: {

lnbits/core/views/api.py

@@ -1,7 +1,7 @@
 import asyncio
+import binascii
 import hashlib
 import json
-from binascii import unhexlify
 from http import HTTPStatus
 from io import BytesIO
 from typing import Dict, List, Optional, Tuple, Union
@@ -152,11 +152,23 @@ class CreateInvoiceData(BaseModel):
 
 async def api_payments_create_invoice(data: CreateInvoiceData, wallet: Wallet):
     if data.description_hash:
-        description_hash = unhexlify(data.description_hash)
+        try:
+            description_hash = binascii.unhexlify(data.description_hash)
+        except binascii.Error:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="'description_hash' must be a valid hex string",
+            )
         unhashed_description = b""
         memo = ""
     elif data.unhashed_description:
-        unhashed_description = unhexlify(data.unhashed_description)
+        try:
+            unhashed_description = binascii.unhexlify(data.unhashed_description)
+        except binascii.Error:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="'unhashed_description' must be a valid hex string",
+            )
         description_hash = b""
         memo = ""
     else:

lnbits/decorators.py

@@ -130,10 +130,13 @@ async def get_key_type(
     # 2: invalid
     pathname = r["path"].split("/")[1]
 
-    if not api_key_header and not api_key_query:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST)
+    token = api_key_header or api_key_query
 
-    token = api_key_header if api_key_header else api_key_query
+    if not token:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail="Invoice (or Admin) key required.",
+        )
 
     try:
         admin_checker = WalletAdminKeyChecker(api_key=token)
@@ -180,7 +183,14 @@ async def require_admin_key(
     api_key_header: str = Security(api_key_header),  # type: ignore
     api_key_query: str = Security(api_key_query),  # type: ignore
 ):
-    token = api_key_header if api_key_header else api_key_query
+
+    token = api_key_header or api_key_query
+
+    if not token:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail="Admin key required.",
+        )
 
     wallet = await get_key_type(r, token)
 
@@ -199,11 +209,12 @@ async def require_invoice_key(
     api_key_header: str = Security(api_key_header),  # type: ignore
     api_key_query: str = Security(api_key_query),  # type: ignore
 ):
+
     token = api_key_header or api_key_query
 
-    if token is None:
+    if not token:
         raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
+            status_code=HTTPStatus.UNAUTHORIZED,
             detail="Invoice (or Admin) key required.",
         )
 

lnbits/extensions/lnaddress/templates/lnaddress/_api_docs.html

@@ -13,7 +13,7 @@
         Charge people for using your domain name...<br />
 
         <a
-          href="https://github.com/lnbits/lnbits/tree/master/lnbits/extensions/lnaddress"
+          href="https://github.com/lnbits/lnbits-legend/tree/main/lnbits/extensions/lnaddress"
           >More details</a
         >
         <br />

lnbits/extensions/lnurlp/templates/lnurlp/index.html

@@ -296,16 +296,17 @@
         <q-btn
           outline
           color="grey"
+          icon="link"
           @click="copyText(qrCodeDialog.data.pay_url, 'Link copied to clipboard!')"
-          >Shareable link</q-btn
-        >
+          ><q-tooltip>Copy sharable link</q-tooltip>
+        </q-btn>
         <q-btn
           outline
           color="grey"
           icon="nfc"
           @click="writeNfcTag(qrCodeDialog.data.lnurl)"
           :disable="nfcTagWriting"
-        >
+          ><q-tooltip>Write to NFC</q-tooltip>
         </q-btn>
         <q-btn
           outline
@@ -314,7 +315,8 @@
           type="a"
           :href="qrCodeDialog.data.print_url"
           target="_blank"
-        ></q-btn>
+          ><q-tooltip>Print</q-tooltip></q-btn
+        >
         <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
       </div>
     </q-card>

lnbits/extensions/satsdice/templates/satsdice/index.html

@@ -232,7 +232,7 @@
         <q-btn
           outline
           color="grey"
-          icon="share"
+          icon="link"
           @click="copyText(qrCodeDialog.data.pay_url, 'Link copied to clipboard!')"
           ><q-tooltip>Copy shareable link</q-tooltip></q-btn
         >

lnbits/extensions/subdomains/templates/subdomains/_api_docs.html

@@ -13,7 +13,7 @@
         Charge people for using your subdomain name...<br />
 
         <a
-          href="https://github.com/lnbits/lnbits/tree/master/lnbits/extensions/subdomains"
+          href="https://github.com/lnbits/lnbits-legend/tree/main/lnbits/extensions/subdomains"
           >More details</a
         >
         <br />

lnbits/extensions/tipjar/crud.py

@@ -76,10 +76,10 @@ async def get_tipjars(wallet_id: str) -> Optional[list]:
 
 async def delete_tipjar(tipjar_id: int) -> None:
     """Delete a TipJar and all corresponding Tips"""
-    await db.execute("DELETE FROM tipjar.TipJars WHERE id = ?", (tipjar_id,))
     rows = await db.fetchall("SELECT * FROM tipjar.Tips WHERE tipjar = ?", (tipjar_id,))
     for row in rows:
         await delete_tip(row["id"])
+    await db.execute("DELETE FROM tipjar.TipJars WHERE id = ?", (tipjar_id,))
 
 
 async def get_tip(tip_id: str) -> Optional[Tip]:

lnbits/extensions/withdraw/templates/withdraw/index.html

@@ -418,16 +418,18 @@
         <q-btn
           outline
           color="grey"
+          icon="link"
           @click="copyText(qrCodeDialog.data.withdraw_url, 'Link copied to clipboard!')"
-          >Shareable link</q-btn
-        >
+          ><q-tooltip>Copy sharable link</q-tooltip>
+        </q-btn>
         <q-btn
           outline
           color="grey"
           icon="nfc"
           @click="writeNfcTag(qrCodeDialog.data.lnurl)"
           :disable="nfcTagWriting"
-        ></q-btn>
+          ><q-tooltip>Write to NFC</q-tooltip></q-btn
+        >
         <q-btn
           outline
           color="grey"
@@ -435,7 +437,8 @@
           type="a"
           :href="qrCodeDialog.data.print_url"
           target="_blank"
-        ></q-btn>
+          ><q-tooltip>Print</q-tooltip></q-btn
+        >
         <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
       </div>
     </q-card>

lnbits/static/js/components.js

@@ -179,6 +179,11 @@ Vue.component('lnbits-extension-list', {
 
 Vue.component('lnbits-payment-details', {
   props: ['payment'],
+  data: function () {
+    return {
+      LNBITS_DENOMINATION: LNBITS_DENOMINATION
+    }
+  },
   template: `
     <div class="q-py-md" style="text-align: left">
       <div class="row justify-center q-mb-md">