Merge remote-tracking branch 'upstream/master'

Groestlcoin · Oct 26, 2024 · f22e373 · f22e373
2 parents 56b5c50 + e7b9688
commit f22e373
Show file tree

Hide file tree

Showing 181 changed files with 1,294 additions and 956 deletions.
diff --git a/BTCPayServer.Tests/GreenfieldAPITests.cs b/BTCPayServer.Tests/GreenfieldAPITests.cs
@@ -2981,9 +2981,10 @@ public async Task CanUseLightningAPI()
 
             // check list for store with paid invoice
             var merchantInvoices = await merchantClient.GetLightningInvoices(merchant.StoreId, "BTC");
-            merchantPendingInvoices = await merchantClient.GetLightningInvoices(merchant.StoreId, "BTC", true);
             Assert.NotEmpty(merchantInvoices);
-            Assert.Empty(merchantPendingInvoices);
+            merchantPendingInvoices = await merchantClient.GetLightningInvoices(merchant.StoreId, "BTC", true);
+            Assert.True(merchantPendingInvoices.Length < merchantInvoices.Length);
+            Assert.All(merchantPendingInvoices, m => Assert.Equal(LightningInvoiceStatus.Unpaid, m.Status));
             // if the test ran too many times the invoice might be on a later page
             if (merchantInvoices.Length < 100)
                 Assert.Contains(merchantInvoices, i => i.Id == merchantInvoice.Id);
@@ -3047,7 +3048,7 @@ public async Task CanAccessInvoiceLightningPaymentMethodDetails()
                 new CreateInvoiceRequest
                 {
                     Currency = "USD",
-                    Amount = 100,
+                    Amount = 0.1m,
                     Checkout = new CreateInvoiceRequest.CheckoutOptions
                     {
                         PaymentMethods = new[] { "BTC-LN" },

diff --git a/BTCPayServer.Tests/UtilitiesTests.cs b/BTCPayServer.Tests/UtilitiesTests.cs
@@ -360,7 +360,9 @@ public async Task UpdateDefaultTranslations()
             {
                 await tester.StartAsync();
                 var engine = tester.PayTester.GetService<RazorProjectEngine>();
-                foreach (var file in soldir.EnumerateFiles("*.cshtml", SearchOption.AllDirectories))
+                var files = soldir.EnumerateFiles("*.cshtml", SearchOption.AllDirectories)
+                    .Union(soldir.EnumerateFiles("*.razor", SearchOption.AllDirectories));
+                foreach (var file in files)
                 {
                     var filePath = file.FullName;
                     var txt = File.ReadAllText(file.FullName);

diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
@@ -42,7 +42,7 @@
     <PackageReference Include="YamlDotNet" Version="8.0.0" />
     <PackageReference Include="BIP78.Sender" Version="0.2.2" />
     <PackageReference Include="BTCPayServer.Hwi" Version="2.0.2" />
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.6.5" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.6.6" />
     <PackageReference Include="CsvHelper" Version="32.0.3" />
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="Fido2" Version="2.0.2" />

diff --git a/BTCPayServer/Blazor/NotificationsDropDown.razor b/BTCPayServer/Blazor/NotificationsDropDown.razor
@@ -4,10 +4,12 @@
 @using BTCPayServer.Services.Notifications;
 @using Microsoft.AspNetCore.Identity;
 @using Microsoft.AspNetCore.Routing;
+@using Microsoft.Extensions.Localization
 @implements IDisposable
 @inject AuthenticationStateProvider _AuthenticationStateProvider
 @inject NotificationManager _NotificationManager
 @inject UserManager<ApplicationUser> _UserManager
+@inject IStringLocalizer StringLocalizer
 @inject IJSRuntime _JSRuntime
 @inject LinkGenerator _LinkGenerator
 @inject BTCPayServerOptions _BTCPayServerOptions
@@ -16,13 +18,13 @@
 <div id="Notifications">
 	@if (UnseenCount == "0")
 	{
-		<a href="@NotificationsUrl" id="NotificationsHandle" class="mainMenuButton" title="Notifications">
+		<a href="@NotificationsUrl" id="NotificationsHandle" class="mainMenuButton" title="@StringLocalizer["Notifications"]">
 			<Icon Symbol="nav-notifications" />
 		</a>
 	}
 	else
 	{
-		<button id="NotificationsHandle" class="mainMenuButton" title="Notifications" type="button" data-bs-toggle="dropdown">
+		<button id="NotificationsHandle" class="mainMenuButton" title="@StringLocalizer["Notifications"]" type="button" data-bs-toggle="dropdown">
 			<Icon Symbol="nav-notifications" />
 			<span class="badge rounded-pill bg-danger p-1 ms-1" id="NotificationsBadge">@UnseenCount</span>
 		</button>
@@ -31,8 +33,8 @@
 	{
 		<div class="dropdown-menu text-center" id="NotificationsDropdown" aria-labelledby="NotificationsHandle">
 			<div class="d-flex gap-3 align-items-center justify-content-between py-3 px-4 border-bottom border-light">
-				<h5 class="m-0">Notifications</h5>
-				<a class="btn btn-link p-0" @onclick="MarkAllAsSeen" id="NotificationsMarkAllAsSeen">Mark all as seen</a>
+				<h5 class="m-0" text-translate="true">Notifications</h5>
+				<a class="btn btn-link p-0" @onclick="MarkAllAsSeen" id="NotificationsMarkAllAsSeen" text-translate="true">Mark all as seen</a>
 			</div>
 			<div id="NotificationsList" v-pre>
 				@foreach (var n in Last5)
@@ -54,7 +56,7 @@
 			</div>
 
 			<div class="p-3">
-				<a href="@NotificationsUrl">View all</a>
+				<a href="@NotificationsUrl" text-translate="true">View all</a>
 			</div>
 		</div>
 	}

diff --git a/BTCPayServer/Blazor/PosLoginCode.razor b/BTCPayServer/Blazor/PosLoginCode.razor
@@ -1,13 +1,13 @@
 @using Microsoft.AspNetCore.Http
 
-@inject IHttpContextAccessor HttpContextAccessor;
+@inject IHttpContextAccessor HttpContextAccessor
 
 @if (Users?.Any() is true)
 {
     <div @attributes="Attrs" class="@CssClass">
-        <label for="SignedInUser" class="form-label">Signed in user</label>
+        <label for="SignedInUser" class="form-label" text-translate="true">Signed in user</label>
         <select id="SignedInUser" class="form-select" value="@_userId" @onchange="@(e => _userId = e.Value?.ToString())">
-            <option value="">None, just open the URL</option>
+            <option value="" text-translate="true">None, just open the URL</option>
             @foreach (var u in Users)
             {
                 <option value="@u.Key">@u.Value</option>

diff --git a/BTCPayServer/Blazor/UserLoginCode.razor b/BTCPayServer/Blazor/UserLoginCode.razor
@@ -5,11 +5,13 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.Mvc
 @using Microsoft.AspNetCore.Routing
+@using Microsoft.Extensions.Localization
 @inject AuthenticationStateProvider AuthenticationStateProvider
-@inject UserManager<ApplicationUser> UserManager;
-@inject UserLoginCodeService UserLoginCodeService;
-@inject LinkGenerator LinkGenerator;
-@inject IHttpContextAccessor HttpContextAccessor;
+@inject UserManager<ApplicationUser> UserManager
+@inject UserLoginCodeService UserLoginCodeService
+@inject LinkGenerator LinkGenerator
+@inject IHttpContextAccessor HttpContextAccessor
+@inject IStringLocalizer StringLocalizer
 @implements IDisposable
 
 @if (!string.IsNullOrEmpty(_data))
@@ -18,7 +20,7 @@
         <div class="qr-container mb-2">
             <QrCode Data="@_data" Size="Size"/>
         </div>
-        <p class="text-center text-muted mb-1" id="progress">Valid for @_seconds seconds</p>
+        <p class="text-center text-muted mb-1" id="progress">@StringLocalizer["Valid for {0} seconds", _seconds]</p>
         <div class="progress only-for-js" data-bs-toggle="tooltip" data-bs-placement="top">
             <div class="progress-bar progress-bar-striped progress-bar-animated @(Percent < 15 ? "bg-warning" : null)" role="progressbar" style="width:@Percent%" id="progressbar"></div>
         </div>

diff --git a/BTCPayServer/Components/Pager/Default.cshtml b/BTCPayServer/Components/Pager/Default.cshtml
@@ -1,3 +1,5 @@
+@using System.Web
+@using BTCPayServer.TagHelpers
 @model BasePagingViewModel
 
 @{
@@ -85,10 +87,26 @@
         {
             // merge both, preferring the `query` properties in case of duplicate keys
             query = query.Concat(Model.PaginationQuery)
+                .Where(e => e.Value != null)
                 .GroupBy(e => e.Key)
                 .ToDictionary(g => g.Key, g => g.First().Value);
         }
 
-        return Url.Action(null, query);
+        return ReplaceQueryParameters(query);
+    }
+
+    string ReplaceQueryParameters(Dictionary<string, object> query)
+    {
+        var uri = new Uri(ViewContext.HttpContext.Request.GetCurrentUrlWithQueryString());
+        var queryParams = HttpUtility.ParseQueryString(uri.Query);
+        foreach (var (key, value) in query)
+        {
+            if (value != null) queryParams[key] = value?.ToString();
+        }
+        var uriBuilder = new UriBuilder(uri)
+        {
+            Query = queryParams.ToString()!
+        };
+        return uriBuilder.ToString();
     }
 }
diff --git a/BTCPayServer/Components/Pager/Pager.cs b/BTCPayServer/Components/Pager/Pager.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using BTCPayServer.Models;
 using Microsoft.AspNetCore.Mvc;
 

diff --git a/BTCPayServer/Components/StoreSelector/Default.cshtml b/BTCPayServer/Components/StoreSelector/Default.cshtml
@@ -17,9 +17,9 @@
             <small class="badge bg-warning rounded-pill ms-1 ms-sm-0" title="@type">@displayType</small>
         }
     }
-    private static string StoreName(string title)
+    private string StoreName(string title)
     {
-        return string.IsNullOrEmpty(title) ? "Unnamed Store" : title;
+        return string.IsNullOrEmpty(title) ? StringLocalizer["Unnamed Store"] : title;
     }
 	#pragma warning restore 1998
 }
@@ -44,7 +44,7 @@ else
                 {
                     <vc:icon symbol="nav-store"/>
                 }
-                <span>@(Model.CurrentStoreId == null ? "Select Store" : Model.CurrentDisplayName)</span>
+                <span>@(Model.CurrentStoreId == null ? StringLocalizer["Select Store"] : Model.CurrentDisplayName)</span>
                 <vc:icon symbol="caret-down"/>
             </button>
             <ul id="StoreSelectorMenu" class="dropdown-menu" aria-labelledby="StoreSelectorToggle">
@@ -58,15 +58,15 @@ else
                 {
                     <li><hr class="dropdown-divider"></li>
                 }
-                <li><a asp-controller="UIUserStores" asp-action="CreateStore" class="dropdown-item @ViewData.ActivePageClass(StoreNavPages.Create)" id="StoreSelectorCreate">Create Store</a></li>
+                <li><a asp-controller="UIUserStores" asp-action="CreateStore" class="dropdown-item @ViewData.ActivePageClass(StoreNavPages.Create)" id="StoreSelectorCreate" text-translate="true">Create Store</a></li>
                 @if (Model.ArchivedCount > 0)
                 {
                     <li><hr class="dropdown-divider"></li>
-                    <li><a asp-controller="UIUserStores" asp-action="ListStores" asp-route-archived="true" class="dropdown-item @ViewData.ActivePageClass(StoreNavPages.Index)" id="StoreSelectorArchived">@Model.ArchivedCount Archived Store@(Model.ArchivedCount == 1 ? "" : "s")</a></li>
+                    <li><a asp-controller="UIUserStores" asp-action="ListStores" asp-route-archived="true" class="dropdown-item @ViewData.ActivePageClass(StoreNavPages.Index)" id="StoreSelectorArchived">@(Model.ArchivedCount == 1 ? StringLocalizer["{0} Archived Store", Model.ArchivedCount] : StringLocalizer["{0} Archived Stores", Model.ArchivedCount])</a></li>
                 }
                 @*
                 <li permission="@Policies.CanModifyServerSettings"><hr class="dropdown-divider"></li>
-                <li permission="@Policies.CanModifyServerSettings"><a asp-controller="UIServer" asp-action="ListStores" class="dropdown-item @ViewData.ActivePageClass(ServerNavPages.Stores)" id="StoreSelectorAdminStores">Admin Store Overview</a></li>
+                <li permission="@Policies.CanModifyServerSettings"><a asp-controller="UIServer" asp-action="ListStores" class="dropdown-item @ViewData.ActivePageClass(ServerNavPages.Stores)" id="StoreSelectorAdminStores" text-translate="true">Admin Store Overview</a></li>
                 *@
             </ul>
         </div>

diff --git a/BTCPayServer/Components/ThemeSwitch/Default.cshtml b/BTCPayServer/Components/ThemeSwitch/Default.cshtml
@@ -3,8 +3,8 @@
 <div class="btcpay-theme-switch @Model.CssClass">
     <span class="btcpay-theme-switch-label" text-translate="true">Theme</span>
     <div class="btcpay-theme-switch-themes">
-        <button type="button" title="System" data-theme="system"><vc:icon symbol="themes-system"/></button>
-        <button type="button" title="Light" data-theme="light"><vc:icon symbol="themes-light"/></button>
-        <button type="button" title="Dark" data-theme="dark"><vc:icon symbol="themes-dark"/></button>
+        <button type="button" title="@StringLocalizer["System"]" data-theme="system"><vc:icon symbol="themes-system"/></button>
+        <button type="button" title="@StringLocalizer["Light"]" data-theme="light"><vc:icon symbol="themes-light"/></button>
+        <button type="button" title="@StringLocalizer["Dark"]" data-theme="dark"><vc:icon symbol="themes-dark"/></button>
     </div>
 </div>
diff --git a/BTCPayServer/Components/WalletNav/WalletNav.cs b/BTCPayServer/Components/WalletNav/WalletNav.cs
@@ -1,27 +1,15 @@
 #nullable enable
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Data;
-using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments;
-using BTCPayServer.Payments.Lightning;
-using BTCPayServer.Services;
-using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
-using BTCPayServer.Services.Stores;
 using BTCPayServer.Services.Wallets;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewComponents;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
-using NBitcoin;
-using NBitcoin.Secp256k1;
+using Microsoft.Extensions.Localization;
 
 namespace BTCPayServer.Components.WalletNav
 {
@@ -33,13 +21,15 @@ public class WalletNav : ViewComponent
         private readonly CurrencyNameTable _currencies;
         private readonly DefaultRulesCollection _defaultRules;
         private readonly RateFetcher _rateFetcher;
+        private IStringLocalizer StringLocalizer { get; }
 
         public WalletNav(
             BTCPayWalletProvider walletProvider,
             PaymentMethodHandlerDictionary handlers,
             UIWalletsController walletsController,
             CurrencyNameTable currencies,
             DefaultRulesCollection defaultRules,
+            IStringLocalizer stringLocalizer,
             RateFetcher rateFetcher)
         {
             _walletProvider = walletProvider;
@@ -48,6 +38,7 @@ public WalletNav(
             _currencies = currencies;
             _defaultRules = defaultRules;
             _rateFetcher = rateFetcher;
+            StringLocalizer = stringLocalizer;
         }
 
         public async Task<IViewComponentResult> InvokeAsync(WalletId walletId)
@@ -71,7 +62,7 @@ public async Task<IViewComponentResult> InvokeAsync(WalletId walletId)
                 Network = network,
                 Balance = balance.ShowMoney(network),
                 DefaultCurrency = defaultCurrency,
-                Label = derivation?.Label ?? $"{store.StoreName} {walletId.CryptoCode} Wallet"
+                Label = derivation?.Label ?? $"{store.StoreName} {StringLocalizer["{0} Wallet", walletId.CryptoCode]}"
             };
 
             if (defaultCurrency != network.CryptoCode)

diff --git a/BTCPayServer/Controllers/UIPullPaymentController.Boltcard.cs b/BTCPayServer/Controllers/UIPullPaymentController.Boltcard.cs
@@ -9,6 +9,7 @@
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
 using static BTCPayServer.BoltcardDataExtensions;
 
 namespace BTCPayServer.Controllers
@@ -71,7 +72,7 @@ public async Task<IActionResult> VaultNFCBridgeConnection(string pullPaymentId)
                         var permission = await vaultClient.AskPermission(VaultServices.NFC, cts.Token);
                         if (permission is null)
                         {
-                            await vaultClient.Show(VaultMessageType.Error, "GRSPay Server Vault does not seem to be running, you can download it on <a target=\"_blank\" href=\"https://github.com/Groestlcoin/GRSPayServer.Vault/releases/latest\">Github</a>.", cts.Token);
+                            await vaultClient.Show(VaultMessageType.Error, StringLocalizer["GRSPay Server Vault does not seem to be running, you can download it on {0}.", new HtmlString("<a href=\"https://github.com/Groestlcoin/GRSPayServer.Vault/releases/latest/\" class=\"alert-link\" target=\"_blank\" rel=\"noreferrer noopener\">GitHub</a>")], cts.Token);
                             goto next;
                         }
                         await vaultClient.Show(VaultMessageType.Ok, StringLocalizer["GRSPayServer successfully connected to the vault."], cts.Token);

diff --git a/BTCPayServer/Controllers/UIServerController.Translations.cs b/BTCPayServer/Controllers/UIServerController.Translations.cs
@@ -88,6 +88,9 @@ public async Task<IActionResult> EditDictionary(string dictionary, EditDictionar
                 foreach (var prop in jobj.Properties())
                 {
                     prop.Value = "OK";
+                    if (prop.Name.Contains("{0}")) prop.Value += " {0}";
+                    if (prop.Name.Contains("{1}")) prop.Value += " {1}";
+                    if (prop.Name.Contains("{2}")) prop.Value += " {2}";
                 }
                 viewModel.Translations = Translations.CreateFromJson(jobj.ToString()).ToJsonFormat();
             }

diff --git a/BTCPayServer/Controllers/UIServerController.Users.cs b/BTCPayServer/Controllers/UIServerController.Users.cs
@@ -331,8 +331,8 @@ public async Task<IActionResult> DeleteUser(string userId)
                 }
 
                 return View("Confirm", new ConfirmModel(StringLocalizer["Delete admin"],
-                    $"The admin <strong>{Html.Encode(user.Email)}</strong> will be permanently deleted. This action will also delete all accounts, users and data associated with the server account. Are you sure?",
-                    "Delete"));
+                    StringLocalizer["The admin {0} will be permanently deleted. This action will also delete all accounts, users and data associated with the server account. Are you sure?", Html.Encode(user.Email)],
+                    StringLocalizer["Delete"]));
             }
 
             return View("Confirm", new ConfirmModel(StringLocalizer["Delete user"], $"The user <strong>{Html.Encode(user.Email)}</strong> will be permanently deleted. Are you sure?", "Delete"));

diff --git a/BTCPayServer/Filters/DomainMappingConstraintAttribute.cs b/BTCPayServer/Filters/DomainMappingConstraintAttribute.cs
@@ -46,6 +46,8 @@ public bool Accept(ActionConstraintContext context)
                     var uri = new UriBuilder(req.Scheme, redirectDomain);
                     if (req.Host.Port.HasValue)
                         uri.Port = req.Host.Port.Value;
+                    if (req.QueryString.HasValue)
+                        uri.Query = req.QueryString.Value!;
                     context.RouteContext.HttpContext.Response.Redirect(uri.ToString());
                 }
                 return true;

diff --git a/BTCPayServer/Forms/ModifyForm.cs b/BTCPayServer/Forms/ModifyForm.cs
@@ -4,6 +4,7 @@ namespace BTCPayServer.Forms;
 
 public class ModifyForm
 {
+    [DisplayName("Name")]
     public string Name { get; set; }
 
     [DisplayName("Form configuration (JSON)")]