chore: remove pending macaroon mentions

lnbits/core/templates/core/_api_docs.html

@@ -15,7 +15,7 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Returns 201 CREATED (application/json)</h5>
         <code>{"checking_id": &lt;string&gt;, "payment_request": &lt;string&gt;}</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code>curl -X POST http://127.0.0.1:5000/api/v1/payments -d '{"out": false, "amount": &lt;int&gt;, "memo": &lt;string&gt;}' -H "Grpc-Metadata-macaroon: <i>{{ wallet.inkey }}</i>" -H "Content-type: application/json"</code>
+        <code>curl -X POST http://127.0.0.1:5000/api/v1/payments -d '{"out": false, "amount": &lt;int&gt;, "memo": &lt;string&gt;}' -H "X-Api-Key: <i>{{ wallet.inkey }}</i>" -H "Content-type: application/json"</code>
       </q-card-section>
     </q-card>
   </q-expansion-item>
@@ -30,7 +30,7 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Returns 201 CREATED (application/json)</h5>
         <code>{"checking_id": &lt;string&gt;}</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code>curl -X POST http://127.0.0.1:5000/api/v1/payments -d '{"out": true, "bolt11": &lt;string&gt;}' -H "Grpc-Metadata-macaroon: {{ wallet.adminkey }}"</i> -H "Content-type: application/json"</code>
+        <code>curl -X POST http://127.0.0.1:5000/api/v1/payments -d '{"out": true, "bolt11": &lt;string&gt;}' -H "X-Api-Key: {{ wallet.adminkey }}"</i> -H "Content-type: application/json"</code>
       </q-card-section>
     </q-card>
   </q-expansion-item>
@@ -44,7 +44,7 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Returns 200 OK (application/json)</h5>
         <code>{"paid": &lt;bool&gt;}</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code>curl -X GET http://127.0.0.1:5000/api/v1/payments/&lt;checking_id&gt; -H "Grpc-Metadata-macaroon: {{ wallet.inkey }}"</i> -H "Content-type: application/json"</code>
+        <code>curl -X GET http://127.0.0.1:5000/api/v1/payments/&lt;checking_id&gt; -H "X-Api-Key: {{ wallet.inkey }}"</i> -H "Content-type: application/json"</code>
       </q-card-section>
     </q-card>
   </q-expansion-item>

lnbits/extensions/amilk/README.md

@@ -8,4 +8,4 @@ Try to include an image
 
 <h2>If your extension has API endpoints, include useful ones here</h2>
 
-<code>curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "Grpc-Metadata-macaroon: YOUR_WALLET-ADMIN/INVOICE-KEY"</code>
+<code>curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "X-Api-Key: YOUR_WALLET-ADMIN/INVOICE-KEY"</code>

lnbits/extensions/events/templates/events/display.html

@@ -455,7 +455,7 @@ background-color:
            <div id="theform">
           <br/><br/><br/>
                 <center>
-              
+
                 <form role="form">
 
                     <div class="form-group" style="width:300px;">
@@ -497,7 +497,7 @@ function postAjax(url, data, thekey, success) {
       success(xhr.responseText)
     }
   }
-  xhr.setRequestHeader('Grpc-Metadata-macaroon', thekey)
+  xhr.setRequestHeader('X-Api-Key', thekey)
   xhr.setRequestHeader('Content-Type', 'application/json')
   xhr.send(params)
   return xhr
@@ -513,7 +513,7 @@ function postAjax(url, data, thekey, success) {
       success(xhr.responseText)
     }
   }
-  xhr.setRequestHeader('Grpc-Metadata-macaroon', thekey)
+  xhr.setRequestHeader('X-Api-Key', thekey)
   xhr.setRequestHeader('Content-Type', 'application/json')
 
   xhr.send()
@@ -530,7 +530,7 @@ function submitforticket(){
     JSON.stringify({"unireg": "{{wave }}", "name": nam}),
     "filla",
 
-    function(data) {  
+    function(data) {
       theinvoice = JSON.parse(data).pay_req
       thehash = JSON.parse(data).payment_hash
 
@@ -549,7 +549,7 @@ function submitforticket(){
 
 
       document.getElementById('qrcodetxt').innerHTML = theinvoice + "<br/><br/>"
-      
+
       var refreshId = setInterval(function(){
 
       getAjax('/api/v1/invoice/' + thehash, "{{wave}}", function(datab) {
@@ -559,7 +559,7 @@ function submitforticket(){
            clearInterval(refreshId)
         }
       })}, 3000);
-     
+
 
 })
 }

lnbits/extensions/events/templates/events/registration.html

@@ -453,7 +453,7 @@ background-color:
         <!-- Main content -->
         <section class="content"><br/><br/>
           <center><h1 style="font-size:500%">{{ user_ev[0][6] }}</h1></center>
-      
+
 
         <br/><br/><br/>
 
@@ -474,13 +474,13 @@ background-color:
           Scan ticket
         </button>
          </center>
-   
-   
+
+
       <div id="scantickets"></div>
             <br/><br/><br/>
           <div id="qrcodetxt"></div> <br/></center>
       <br/><br/><br/>
-     
+
      <center>
       <div class="row" style="width:80%;margin-top:80px">
 
@@ -578,7 +578,7 @@ function postAjax(url, data, thekey, success) {
       success(xhr.responseText)
     }
   }
-  xhr.setRequestHeader('Grpc-Metadata-macaroon', thekey)
+  xhr.setRequestHeader('X-Api-Key', thekey)
   xhr.setRequestHeader('Content-Type', 'application/json')
   xhr.send(params)
   return xhr
@@ -594,7 +594,7 @@ function postAjax(url, data, thekey, success) {
       success(xhr.responseText)
     }
   }
-  xhr.setRequestHeader('Grpc-Metadata-macaroon', thekey)
+  xhr.setRequestHeader('X-Api-Key', thekey)
   xhr.setRequestHeader('Content-Type', 'application/json')
 
   xhr.send()
@@ -666,7 +666,7 @@ function scanQRsend() {
 }
 
 function cancelsend() {
-  location.reload(); 
+  location.reload();
 }
 
 

lnbits/extensions/events/views_api.py

@@ -21,7 +21,7 @@ def api_getticket():
         user_ev = events_ext_db.fetchall("SELECT * FROM events WHERE unireg = ?", (unireg,))
 
 
-        header = {"Content-Type": "application/json", "Grpc-Metadata-macaroon": user_ev[0][4]}
+        header = {"Content-Type": "application/json", "X-Api-Key": user_ev[0][4]}
         data = {"value": str(user_ev[0][10]), "memo": user_ev[0][6]}
         print(url_for("api_invoices", _external=True))
         r = requests.post(url=url_for("api_invoices", _external=True), headers=header, data=json.dumps(data))

lnbits/extensions/example/README.md

@@ -8,4 +8,4 @@ Try to include an image
 
 <h2>If your extension has API endpoints, include useful ones here</h2>
 
-<code>curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "Grpc-Metadata-macaroon: YOUR_WALLET-ADMIN/INVOICE-KEY"</code>
+<code>curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "X-Api-Key: YOUR_WALLET-ADMIN/INVOICE-KEY"</code>

lnbits/extensions/paywall/README.md

@@ -8,4 +8,4 @@ Try to include an image
 
 <h2>If your extension has API endpoints, include useful ones here</h2>
 
-<code>curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "Grpc-Metadata-macaroon: YOUR_WALLET-ADMIN/INVOICE-KEY"</code>
+<code>curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/YOUR-EXTENSION/api/v1/EXAMPLE -d '{"amount":"100","memo":"example"}' -H "X-Api-Key: YOUR_WALLET-ADMIN/INVOICE-KEY"</code>

lnbits/extensions/withdraw/README.md

@@ -1,14 +1,14 @@
-# LNURLw
-## Withdraw link maker
-LNURL withdraw is a very powerful tool and should not have his use limited to just faucet applications. With LNURL withdraw, you have the ability to give someone the right to spend a range, once or multiple times. This functionality has not existed in money before.
-https://github.com/btcontract/lnurl-rfc/blob/master/spec.md#3-lnurl-withdraw
-
-With this extension to can create/edit LNURL withdraws, set a min/max amount, set time (useful for subscription services)
-
-![lnurl](https://i.imgur.com/qHi7ExL.png)
-
-
-## API endpoint - /withdraw/api/v1/lnurlmaker
-Easily fetch one-off LNURLw
-
-    curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/withdraw/api/v1/lnurlmaker -d '{"amount":"100","memo":"ATM"}' -H "Grpc-Metadata-macaroon: YOUR-WALLET-ADMIN-KEY"
+# LNURLw
+## Withdraw link maker
+LNURL withdraw is a very powerful tool and should not have his use limited to just faucet applications. With LNURL withdraw, you have the ability to give someone the right to spend a range, once or multiple times. This functionality has not existed in money before.
+https://github.com/btcontract/lnurl-rfc/blob/master/spec.md#3-lnurl-withdraw
+
+With this extension to can create/edit LNURL withdraws, set a min/max amount, set time (useful for subscription services)
+
+![lnurl](https://i.imgur.com/qHi7ExL.png)
+
+
+## API endpoint - /withdraw/api/v1/lnurlmaker
+Easily fetch one-off LNURLw
+
+    curl -H "Content-type: application/json" -X POST https://YOUR-LNBITS/withdraw/api/v1/lnurlmaker -d '{"amount":"100","memo":"ATM"}' -H "X-Api-Key: YOUR-WALLET-ADMIN-KEY"