Michilis/lnbits
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'FastAPI' into lnurlpayout

Browse Source
This commit is contained in:
benarc
2021-12-02 11:47:00 +00:00
parent b7fcf461f1 0233aa51b1
commit ccc52dc585
15 changed files with 75 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lnbits/extensions/lnaddress/crud.py
+1 -1
View File
@@ -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"]
lnbits/extensions/lnaddress/lnurl.py
+17 -12
View File
@@ -1,4 +1,5 @@
import hashlib
import json
from datetime import datetime, timedelta
import httpx
@@ -9,6 +10,7 @@ from lnurl import ( # type: ignore
LnurlPayResponse,
)
from starlette.requests import Request
from starlette.responses import HTMLResponse
from . import lnaddress_ext
from .crud import get_address, get_address_by_username, get_domain
@@ -28,27 +30,29 @@ async def lnurl_response(username: str, domain: str, request: Request):
if now > expiration:
return LnurlErrorResponse(reason="Address has expired.").dict()
resp = LnurlPayResponse(
callback=request.url_for("lnaddress.lnurl_callback", address_id=address.id),
min_sendable=1000,
max_sendable=1000000000,
metadata=await address.lnurlpay_metadata(),
)
resp = {
"tag": "payRequest",
"callback": request.url_for("lnaddress.lnurl_callback", address_id=address.id),
"metadata": await address.lnurlpay_metadata(domain=domain),
"minSendable": 1000,
"maxSendable": 1000000000,
}
return resp.dict()
print("RESP", resp)
return resp
@lnaddress_ext.get("/lnurl/cb/{address_id}", name="lnaddress.lnurl_callback")
async def lnurl_callback(address_id, amount: int = Query(...)):
print("PING")
address = await get_address(address_id)
if not address:
return LnurlErrorResponse(reason=f"Address not found").dict()
amount_received = amount
domain = await get_domain(address.domain)
base_url = (
address.wallet_endpoint[:-1]
if address.wallet_endpoint.endswith("/")
@@ -67,7 +71,7 @@ async def lnurl_callback(address_id, amount: int = Query(...)):
"out": False,
"amount": int(amount_received / 1000),
"description_hash": hashlib.sha256(
(await address.lnurlpay_metadata()).encode("utf-8")
(await address.lnurlpay_metadata(domain=domain.domain)).encode("utf-8")
).hexdigest(),
"extra": {"tag": f"Payment to {address.username}@{domain.domain}"},
},
@@ -78,6 +82,7 @@ async def lnurl_callback(address_id, amount: int = Query(...)):
except AssertionError as e:
return LnurlErrorResponse(reason="ERROR")
resp = LnurlPayActionResponse(pr=r["payment_request"], routes=[])
# resp = LnurlPayActionResponse(pr=r["payment_request"], routes=[])
resp = {"pr": r["payment_request"], "routes": []}
return resp.dict()
return resp
lnbits/extensions/lnaddress/models.py
+5 -4
View File
@@ -3,7 +3,7 @@ from typing import Optional
from fastapi.params import Query
from lnurl.types import LnurlPayMetadata
from pydantic.main import BaseModel # type: ignore
from pydantic.main import BaseModel
class CreateDomain(BaseModel):
@@ -49,8 +49,9 @@ class Addresses(BaseModel):
paid: bool
time: int
async def lnurlpay_metadata(self) -> LnurlPayMetadata:
async def lnurlpay_metadata(self, domain) -> LnurlPayMetadata:
text = f"Payment to {self.username}"
metadata = [["text/plain", text]]
identifier = f"{self.username}@{domain}"
metadata = [["text/plain", text], ["text/identifier", identifier]]
return LnurlPayMetadata(json.dumps(metadata))
lnbits/extensions/lnaddress/tasks.py
+2 -2
View File
@@ -47,7 +47,7 @@ async def on_invoice_paid(payment: Payment) -> None:
await payment.set_pending(False)
await set_address_paid(payment_hash=payment.payment_hash)
await call_webhook_on_paid(payment.payment_hash)
await call_webhook_on_paid(payment_hash=payment.payment_hash)
elif "renew lnaddress" == payment.extra.get("tag"):
@@ -55,7 +55,7 @@ async def on_invoice_paid(payment: Payment) -> None:
await set_address_renewed(
address_id=payment.extra["id"], duration=payment.extra["duration"]
)
await call_webhook_on_paid(payment.payment_hash)
await call_webhook_on_paid(payment_hash=payment.payment_hash)
else:
return
lnbits/extensions/lnaddress/templates/lnaddress/display.html
+2 -3
View File
@@ -370,10 +370,9 @@
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)
axios
.post('/lnaddress/api/v1/address/{{ domain_id }}', data)
.then(response => {
lnbits/extensions/lnaddress/templates/lnaddress/index.html
+4 -12
View File
@@ -186,10 +186,14 @@
<q-input
filled
dense
bottom-slots
v-model.trim="domainDialog.data.cf_token"
type="text"
label="Cloudflare API token"
>
<template v-slot:hint>
Check extension <a href="https://github.com/lnbits/lnbits-legend/tree/master/lnbits/extensions/lnaddress">documentation!</a>
</template>
<q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
>Your API key in cloudflare</q-tooltip
>
@@ -489,18 +493,6 @@
this.getDomains()
this.getAddresses()
}
// 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
// })
}
})
</script>
lnbits/extensions/lnaddress/views.py
+4 -1
View File
@@ -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}"
},
)
lnbits/extensions/usermanager/models.py
+3 -2
View File
@@ -2,6 +2,7 @@ from sqlite3 import Row
from fastapi.param_functions import Query
from pydantic import BaseModel
from typing import Optional
class CreateUserData(BaseModel):
@@ -22,8 +23,8 @@ class Users(BaseModel):
id: str
name: str
admin: str
email: str
password: str
email: Optional[str] = None
password: Optional[str] = None
class Wallets(BaseModel):
lnbits/extensions/usermanager/views_api.py
+4 -4
View File
@@ -23,7 +23,7 @@ from .crud import (
)
from .models import CreateUserData, CreateUserWallet
### Users
# Users
@usermanager_ext.get("/api/v1/users", status_code=HTTPStatus.OK)
@@ -63,7 +63,7 @@ async def api_usermanager_users_delete(
raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
###Activate Extension
# Activate Extension
@usermanager_ext.post("/api/v1/extensions")
@@ -79,7 +79,7 @@ async def api_usermanager_activate_extension(
return {"extension": "updated"}
###Wallets
# Wallets
@usermanager_ext.post("/api/v1/wallets")
@@ -98,7 +98,7 @@ async def api_usermanager_wallets(wallet: WalletTypeInfo = Depends(get_key_type)
return [wallet.dict() for wallet in await get_usermanager_wallets(admin_id)]
@usermanager_ext.get("/api/v1/wallets/{wallet_id}")
@usermanager_ext.get("/api/v1/transactions/{wallet_id}")
async def api_usermanager_wallet_transactions(
wallet_id, wallet: WalletTypeInfo = Depends(get_key_type)
):