From b46ae7a651fc2b821bf37f7dd8d58ac3b3d6f678 Mon Sep 17 00:00:00 2001 From: d11n Date: Tue, 24 Jan 2023 10:10:38 +0100 Subject: [PATCH] Checkout v2: Re-add LNURL for top-up invoices (#4556) My bad, this was excluded erroneously. Co-authored-by: Nicolas Dorier --- BTCPayServer.Tests/Checkoutv2Tests.cs | 42 +++++++++++++++---- .../Controllers/UIInvoiceController.UI.cs | 15 ++++--- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/BTCPayServer.Tests/Checkoutv2Tests.cs b/BTCPayServer.Tests/Checkoutv2Tests.cs index 4db107360..23be45b1c 100644 --- a/BTCPayServer.Tests/Checkoutv2Tests.cs +++ b/BTCPayServer.Tests/Checkoutv2Tests.cs @@ -41,18 +41,45 @@ namespace BTCPayServer.Tests s.Driver.FindElement(By.Id("StoreWebsite")).SendKeys(storeUrl); s.Driver.FindElement(By.Id("Save")).Click(); Assert.Contains("Store successfully updated", s.FindAlertMessage().Text); - - // Default payment method - var invoiceId = s.CreateInvoice(defaultPaymentMethod: "BTC_LightningLike"); + + // Enable LNURL, which we will need for (non-)presence checks throughout this test + s.GoToHome(); + s.GoToLightningSettings(); + s.Driver.SetCheckbox(By.Id("LNURLEnabled"), true); + s.Driver.SetCheckbox(By.Id("LNURLStandardInvoiceEnabled"), true); + s.Driver.FindElement(By.Id("save")).Click(); + Assert.Contains("BTC Lightning settings successfully updated", s.FindAlertMessage().Text); + + // Top up/zero amount invoices + var invoiceId = s.CreateInvoice(amount: null); s.GoToInvoiceCheckout(invoiceId); // Ensure we are seeing Checkout v2 s.Driver.WaitUntilAvailable(By.Id("Checkout-v2")); + Assert.Equal(2, s.Driver.FindElements(By.CssSelector(".payment-method")).Count); + Assert.Contains("Bitcoin", s.Driver.FindElement(By.CssSelector(".payment-method.active")).Text); + Assert.Contains("LNURL", s.Driver.FindElement(By.CssSelector(".payment-method:nth-child(2)")).Text); + var payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href"); + Assert.StartsWith("bitcoin:", payUrl); + Assert.DoesNotContain("&lightning=", payUrl); + + // Switch to LNURL + s.Driver.FindElement(By.CssSelector(".payment-method:nth-child(2)")).Click(); + TestUtils.Eventually(() => + { + payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href"); + Assert.StartsWith("lightning:", payUrl); + }); + + // Default payment method + s.GoToHome(); + invoiceId = s.CreateInvoice(defaultPaymentMethod: "BTC_LightningLike"); + s.GoToInvoiceCheckout(invoiceId); Assert.Equal(2, s.Driver.FindElements(By.CssSelector(".payment-method")).Count); Assert.Contains("Lightning", s.Driver.WaitForElement(By.CssSelector(".payment-method.active")).Text); Assert.DoesNotContain("LNURL", s.Driver.PageSource); - var payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href"); + payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href"); Assert.StartsWith("lightning:", payUrl); // Lightning amount in Sats @@ -163,13 +190,14 @@ namespace BTCPayServer.Tests Assert.StartsWith("bitcoin:", payUrl); Assert.Contains("&lightning=", payUrl); - // BIP21 with topup invoice (which is only available with Bitcoin onchain) + // BIP21 with topup invoice s.GoToHome(); invoiceId = s.CreateInvoice(amount: null); s.GoToInvoiceCheckout(invoiceId); - Assert.Empty(s.Driver.FindElements(By.CssSelector(".payment-method"))); + Assert.Equal(2, s.Driver.FindElements(By.CssSelector(".payment-method")).Count); + Assert.Contains("Bitcoin", s.Driver.FindElement(By.CssSelector(".payment-method.active")).Text); + Assert.Contains("LNURL", s.Driver.FindElement(By.CssSelector(".payment-method:nth-child(2)")).Text); payUrl = s.Driver.FindElement(By.CssSelector(".btn-primary")).GetAttribute("href"); - Assert.StartsWith("bitcoin:", payUrl); Assert.DoesNotContain("&lightning=", payUrl); // Expiry message should not show amount for topup invoice diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs index 869263dc3..98c94c33a 100644 --- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs +++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs @@ -651,12 +651,13 @@ namespace BTCPayServer.Controllers if (paymentMethodId is null) { var enabledPaymentIds = store.GetEnabledPaymentIds(_NetworkProvider) - // Exclude LNURL for Checkout v2 - .Where(pmId => storeBlob.CheckoutType == CheckoutType.V1 || pmId.PaymentType is not LNURLPayPaymentType) + // Exclude LNURL for Checkout v2 + non-top up invoices + .Where(pmId => storeBlob.CheckoutType == CheckoutType.V1 || + pmId.PaymentType is not LNURLPayPaymentType || invoice.IsUnsetTopUp()) .ToArray(); // Exclude Lightning if OnChainWithLnInvoiceFallback is active and we have both payment methods - if (storeBlob.CheckoutType == CheckoutType.V2 && storeBlob.OnChainWithLnInvoiceFallback && + if (storeBlob is { CheckoutType: CheckoutType.V2, OnChainWithLnInvoiceFallback: true } && enabledPaymentIds.Contains(btcId) && enabledPaymentIds.Contains(lnId)) { enabledPaymentIds = enabledPaymentIds.Where(pmId => pmId != lnId).ToArray(); @@ -800,8 +801,10 @@ namespace BTCPayServer.Controllers StoreId = store.Id, AvailableCryptos = invoice.GetPaymentMethods() .Where(i => i.Network != null && - // Exclude LNURL for Checkout v2 - (storeBlob.CheckoutType == CheckoutType.V1 || i.GetId().PaymentType is not LNURLPayPaymentType)) + // Exclude LNURL for Checkout v2 + non-top up invoices + (storeBlob.CheckoutType == CheckoutType.V1 || + i.GetId().PaymentType is not LNURLPayPaymentType || + invoice.IsUnsetTopUp())) .Select(kv => { var availableCryptoPaymentMethodId = kv.GetId(); @@ -827,7 +830,7 @@ namespace BTCPayServer.Controllers }; // Exclude Lightning if OnChainWithLnInvoiceFallback is active and we have both payment methods - if (storeBlob.CheckoutType == CheckoutType.V2 && storeBlob.OnChainWithLnInvoiceFallback) + if (storeBlob is { CheckoutType: CheckoutType.V2, OnChainWithLnInvoiceFallback: true }) { var onchainPM = model.AvailableCryptos.Find(c => c.PaymentMethodId == btcId.ToString()); var lightningPM = model.AvailableCryptos.Find(c => c.PaymentMethodId == lnId.ToString());