Merge remote-tracking branch 'upstream/master'

BTCPayServer.Client/BTCPayServerClient.Apps.cs

@@ -78,4 +78,14 @@ public virtual async Task DeleteApp(string appId, CancellationToken token = defa
         if (appId == null) throw new ArgumentNullException(nameof(appId));
         await SendHttpRequest($"api/v1/apps/{appId}", null, HttpMethod.Delete, token);
     }
+
+    public virtual async Task<FileData> UploadAppItemImage(string appId, string filePath, string mimeType, CancellationToken token = default)
+    {
+        return await UploadFileRequest<FileData>($"api/v1/apps/{appId}/image", filePath, mimeType, "file", HttpMethod.Post, token);
+    }
+
+    public virtual async Task DeleteAppItemImage(string appId, string fileId, CancellationToken token = default)
+    {
+        await SendHttpRequest($"api/v1/apps/{appId}/image/{fileId}", null, HttpMethod.Delete, token);
+    }
 }

BTCPayServer.Client/BTCPayServerClient.cs

@@ -156,7 +156,7 @@ protected virtual HttpRequestMessage CreateHttpRequest<T>(string path,
     protected virtual async Task<T> UploadFileRequest<T>(string apiPath, string filePath, string mimeType, string formFieldName, HttpMethod method = null, CancellationToken token = default)
     {
         using MultipartFormDataContent multipartContent = new();
-        var fileContent = new StreamContent(File.OpenRead(filePath));
+        using var fileContent = new StreamContent(File.OpenRead(filePath));
         var fileName = Path.GetFileName(filePath);
         fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(mimeType);
         multipartContent.Add(fileContent, formFieldName, fileName);

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -7,7 +7,4 @@
     <PackageReference Include="NBXplorer.Client" Version="4.3.1" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="2.0.1" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Altcoins\" />
-  </ItemGroup>
 </Project>

BTCPayServer.Tests/GreenfieldAPITests.cs

@@ -318,6 +318,20 @@ await AssertValidationError(["file"],
             Assert.Empty(await client.GetFiles());
             storeData = await client.GetStore(store.Id);
             Assert.Null(storeData.LogoUrl);
+
+            // App Item Image
+            var app = await client.CreatePointOfSaleApp(store.Id, new PointOfSaleAppRequest { AppName = "Test App" });
+            await AssertValidationError(["file"],
+                async () => await client.UploadAppItemImage(app.Id, filePath, "text/csv")
+            );
+
+            var fileData = await client.UploadAppItemImage(app.Id, logoPath, "image/png");
+            Assert.Equal("logo.png", fileData.OriginalName);
+            files = await client.GetFiles();
+            Assert.Single(files);
+
+            await client.DeleteAppItemImage(app.Id, fileData.Id);
+            Assert.Empty(await client.GetFiles());
         }
 
         [Fact(Timeout = TestTimeout)]

BTCPayServer/ColorPalette.cs

@@ -110,5 +110,10 @@ public Color FromHtml(string html)
         {
             return ColorTranslator.FromHtml(html);
         }
+
+        public string ToHtml(Color color)
+        {
+            return ColorTranslator.ToHtml(color);
+        }
     }
 }

BTCPayServer/Components/AppSales/AppSales.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Security.AccessControl;
 using System.Threading.Tasks;
-using BTCPayServer.Data;
-using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Services.Apps;
-using BTCPayServer.Services.Stores;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewComponents;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;

BTCPayServer/Components/AppSales/AppSalesViewModel.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using BTCPayServer.Client.Models;
-using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.Components.AppSales;
 

BTCPayServer/Components/AppSales/Default.cshtml.js

@@ -45,7 +45,6 @@ if (!window.appSales) {
 
             function addEventListeners() {
                 delegate('change', `#${id} [name="AppSalesPeriod-${appId}"]`, async e => {
-                    console.log("CHANGED", id)
                     const type = e.target.value;
                     await update(type);
                 });

BTCPayServer/Components/StoreLightningBalance/StoreLightningBalanceViewModel.cs

@@ -4,7 +4,6 @@
 using BTCPayServer.Lightning;
 using BTCPayServer.Services.Rates;
 using NBitcoin;
-using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Components.StoreLightningBalance;
 

BTCPayServer/Components/StoreLightningServices/Default.cshtml

@@ -2,14 +2,14 @@
 
 @if (Model.Services != null && Model.Services.Any())
 {
-    <div id="StoreLightningServices-@Model.Store.Id" class="widget store-lightning-services">
+    <div id="StoreLightningServices-@Model.StoreId" class="widget store-lightning-services">
         <header class="mb-4">
             <h6 text-translate="true">Lightning Services</h6>
             <a
                 asp-controller="UIPublicLightningNodeInfo"
                 asp-action="ShowLightningNodeInfo"app-top-items
                 asp-route-cryptoCode="@Model.CryptoCode"
-                asp-route-storeId="@Model.Store.Id"
+                asp-route-storeId="@Model.StoreId"
                 target="_blank"
                 id="PublicNodeInfo"
                 text-translate="true">

BTCPayServer/Components/StoreLightningServices/StoreLightningServices.cs

@@ -2,15 +2,16 @@
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Client;
 using BTCPayServer.Configuration;
 using BTCPayServer.Data;
-using BTCPayServer.Lightning;
 using BTCPayServer.Models;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
-using BTCPayServer.Services;
-using BTCPayServer.Services.Stores;
+using BTCPayServer.Security;
+using BTCPayServer.Services.Invoices;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
@@ -20,24 +21,38 @@ public class StoreLightningServices : ViewComponent
 {
     private readonly BTCPayServerOptions _btcpayServerOptions;
     private readonly BTCPayNetworkProvider _networkProvider;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly PaymentMethodHandlerDictionary _handlers;
+    private readonly IOptions<LightningNetworkOptions> _lightningNetworkOptions;
     private readonly IOptions<ExternalServicesOptions> _externalServiceOptions;
 
     public StoreLightningServices(
         BTCPayNetworkProvider networkProvider,
         BTCPayServerOptions btcpayServerOptions,
+        IAuthorizationService authorizationService,
+        PaymentMethodHandlerDictionary handlers,
+        IOptions<LightningNetworkOptions> lightningNetworkOptions,
         IOptions<ExternalServicesOptions> externalServiceOptions)
     {
         _networkProvider = networkProvider;
         _btcpayServerOptions = btcpayServerOptions;
+        _lightningNetworkOptions = lightningNetworkOptions;
         _externalServiceOptions = externalServiceOptions;
+        _authorizationService = authorizationService;
+        _handlers = handlers;
     }
 
-    public IViewComponentResult Invoke(StoreLightningServicesViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
+        var vm = new StoreLightningServicesViewModel { StoreId = store.Id, CryptoCode = cryptoCode };
+        var id = PaymentTypes.LN.GetPaymentMethodId(cryptoCode);
+        var existing = store.GetPaymentMethodConfig<LightningPaymentMethodConfig>(id, _handlers);
+        if (existing?.IsInternalNode is true && _lightningNetworkOptions.Value.InternalLightningByCryptoCode.TryGetValue(cryptoCode, out _))
+        {
+            var result = await _authorizationService.AuthorizeAsync(HttpContext.User, null, new PolicyRequirement(Policies.CanUseInternalLightningNode));
+            vm.LightningNodeType = result.Succeeded ? LightningNodeType.Internal : null;
+        }
+
         if (vm.LightningNodeType != LightningNodeType.Internal)
             return View(vm);
         if (!User.IsInRole(Roles.ServerAdmin))

BTCPayServer/Components/StoreLightningServices/StoreLightningServicesViewModel.cs

@@ -8,8 +8,8 @@ namespace BTCPayServer.Components.StoreLightningServices;
 
 public class StoreLightningServicesViewModel
 {
+    public string StoreId { get; set; }
     public string CryptoCode { get; set; }
-    public StoreData Store { get; set; }
-    public LightningNodeType LightningNodeType { get; set; }
+    public LightningNodeType? LightningNodeType { get; set; }
     public List<AdditionalServiceViewModel> Services { get; set; }
 }

BTCPayServer/Components/StoreNumbers/Default.cshtml

@@ -1,7 +1,7 @@
 @using BTCPayServer.Client
 @model BTCPayServer.Components.StoreNumbers.StoreNumbersViewModel
 
-<div class="widget store-numbers" id="StoreNumbers-@Model.Store.Id">
+<div class="widget store-numbers" id="StoreNumbers-@Model.StoreId">
     @if (Model.InitialRendering)
     {
         <div class="loading d-flex justify-content-center p-3">
@@ -11,8 +11,8 @@
         </div>
         <script>
             (async () => {
-                const url = @Safe.Json(Url.Action("StoreNumbers", "UIStores", new { storeId = Model.Store.Id, cryptoCode = Model.CryptoCode }));
-                const storeId = @Safe.Json(Model.Store.Id);
+                const url = @Safe.Json(Url.Action("StoreNumbers", "UIStores", new { storeId = Model.StoreId, cryptoCode = Model.CryptoCode }));
+                const storeId = @Safe.Json(Model.StoreId);
                 const response = await fetch(url);
                 if (response.ok) {
                     document.getElementById(`StoreNumbers-${storeId}`).outerHTML = await response.text();
@@ -24,18 +24,18 @@
     {
         <div class="store-number">
             <header>
-                <h6 text-translate="true">@ViewLocalizer["Paid invoices in the last {0} days", @Model.TimeframeDays]</h6>
+                <h6 text-translate="true">@ViewLocalizer["Paid invoices in the last {0} days", Model.TimeframeDays]</h6>
                 @if (Model.PaidInvoices > 0)
                 {
-                    <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.Store.Id"  permission="@Policies.CanViewInvoices">View All</a>
+                    <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.StoreId"  permission="@Policies.CanViewInvoices" text-translate="true">View All</a>
                 }
             </header>
             <div class="h3">@Model.PaidInvoices</div>
         </div>
         <div class="store-number">
             <header>
                 <h6 text-translate="true">Payouts Pending</h6>
-                <a asp-controller="UIStorePullPayments" asp-action="Payouts" asp-route-storeId="@Model.Store.Id" permission="@Policies.CanManagePullPayments" text-translate="true">Manage</a>
+                <a asp-controller="UIStorePullPayments" asp-action="Payouts" asp-route-storeId="@Model.StoreId" permission="@Policies.CanManagePullPayments" text-translate="true">Manage</a>
             </header>
             <div class="h3">@Model.PayoutsPending</div>
         </div>

BTCPayServer/Components/StoreNumbers/StoreNumbers.cs

@@ -1,19 +1,12 @@
 using System;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
-using BTCPayServer.Components.StoreRecentTransactions;
 using BTCPayServer.Data;
-using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Stores;
-using BTCPayServer.Services.Wallets;
-using Dapper;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Npgsql;
 using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Components.StoreNumbers;
@@ -34,14 +27,15 @@ public StoreNumbers(
         _invoiceRepository = invoiceRepository;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(StoreNumbersViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode, bool initialRendering)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
-
-        vm.WalletId = new WalletId(vm.Store.Id, vm.CryptoCode);
+        var vm = new StoreNumbersViewModel
+        {
+            StoreId = store.Id,
+            CryptoCode = cryptoCode,
+            InitialRendering = initialRendering,
+            WalletId = new WalletId(store.Id, cryptoCode)
+        };
 
         if (vm.InitialRendering)
             return View(vm);
@@ -50,12 +44,12 @@ public async Task<IViewComponentResult> InvokeAsync(StoreNumbersViewModel vm)
         var offset = DateTimeOffset.Now.AddDays(-vm.TimeframeDays).ToUniversalTime();
 
         vm.PaidInvoices = await _invoiceRepository.GetInvoiceCount(
-            new InvoiceQuery { StoreId = new [] { vm.Store.Id }, StartDate = offset, Status = new [] { "paid", "confirmed" } });
+            new InvoiceQuery { StoreId = [store.Id], StartDate = offset, Status = ["paid", "confirmed"] });
         vm.PayoutsPending = await ctx.Payouts
-            .Where(p => p.PullPaymentData.StoreId == vm.Store.Id && !p.PullPaymentData.Archived && p.State == PayoutState.AwaitingApproval)
+            .Where(p => p.PullPaymentData.StoreId == store.Id && !p.PullPaymentData.Archived && p.State == PayoutState.AwaitingApproval)
             .CountAsync();
         vm.RefundsIssued = await ctx.Invoices
-            .Where(i => i.StoreData.Id == vm.Store.Id && !i.Archived && i.Created >= offset)
+            .Where(i => i.StoreData.Id == store.Id && !i.Archived && i.Created >= offset)
             .SelectMany(i => i.Refunds)
             .CountAsync();
 

BTCPayServer/Components/StoreNumbers/StoreNumbersViewModel.cs

@@ -1,10 +1,8 @@
-using BTCPayServer.Data;
-
 namespace BTCPayServer.Components.StoreNumbers;
 
 public class StoreNumbersViewModel
 {
-    public StoreData Store { get; set; }
+    public string StoreId { get; set; }
     public WalletId WalletId { get; set; }
     public int PayoutsPending { get; set; }
     public int TimeframeDays { get; set; } = 7;

BTCPayServer/Components/StoreRecentInvoices/Default.cshtml

@@ -1,15 +1,14 @@
 @using BTCPayServer.Client.Models
 @using BTCPayServer.Services
-@using BTCPayServer.Services.Invoices
 @inject DisplayFormatter DisplayFormatter
 @model BTCPayServer.Components.StoreRecentInvoices.StoreRecentInvoicesViewModel
 
-<div class="widget store-recent-invoices" id="StoreRecentInvoices-@Model.Store.Id">
+<div class="widget store-recent-invoices" id="StoreRecentInvoices-@Model.StoreId">
     <header>
         <h3 text-translate="true">Recent Invoices</h3>
         @if (Model.Invoices.Any())
         {
-            <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.Store.Id" text-translate="true">View All</a>
+            <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" text-translate="true">View All</a>
         }
     </header>
     @if (Model.InitialRendering)
@@ -21,8 +20,8 @@
         </div>
         <script>
             (async () => {
-                const url = @Safe.Json(Url.Action("RecentInvoices", "UIStores", new { storeId = Model.Store.Id, cryptoCode = Model.CryptoCode }));
-                const storeId = @Safe.Json(Model.Store.Id);
+                const url = @Safe.Json(Url.Action("RecentInvoices", "UIStores", new { storeId = Model.StoreId, cryptoCode = Model.CryptoCode }));
+                const storeId = @Safe.Json(Model.StoreId);
                 const response = await fetch(url);
                 if (response.ok) {
                     document.getElementById(`StoreRecentInvoices-${storeId}`).outerHTML = await response.text();
@@ -68,7 +67,7 @@
         <p class="text-secondary my-3" text-translate="true">
             There are no recent invoices.
         </p>
-        <a asp-controller="UIInvoice" asp-action="CreateInvoice" asp-route-storeId="@Model.Store.Id" class="fw-semibold" text-translate="true">
+        <a asp-controller="UIInvoice" asp-action="CreateInvoice" asp-route-storeId="@Model.StoreId" class="fw-semibold" text-translate="true">
             Create Invoice
         </a>
     }

BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
@@ -9,7 +7,6 @@
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using NBitcoin;
 
 namespace BTCPayServer.Components.StoreRecentInvoices;
 
@@ -35,20 +32,23 @@ public StoreRecentInvoices(
         _dbContextFactory = dbContextFactory;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(StoreRecentInvoicesViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode, bool initialRendering)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
+        var vm = new StoreRecentInvoicesViewModel
+        {
+            StoreId = store.Id,
+            CryptoCode = cryptoCode,
+            InitialRendering = initialRendering
+        };
+
         if (vm.InitialRendering)
             return View(vm);
 
         var userId = _userManager.GetUserId(UserClaimsPrincipal);
         var invoiceEntities = await _invoiceRepo.GetInvoices(new InvoiceQuery
         {
             UserId = userId,
-            StoreId = new[] { vm.Store.Id },
+            StoreId = [store.Id],
             IncludeArchived = false,
             IncludeRefunds = true,
             Take = 5

BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoicesViewModel.cs

@@ -5,7 +5,7 @@ namespace BTCPayServer.Components.StoreRecentInvoices;
 
 public class StoreRecentInvoicesViewModel
 {
-    public StoreData Store { get; set; }
+    public string StoreId { get; set; }
     public IList<StoreRecentInvoiceViewModel> Invoices { get; set; } = new List<StoreRecentInvoiceViewModel>();
     public bool InitialRendering { get; set; }
     public string CryptoCode { get; set; }