From fd4dc6c48f54e83f4503e5685d0dd863c5fcbc54 Mon Sep 17 00:00:00 2001 From: Eneko Illarramendi Date: Tue, 21 Apr 2020 23:22:01 +0200 Subject: [PATCH] chore: remove pending macaroon mentions --- lnbits/core/templates/core/_api_docs.html | 6 ++-- lnbits/extensions/amilk/README.md | 2 +- .../events/templates/events/display.html | 12 ++++---- .../events/templates/events/registration.html | 14 +++++----- lnbits/extensions/events/views_api.py | 2 +- lnbits/extensions/example/README.md | 2 +- lnbits/extensions/paywall/README.md | 2 +- lnbits/extensions/withdraw/README.md | 28 +++++++++---------- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/lnbits/core/templates/core/_api_docs.html b/lnbits/core/templates/core/_api_docs.html index e500dcbe0..689be7d8b 100644 --- a/lnbits/core/templates/core/_api_docs.html +++ b/lnbits/core/templates/core/_api_docs.html @@ -15,7 +15,7 @@
Returns 201 CREATED (application/json)
{"checking_id": <string>, "payment_request": <string>}
Curl example
- curl -X POST http://127.0.0.1:5000/api/v1/payments -d '{"out": false, "amount": <int>, "memo": <string>}' -H "Grpc-Metadata-macaroon: {{ wallet.inkey }}" -H "Content-type: application/json" + curl -X POST http://127.0.0.1:5000/api/v1/payments -d '{"out": false, "amount": <int>, "memo": <string>}' -H "X-Api-Key: {{ wallet.inkey }}" -H "Content-type: application/json" @@ -30,7 +30,7 @@
Returns 201 CREATED (application/json)
{"checking_id": <string>}
Curl example
- curl -X POST http://127.0.0.1:5000/api/v1/payments -d '{"out": true, "bolt11": <string>}' -H "Grpc-Metadata-macaroon: {{ wallet.adminkey }}" -H "Content-type: application/json" + curl -X POST http://127.0.0.1:5000/api/v1/payments -d '{"out": true, "bolt11": <string>}' -H "X-Api-Key: {{ wallet.adminkey }}" -H "Content-type: application/json" @@ -44,7 +44,7 @@
Returns 200 OK (application/json)
{"paid": <bool>}
Curl example
- curl -X GET http://127.0.0.1:5000/api/v1/payments/<checking_id> -H "Grpc-Metadata-macaroon: {{ wallet.inkey }}" -H "Content-type: application/json" + curl -X GET http://127.0.0.1:5000/api/v1/payments/<checking_id> -H "X-Api-Key: {{ wallet.inkey }}" -H "Content-type: application/json" diff --git a/lnbits/extensions/amilk/README.md b/lnbits/extensions/amilk/README.md index f3c20fb89..277294592 100644 --- a/lnbits/extensions/amilk/README.md +++ b/lnbits/extensions/amilk/README.md @@ -8,4 +8,4 @@ Try to include an image

If your extension has API endpoints, include useful ones here

-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" +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" diff --git a/lnbits/extensions/events/templates/events/display.html b/lnbits/extensions/events/templates/events/display.html index bd1053167..74f5315ae 100644 --- a/lnbits/extensions/events/templates/events/display.html +++ b/lnbits/extensions/events/templates/events/display.html @@ -455,7 +455,7 @@ background-color:



- +
@@ -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 + "

" - + var refreshId = setInterval(function(){ getAjax('/api/v1/invoice/' + thehash, "{{wave}}", function(datab) { @@ -559,7 +559,7 @@ function submitforticket(){ clearInterval(refreshId) } })}, 3000); - + }) } diff --git a/lnbits/extensions/events/templates/events/registration.html b/lnbits/extensions/events/templates/events/registration.html index 14d932eb7..3e637eddd 100644 --- a/lnbits/extensions/events/templates/events/registration.html +++ b/lnbits/extensions/events/templates/events/registration.html @@ -453,7 +453,7 @@ background-color:


{{ user_ev[0][6] }}

- +


@@ -474,13 +474,13 @@ background-color: Scan ticket
- - + +







- +
@@ -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(); } diff --git a/lnbits/extensions/events/views_api.py b/lnbits/extensions/events/views_api.py index c8dc6fbd2..b2468a885 100644 --- a/lnbits/extensions/events/views_api.py +++ b/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)) diff --git a/lnbits/extensions/example/README.md b/lnbits/extensions/example/README.md index f3c20fb89..277294592 100644 --- a/lnbits/extensions/example/README.md +++ b/lnbits/extensions/example/README.md @@ -8,4 +8,4 @@ Try to include an image

If your extension has API endpoints, include useful ones here

-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" +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" diff --git a/lnbits/extensions/paywall/README.md b/lnbits/extensions/paywall/README.md index f3c20fb89..277294592 100644 --- a/lnbits/extensions/paywall/README.md +++ b/lnbits/extensions/paywall/README.md @@ -8,4 +8,4 @@ Try to include an image

If your extension has API endpoints, include useful ones here

-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" +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" diff --git a/lnbits/extensions/withdraw/README.md b/lnbits/extensions/withdraw/README.md index 0a484d282..950da2023 100644 --- a/lnbits/extensions/withdraw/README.md +++ b/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"