Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check if pinLimit is present #97

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+123 −25
Draft

check if pinLimit is present #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb6e62c
check if pinLimit is present
talvasconcelos Aug 20, 2024
ad02b4c
testing this is turning out a PITA
talvasconcelos Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 54 additions & 20 deletions static/js/tpos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,30 +604,64 @@ const tposJS = async () => {
readerAbortController.abort()
})
},
payInvoice: function (lnurl, readerAbortController) {
const self = this

return axios
.post(
'/tpos/api/v1/tposs/' +
self.tposId +
'/invoices/' +
self.invoiceDialog.data.payment_request +
'/pay',
{
lnurl: lnurl
}
)
.then(response => {
if (!response.data.success) {
async pinCallback(callback) {
const {data} = await axios.get(
`/tpos/api/v1/tposs/${this.tposId}/invoices/${this.invoiceDialog.data.payment_request}/pay?cb=${callback}`
)
if (!data.success) {
this.$q.notify({
type: 'negative',
message: data.detail
})
}
},
async payInvoice(lnurl, readerAbortController) {
const {data} = await axios.post(
`/tpos/api/v1/tposs/${this.tposId}/invoices/${this.invoiceDialog.data.payment_request}/pay`,
{lnurl}
)
if (!data.success) {
this.$q.notify({
type: 'negative',
message: data.detail
})
}
if (data.success && data.detail.includes('PIN') && data.callback) {
this.$q.notify({
type: 'negative',
message: data.detail
})
this.$q
.dialog({
title: 'Prompt',
message: 'Enter PIN',
prompt: {
model: '',
isValid: val => val.length == 4,
type: 'integer'
},
cancel: true,
persistent: true
})
.onOk(pin => {
const callback = new URL(data.callback)
callback.searchParams.set('k1', data.k1)
callback.searchParams.set(
'pr',
this.invoiceDialog.data.payment_request
)
callback.searchParams.set('pin', pin)
this.pinCallback(callback.toString())
})
.onCancel(() => {
this.$q.notify({
type: 'negative',
message: response.data.detail
message: 'Payment canceled'
})
}
})
}

readerAbortController.abort()
})
readerAbortController.abort()
},
getRates() {
if (this.currency == 'sats') {
Expand Down
74 changes: 69 additions & 5 deletions views_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import httpx
from fastapi import APIRouter, Depends, Query, Request
from lnbits import bolt11
from lnbits.core.crud import (
get_latest_payments_by_extension,
get_standalone_payment,
Expand Down Expand Up @@ -169,6 +170,7 @@ async def api_tpos_get_latest_invoices(tpos_id: str):
async def api_tpos_pay_invoice(
lnurl_data: PayLnurlWData, payment_request: str, tpos_id: str
):
logger.debug(f"1st call lnurl_data: {lnurl_data}")
tpos = await get_tpos(tpos_id)

if not tpos:
Expand Down Expand Up @@ -197,30 +199,92 @@ async def api_tpos_pay_invoice(
lnurl_response = {"success": False, "detail": "Error loading"}
else:
resp = r.json()
if resp["tag"] != "withdrawRequest":
logger.debug(f"1st call resp: {resp}")
if resp.get("tag") != "withdrawRequest":
lnurl_response = {"success": False, "detail": "Wrong tag type"}

elif resp.get("pinLimit"):
logger.debug(
f"PIN required for this amount: {resp.get('pinLimit')}"
)
invoice = bolt11.decode(payment_request)
if invoice.amount_msat >= resp.get("pinLimit"):
return {
"success": True,
"detail": "PIN required for this amount",
"callback": resp.get("callback"),
"k1": resp.get("k1"),
}
else:
logger.debug(
f"all clear making callback to: {resp.get('callback')}"
)
r2 = await client.get(
resp["callback"],
resp.get("callback"),
follow_redirects=True,
headers=headers,
params={
"k1": resp["k1"],
"k1": resp.get("k1"),
"pr": payment_request,
},
)
resp2 = r2.json()
logger.debug(f"2nd call resp2 OK: {resp2}")
if r2.is_error:
lnurl_response = {
"success": False,
"detail": "Error loading callback",
}
elif resp2["status"] == "ERROR":
lnurl_response = {"success": False, "detail": resp2["reason"]}
elif resp2.get("status") == "ERROR":
lnurl_response = {
"success": False,
"detail": resp2.get("reason"),
}
else:
lnurl_response = {"success": True, "detail": resp2}
except (httpx.ConnectError, httpx.RequestError):
lnurl_response = {"success": False, "detail": "Unexpected error occurred"}
logger.debug(f"lnurl_response: {lnurl_response}")
return lnurl_response


@tpos_api_router.get(
"/api/v1/tposs/{tpos_id}/invoices/{payment_request}/pay",
status_code=HTTPStatus.OK,
)
async def api_tpos_pay_invoice_cb(
payment_request: str,
tpos_id: str,
cb: str = Query(None),
):
tpos = await get_tpos(tpos_id)
logger.debug(f"2nd call cb: {cb}")

if not tpos:
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="TPoS does not exist."
)

async with httpx.AsyncClient() as client:
try:
headers = {"user-agent": "lnbits/tpos"}
r = await client.get(
cb,
follow_redirects=True,
headers=headers,
)
r_json = r.json()
if r.is_error:
lnurl_response = {
"success": False,
"detail": "Error loading callback",
}
elif r_json["status"] == "ERROR":
lnurl_response = {"success": False, "detail": r_json["reason"]}
else:
lnurl_response = {"success": True, "detail": r_json}
except (httpx.ConnectError, httpx.RequestError):
lnurl_response = {"success": False, "detail": "Unexpected error occurred"}

return lnurl_response

Expand Down
Loading