feat: Adds revolut checkout and subscriptions (#3968)
Co-authored-by: alan <alan@lnbits.com>
This commit is contained in:
Arc
committed by
Vlad Stan
Vlad Stan
co-authored by
alan
alan
parent
c4ee3a7c6b
commit
751bd42169
@@ -17,6 +17,7 @@ from lnbits.core.models.wallets import Wallet
|
||||
from lnbits.core.services import check_payment_status, payments
|
||||
from lnbits.core.services.fiat_providers import (
|
||||
check_fiat_status,
|
||||
check_revolut_signature,
|
||||
check_square_signature,
|
||||
check_stripe_signature,
|
||||
handle_fiat_payment_confirmation,
|
||||
@@ -32,6 +33,7 @@ from lnbits.fiat.base import (
|
||||
FiatStatusResponse,
|
||||
FiatSubscriptionPaymentOptions,
|
||||
)
|
||||
from lnbits.fiat.revolut import REVOLUT_WEBHOOK_EVENTS, RevolutWallet
|
||||
from lnbits.fiat.square import SquareWallet
|
||||
from lnbits.settings import Settings
|
||||
from tests.helpers import get_random_string
|
||||
@@ -83,9 +85,18 @@ def fiat_provider_test_settings(settings: Settings):
|
||||
original_square_payment_webhook_url = settings.square_payment_webhook_url
|
||||
original_square_webhook_signature_key = settings.square_webhook_signature_key
|
||||
original_square_limits = settings.square_limits.copy(deep=True)
|
||||
original_revolut_enabled = settings.revolut_enabled
|
||||
original_revolut_api_endpoint = settings.revolut_api_endpoint
|
||||
original_revolut_api_secret_key = settings.revolut_api_secret_key
|
||||
original_revolut_api_version = settings.revolut_api_version
|
||||
original_revolut_payment_success_url = settings.revolut_payment_success_url
|
||||
original_revolut_payment_webhook_url = settings.revolut_payment_webhook_url
|
||||
original_revolut_webhook_signing_secret = settings.revolut_webhook_signing_secret
|
||||
original_revolut_limits = settings.revolut_limits.copy(deep=True)
|
||||
settings.lnbits_allowed_currencies = []
|
||||
settings.paypal_enabled = False
|
||||
settings.square_enabled = False
|
||||
settings.revolut_enabled = False
|
||||
yield
|
||||
settings.lnbits_allowed_currencies = original_allowed_currencies
|
||||
settings.paypal_enabled = original_paypal_enabled
|
||||
@@ -98,6 +109,14 @@ def fiat_provider_test_settings(settings: Settings):
|
||||
settings.square_payment_webhook_url = original_square_payment_webhook_url
|
||||
settings.square_webhook_signature_key = original_square_webhook_signature_key
|
||||
settings.square_limits = original_square_limits
|
||||
settings.revolut_enabled = original_revolut_enabled
|
||||
settings.revolut_api_endpoint = original_revolut_api_endpoint
|
||||
settings.revolut_api_secret_key = original_revolut_api_secret_key
|
||||
settings.revolut_api_version = original_revolut_api_version
|
||||
settings.revolut_payment_success_url = original_revolut_payment_success_url
|
||||
settings.revolut_payment_webhook_url = original_revolut_payment_webhook_url
|
||||
settings.revolut_webhook_signing_secret = original_revolut_webhook_signing_secret
|
||||
settings.revolut_limits = original_revolut_limits
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
@@ -178,6 +197,23 @@ async def test_create_wallet_fiat_invoice_allowed_users(
|
||||
assert user
|
||||
assert user.fiat_providers == ["square"]
|
||||
|
||||
settings.square_enabled = False
|
||||
settings.revolut_enabled = True
|
||||
settings.revolut_limits.allowed_users = []
|
||||
user = await get_user(to_user.id)
|
||||
assert user
|
||||
assert user.fiat_providers == ["revolut"]
|
||||
|
||||
settings.revolut_limits.allowed_users = ["some_other_user_id"]
|
||||
user = await get_user(to_user.id)
|
||||
assert user
|
||||
assert user.fiat_providers == []
|
||||
|
||||
settings.revolut_limits.allowed_users.append(to_user.id)
|
||||
user = await get_user(to_user.id)
|
||||
assert user
|
||||
assert user.fiat_providers == ["revolut"]
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_create_wallet_fiat_invoice_fiat_limits_fail(
|
||||
@@ -695,6 +731,380 @@ async def test_square_wallet_get_invoice_status(settings: Settings):
|
||||
assert client.calls[1][0] == "/v2/payments/PAYMENT123"
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_create_wallet_revolut_fiat_invoice_success(
|
||||
to_wallet: Wallet, settings: Settings, mocker: MockerFixture
|
||||
):
|
||||
settings.revolut_enabled = True
|
||||
settings.revolut_api_secret_key = "revolut-secret"
|
||||
settings.revolut_limits.service_min_amount_sats = 0
|
||||
settings.revolut_limits.service_max_amount_sats = 0
|
||||
settings.revolut_limits.service_faucet_wallet_id = None
|
||||
|
||||
invoice_data = CreateInvoice(
|
||||
unit="USD", amount=1.0, memo="Test", fiat_provider="revolut"
|
||||
)
|
||||
fiat_mock_response = FiatInvoiceResponse(
|
||||
ok=True,
|
||||
checking_id="order_ORDER123",
|
||||
payment_request="https://checkout.revolut.com/payment-link/ORDER123",
|
||||
)
|
||||
|
||||
mocker.patch(
|
||||
"lnbits.fiat.RevolutWallet.create_invoice",
|
||||
AsyncMock(return_value=fiat_mock_response),
|
||||
)
|
||||
mocker.patch(
|
||||
"lnbits.utils.exchange_rates.get_fiat_rate_satoshis",
|
||||
AsyncMock(return_value=1000),
|
||||
)
|
||||
payment = await payments.create_fiat_invoice(to_wallet.id, invoice_data)
|
||||
assert payment.status == PaymentState.PENDING
|
||||
assert payment.fiat_provider == "revolut"
|
||||
assert payment.extra.get("fiat_checking_id") == fiat_mock_response.checking_id
|
||||
assert payment.checking_id.startswith("fiat_revolut_order_ORDER123")
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_revolut_wallet_create_invoice(settings: Settings):
|
||||
settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
|
||||
settings.revolut_api_secret_key = "revolut-secret"
|
||||
settings.revolut_api_version = "2026-04-20"
|
||||
settings.revolut_payment_success_url = "https://lnbits.example/success"
|
||||
|
||||
wallet = RevolutWallet()
|
||||
client = MockHTTPClient(
|
||||
[
|
||||
MockHTTPResponse(
|
||||
json_data={
|
||||
"id": "ORDER123",
|
||||
"checkout_url": "https://checkout.revolut.com/payment-link/abc123",
|
||||
}
|
||||
)
|
||||
]
|
||||
)
|
||||
wallet.client = client # type: ignore[assignment]
|
||||
|
||||
response = await wallet.create_invoice(
|
||||
amount=1.23,
|
||||
payment_hash="hash123",
|
||||
currency="USD",
|
||||
memo="LNbits Revolut invoice",
|
||||
extra={"checkout": {"metadata": {"source": "test"}}},
|
||||
)
|
||||
|
||||
assert response.ok is True
|
||||
assert response.checking_id == "order_ORDER123"
|
||||
assert (
|
||||
response.payment_request == "https://checkout.revolut.com/payment-link/abc123"
|
||||
)
|
||||
assert client.calls[0][0] == "/api/orders"
|
||||
payload = client.calls[0][1]["json"]
|
||||
assert payload["amount"] == 123
|
||||
assert payload["currency"] == "USD"
|
||||
assert payload["metadata"]["payment_hash"] == "hash123"
|
||||
assert payload["metadata"]["alan_action"] == "invoice"
|
||||
assert payload["metadata"]["source"] == "test"
|
||||
assert payload["redirect_url"] == "https://lnbits.example/success"
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_revolut_wallet_create_invoice_uses_currency_minor_units(
|
||||
settings: Settings,
|
||||
):
|
||||
settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
|
||||
settings.revolut_api_secret_key = "revolut-secret"
|
||||
settings.revolut_api_version = "2026-04-20"
|
||||
|
||||
wallet = RevolutWallet()
|
||||
client = MockHTTPClient(
|
||||
[
|
||||
MockHTTPResponse(
|
||||
json_data={
|
||||
"id": "ORDER_JPY",
|
||||
"checkout_url": "https://checkout.revolut.com/payment-link/jpy",
|
||||
}
|
||||
),
|
||||
MockHTTPResponse(
|
||||
json_data={
|
||||
"id": "ORDER_KWD",
|
||||
"checkout_url": "https://checkout.revolut.com/payment-link/kwd",
|
||||
}
|
||||
),
|
||||
]
|
||||
)
|
||||
wallet.client = client # type: ignore[assignment]
|
||||
|
||||
await wallet.create_invoice(
|
||||
amount=123,
|
||||
payment_hash="hash_jpy",
|
||||
currency="JPY",
|
||||
)
|
||||
await wallet.create_invoice(
|
||||
amount=1.234,
|
||||
payment_hash="hash_kwd",
|
||||
currency="KWD",
|
||||
)
|
||||
|
||||
assert client.calls[0][1]["json"]["amount"] == 123
|
||||
assert client.calls[1][1]["json"]["amount"] == 1234
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_revolut_wallet_get_invoice_status(settings: Settings):
|
||||
settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
|
||||
settings.revolut_api_secret_key = "revolut-secret"
|
||||
settings.revolut_api_version = "2026-04-20"
|
||||
|
||||
wallet = RevolutWallet()
|
||||
client = MockHTTPClient([MockHTTPResponse(json_data={"state": "COMPLETED"})])
|
||||
wallet.client = client # type: ignore[assignment]
|
||||
|
||||
status = await wallet.get_invoice_status("fiat_revolut_order_ORDER123")
|
||||
|
||||
assert status.success is True
|
||||
assert client.calls[0][0] == "/api/orders/ORDER123"
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_revolut_wallet_create_subscription(settings: Settings):
|
||||
settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
|
||||
settings.revolut_api_secret_key = "revolut-secret"
|
||||
settings.revolut_api_version = "2026-04-20"
|
||||
settings.revolut_payment_success_url = "https://lnbits.example/subscription-success"
|
||||
|
||||
wallet = RevolutWallet()
|
||||
client = MockHTTPClient(
|
||||
[
|
||||
MockHTTPResponse(
|
||||
json_data={
|
||||
"id": "SUBSCRIPTION123",
|
||||
"setup_order_id": "ORDER123",
|
||||
}
|
||||
),
|
||||
MockHTTPResponse(
|
||||
json_data={
|
||||
"id": "ORDER123",
|
||||
"checkout_url": "https://checkout.revolut.com/payment-link/sub_123",
|
||||
}
|
||||
),
|
||||
]
|
||||
)
|
||||
wallet.client = client # type: ignore[assignment]
|
||||
|
||||
payment_options = FiatSubscriptionPaymentOptions(
|
||||
wallet_id="wallet_1",
|
||||
memo="Monthly Gold",
|
||||
tag="gold",
|
||||
extra={"customer_id": "CUSTOMER123", "link": "link-1"},
|
||||
success_url="https://lnbits.example/subscription-success",
|
||||
)
|
||||
|
||||
response = await wallet.create_subscription(
|
||||
"PLAN_VARIATION_123", 1, payment_options
|
||||
)
|
||||
|
||||
assert response.ok is True
|
||||
assert response.subscription_request_id == "SUBSCRIPTION123"
|
||||
assert (
|
||||
response.checkout_session_url
|
||||
== "https://checkout.revolut.com/payment-link/sub_123"
|
||||
)
|
||||
assert client.calls[0][0] == "/api/subscriptions"
|
||||
payload = client.calls[0][1]["json"]
|
||||
assert payload["plan_variation_id"] == "PLAN_VARIATION_123"
|
||||
assert payload["customer_id"] == "CUSTOMER123"
|
||||
assert payload["setup_order_redirect_url"] == (
|
||||
"https://lnbits.example/subscription-success"
|
||||
)
|
||||
reference = json.loads(payload["external_reference"])
|
||||
assert reference["wallet_id"] == "wallet_1"
|
||||
assert reference["tag"] == "gold"
|
||||
assert reference["memo"] == "Monthly Gold"
|
||||
assert reference["extra"]["customer_id"] == "CUSTOMER123"
|
||||
assert client.calls[1][0] == "/api/orders/ORDER123"
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_revolut_wallet_cancel_subscription(settings: Settings):
|
||||
settings.revolut_api_endpoint = "https://sandbox-merchant.revolut.com"
|
||||
settings.revolut_api_secret_key = "revolut-secret"
|
||||
settings.revolut_api_version = "2026-04-20"
|
||||
|
||||
wallet = RevolutWallet()
|
||||
client = MockHTTPClient([MockHTTPResponse(json_data={})])
|
||||
wallet.client = client # type: ignore[assignment]
|
||||
|
||||
response = await wallet.cancel_subscription("SUBSCRIPTION123", "wallet_1")
|
||||
|
||||
assert response.ok is True
|
||||
assert client.calls[0][0] == "/api/subscriptions/SUBSCRIPTION123/cancel"
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_revolut_wallet_create_webhook(mocker: MockerFixture):
|
||||
client = MockHTTPClient(
|
||||
[
|
||||
MockHTTPResponse({"webhooks": []}),
|
||||
MockHTTPResponse(
|
||||
{
|
||||
"id": "webhook_1",
|
||||
"url": "https://lnbits.example/api/v1/callback/revolut",
|
||||
"events": REVOLUT_WEBHOOK_EVENTS,
|
||||
"signing_secret": "whsec_1",
|
||||
}
|
||||
),
|
||||
]
|
||||
)
|
||||
async_client = mocker.patch("lnbits.fiat.revolut.httpx.AsyncClient")
|
||||
async_client.return_value = client
|
||||
|
||||
response = await RevolutWallet.create_webhook(
|
||||
url="https://lnbits.example/api/v1/callback/revolut",
|
||||
endpoint="https://sandbox-merchant.revolut.com",
|
||||
api_secret_key="revolut-secret",
|
||||
api_version="2026-04-20",
|
||||
)
|
||||
|
||||
assert response["signing_secret"] == "whsec_1"
|
||||
async_client.assert_called_once()
|
||||
assert async_client.call_args.kwargs["base_url"] == (
|
||||
"https://sandbox-merchant.revolut.com"
|
||||
)
|
||||
assert async_client.call_args.kwargs["headers"]["Authorization"] == (
|
||||
"Bearer revolut-secret"
|
||||
)
|
||||
assert client.calls == [
|
||||
(
|
||||
"/api/webhooks",
|
||||
{
|
||||
"timeout": 15,
|
||||
},
|
||||
),
|
||||
(
|
||||
"/api/webhooks",
|
||||
{
|
||||
"json": {
|
||||
"url": "https://lnbits.example/api/v1/callback/revolut",
|
||||
"events": REVOLUT_WEBHOOK_EVENTS,
|
||||
},
|
||||
"timeout": 15,
|
||||
},
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_revolut_wallet_reuses_existing_webhook(mocker: MockerFixture):
|
||||
client = MockHTTPClient(
|
||||
[
|
||||
MockHTTPResponse(
|
||||
{
|
||||
"webhooks": [
|
||||
{
|
||||
"id": "webhook_1",
|
||||
"url": "https://lnbits.example/api/v1/callback/revolut",
|
||||
"events": REVOLUT_WEBHOOK_EVENTS,
|
||||
"signing_secret": "whsec_1",
|
||||
}
|
||||
]
|
||||
}
|
||||
)
|
||||
]
|
||||
)
|
||||
async_client = mocker.patch("lnbits.fiat.revolut.httpx.AsyncClient")
|
||||
async_client.return_value = client
|
||||
|
||||
response = await RevolutWallet.create_webhook(
|
||||
url="https://lnbits.example/api/v1/callback/revolut",
|
||||
endpoint="https://sandbox-merchant.revolut.com",
|
||||
api_secret_key="revolut-secret",
|
||||
api_version="2026-04-20",
|
||||
)
|
||||
|
||||
assert response["already_exists"] is True
|
||||
assert response["signing_secret"] == "whsec_1"
|
||||
assert client.calls == [
|
||||
(
|
||||
"/api/webhooks",
|
||||
{
|
||||
"timeout": 15,
|
||||
},
|
||||
)
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_revolut_wallet_rejects_local_webhook_url():
|
||||
with pytest.raises(ValueError, match="clearnet URL"):
|
||||
await RevolutWallet.create_webhook(
|
||||
url="http://localhost:5000/api/v1/callback/revolut",
|
||||
endpoint="https://sandbox-merchant.revolut.com",
|
||||
api_secret_key="revolut-secret",
|
||||
api_version="2026-04-20",
|
||||
)
|
||||
|
||||
|
||||
def test_check_revolut_signature():
|
||||
payload = b'{"event":"ORDER_COMPLETED","order_id":"ORDER123"}'
|
||||
timestamp = str(int(time.time() * 1000))
|
||||
secret = "revolut-secret"
|
||||
signed_payload = b"v1." + timestamp.encode() + b"." + payload
|
||||
sig = "v1=" + hmac.new(secret.encode(), signed_payload, hashlib.sha256).hexdigest()
|
||||
|
||||
check_revolut_signature(payload, sig, timestamp, secret)
|
||||
|
||||
|
||||
def test_check_revolut_signature_rejects_payload_only_signature():
|
||||
payload = b'{"event":"ORDER_COMPLETED","order_id":"ORDER123"}'
|
||||
timestamp = str(int(time.time() * 1000))
|
||||
secret = "revolut-secret"
|
||||
sig = hmac.new(secret.encode(), payload, hashlib.sha256).hexdigest()
|
||||
|
||||
with pytest.raises(ValueError, match="signature verification failed"):
|
||||
check_revolut_signature(payload, sig, timestamp, secret)
|
||||
|
||||
|
||||
def test_check_revolut_signature_v1_header():
|
||||
payload = b'{"event":"ORDER_COMPLETED","order_id":"ORDER123"}'
|
||||
timestamp = str(int(time.time() * 1000))
|
||||
secret = "revolut-secret"
|
||||
signed_payload = b"v1." + timestamp.encode() + b"." + payload
|
||||
sig = "v1=" + hmac.new(secret.encode(), signed_payload, hashlib.sha256).hexdigest()
|
||||
|
||||
check_revolut_signature(payload, sig, timestamp, secret)
|
||||
|
||||
|
||||
def test_check_revolut_signature_multiple_v1_headers():
|
||||
payload = b'{"event":"ORDER_COMPLETED","order_id":"ORDER123"}'
|
||||
timestamp = str(int(time.time() * 1000))
|
||||
secret = "revolut-secret"
|
||||
signed_payload = b"v1." + timestamp.encode() + b"." + payload
|
||||
valid_sig = (
|
||||
"v1=" + hmac.new(secret.encode(), signed_payload, hashlib.sha256).hexdigest()
|
||||
)
|
||||
sig_header = f"v1=deadbeef,{valid_sig}"
|
||||
|
||||
check_revolut_signature(payload, sig_header, timestamp, secret)
|
||||
|
||||
|
||||
def test_check_revolut_signature_docs_vector():
|
||||
payload = (
|
||||
b'{"data":{"id":"645a7696-22f3-aa47-9c74-cbae0449cc46",'
|
||||
b'"new_state":"completed","old_state":"pending",'
|
||||
b'"request_id":"app_charges-9f5d5eb3-1e06-46c5-b1c0-3914763e0bcb"},'
|
||||
b'"event":"TransactionStateChanged",'
|
||||
b'"timestamp":"2023-05-09T16:36:38.028960Z"}'
|
||||
)
|
||||
timestamp = "1683650202360"
|
||||
secret = "wsk_r59a4HfWVAKycbCaNO1RvgCJec02gRd8"
|
||||
sig = "v1=bca326fb378d0da7f7c490ad584a8106bab9723d8d9cdd0d50b4c5b3be3837c0"
|
||||
|
||||
check_revolut_signature(
|
||||
payload, sig, timestamp, secret, tolerance_seconds=100000000
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_fiat_service_fee(settings: Settings):
|
||||
# settings.stripe_limits.service_min_amount_sats = 0
|
||||
|
||||
Reference in New Issue
Block a user