From 63546036bcfe9d2aee29ca9226c939f2ae0f6bd0 Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Tue, 30 Nov 2021 14:12:01 +0000 Subject: [PATCH 1/6] fix purge --- lnbits/extensions/lnaddress/crud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnbits/extensions/lnaddress/crud.py b/lnbits/extensions/lnaddress/crud.py index 4cfff2f9e..3bd636f19 100644 --- a/lnbits/extensions/lnaddress/crud.py +++ b/lnbits/extensions/lnaddress/crud.py @@ -176,7 +176,7 @@ async def purge_addresses(domain_id: str): now = datetime.now().timestamp() for row in rows: - r = Addresses(**row)._asdict() + r = Addresses(**row).dict() start = datetime.fromtimestamp(r["time"]) paid = r["paid"] From 5b01ee6879a2fe37b6668e474070eccd8b0ec939 Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Tue, 30 Nov 2021 14:20:34 +0000 Subject: [PATCH 2/6] check for missing protocol --- lnbits/extensions/lnaddress/lnurl.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py index 30b8fc5a4..20ec7a964 100644 --- a/lnbits/extensions/lnaddress/lnurl.py +++ b/lnbits/extensions/lnaddress/lnurl.py @@ -15,6 +15,7 @@ from .crud import get_address, get_address_by_username, get_domain async def lnurl_response(username: str, domain: str, request: Request): + print("LNU", username, domain) address = await get_address_by_username(username, domain) if not address: @@ -54,7 +55,7 @@ async def lnurl_callback(address_id, amount: int = Query(...)): if address.wallet_endpoint.endswith("/") else address.wallet_endpoint ) - + print("BASE", base_url) async with httpx.AsyncClient() as client: try: call = await client.post( From f37af0ddf6102871c4a7bf0bcd061399514db42f Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Tue, 30 Nov 2021 14:41:25 +0000 Subject: [PATCH 3/6] fix request url default --- lnbits/extensions/lnaddress/lnurl.py | 2 +- lnbits/extensions/lnaddress/templates/lnaddress/display.html | 2 +- lnbits/extensions/lnaddress/templates/lnaddress/index.html | 1 + lnbits/extensions/lnaddress/views.py | 5 ++++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py index 20ec7a964..22e54b8a2 100644 --- a/lnbits/extensions/lnaddress/lnurl.py +++ b/lnbits/extensions/lnaddress/lnurl.py @@ -55,7 +55,7 @@ async def lnurl_callback(address_id, amount: int = Query(...)): if address.wallet_endpoint.endswith("/") else address.wallet_endpoint ) - print("BASE", base_url) + print("BASE", base_url ) async with httpx.AsyncClient() as client: try: call = await client.post( diff --git a/lnbits/extensions/lnaddress/templates/lnaddress/display.html b/lnbits/extensions/lnaddress/templates/lnaddress/display.html index 67745fa85..f820c81f6 100644 --- a/lnbits/extensions/lnaddress/templates/lnaddress/display.html +++ b/lnbits/extensions/lnaddress/templates/lnaddress/display.html @@ -370,7 +370,7 @@ if (data.wallet_endpoint == '') { data.wallet_endpoint = null } - data.wallet_endpoint = data.wallet_endpoint ?? '{{ request.url_root }}' + data.wallet_endpoint = data.wallet_endpoint ?? '{{ root_url }}' data.duration = parseInt(data.duration) console.log('data', data) diff --git a/lnbits/extensions/lnaddress/templates/lnaddress/index.html b/lnbits/extensions/lnaddress/templates/lnaddress/index.html index ef04b5937..3969d6f56 100644 --- a/lnbits/extensions/lnaddress/templates/lnaddress/index.html +++ b/lnbits/extensions/lnaddress/templates/lnaddress/index.html @@ -489,6 +489,7 @@ this.getDomains() this.getAddresses() } + console.log('{{ request.url.path }}') // var self = this // // // axios is available for making requests diff --git a/lnbits/extensions/lnaddress/views.py b/lnbits/extensions/lnaddress/views.py index cec12bf89..ef6d2b766 100644 --- a/lnbits/extensions/lnaddress/views.py +++ b/lnbits/extensions/lnaddress/views.py @@ -1,4 +1,5 @@ from http import HTTPStatus +from urllib.parse import urlparse from fastapi import Request from fastapi.params import Depends @@ -34,7 +35,8 @@ async def display(domain_id, request: Request): await purge_addresses(domain_id) wallet = await get_wallet(domain.wallet) - + url = urlparse(str(request.url)) + return lnaddress_renderer().TemplateResponse( "lnaddress/display.html", { @@ -43,5 +45,6 @@ async def display(domain_id, request: Request): "domain_domain": domain.domain, "domain_cost": domain.cost, "domain_wallet_inkey": wallet.inkey, + "root_url": f"{url.scheme}://{url.netloc}" }, ) From d6f3c2f9c44d620c67b69885206cc5eeea1dfda5 Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Tue, 30 Nov 2021 14:46:48 +0000 Subject: [PATCH 4/6] more debub --- lnbits/extensions/lnaddress/lnurl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py index 22e54b8a2..f233b2911 100644 --- a/lnbits/extensions/lnaddress/lnurl.py +++ b/lnbits/extensions/lnaddress/lnurl.py @@ -55,7 +55,7 @@ async def lnurl_callback(address_id, amount: int = Query(...)): if address.wallet_endpoint.endswith("/") else address.wallet_endpoint ) - print("BASE", base_url ) + print("BASE", base_url, address ) async with httpx.AsyncClient() as client: try: call = await client.post( From ccd3a12ed34fc41a1453fdd47331991520dfcf40 Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Tue, 30 Nov 2021 14:58:03 +0000 Subject: [PATCH 5/6] fix lnbits root url --- lnbits/extensions/lnaddress/lnurl.py | 3 +-- .../lnaddress/templates/lnaddress/display.html | 3 +-- .../lnaddress/templates/lnaddress/index.html | 13 ------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py index f233b2911..30b8fc5a4 100644 --- a/lnbits/extensions/lnaddress/lnurl.py +++ b/lnbits/extensions/lnaddress/lnurl.py @@ -15,7 +15,6 @@ from .crud import get_address, get_address_by_username, get_domain async def lnurl_response(username: str, domain: str, request: Request): - print("LNU", username, domain) address = await get_address_by_username(username, domain) if not address: @@ -55,7 +54,7 @@ async def lnurl_callback(address_id, amount: int = Query(...)): if address.wallet_endpoint.endswith("/") else address.wallet_endpoint ) - print("BASE", base_url, address ) + async with httpx.AsyncClient() as client: try: call = await client.post( diff --git a/lnbits/extensions/lnaddress/templates/lnaddress/display.html b/lnbits/extensions/lnaddress/templates/lnaddress/display.html index f820c81f6..7164752c0 100644 --- a/lnbits/extensions/lnaddress/templates/lnaddress/display.html +++ b/lnbits/extensions/lnaddress/templates/lnaddress/display.html @@ -372,8 +372,7 @@ } data.wallet_endpoint = data.wallet_endpoint ?? '{{ root_url }}' data.duration = parseInt(data.duration) - console.log('data', data) - + axios .post('/lnaddress/api/v1/address/{{ domain_id }}', data) .then(response => { diff --git a/lnbits/extensions/lnaddress/templates/lnaddress/index.html b/lnbits/extensions/lnaddress/templates/lnaddress/index.html index 3969d6f56..54836a430 100644 --- a/lnbits/extensions/lnaddress/templates/lnaddress/index.html +++ b/lnbits/extensions/lnaddress/templates/lnaddress/index.html @@ -489,19 +489,6 @@ this.getDomains() this.getAddresses() } - console.log('{{ request.url.path }}') - // var self = this - // - // // axios is available for making requests - // axios({ - // method: 'GET', - // url: '/example/api/v1/tools', - // headers: { - // 'X-example-header': 'not-used' - // } - // }).then(function (response) { - // self.tools = response.data - // }) } }) From e3360514cd4fb02c73497da51139005bbd47cbee Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Tue, 30 Nov 2021 15:12:13 +0000 Subject: [PATCH 6/6] add documentation reference --- lnbits/extensions/lnaddress/templates/lnaddress/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lnbits/extensions/lnaddress/templates/lnaddress/index.html b/lnbits/extensions/lnaddress/templates/lnaddress/index.html index 54836a430..dffef837a 100644 --- a/lnbits/extensions/lnaddress/templates/lnaddress/index.html +++ b/lnbits/extensions/lnaddress/templates/lnaddress/index.html @@ -186,10 +186,14 @@ + Your API key in cloudflare