formatting

lnbits/extensions/boltcards/lnurl.py

@@ -2,21 +2,19 @@ import base64
 import hashlib
 import hmac
 import json
+import secrets
 from http import HTTPStatus
 from io import BytesIO
 from typing import Optional
 
-from loguru import logger
-
 from embit import bech32, compact
 from fastapi import Request
 from fastapi.param_functions import Query
-from starlette.exceptions import HTTPException
-
-import secrets
-from http import HTTPStatus
-
 from fastapi.params import Depends, Query
+from lnurl import Lnurl, LnurlWithdrawResponse
+from lnurl import encode as lnurl_encode  # type: ignore
+from lnurl.types import LnurlPayMetadata  # type: ignore
+from loguru import logger
 from starlette.exceptions import HTTPException
 from starlette.requests import Request
 from starlette.responses import HTMLResponse
@@ -24,17 +22,12 @@ from starlette.responses import HTMLResponse
 from lnbits.core.services import create_invoice
 from lnbits.core.views.api import pay_invoice
 
-from lnurl import Lnurl, LnurlWithdrawResponse
-from lnurl import encode as lnurl_encode  # type: ignore
-from lnurl.types import LnurlPayMetadata  # type: ignore
-
 from . import boltcards_ext
 from .crud import (
     create_hit,
     get_card,
-    get_card_by_uid,
     get_card_by_otp,
-    get_card,
+    get_card_by_uid,
     get_hit,
     get_hits_today,
     spend_hit,

lnbits/extensions/boltcards/models.py

@@ -1,9 +1,8 @@
-from fastapi.params import Query
-from pydantic import BaseModel
 from sqlite3 import Row
 from typing import Optional
 
 from fastapi import Request
+from fastapi.params import Query
 from lnurl import Lnurl
 from lnurl import encode as lnurl_encode  # type: ignore
 from lnurl.models import LnurlPaySuccessAction, UrlAction  # type: ignore

lnbits/extensions/boltcards/tasks.py

@@ -7,7 +7,7 @@ from lnbits.core import db as core_db
 from lnbits.core.models import Payment
 from lnbits.tasks import register_invoice_listener
 
-from .crud import get_hit, create_refund
+from .crud import create_refund, get_hit
 
 
 async def wait_for_paid_invoices():

lnbits/extensions/boltcards/templates/boltcards/index.html

@@ -12,18 +12,33 @@
                 <h5 class="text-subtitle1 q-my-none">Cards</h5>
               </div>
               <div class="col">
-                <q-btn round size="sm" icon="add" unelevated color="primary" @click="addCardOpen">
+                <q-btn
+                  round
+                  size="sm"
+                  icon="add"
+                  unelevated
+                  color="primary"
+                  @click="addCardOpen"
+                >
                   <q-tooltip>Add card</q-tooltip>
                 </q-btn>
               </div>
             </div>
           </div>
           <div class="col-auto">
-            <q-btn flat color="grey" @click="exportCardsCSV">Export to CSV</q-btn>
+            <q-btn flat color="grey" @click="exportCardsCSV"
+              >Export to CSV</q-btn
+            >
           </div>
         </div>
-        <q-table dense flat :data="cards" row-key="id" :columns="cardsTable.columns"
-          :pagination.sync="cardsTable.pagination">
+        <q-table
+          dense
+          flat
+          :data="cards"
+          row-key="id"
+          :columns="cardsTable.columns"
+          :pagination.sync="cardsTable.pagination"
+        >
           {% raw %}
           <template v-slot:header="props">
             <q-tr :props="props">
@@ -38,8 +53,13 @@
           <template v-slot:body="props">
             <q-tr :props="props">
               <q-td auto-width>
-                <q-btn unelevated dense icon="qr_code" :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-                  @click="openQrCodeDialog(props.row.id)">
+                <q-btn
+                  unelevated
+                  dense
+                  icon="qr_code"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  @click="openQrCodeDialog(props.row.id)"
+                >
                   <q-tooltip>Card key credentials</q-tooltip>
                 </q-btn>
               </q-td>
@@ -47,19 +67,45 @@
                 {{ col.value }}
               </q-td>
               <q-td auto-width>
-                <q-btn v-if="props.row.enable" dense @click="enableCard(props.row.wallet, props.row.id, false)"
-                  color="pink">DISABLE</q-btn>
-                <q-btn v-else dense @click="enableCard(props.row.wallet, props.row.id, true)" color="green">ENABLE
+                <q-btn
+                  v-if="props.row.enable"
+                  dense
+                  @click="enableCard(props.row.wallet, props.row.id, false)"
+                  color="pink"
+                  >DISABLE</q-btn
+                >
+                <q-btn
+                  v-else
+                  dense
+                  @click="enableCard(props.row.wallet, props.row.id, true)"
+                  color="green"
+                  >ENABLE
                 </q-btn>
               </q-td>
               <q-td auto-width>
-                <q-btn flat dense size="xs" @click="updateCardDialog(props.row.id)" icon="edit" color="light-blue">
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="updateCardDialog(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                >
                   <q-tooltip>Edit card</q-tooltip>
                 </q-btn>
               </q-td>
               <q-td auto-width>
-                <q-btn flat dense size="xs" @click="deleteCard(props.row.id)" icon="cancel" color="pink">
-                  <q-tooltip>Deleting card will also delete all records</q-tooltip>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteCard(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                >
+                  <q-tooltip
+                    >Deleting card will also delete all records</q-tooltip
+                  >
                 </q-btn>
               </q-td>
             </q-tr>
@@ -75,11 +121,19 @@
             <h5 class="text-subtitle1 q-my-none">Hits</h5>
           </div>
           <div class="col-auto">
-            <q-btn flat color="grey" @click="exportCardsCSV">Export to CSV</q-btn>
+            <q-btn flat color="grey" @click="exportCardsCSV"
+              >Export to CSV</q-btn
+            >
           </div>
         </div>
-        <q-table dense flat :data="hits" row-key="id" :columns="hitsTable.columns"
-          :pagination.sync="hitsTable.pagination">
+        <q-table
+          dense
+          flat
+          :data="hits"
+          row-key="id"
+          :columns="hitsTable.columns"
+          :pagination.sync="hitsTable.pagination"
+        >
           {% raw %}
           <template v-slot:header="props">
             <q-tr :props="props">
@@ -106,11 +160,19 @@
             <h5 class="text-subtitle1 q-my-none">Refunds</h5>
           </div>
           <div class="col-auto">
-            <q-btn flat color="grey" @click="exportRefundsCSV">Export to CSV</q-btn>
+            <q-btn flat color="grey" @click="exportRefundsCSV"
+              >Export to CSV</q-btn
+            >
           </div>
         </div>
-        <q-table dense flat :data="refunds" row-key="id" :columns="refundsTable.columns"
-          :pagination.sync="refundsTable.pagination">
+        <q-table
+          dense
+          flat
+          :data="refunds"
+          row-key="id"
+          :columns="refundsTable.columns"
+          :pagination.sync="refundsTable.pagination"
+        >
           {% raw %}
           <template v-slot:header="props">
             <q-tr :props="props">
@@ -147,54 +209,147 @@
   <q-dialog v-model="cardDialog.show" position="top" @hide="closeFormDialog">
     <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
       <q-form @submit="sendFormData" class="q-gutter-md">
-        <q-select filled dense emit-value v-model="cardDialog.data.wallet" :options="g.user.walletOptions"
-          label="Wallet *">
+        <q-select
+          filled
+          dense
+          emit-value
+          v-model="cardDialog.data.wallet"
+          :options="g.user.walletOptions"
+          label="Wallet *"
+        >
         </q-select>
         <div class="row">
           <div class="col">
-            <q-input filled dense emit-value v-model.trim="cardDialog.data.tx_limit" type="number"
-              label="Max transaction (sats)" class="q-pr-sm"></q-input>
+            <q-input
+              filled
+              dense
+              emit-value
+              v-model.trim="cardDialog.data.tx_limit"
+              type="number"
+              label="Max transaction (sats)"
+              class="q-pr-sm"
+            ></q-input>
           </div>
           <div class="col">
-            <q-input filled dense emit-value v-model.trim="cardDialog.data.daily_limit" type="number"
-              label="Daily limit (sats)"></q-input>
+            <q-input
+              filled
+              dense
+              emit-value
+              v-model.trim="cardDialog.data.daily_limit"
+              type="number"
+              label="Daily limit (sats)"
+            ></q-input>
           </div>
         </div>
-        <q-input filled dense emit-value v-model.trim="cardDialog.data.card_name" type="text" label="Card name ">
+        <q-input
+          filled
+          dense
+          emit-value
+          v-model.trim="cardDialog.data.card_name"
+          type="text"
+          label="Card name "
+        >
         </q-input>
         <div class="row">
           <div class="col-10">
-            <q-input filled dense emit-value v-model.trim="cardDialog.data.uid" type="text" label="Card UID ">
-              <q-tooltip>Get from the card you'll use, using an NFC app</q-tooltip>
+            <q-input
+              filled
+              dense
+              emit-value
+              v-model.trim="cardDialog.data.uid"
+              type="text"
+              label="Card UID "
+            >
+              <q-tooltip
+                >Get from the card you'll use, using an NFC app</q-tooltip
+              >
             </q-input>
           </div>
           <div class="col-2 q-pl-sm">
-            <q-btn outline disable color="grey" icon="nfc" :disable="nfcTagReading" @click="readNfcTag()">
+            <q-btn
+              outline
+              disable
+              color="grey"
+              icon="nfc"
+              :disable="nfcTagReading"
+              @click="readNfcTag()"
+            >
               <q-tooltip>Tap card to scan UID</q-tooltip>
             </q-btn>
           </div>
         </div>
 
-        <q-toggle v-model="toggleAdvanced" label="Show advanced options"></q-toggle>
+        <q-toggle
+          v-model="toggleAdvanced"
+          label="Show advanced options"
+        ></q-toggle>
         <div v-show="toggleAdvanced">
-          <q-input filled dense v-model.trim="cardDialog.data.k0" type="text" label="Card Auth key (K0)"
-            hint="Used to authentificate with the card (16 bytes in HEX). " @randomkey>
+          <q-input
+            filled
+            dense
+            v-model.trim="cardDialog.data.k0"
+            type="text"
+            label="Card Auth key (K0)"
+            hint="Used to authentificate with the card (16 bytes in HEX). "
+            @randomkey
+          >
           </q-input>
-          <q-input filled dense v-model.trim="cardDialog.data.k1" type="text" label="Card Meta key (K1)"
-            hint="Used for encypting of the message (16 bytes in HEX)."></q-input>
-          <q-input filled dense v-model.trim="cardDialog.data.k2" type="text" label="Card File key (K2)"
-            hint="Used for CMAC of the message (16 bytes in HEX).">
+          <q-input
+            filled
+            dense
+            v-model.trim="cardDialog.data.k1"
+            type="text"
+            label="Card Meta key (K1)"
+            hint="Used for encypting of the message (16 bytes in HEX)."
+          ></q-input>
+          <q-input
+            filled
+            dense
+            v-model.trim="cardDialog.data.k2"
+            type="text"
+            label="Card File key (K2)"
+            hint="Used for CMAC of the message (16 bytes in HEX)."
+          >
           </q-input>
-          <q-input filled dense v-model.number="cardDialog.data.counter" type="number" label="Initial counter">
-            <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left">Zero if you don't know.</q-tooltip>
+          <q-input
+            filled
+            dense
+            v-model.number="cardDialog.data.counter"
+            type="number"
+            label="Initial counter"
+          >
+            <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
+              >Zero if you don't know.</q-tooltip
+            >
           </q-input>
-          <q-btn unelevated color="primary" class="q-ml-auto" v-on:click="generateKeys" v-on:click.right="debugKeys">Generate keys</q-btn>
+          <q-btn
+            unelevated
+            color="primary"
+            class="q-ml-auto"
+            v-on:click="generateKeys"
+            v-on:click.right="debugKeys"
+            >Generate keys</q-btn
+          >
         </div>
         <div class="row q-mt-lg">
-          <q-btn v-if="cardDialog.data.id" unelevated color="primary" type="submit">Update Card</q-btn>
-          <q-btn v-else unelevated color="primary" :disable="cardDialog.data.uid == null" type="submit">Create Card
+          <q-btn
+            v-if="cardDialog.data.id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update Card</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="cardDialog.data.uid == null"
+            type="submit"
+            >Create Card
           </q-btn>
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto">Cancel</q-btn>
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
         </div>
       </q-form>
     </q-card>
@@ -204,10 +359,19 @@
     <q-card v-if="qrCodeDialog.data" class="q-pa-lg lnbits__dialog-card">
       {% raw %}
       <q-responsive :ratio="1" class="q-mx-xl q-mb-md">
-        <qrcode :value="qrCodeDialog.data.link" :options="{width: 800}" class="rounded-borders"></qrcode>
+        <qrcode
+          :value="qrCodeDialog.data.link"
+          :options="{width: 800}"
+          class="rounded-borders"
+        ></qrcode>
       </q-responsive>
       <p style="word-break: break-all" class="text-center">
-        (Keys for <a href="https://play.google.com/store/apps/details?id=com.lightningnfcapp" target="_blank">bolt-nfc-android-app</a>)
+        (Keys for
+        <a
+          href="https://play.google.com/store/apps/details?id=com.lightningnfcapp"
+          target="_blank"
+          >bolt-nfc-android-app</a
+        >)
       </p>
       <p style="word-break: break-all">
         <strong>Name:</strong> {{ qrCodeDialog.data.name }}<br />
@@ -215,11 +379,24 @@
         <strong>Lock key:</strong> {{ qrCodeDialog.data.k0 }}<br />
         <strong>Meta key:</strong> {{ qrCodeDialog.data.k1 }}<br />
         <strong>File key:</strong> {{ qrCodeDialog.data.k2 }}<br />
-      </p><br />
+      </p>
+      <br />
 
-        <q-btn unelevated outline color="grey" @click="copyText(lnurlLink + qrCodeDialog.data.uid)" label="Base url (LNURL://)">
+      <q-btn
+        unelevated
+        outline
+        color="grey"
+        @click="copyText(lnurlLink + qrCodeDialog.data.uid)"
+        label="Base url (LNURL://)"
+      >
       </q-btn>
-      <q-btn unelevated outline color="grey" @click="copyText(qrCodeDialog.data.link)" label="Keys/Auth link">
+      <q-btn
+        unelevated
+        outline
+        color="grey"
+        @click="copyText(qrCodeDialog.data.link)"
+        label="Keys/Auth link"
+      >
       </q-btn>
       <q-tooltip>Click to copy, then add to NFC card</q-tooltip>
 

lnbits/extensions/boltcards/views_api.py

@@ -2,6 +2,7 @@ import secrets
 from http import HTTPStatus
 
 from fastapi.params import Depends, Query
+from loguru import logger
 from starlette.exceptions import HTTPException
 from starlette.requests import Request
 
@@ -13,22 +14,20 @@ from .crud import (
     create_card,
     create_hit,
     delete_card,
+    enable_disable_card,
     get_card,
     get_card_by_otp,
     get_card_by_uid,
     get_cards,
     get_hits,
+    get_refunds,
     update_card,
     update_card_counter,
     update_card_otp,
-    enable_disable_card,
-    get_refunds,
 )
 from .models import CreateCardData
 from .nxp424 import decryptSUN, getSunMAC
 
-from loguru import logger
-
 
 @boltcards_ext.get("/api/v1/cards")
 async def api_cards(
@@ -77,7 +76,8 @@ async def api_card_create_or_update(
     checkUid = await get_card_by_uid(data.uid)
     if checkUid:
         raise HTTPException(
-            detail="UID already registered. Delete registered card and try again.", status_code=HTTPStatus.BAD_REQUEST
+            detail="UID already registered. Delete registered card and try again.",
+            status_code=HTTPStatus.BAD_REQUEST,
         )
     if card_id:
         card = await get_card(card_id)