From eaf47d3739e01e3bcc64c364afbe09af612d2969 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 7 Jan 2022 12:08:28 +0900 Subject: [PATCH 1/4] Rename controllers Bitpay controllers --- BTCPayServer.Tests/UnitTest1.cs | 4 ++-- ...ccessTokenController.cs => BitpayAccessTokenController.cs} | 4 ++-- .../{InvoiceController.API.cs => BitpayInvoiceController.cs} | 4 ++-- .../{RateController.cs => BitpayRateController.cs} | 4 ++-- BTCPayServer/Controllers/StoresController.cs | 4 ++-- BTCPayServer/Hosting/BTCPayServerServices.cs | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename BTCPayServer/Controllers/{AccessTokenController.cs => BitpayAccessTokenController.cs} (96%) rename BTCPayServer/Controllers/{InvoiceController.API.cs => BitpayInvoiceController.cs} (96%) rename BTCPayServer/Controllers/{RateController.cs => BitpayRateController.cs} (98%) diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs index 40d8a694c..bd2922f8e 100644 --- a/BTCPayServer.Tests/UnitTest1.cs +++ b/BTCPayServer.Tests/UnitTest1.cs @@ -889,7 +889,7 @@ namespace BTCPayServer.Tests acc.GrantAccess(); acc.RegisterDerivationScheme("BTC"); - var rateController = acc.GetController(); + var rateController = acc.GetController(); var GetBaseCurrencyRatesResult = JObject.Parse(((JsonResult)rateController .GetBaseCurrencyRates("BTC", default) .GetAwaiter().GetResult()).Value.ToJson()).ToObject>(); @@ -908,7 +908,7 @@ namespace BTCPayServer.Tests ratesVM.DefaultCurrencyPairs = "BTC_USD,LTC_USD"; await store.Rates(ratesVM); store = acc.GetController(); - rateController = acc.GetController(); + rateController = acc.GetController(); GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, default) .GetAwaiter().GetResult()).Value.ToJson()).ToObject>(); // Now we should have a result diff --git a/BTCPayServer/Controllers/AccessTokenController.cs b/BTCPayServer/Controllers/BitpayAccessTokenController.cs similarity index 96% rename from BTCPayServer/Controllers/AccessTokenController.cs rename to BTCPayServer/Controllers/BitpayAccessTokenController.cs index 844c7a998..205cffb13 100644 --- a/BTCPayServer/Controllers/AccessTokenController.cs +++ b/BTCPayServer/Controllers/BitpayAccessTokenController.cs @@ -12,10 +12,10 @@ namespace BTCPayServer.Controllers { [Authorize(AuthenticationSchemes = AuthenticationSchemes.Bitpay)] [BitpayAPIConstraint()] - public class AccessTokenController : Controller + public class BitpayAccessTokenController : Controller { readonly TokenRepository _TokenRepository; - public AccessTokenController(TokenRepository tokenRepository) + public BitpayAccessTokenController(TokenRepository tokenRepository) { _TokenRepository = tokenRepository ?? throw new ArgumentNullException(nameof(tokenRepository)); } diff --git a/BTCPayServer/Controllers/InvoiceController.API.cs b/BTCPayServer/Controllers/BitpayInvoiceController.cs similarity index 96% rename from BTCPayServer/Controllers/InvoiceController.API.cs rename to BTCPayServer/Controllers/BitpayInvoiceController.cs index 520601ff6..0affe1e93 100644 --- a/BTCPayServer/Controllers/InvoiceController.API.cs +++ b/BTCPayServer/Controllers/BitpayInvoiceController.cs @@ -16,12 +16,12 @@ namespace BTCPayServer.Controllers { [BitpayAPIConstraint] [Authorize(Policies.CanCreateInvoice, AuthenticationSchemes = AuthenticationSchemes.Bitpay)] - public class InvoiceControllerAPI : Controller + public class BitpayInvoiceController : Controller { private readonly InvoiceController _InvoiceController; private readonly InvoiceRepository _InvoiceRepository; - public InvoiceControllerAPI(InvoiceController invoiceController, + public BitpayInvoiceController(InvoiceController invoiceController, InvoiceRepository invoiceRepository) { _InvoiceController = invoiceController; diff --git a/BTCPayServer/Controllers/RateController.cs b/BTCPayServer/Controllers/BitpayRateController.cs similarity index 98% rename from BTCPayServer/Controllers/RateController.cs rename to BTCPayServer/Controllers/BitpayRateController.cs index cea64e559..4c4819113 100644 --- a/BTCPayServer/Controllers/RateController.cs +++ b/BTCPayServer/Controllers/BitpayRateController.cs @@ -23,7 +23,7 @@ namespace BTCPayServer.Controllers { [EnableCors(CorsPolicies.All)] [Authorize(Policy = ServerPolicies.CanGetRates.Key, AuthenticationSchemes = AuthenticationSchemes.Bitpay)] - public class RateController : Controller + public class BitpayRateController : Controller { public StoreData CurrentStore { @@ -40,7 +40,7 @@ namespace BTCPayServer.Controllers public TokenRepository TokenRepository { get; } - public RateController( + public BitpayRateController( RateFetcher rateProviderFactory, BTCPayNetworkProvider networkProvider, TokenRepository tokenRepository, diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs index b839d18b7..f128c041a 100644 --- a/BTCPayServer/Controllers/StoresController.cs +++ b/BTCPayServer/Controllers/StoresController.cs @@ -47,7 +47,7 @@ namespace BTCPayServer.Controllers StoreRepository repo, TokenRepository tokenRepo, UserManager userManager, - AccessTokenController tokenController, + BitpayAccessTokenController tokenController, BTCPayWalletProvider walletProvider, BTCPayNetworkProvider networkProvider, RateFetcher rateFactory, @@ -90,7 +90,7 @@ namespace BTCPayServer.Controllers readonly BTCPayNetworkProvider _NetworkProvider; private readonly ExplorerClientProvider _ExplorerProvider; readonly BTCPayWalletProvider _WalletProvider; - readonly AccessTokenController _TokenController; + readonly BitpayAccessTokenController _TokenController; readonly StoreRepository _Repo; readonly TokenRepository _TokenRepository; readonly UserManager _UserManager; diff --git a/BTCPayServer/Hosting/BTCPayServerServices.cs b/BTCPayServer/Hosting/BTCPayServerServices.cs index 65a4de617..56a69097d 100644 --- a/BTCPayServer/Hosting/BTCPayServerServices.cs +++ b/BTCPayServer/Hosting/BTCPayServerServices.cs @@ -381,7 +381,7 @@ namespace BTCPayServer.Hosting services.TryAddSingleton(); services.TryAddScoped(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); From ce43de0c572bbf33f4fc0aa278473c6c066916e9 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 7 Jan 2022 12:17:59 +0900 Subject: [PATCH 2/4] Rename greenfield controllers --- ...ller.cs => GreenfieldApiKeysController.cs} | 4 +- ...oller.cs => GreenfieldHealthController.cs} | 4 +- ...ller.cs => GreenfieldInvoiceController.cs} | 4 +- ...eldLightningNodeApiController.Internal.cs} | 4 +- ...nfieldLightningNodeApiController.Store.cs} | 4 +- ...> GreenfieldLightningNodeApiController.cs} | 4 +- ...s => GreenfieldNotificationsController.cs} | 4 +- ...=> GreenfieldPaymentRequestsController.cs} | 4 +- ....cs => GreenfieldPullPaymentController.cs} | 0 ...r.cs => GreenfieldServerInfoController.cs} | 4 +- ...dStoreLNURLPayPaymentMethodsController.cs} | 6 +- ...ghtningNetworkPaymentMethodsController.cs} | 4 +- ...mentMethodsController.WalletGeneration.cs} | 2 +- ...ldStoreOnChainPaymentMethodsController.cs} | 4 +- ...reenfieldStoreOnChainWalletsController.cs} | 4 +- ...reenfieldStorePaymentMethodsController.cs} | 4 +- ...s => GreenfieldStoreWebhooksController.cs} | 2 +- ...oller.cs => GreenfieldStoresController.cs} | 4 +- ...r.cs => GreenfieldTestApiKeyController.cs} | 4 +- ...roller.cs => GreenfieldUsersController.cs} | 4 +- .../GreenField/LocalBTCPayServerClient.cs | 128 +++++++++--------- BTCPayServer/HostedServices/WebhookSender.cs | 4 +- 22 files changed, 103 insertions(+), 103 deletions(-) rename BTCPayServer/Controllers/GreenField/{ApiKeysController.cs => GreenfieldApiKeysController.cs} (95%) rename BTCPayServer/Controllers/GreenField/{HealthController.cs => GreenfieldHealthController.cs} (83%) rename BTCPayServer/Controllers/GreenField/{InvoiceController.cs => GreenfieldInvoiceController.cs} (99%) rename BTCPayServer/Controllers/GreenField/{LightningNodeApiController.Internal.cs => GreenfieldLightningNodeApiController.Internal.cs} (97%) rename BTCPayServer/Controllers/GreenField/{LightningNodeApiController.Store.cs => GreenfieldLightningNodeApiController.Store.cs} (97%) rename BTCPayServer/Controllers/GreenField/{LightningNodeApiController.cs => GreenfieldLightningNodeApiController.cs} (98%) rename BTCPayServer/Controllers/GreenField/{NotificationsController.cs => GreenfieldNotificationsController.cs} (96%) rename BTCPayServer/Controllers/GreenField/{PaymentRequestsController.cs => GreenfieldPaymentRequestsController.cs} (98%) rename BTCPayServer/Controllers/GreenField/{PullPaymentController.cs => GreenfieldPullPaymentController.cs} (100%) rename BTCPayServer/Controllers/GreenField/{ServerInfoController.cs => GreenfieldServerInfoController.cs} (95%) rename BTCPayServer/Controllers/GreenField/{StoreLNURLPayPaymentMethodsController.cs => GreenfieldStoreLNURLPayPaymentMethodsController.cs} (96%) rename BTCPayServer/Controllers/GreenField/{StoreLightningNetworkPaymentMethodsController.cs => GreenfieldStoreLightningNetworkPaymentMethodsController.cs} (98%) rename BTCPayServer/Controllers/GreenField/{StoreOnChainPaymentMethodsController.WalletGeneration.cs => GreenfieldStoreOnChainPaymentMethodsController.WalletGeneration.cs} (98%) rename BTCPayServer/Controllers/GreenField/{StoreOnChainPaymentMethodsController.cs => GreenfieldStoreOnChainPaymentMethodsController.cs} (98%) rename BTCPayServer/Controllers/GreenField/{StoreOnChainWalletsController.cs => GreenfieldStoreOnChainWalletsController.cs} (99%) rename BTCPayServer/Controllers/GreenField/{StorePaymentMethodsController.cs => GreenfieldStorePaymentMethodsController.cs} (91%) rename BTCPayServer/Controllers/GreenField/{StoreWebhooksController.cs => GreenfieldStoreWebhooksController.cs} (99%) rename BTCPayServer/Controllers/GreenField/{StoresController.cs => GreenfieldStoresController.cs} (98%) rename BTCPayServer/Controllers/GreenField/{TestApiKeyController.cs => GreenfieldTestApiKeyController.cs} (91%) rename BTCPayServer/Controllers/GreenField/{UsersController.cs => GreenfieldUsersController.cs} (98%) diff --git a/BTCPayServer/Controllers/GreenField/ApiKeysController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldApiKeysController.cs similarity index 95% rename from BTCPayServer/Controllers/GreenField/ApiKeysController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldApiKeysController.cs index 3a1c770a0..be8fee266 100644 --- a/BTCPayServer/Controllers/GreenField/ApiKeysController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldApiKeysController.cs @@ -18,12 +18,12 @@ namespace BTCPayServer.Controllers.GreenField [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.GreenfieldAPIKeys)] [EnableCors(CorsPolicies.All)] - public class ApiKeysController : ControllerBase + public class GreenfieldApiKeysController : ControllerBase { private readonly APIKeyRepository _apiKeyRepository; private readonly UserManager _userManager; - public ApiKeysController(APIKeyRepository apiKeyRepository, UserManager userManager) + public GreenfieldApiKeysController(APIKeyRepository apiKeyRepository, UserManager userManager) { _apiKeyRepository = apiKeyRepository; _userManager = userManager; diff --git a/BTCPayServer/Controllers/GreenField/HealthController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldHealthController.cs similarity index 83% rename from BTCPayServer/Controllers/GreenField/HealthController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldHealthController.cs index 05aa47cb2..6d19a3494 100644 --- a/BTCPayServer/Controllers/GreenField/HealthController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldHealthController.cs @@ -8,11 +8,11 @@ namespace BTCPayServer.Controllers.GreenField { [Controller] [EnableCors(CorsPolicies.All)] - public class HealthController : ControllerBase + public class GreenfieldHealthController : ControllerBase { private readonly NBXplorerDashboard _dashBoard; - public HealthController(NBXplorerDashboard dashBoard) + public GreenfieldHealthController(NBXplorerDashboard dashBoard) { _dashBoard = dashBoard; } diff --git a/BTCPayServer/Controllers/GreenField/InvoiceController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs similarity index 99% rename from BTCPayServer/Controllers/GreenField/InvoiceController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs index 72f5f1396..1f5dc272a 100644 --- a/BTCPayServer/Controllers/GreenField/InvoiceController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs @@ -22,7 +22,7 @@ namespace BTCPayServer.Controllers.GreenField [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] [EnableCors(CorsPolicies.All)] - public class GreenFieldInvoiceController : Controller + public class GreenfieldInvoiceController : Controller { private readonly InvoiceController _invoiceController; private readonly InvoiceRepository _invoiceRepository; @@ -33,7 +33,7 @@ namespace BTCPayServer.Controllers.GreenField public LanguageService LanguageService { get; } - public GreenFieldInvoiceController(InvoiceController invoiceController, InvoiceRepository invoiceRepository, + public GreenfieldInvoiceController(InvoiceController invoiceController, InvoiceRepository invoiceRepository, LinkGenerator linkGenerator, LanguageService languageService, BTCPayNetworkProvider btcPayNetworkProvider, EventAggregator eventAggregator, PaymentMethodHandlerDictionary paymentMethodHandlerDictionary) { diff --git a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Internal.cs b/BTCPayServer/Controllers/GreenField/GreenfieldLightningNodeApiController.Internal.cs similarity index 97% rename from BTCPayServer/Controllers/GreenField/LightningNodeApiController.Internal.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldLightningNodeApiController.Internal.cs index 9b59b80d8..6019f1c72 100644 --- a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Internal.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldLightningNodeApiController.Internal.cs @@ -19,14 +19,14 @@ namespace BTCPayServer.Controllers.GreenField [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] [LightningUnavailableExceptionFilter] [EnableCors(CorsPolicies.All)] - public class InternalLightningNodeApiController : LightningNodeApiController + public class GreenfieldInternalLightningNodeApiController : GreenfieldLightningNodeApiController { private readonly BTCPayNetworkProvider _btcPayNetworkProvider; private readonly LightningClientFactoryService _lightningClientFactory; private readonly IOptions _lightningNetworkOptions; - public InternalLightningNodeApiController( + public GreenfieldInternalLightningNodeApiController( BTCPayNetworkProvider btcPayNetworkProvider, ISettingsRepository settingsRepository, LightningClientFactoryService lightningClientFactory, IOptions lightningNetworkOptions, IAuthorizationService authorizationService) : base( diff --git a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Store.cs b/BTCPayServer/Controllers/GreenField/GreenfieldLightningNodeApiController.Store.cs similarity index 97% rename from BTCPayServer/Controllers/GreenField/LightningNodeApiController.Store.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldLightningNodeApiController.Store.cs index 90c6e1ee0..747e1f2b3 100644 --- a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.Store.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldLightningNodeApiController.Store.cs @@ -23,13 +23,13 @@ namespace BTCPayServer.Controllers.GreenField [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] [LightningUnavailableExceptionFilter] [EnableCors(CorsPolicies.All)] - public class StoreLightningNodeApiController : LightningNodeApiController + public class GreenfieldStoreLightningNodeApiController : GreenfieldLightningNodeApiController { private readonly IOptions _lightningNetworkOptions; private readonly LightningClientFactoryService _lightningClientFactory; private readonly BTCPayNetworkProvider _btcPayNetworkProvider; - public StoreLightningNodeApiController( + public GreenfieldStoreLightningNodeApiController( IOptions lightningNetworkOptions, LightningClientFactoryService lightningClientFactory, BTCPayNetworkProvider btcPayNetworkProvider, ISettingsRepository settingsRepository, diff --git a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldLightningNodeApiController.cs similarity index 98% rename from BTCPayServer/Controllers/GreenField/LightningNodeApiController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldLightningNodeApiController.cs index dd3536fe1..a1450b27e 100644 --- a/BTCPayServer/Controllers/GreenField/LightningNodeApiController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldLightningNodeApiController.cs @@ -24,12 +24,12 @@ namespace BTCPayServer.Controllers.GreenField // Do not mark handled, it is possible filters above have better errors } } - public abstract class LightningNodeApiController : Controller + public abstract class GreenfieldLightningNodeApiController : Controller { private readonly BTCPayNetworkProvider _btcPayNetworkProvider; private readonly ISettingsRepository _settingsRepository; private readonly IAuthorizationService _authorizationService; - protected LightningNodeApiController(BTCPayNetworkProvider btcPayNetworkProvider, + protected GreenfieldLightningNodeApiController(BTCPayNetworkProvider btcPayNetworkProvider, ISettingsRepository settingsRepository, IAuthorizationService authorizationService) { diff --git a/BTCPayServer/Controllers/GreenField/NotificationsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldNotificationsController.cs similarity index 96% rename from BTCPayServer/Controllers/GreenField/NotificationsController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldNotificationsController.cs index 85e351b78..bf97d1110 100644 --- a/BTCPayServer/Controllers/GreenField/NotificationsController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldNotificationsController.cs @@ -18,12 +18,12 @@ namespace BTCPayServer.Controllers.GreenField [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] [EnableCors(CorsPolicies.All)] - public class NotificationsController : ControllerBase + public class GreenfieldNotificationsController : ControllerBase { private readonly UserManager _userManager; private readonly NotificationManager _notificationManager; - public NotificationsController(UserManager userManager, + public GreenfieldNotificationsController(UserManager userManager, NotificationManager notificationManager) { _userManager = userManager; diff --git a/BTCPayServer/Controllers/GreenField/PaymentRequestsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldPaymentRequestsController.cs similarity index 98% rename from BTCPayServer/Controllers/GreenField/PaymentRequestsController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldPaymentRequestsController.cs index b74a12a42..524f97ac0 100644 --- a/BTCPayServer/Controllers/GreenField/PaymentRequestsController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldPaymentRequestsController.cs @@ -19,12 +19,12 @@ namespace BTCPayServer.Controllers.GreenField [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] [EnableCors(CorsPolicies.All)] - public class GreenFieldPaymentRequestsController : ControllerBase + public class GreenfieldPaymentRequestsController : ControllerBase { private readonly PaymentRequestRepository _paymentRequestRepository; private readonly CurrencyNameTable _currencyNameTable; - public GreenFieldPaymentRequestsController(PaymentRequestRepository paymentRequestRepository, + public GreenfieldPaymentRequestsController(PaymentRequestRepository paymentRequestRepository, CurrencyNameTable currencyNameTable) { _paymentRequestRepository = paymentRequestRepository; diff --git a/BTCPayServer/Controllers/GreenField/PullPaymentController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs similarity index 100% rename from BTCPayServer/Controllers/GreenField/PullPaymentController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs diff --git a/BTCPayServer/Controllers/GreenField/ServerInfoController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldServerInfoController.cs similarity index 95% rename from BTCPayServer/Controllers/GreenField/ServerInfoController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldServerInfoController.cs index 5b9a3e2de..58466b50e 100644 --- a/BTCPayServer/Controllers/GreenField/ServerInfoController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldServerInfoController.cs @@ -14,13 +14,13 @@ namespace BTCPayServer.Controllers.GreenField { [ApiController] [EnableCors(CorsPolicies.All)] - public class GreenFieldServerInfoController : Controller + public class GreenfieldServerInfoController : Controller { private readonly BTCPayServerEnvironment _env; private readonly PaymentMethodHandlerDictionary _paymentMethodHandlerDictionary; private readonly IEnumerable _summaryProviders; - public GreenFieldServerInfoController( + public GreenfieldServerInfoController( BTCPayServerEnvironment env, PaymentMethodHandlerDictionary paymentMethodHandlerDictionary, IEnumerable summaryProviders) diff --git a/BTCPayServer/Controllers/GreenField/StoreLNURLPayPaymentMethodsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoreLNURLPayPaymentMethodsController.cs similarity index 96% rename from BTCPayServer/Controllers/GreenField/StoreLNURLPayPaymentMethodsController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldStoreLNURLPayPaymentMethodsController.cs index 42052dd58..9ce37657c 100644 --- a/BTCPayServer/Controllers/GreenField/StoreLNURLPayPaymentMethodsController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoreLNURLPayPaymentMethodsController.cs @@ -24,7 +24,7 @@ namespace BTCPayServer.Controllers.GreenField { [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] - public class StoreLNURLPayPaymentMethodsController : ControllerBase + public class GreenfieldStoreLNURLPayPaymentMethodsController : ControllerBase { private StoreData Store => HttpContext.GetStoreData(); private readonly StoreRepository _storeRepository; @@ -32,7 +32,7 @@ namespace BTCPayServer.Controllers.GreenField private readonly IAuthorizationService _authorizationService; private readonly ISettingsRepository _settingsRepository; - public StoreLNURLPayPaymentMethodsController( + public GreenfieldStoreLNURLPayPaymentMethodsController( StoreRepository storeRepository, BTCPayNetworkProvider btcPayNetworkProvider, IAuthorizationService authorizationService, @@ -112,7 +112,7 @@ namespace BTCPayServer.Controllers.GreenField AssertCryptoCodeWallet(cryptoCode, out _); - var lnMethod = StoreLightningNetworkPaymentMethodsController.GetExistingLightningLikePaymentMethod(_btcPayNetworkProvider, + var lnMethod = GreenfieldStoreLightningNetworkPaymentMethodsController.GetExistingLightningLikePaymentMethod(_btcPayNetworkProvider, cryptoCode, Store); if ((lnMethod is null || lnMethod.Enabled is false) && paymentMethodData.Enabled) diff --git a/BTCPayServer/Controllers/GreenField/StoreLightningNetworkPaymentMethodsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoreLightningNetworkPaymentMethodsController.cs similarity index 98% rename from BTCPayServer/Controllers/GreenField/StoreLightningNetworkPaymentMethodsController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldStoreLightningNetworkPaymentMethodsController.cs index fc1f78e77..216378d52 100644 --- a/BTCPayServer/Controllers/GreenField/StoreLightningNetworkPaymentMethodsController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoreLightningNetworkPaymentMethodsController.cs @@ -24,7 +24,7 @@ namespace BTCPayServer.Controllers.GreenField { [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] - public class StoreLightningNetworkPaymentMethodsController : ControllerBase + public class GreenfieldStoreLightningNetworkPaymentMethodsController : ControllerBase { private StoreData Store => HttpContext.GetStoreData(); private readonly StoreRepository _storeRepository; @@ -32,7 +32,7 @@ namespace BTCPayServer.Controllers.GreenField private readonly IAuthorizationService _authorizationService; private readonly ISettingsRepository _settingsRepository; - public StoreLightningNetworkPaymentMethodsController( + public GreenfieldStoreLightningNetworkPaymentMethodsController( StoreRepository storeRepository, BTCPayNetworkProvider btcPayNetworkProvider, IAuthorizationService authorizationService, diff --git a/BTCPayServer/Controllers/GreenField/StoreOnChainPaymentMethodsController.WalletGeneration.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainPaymentMethodsController.WalletGeneration.cs similarity index 98% rename from BTCPayServer/Controllers/GreenField/StoreOnChainPaymentMethodsController.WalletGeneration.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainPaymentMethodsController.WalletGeneration.cs index fbf0f9fef..d4dcd5d4a 100644 --- a/BTCPayServer/Controllers/GreenField/StoreOnChainPaymentMethodsController.WalletGeneration.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainPaymentMethodsController.WalletGeneration.cs @@ -11,7 +11,7 @@ using NBXplorer.Models; namespace BTCPayServer.Controllers.GreenField { - public partial class StoreOnChainPaymentMethodsController + public partial class GreenfieldStoreOnChainPaymentMethodsController { [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Greenfield)] [HttpPost("~/api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/generate")] diff --git a/BTCPayServer/Controllers/GreenField/StoreOnChainPaymentMethodsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainPaymentMethodsController.cs similarity index 98% rename from BTCPayServer/Controllers/GreenField/StoreOnChainPaymentMethodsController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainPaymentMethodsController.cs index 4307ff021..476a4498c 100644 --- a/BTCPayServer/Controllers/GreenField/StoreOnChainPaymentMethodsController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainPaymentMethodsController.cs @@ -21,7 +21,7 @@ namespace BTCPayServer.Controllers.GreenField { [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] - public partial class StoreOnChainPaymentMethodsController : ControllerBase + public partial class GreenfieldStoreOnChainPaymentMethodsController : ControllerBase { private StoreData Store => HttpContext.GetStoreData(); private readonly StoreRepository _storeRepository; @@ -31,7 +31,7 @@ namespace BTCPayServer.Controllers.GreenField private readonly ISettingsRepository _settingsRepository; private readonly ExplorerClientProvider _explorerClientProvider; - public StoreOnChainPaymentMethodsController( + public GreenfieldStoreOnChainPaymentMethodsController( StoreRepository storeRepository, BTCPayNetworkProvider btcPayNetworkProvider, BTCPayWalletProvider walletProvider, diff --git a/BTCPayServer/Controllers/GreenField/StoreOnChainWalletsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs similarity index 99% rename from BTCPayServer/Controllers/GreenField/StoreOnChainWalletsController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs index bf655b07c..96be0ba35 100644 --- a/BTCPayServer/Controllers/GreenField/StoreOnChainWalletsController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs @@ -33,7 +33,7 @@ namespace BTCPayServer.Controllers.GreenField [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] [EnableCors(CorsPolicies.All)] - public class StoreOnChainWalletsController : Controller + public class GreenfieldStoreOnChainWalletsController : Controller { private StoreData Store => HttpContext.GetStoreData(); private readonly IAuthorizationService _authorizationService; @@ -50,7 +50,7 @@ namespace BTCPayServer.Controllers.GreenField private readonly WalletReceiveService _walletReceiveService; private readonly IFeeProviderFactory _feeProviderFactory; - public StoreOnChainWalletsController( + public GreenfieldStoreOnChainWalletsController( IAuthorizationService authorizationService, BTCPayWalletProvider btcPayWalletProvider, BTCPayNetworkProvider btcPayNetworkProvider, diff --git a/BTCPayServer/Controllers/GreenField/StorePaymentMethodsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStorePaymentMethodsController.cs similarity index 91% rename from BTCPayServer/Controllers/GreenField/StorePaymentMethodsController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldStorePaymentMethodsController.cs index 65a8621ee..3a35b9ee0 100644 --- a/BTCPayServer/Controllers/GreenField/StorePaymentMethodsController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStorePaymentMethodsController.cs @@ -15,13 +15,13 @@ namespace BTCPayServer.Controllers.GreenField { [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] - public class StorePaymentMethodsController : ControllerBase + public class GreenfieldStorePaymentMethodsController : ControllerBase { private StoreData Store => HttpContext.GetStoreData(); private readonly BTCPayNetworkProvider _btcPayNetworkProvider; private readonly IAuthorizationService _authorizationService; - public StorePaymentMethodsController(BTCPayNetworkProvider btcPayNetworkProvider, IAuthorizationService authorizationService) + public GreenfieldStorePaymentMethodsController(BTCPayNetworkProvider btcPayNetworkProvider, IAuthorizationService authorizationService) { _btcPayNetworkProvider = btcPayNetworkProvider; _authorizationService = authorizationService; diff --git a/BTCPayServer/Controllers/GreenField/StoreWebhooksController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoreWebhooksController.cs similarity index 99% rename from BTCPayServer/Controllers/GreenField/StoreWebhooksController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldStoreWebhooksController.cs index 9f0409cec..f497e7792 100644 --- a/BTCPayServer/Controllers/GreenField/StoreWebhooksController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoreWebhooksController.cs @@ -24,7 +24,7 @@ namespace BTCPayServer.Controllers.GreenField [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield, Policy = Policies.CanModifyStoreWebhooks)] [EnableCors(CorsPolicies.All)] - public class StoreWebhooksController : ControllerBase + public class GreenfieldStoreWebhooksController : ControllerBase { public StoreWebhooksController(StoreRepository storeRepository, WebhookSender webhookNotificationManager) { diff --git a/BTCPayServer/Controllers/GreenField/StoresController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs similarity index 98% rename from BTCPayServer/Controllers/GreenField/StoresController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs index ef9880b41..d953e8629 100644 --- a/BTCPayServer/Controllers/GreenField/StoresController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs @@ -20,13 +20,13 @@ namespace BTCPayServer.Controllers.GreenField [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] [EnableCors(CorsPolicies.All)] - public class GreenFieldStoresController : ControllerBase + public class GreenfieldStoresController : ControllerBase { private readonly StoreRepository _storeRepository; private readonly UserManager _userManager; private readonly BTCPayNetworkProvider _btcPayNetworkProvider; - public GreenFieldStoresController(StoreRepository storeRepository, UserManager userManager, BTCPayNetworkProvider btcPayNetworkProvider) + public GreenfieldStoresController(StoreRepository storeRepository, UserManager userManager, BTCPayNetworkProvider btcPayNetworkProvider) { _storeRepository = storeRepository; _userManager = userManager; diff --git a/BTCPayServer/Controllers/GreenField/TestApiKeyController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldTestApiKeyController.cs similarity index 91% rename from BTCPayServer/Controllers/GreenField/TestApiKeyController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldTestApiKeyController.cs index 306eb0e65..dbdd702c8 100644 --- a/BTCPayServer/Controllers/GreenField/TestApiKeyController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldTestApiKeyController.cs @@ -16,13 +16,13 @@ namespace BTCPayServer.Controllers.GreenField [Route("api/test/apikey")] [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] - public class TestApiKeyController : ControllerBase + public class GreenfieldTestApiKeyController : ControllerBase { private readonly UserManager _userManager; private readonly StoreRepository _storeRepository; private readonly BTCPayServerClient _localBTCPayServerClient; - public TestApiKeyController(UserManager userManager, StoreRepository storeRepository, BTCPayServerClient localBTCPayServerClient) + public GreenfieldTestApiKeyController(UserManager userManager, StoreRepository storeRepository, BTCPayServerClient localBTCPayServerClient) { _userManager = userManager; _storeRepository = storeRepository; diff --git a/BTCPayServer/Controllers/GreenField/UsersController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs similarity index 98% rename from BTCPayServer/Controllers/GreenField/UsersController.cs rename to BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs index 0fc99a852..6869b54f5 100644 --- a/BTCPayServer/Controllers/GreenField/UsersController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs @@ -27,7 +27,7 @@ namespace BTCPayServer.Controllers.GreenField [ApiController] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)] [EnableCors(CorsPolicies.All)] - public class UsersController : ControllerBase + public class GreenfieldUsersController : ControllerBase { public Logs Logs { get; } @@ -41,7 +41,7 @@ namespace BTCPayServer.Controllers.GreenField private readonly IAuthorizationService _authorizationService; private readonly UserService _userService; - public UsersController(UserManager userManager, + public GreenfieldUsersController(UserManager userManager, RoleManager roleManager, SettingsRepository settingsRepository, EventAggregator eventAggregator, diff --git a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs index d50d366e5..fce28fcd7 100644 --- a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs +++ b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs @@ -33,47 +33,47 @@ namespace BTCPayServer.Controllers.GreenField { private readonly StoreRepository _storeRepository; private readonly IOptionsMonitor _identityOptions; - private readonly StoreOnChainPaymentMethodsController _chainPaymentMethodsController; - private readonly StoreOnChainWalletsController _storeOnChainWalletsController; - private readonly StoreLightningNetworkPaymentMethodsController _storeLightningNetworkPaymentMethodsController; - private readonly StoreLNURLPayPaymentMethodsController _storeLnurlPayPaymentMethodsController; - private readonly HealthController _healthController; - private readonly GreenFieldPaymentRequestsController _paymentRequestController; - private readonly ApiKeysController _apiKeysController; - private readonly NotificationsController _notificationsController; - private readonly UsersController _usersController; - private readonly GreenFieldStoresController _storesController; - private readonly InternalLightningNodeApiController _internalLightningNodeApiController; - private readonly StoreLightningNodeApiController _storeLightningNodeApiController; - private readonly GreenFieldInvoiceController _greenFieldInvoiceController; + private readonly GreenfieldStoreOnChainPaymentMethodsController _chainPaymentMethodsController; + private readonly GreenfieldStoreOnChainWalletsController _storeOnChainWalletsController; + private readonly GreenfieldStoreLightningNetworkPaymentMethodsController _storeLightningNetworkPaymentMethodsController; + private readonly GreenfieldStoreLNURLPayPaymentMethodsController _storeLnurlPayPaymentMethodsController; + private readonly GreenfieldHealthController _healthController; + private readonly GreenfieldPaymentRequestsController _paymentRequestController; + private readonly GreenfieldApiKeysController _apiKeysController; + private readonly GreenfieldNotificationsController _notificationsController; + private readonly GreenfieldUsersController _usersController; + private readonly GreenfieldStoresController _storesController; + private readonly GreenfieldInternalLightningNodeApiController _internalLightningNodeApiController; + private readonly GreenfieldStoreLightningNodeApiController _storeLightningNodeApiController; + private readonly GreenfieldInvoiceController _greenFieldInvoiceController; private readonly UserManager _userManager; - private readonly GreenFieldServerInfoController _greenFieldServerInfoController; - private readonly StoreWebhooksController _storeWebhooksController; + private readonly GreenfieldServerInfoController _greenFieldServerInfoController; + private readonly GreenfieldStoreWebhooksController _storeWebhooksController; private readonly GreenfieldPullPaymentController _greenfieldPullPaymentController; private readonly HomeController _homeController; - private readonly StorePaymentMethodsController _storePaymentMethodsController; + private readonly GreenfieldStorePaymentMethodsController _storePaymentMethodsController; public BTCPayServerClientFactory(StoreRepository storeRepository, IOptionsMonitor identityOptions, - StoreOnChainPaymentMethodsController chainPaymentMethodsController, - StoreOnChainWalletsController storeOnChainWalletsController, - StoreLightningNetworkPaymentMethodsController storeLightningNetworkPaymentMethodsController, - StoreLNURLPayPaymentMethodsController storeLnurlPayPaymentMethodsController, - HealthController healthController, - GreenFieldPaymentRequestsController paymentRequestController, - ApiKeysController apiKeysController, - NotificationsController notificationsController, - UsersController usersController, - GreenFieldStoresController storesController, - InternalLightningNodeApiController internalLightningNodeApiController, - StoreLightningNodeApiController storeLightningNodeApiController, - GreenFieldInvoiceController greenFieldInvoiceController, + GreenfieldStoreOnChainPaymentMethodsController chainPaymentMethodsController, + GreenfieldStoreOnChainWalletsController storeOnChainWalletsController, + GreenfieldStoreLightningNetworkPaymentMethodsController storeLightningNetworkPaymentMethodsController, + GreenfieldStoreLNURLPayPaymentMethodsController storeLnurlPayPaymentMethodsController, + GreenfieldHealthController healthController, + GreenfieldPaymentRequestsController paymentRequestController, + GreenfieldApiKeysController apiKeysController, + GreenfieldNotificationsController notificationsController, + GreenfieldUsersController usersController, + GreenfieldStoresController storesController, + GreenfieldInternalLightningNodeApiController internalLightningNodeApiController, + GreenfieldStoreLightningNodeApiController storeLightningNodeApiController, + GreenfieldInvoiceController greenFieldInvoiceController, UserManager userManager, - GreenFieldServerInfoController greenFieldServerInfoController, - StoreWebhooksController storeWebhooksController, + GreenfieldServerInfoController greenFieldServerInfoController, + GreenfieldStoreWebhooksController storeWebhooksController, GreenfieldPullPaymentController greenfieldPullPaymentController, HomeController homeController, - StorePaymentMethodsController storePaymentMethodsController) + GreenfieldStorePaymentMethodsController storePaymentMethodsController) { _storeRepository = storeRepository; _identityOptions = identityOptions; @@ -157,43 +157,43 @@ namespace BTCPayServer.Controllers.GreenField public class LocalBTCPayServerClient : BTCPayServerClient { - private readonly StoreOnChainPaymentMethodsController _chainPaymentMethodsController; - private readonly StoreOnChainWalletsController _storeOnChainWalletsController; - private readonly HealthController _healthController; - private readonly GreenFieldPaymentRequestsController _paymentRequestController; - private readonly ApiKeysController _apiKeysController; - private readonly NotificationsController _notificationsController; - private readonly UsersController _usersController; - private readonly GreenFieldStoresController _storesController; - private readonly StoreLightningNodeApiController _storeLightningNodeApiController; - private readonly InternalLightningNodeApiController _lightningNodeApiController; - private readonly StoreLightningNetworkPaymentMethodsController _storeLightningNetworkPaymentMethodsController; - private readonly StoreLNURLPayPaymentMethodsController _storeLnurlPayPaymentMethodsController; - private readonly GreenFieldInvoiceController _greenFieldInvoiceController; - private readonly GreenFieldServerInfoController _greenFieldServerInfoController; - private readonly StoreWebhooksController _storeWebhooksController; + private readonly GreenfieldStoreOnChainPaymentMethodsController _chainPaymentMethodsController; + private readonly GreenfieldStoreOnChainWalletsController _storeOnChainWalletsController; + private readonly GreenfieldHealthController _healthController; + private readonly GreenfieldPaymentRequestsController _paymentRequestController; + private readonly GreenfieldApiKeysController _apiKeysController; + private readonly GreenfieldNotificationsController _notificationsController; + private readonly GreenfieldUsersController _usersController; + private readonly GreenfieldStoresController _storesController; + private readonly GreenfieldStoreLightningNodeApiController _storeLightningNodeApiController; + private readonly GreenfieldInternalLightningNodeApiController _lightningNodeApiController; + private readonly GreenfieldStoreLightningNetworkPaymentMethodsController _storeLightningNetworkPaymentMethodsController; + private readonly GreenfieldStoreLNURLPayPaymentMethodsController _storeLnurlPayPaymentMethodsController; + private readonly GreenfieldInvoiceController _greenFieldInvoiceController; + private readonly GreenfieldServerInfoController _greenFieldServerInfoController; + private readonly GreenfieldStoreWebhooksController _storeWebhooksController; private readonly GreenfieldPullPaymentController _greenfieldPullPaymentController; private readonly HomeController _homeController; - private readonly StorePaymentMethodsController _storePaymentMethodsController; + private readonly GreenfieldStorePaymentMethodsController _storePaymentMethodsController; - public LocalBTCPayServerClient(StoreOnChainPaymentMethodsController chainPaymentMethodsController, - StoreOnChainWalletsController storeOnChainWalletsController, - HealthController healthController, - GreenFieldPaymentRequestsController paymentRequestController, - ApiKeysController apiKeysController, - NotificationsController notificationsController, - UsersController usersController, - GreenFieldStoresController storesController, - StoreLightningNodeApiController storeLightningNodeApiController, - InternalLightningNodeApiController lightningNodeApiController, - StoreLightningNetworkPaymentMethodsController storeLightningNetworkPaymentMethodsController, - StoreLNURLPayPaymentMethodsController storeLnurlPayPaymentMethodsController, - GreenFieldInvoiceController greenFieldInvoiceController, - GreenFieldServerInfoController greenFieldServerInfoController, - StoreWebhooksController storeWebhooksController, + public LocalBTCPayServerClient(GreenfieldStoreOnChainPaymentMethodsController chainPaymentMethodsController, + GreenfieldStoreOnChainWalletsController storeOnChainWalletsController, + GreenfieldHealthController healthController, + GreenfieldPaymentRequestsController paymentRequestController, + GreenfieldApiKeysController apiKeysController, + GreenfieldNotificationsController notificationsController, + GreenfieldUsersController usersController, + GreenfieldStoresController storesController, + GreenfieldStoreLightningNodeApiController storeLightningNodeApiController, + GreenfieldInternalLightningNodeApiController lightningNodeApiController, + GreenfieldStoreLightningNetworkPaymentMethodsController storeLightningNetworkPaymentMethodsController, + GreenfieldStoreLNURLPayPaymentMethodsController storeLnurlPayPaymentMethodsController, + GreenfieldInvoiceController greenFieldInvoiceController, + GreenfieldServerInfoController greenFieldServerInfoController, + GreenfieldStoreWebhooksController storeWebhooksController, GreenfieldPullPaymentController greenfieldPullPaymentController, HomeController homeController, - StorePaymentMethodsController storePaymentMethodsController, + GreenfieldStorePaymentMethodsController storePaymentMethodsController, IHttpContextAccessor httpContextAccessor) : base(new Uri("https://dummy.local"), "", "") { _chainPaymentMethodsController = chainPaymentMethodsController; diff --git a/BTCPayServer/HostedServices/WebhookSender.cs b/BTCPayServer/HostedServices/WebhookSender.cs index 446ee521e..edeaeaa89 100644 --- a/BTCPayServer/HostedServices/WebhookSender.cs +++ b/BTCPayServer/HostedServices/WebhookSender.cs @@ -229,14 +229,14 @@ namespace BTCPayServer.HostedServices { AfterExpiration = invoiceEvent.Invoice.Status.ToModernStatus() == InvoiceStatus.Expired || invoiceEvent.Invoice.Status.ToModernStatus() == InvoiceStatus.Invalid, PaymentMethod = invoiceEvent.Payment.GetPaymentMethodId().ToStringNormalized(), - Payment = GreenFieldInvoiceController.ToPaymentModel(invoiceEvent.Invoice, invoiceEvent.Payment) + Payment = GreenfieldInvoiceController.ToPaymentModel(invoiceEvent.Invoice, invoiceEvent.Payment) }; case InvoiceEventCode.PaymentSettled: return new WebhookInvoiceReceivedPaymentEvent(WebhookEventType.InvoicePaymentSettled) { AfterExpiration = invoiceEvent.Invoice.Status.ToModernStatus() == InvoiceStatus.Expired || invoiceEvent.Invoice.Status.ToModernStatus() == InvoiceStatus.Invalid, PaymentMethod = invoiceEvent.Payment.GetPaymentMethodId().ToStringNormalized(), - Payment = GreenFieldInvoiceController.ToPaymentModel(invoiceEvent.Invoice, invoiceEvent.Payment), + Payment = GreenfieldInvoiceController.ToPaymentModel(invoiceEvent.Invoice, invoiceEvent.Payment), OverPaid = invoiceEvent.Invoice.ExceptionStatus == InvoiceExceptionStatus.PaidOver, }; default: From 7a787fc94536d22bbbde9271201f8b65d6e79732 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 7 Jan 2022 12:32:00 +0900 Subject: [PATCH 3/4] Rename UI controllers --- .../Shared/TestExtensionNavExtension.cshtml | 2 +- .../AltcoinTests/AltcoinTests.cs | 20 +-- .../AltcoinTests/ElementsTests.cs | 2 +- BTCPayServer.Tests/CrowdfundTests.cs | 16 +-- BTCPayServer.Tests/FastTests.cs | 2 +- BTCPayServer.Tests/GreenfieldAPITests.cs | 4 +- BTCPayServer.Tests/POSTests.cs | 4 +- BTCPayServer.Tests/PSBTTests.cs | 2 +- BTCPayServer.Tests/PayJoinTests.cs | 2 +- BTCPayServer.Tests/PaymentRequestTests.cs | 12 +- BTCPayServer.Tests/SeleniumTests.cs | 8 +- BTCPayServer.Tests/TestAccount.cs | 26 ++-- BTCPayServer.Tests/ThirdPartyTests.cs | 4 +- BTCPayServer.Tests/UnitTest1.cs | 130 +++++++++--------- BTCPayServer/BTCPayServer.csproj | 58 ++++---- .../Components/MainNav/Default.cshtml | 38 ++--- BTCPayServer/Components/MainNav/MainNav.cs | 4 +- .../Components/Notifications/Dropdown.cshtml | 6 +- .../Components/Notifications/List.cshtml | 2 +- .../Components/Notifications/Recent.cshtml | 2 +- .../Components/StoreSelector/Default.cshtml | 8 +- .../Controllers/BitpayInvoiceController.cs | 4 +- .../GreenField/GreenfieldInvoiceController.cs | 4 +- .../GreenfieldPullPaymentController.cs | 4 +- ...GreenfieldStoreOnChainWalletsController.cs | 4 +- .../GreenfieldStoreWebhooksController.cs | 8 +- .../GreenField/LocalBTCPayServerClient.cs | 8 +- ...ntController.cs => UIAccountController.cs} | 14 +- ...dfund.cs => UIAppsController.Crowdfund.cs} | 2 +- ...ale.cs => UIAppsController.PointOfSale.cs} | 2 +- ...{AppsController.cs => UIAppsController.cs} | 4 +- ...ontroller.cs => UIAppsPublicController.cs} | 14 +- ...rrorController.cs => UIErrorController.cs} | 2 +- ...{HomeController.cs => UIHomeController.cs} | 6 +- ...ting.cs => UIInvoiceController.Testing.cs} | 2 +- ...roller.UI.cs => UIInvoiceController.UI.cs} | 18 +-- ...ceController.cs => UIInvoiceController.cs} | 4 +- .../UILNURLController.cs} | 15 +- ...oller.2FA.cs => UIManageController.2FA.cs} | 2 +- ...IKeys.cs => UIManageController.APIKeys.cs} | 2 +- ...es.cs => UIManageController.LoginCodes.cs} | 2 +- ...cs => UIManageController.Notifications.cs} | 2 +- ...ageController.cs => UIManageController.cs} | 8 +- ...roller.cs => UINotificationsController.cs} | 6 +- ...oller.cs => UIPaymentRequestController.cs} | 12 +- ...licController.cs => UIPublicController.cs} | 6 +- ...=> UIPublicLightningNodeInfoController.cs} | 4 +- ...ntroller.cs => UIPullPaymentController.cs} | 4 +- ...ugins.cs => UIServerController.Plugins.cs} | 2 +- ...orage.cs => UIServerController.Storage.cs} | 4 +- ...r.Users.cs => UIServerController.Users.cs} | 2 +- ...verController.cs => UIServerController.cs} | 4 +- ...geController.cs => UIStorageController.cs} | 4 +- ...orePullPaymentsController.PullPayments.cs} | 8 +- ...r.Email.cs => UIStoresController.Email.cs} | 2 +- ....cs => UIStoresController.Integrations.cs} | 2 +- ...cs => UIStoresController.LightningLike.cs} | 2 +- ...chain.cs => UIStoresController.Onchain.cs} | 2 +- ...resController.cs => UIStoresController.cs} | 10 +- ...ontroller.cs => UIUserStoresController.cs} | 8 +- ...aultController.cs => UIVaultController.cs} | 4 +- ...er.PSBT.cs => UIWalletsController.PSBT.cs} | 2 +- ...tsController.cs => UIWalletsController.cs} | 10 +- .../BitcoinLike/BitcoinLikePayoutHandler.cs | 4 +- .../LightningLikePayoutHandler.cs | 2 +- ....cs => UILightningLikePayoutController.cs} | 4 +- BTCPayServer/Extensions.cs | 4 +- .../Extensions/UrlHelperExtensions.cs | 26 ++-- BTCPayServer/Fido2/Fido2Controller.cs | 2 +- .../AppInventoryUpdaterHostedService.cs | 4 +- BTCPayServer/Hosting/BTCPayServerServices.cs | 6 +- BTCPayServer/Hosting/MigrationStartupTask.cs | 2 +- BTCPayServer/Hosting/Startup.cs | 2 +- .../PaymentRequest/PaymentRequestHub.cs | 4 +- .../Plugins/Shopify/ShopifyController.cs | 4 +- BTCPayServer/Services/Apps/AppHub.cs | 4 +- BTCPayServer/Services/Apps/AppHubStreamer.cs | 4 +- BTCPayServer/Services/Apps/AppService.cs | 2 +- .../ExternalPayoutTransactionNotification.cs | 4 +- .../Blobs/InvoiceEventNotification.cs | 4 +- .../Notifications/Blobs/PayoutNotification.cs | 4 +- .../Views/AppsPublic/PointOfSale/Light.cshtml | 18 --- BTCPayServer/Views/Fido2/_ViewStart.cshtml | 4 - BTCPayServer/Views/Server/_Nav.cshtml | 18 --- .../Shared/LNURL/LightningAddressNav.cshtml | 2 +- .../LNURL/LightningAddressOption.cshtml | 4 +- .../Monero/StoreNavMoneroExtension.cshtml | 2 +- .../Shared/NotificationEmailWarning.cshtml | 2 +- .../Views/Shared/_BTCPaySupporters.cshtml | 4 +- BTCPayServer/Views/Shared/_Layout.cshtml | 4 +- .../ForgotPassword.cshtml | 0 .../ForgotPasswordConfirmation.cshtml | 0 .../{Account => UIAccount}/Lockout.cshtml | 0 .../Views/{Account => UIAccount}/Login.cshtml | 2 +- .../LoginWith2fa.cshtml | 0 .../LoginWithFido2.cshtml | 0 .../LoginWithRecoveryCode.cshtml | 0 .../{Account => UIAccount}/Register.cshtml | 2 +- .../SecondaryLogin.cshtml | 0 .../{Account => UIAccount}/SetPassword.cshtml | 2 +- .../{Account => UIAccount}/SignedOut.cshtml | 0 .../_ViewImports.cshtml | 0 .../Views/{Apps => UIApps}/AppsNavPages.cs | 0 .../Views/{Apps => UIApps}/CreateApp.cshtml | 0 .../Views/{Apps => UIApps}/ListApps.cshtml | 8 +- .../{Apps => UIApps}/TemplateEditor.cshtml | 0 .../{Apps => UIApps}/UpdateCrowdfund.cshtml | 8 +- .../{Apps => UIApps}/UpdatePointOfSale.cshtml | 10 +- .../{Apps => UIApps}/_ViewImports.cshtml | 0 .../Views/{Apps => UIApps}/_ViewStart.cshtml | 0 .../Crowdfund/ContributeForm.cshtml | 0 .../PointOfSale/Cart.cshtml | 2 +- .../UIAppsPublic/PointOfSale/Light.cshtml | 18 +++ .../PointOfSale/MinimalLight.cshtml | 2 +- .../PointOfSale/Print.cshtml | 4 +- .../PointOfSale/Static.cshtml | 6 +- .../PointOfSale/VueLight.cshtml | 2 +- .../ViewCrowdfund.cshtml | 4 +- .../Views/{Error => UIError}/403.cshtml | 0 .../Views/{Error => UIError}/404.cshtml | 0 .../Views/{Error => UIError}/406.cshtml | 0 .../Views/{Error => UIError}/417.cshtml | 0 .../Views/{Error => UIError}/429.cshtml | 0 .../Views/{Error => UIError}/500.cshtml | 0 .../Views/{Error => UIError}/502.cshtml | 0 .../Views/{Error => UIError}/Handle.cshtml | 2 +- .../{Error => UIError}/_LayoutError.cshtml | 2 +- .../{Error => UIError}/_ViewStart.cshtml | 0 .../Views/{Fido2 => UIFido2}/Create.cshtml | 0 .../{Fido2 => UIFido2}/_ViewImports.cshtml | 0 BTCPayServer/Views/UIFido2/_ViewStart.cshtml | 4 + .../Views/{Home => UIHome}/Home.cshtml | 4 +- .../RecoverySeedBackup.cshtml | 0 .../Views/{Home => UIHome}/SwaggerDocs.cshtml | 0 .../Checkout-Body.cshtml | 0 .../Checkout-Spinner.cshtml | 0 .../Checkout-Testing.cshtml | 0 .../{Invoice => UIInvoice}/Checkout.cshtml | 0 .../CheckoutNoScript.cshtml | 0 .../CreateInvoice.cshtml | 0 .../{Invoice => UIInvoice}/Invoice.cshtml | 0 .../{Invoice => UIInvoice}/InvoiceNavPages.cs | 0 .../InvoiceStatusChangePartial.cshtml | 2 +- .../ListInvoices.cshtml | 0 .../ListInvoicesPaymentsPartial.cshtml | 0 .../{Invoice => UIInvoice}/PosData.cshtml | 0 .../{Invoice => UIInvoice}/Refund.cshtml | 0 .../_ViewImports.cshtml | 0 .../{Invoice => UIInvoice}/_ViewStart.cshtml | 0 .../EditLightningAddress.cshtml | 2 +- .../ConfirmLightningPayout.cshtml | 2 +- .../LightningPayoutResult.cshtml | 2 +- .../Views/{Manage => UIManage}/APIKeys.cshtml | 10 +- .../{Manage => UIManage}/AddApiKey.cshtml | 4 +- .../AuthorizeAPIKey.cshtml | 4 +- .../ChangePassword.cshtml | 0 .../{Manage => UIManage}/ConfirmAPIKey.cshtml | 4 +- .../EnableAuthenticator.cshtml | 0 .../GenerateRecoveryCodes.cshtml | 0 .../Views/{Manage => UIManage}/Index.cshtml | 0 .../{Manage => UIManage}/LoginCodes.cshtml | 0 .../{Manage => UIManage}/ManageNavPages.cs | 0 .../NotificationSettings.cshtml | 2 +- .../{Manage => UIManage}/SetPassword.cshtml | 0 .../TwoFactorAuthentication.cshtml | 4 +- .../Views/{Manage => UIManage}/_Nav.cshtml | 12 +- .../{Manage => UIManage}/_ViewImports.cshtml | 0 .../{Manage => UIManage}/_ViewStart.cshtml | 0 .../GetStoreMoneroLikePaymentMethod.cshtml | 4 +- .../GetStoreMoneroLikePaymentMethods.cshtml | 2 +- .../Index.cshtml | 6 +- .../NotificationsNavPages.cs | 0 .../_ViewImports.cshtml | 0 .../_ViewStart.cshtml | 0 .../EditPaymentRequest.cshtml | 8 +- .../GetPaymentRequests.cshtml | 2 +- .../PaymentRequestsNavPages.cs | 0 .../ViewPaymentRequest.cshtml | 0 .../_ViewImports.cshtml | 0 .../_ViewStart.cshtml | 0 .../PayButtonHandle.cshtml | 0 .../ShowLightningNodeInfo.cshtml | 0 .../ViewPullPayment.cshtml | 0 .../CLightningRestServices.cshtml | 0 .../ConfiguratorService.cshtml | 0 .../CreateTemporaryFileUrl.cshtml | 4 +- .../{Server => UIServer}/CreateUser.cshtml | 0 .../DynamicDnsService.cshtml | 0 .../DynamicDnsServices.cshtml | 0 .../EditAmazonS3StorageProvider.cshtml | 0 ...EditAzureBlobStorageStorageProvider.cshtml | 0 .../EditFileSystemStorageProvider.cshtml | 0 ...itGoogleCloudStorageStorageProvider.cshtml | 0 .../Views/{Server => UIServer}/Emails.cshtml | 0 .../Views/{Server => UIServer}/Files.cshtml | 6 +- .../LightningChargeServices.cshtml | 0 .../LightningWalletServices.cshtml | 0 .../{Server => UIServer}/ListPlugins.cshtml | 2 +- .../{Server => UIServer}/ListUsers.cshtml | 0 .../{Server => UIServer}/LndSeedBackup.cshtml | 0 .../{Server => UIServer}/LndServices.cshtml | 0 .../Views/{Server => UIServer}/Logs.cshtml | 0 .../{Server => UIServer}/Maintenance.cshtml | 0 .../{Server => UIServer}/P2PService.cshtml | 0 .../{Server => UIServer}/Policies.cshtml | 2 +- .../{Server => UIServer}/RPCService.cshtml | 0 .../{Server => UIServer}/SSHService.cshtml | 0 .../{Server => UIServer}/ServerNavPages.cs | 0 .../{Server => UIServer}/Services.cshtml | 0 .../Views/{Server => UIServer}/Storage.cshtml | 0 .../Views/{Server => UIServer}/Theme.cshtml | 0 .../Views/{Server => UIServer}/User.cshtml | 0 BTCPayServer/Views/UIServer/_Nav.cshtml | 18 +++ .../{Server => UIServer}/_ViewImports.cshtml | 0 .../{Server => UIServer}/_ViewStart.cshtml | 0 .../EditShopifyIntegration.cshtml | 0 .../NewPullPayment.cshtml | 0 .../Payouts.cshtml | 0 .../PullPayments.cshtml | 2 +- .../CheckoutAppearance.cshtml | 0 .../{Stores => UIStores}/CreateToken.cshtml | 0 .../{Stores => UIStores}/Dashboard.cshtml | 10 +- .../Views/{Stores => UIStores}/Emails.cshtml | 0 .../GeneralSettings.cshtml | 0 .../GenerateWallet.cshtml | 2 +- .../GenerateWalletOptions.cshtml | 6 +- .../ImportWallet/ConfirmAddresses.cshtml | 6 +- .../ImportWallet/File.cshtml | 2 +- .../ImportWallet/Hardware.cshtml | 4 +- .../ImportWallet/Scan.cshtml | 2 +- .../ImportWallet/Seed.cshtml | 2 +- .../ImportWallet/Xpub.cshtml | 2 +- .../ImportWalletOptions.cshtml | 12 +- .../{Stores => UIStores}/Integrations.cshtml | 0 .../LightningSettings.cshtml | 2 +- .../{Stores => UIStores}/ListTokens.cshtml | 0 .../{Stores => UIStores}/ModifyWebhook.cshtml | 0 .../{Stores => UIStores}/PayButton.cshtml | 0 .../PayButtonEnable.cshtml | 0 .../PaymentMethods.cshtml | 4 +- .../Views/{Stores => UIStores}/Rates.cshtml | 2 +- .../RequestPairing.cshtml | 0 .../SetupLightningNode.cshtml | 0 .../{Stores => UIStores}/SetupWallet.cshtml | 4 +- .../{Stores => UIStores}/ShowToken.cshtml | 0 .../{Stores => UIStores}/StoreNavPages.cs | 0 .../{Stores => UIStores}/StoreUsers.cshtml | 0 .../{Stores => UIStores}/TestWebhook.cshtml | 0 .../WalletSettings.cshtml | 6 +- .../{Stores => UIStores}/Webhooks.cshtml | 0 .../_GenerateWalletForm.cshtml | 0 .../_LayoutWalletSetup.cshtml | 2 +- .../Views/{Stores => UIStores}/_Nav.cshtml | 16 +-- .../{Stores => UIStores}/_ViewImports.cshtml | 0 .../{Stores => UIStores}/_ViewStart.cshtml | 0 .../CreateStore.cshtml | 0 .../_ViewImports.cshtml | 0 .../_ViewStart.cshtml | 0 .../CoinSelection.cshtml | 0 .../{Wallets => UIWallets}/ListWallets.cshtml | 2 +- .../SignWithSeed.cshtml | 0 .../SigningContext.cshtml | 0 .../{Wallets => UIWallets}/WalletPSBT.cshtml | 0 .../WalletPSBTCombine.cshtml | 0 .../WalletPSBTDecoded.cshtml | 0 .../WalletReceive.cshtml | 0 .../WalletRescan.cshtml | 0 .../{Wallets => UIWallets}/WalletSend.cshtml | 0 .../WalletSendVault.cshtml | 0 .../WalletSigningOptions.cshtml | 0 .../WalletTransactions.cshtml | 0 .../{Wallets => UIWallets}/WalletsNavPages.cs | 0 .../Views/{Wallets => UIWallets}/_Nav.cshtml | 12 +- .../{Wallets => UIWallets}/_PSBTInfo.cshtml | 0 .../_ViewImports.cshtml | 0 .../{Wallets => UIWallets}/_ViewStart.cshtml | 0 276 files changed, 506 insertions(+), 503 deletions(-) rename BTCPayServer/Controllers/{AccountController.cs => UIAccountController.cs} (98%) rename BTCPayServer/Controllers/{AppsController.Crowdfund.cs => UIAppsController.Crowdfund.cs} (99%) rename BTCPayServer/Controllers/{AppsController.PointOfSale.cs => UIAppsController.PointOfSale.cs} (99%) rename BTCPayServer/Controllers/{AppsController.cs => UIAppsController.cs} (98%) rename BTCPayServer/Controllers/{AppsPublicController.cs => UIAppsPublicController.cs} (97%) rename BTCPayServer/Controllers/{ErrorController.cs => UIErrorController.cs} (94%) rename BTCPayServer/Controllers/{HomeController.cs => UIHomeController.cs} (96%) rename BTCPayServer/Controllers/{InvoiceController.Testing.cs => UIInvoiceController.Testing.cs} (98%) rename BTCPayServer/Controllers/{InvoiceController.UI.cs => UIInvoiceController.UI.cs} (98%) rename BTCPayServer/Controllers/{InvoiceController.cs => UIInvoiceController.cs} (99%) rename BTCPayServer/{LNURL/LNURLController.cs => Controllers/UILNURLController.cs} (98%) rename BTCPayServer/Controllers/{ManageController.2FA.cs => UIManageController.2FA.cs} (99%) rename BTCPayServer/Controllers/{ManageController.APIKeys.cs => UIManageController.APIKeys.cs} (99%) rename BTCPayServer/Controllers/{ManageController.LoginCodes.cs => UIManageController.LoginCodes.cs} (92%) rename BTCPayServer/Controllers/{ManageController.Notifications.cs => UIManageController.Notifications.cs} (98%) rename BTCPayServer/Controllers/{ManageController.cs => UIManageController.cs} (97%) rename BTCPayServer/Controllers/{NotificationsController.cs => UINotificationsController.cs} (97%) rename BTCPayServer/Controllers/{PaymentRequestController.cs => UIPaymentRequestController.cs} (97%) rename BTCPayServer/Controllers/{PublicController.cs => UIPublicController.cs} (95%) rename BTCPayServer/Controllers/{PublicLightningNodeInfoController.cs => UIPublicLightningNodeInfoController.cs} (96%) rename BTCPayServer/Controllers/{PullPaymentController.cs => UIPullPaymentController.cs} (98%) rename BTCPayServer/Controllers/{ServerController.Plugins.cs => UIServerController.Plugins.cs} (99%) rename BTCPayServer/Controllers/{ServerController.Storage.cs => UIServerController.Storage.cs} (99%) rename BTCPayServer/Controllers/{ServerController.Users.cs => UIServerController.Users.cs} (99%) rename BTCPayServer/Controllers/{ServerController.cs => UIServerController.cs} (99%) rename BTCPayServer/Controllers/{StorageController.cs => UIStorageController.cs} (82%) rename BTCPayServer/Controllers/{StorePullPaymentsController.PullPayments.cs => UIStorePullPaymentsController.PullPayments.cs} (98%) rename BTCPayServer/Controllers/{StoresController.Email.cs => UIStoresController.Email.cs} (98%) rename BTCPayServer/Controllers/{StoresController.Integrations.cs => UIStoresController.Integrations.cs} (99%) rename BTCPayServer/Controllers/{StoresController.LightningLike.cs => UIStoresController.LightningLike.cs} (99%) rename BTCPayServer/Controllers/{StoresController.Onchain.cs => UIStoresController.Onchain.cs} (99%) rename BTCPayServer/Controllers/{StoresController.cs => UIStoresController.cs} (99%) rename BTCPayServer/Controllers/{UserStoresController.cs => UIUserStoresController.cs} (91%) rename BTCPayServer/Controllers/{VaultController.cs => UIVaultController.cs} (99%) rename BTCPayServer/Controllers/{WalletsController.PSBT.cs => UIWalletsController.PSBT.cs} (99%) rename BTCPayServer/Controllers/{WalletsController.cs => UIWalletsController.cs} (99%) rename BTCPayServer/Data/Payouts/LightningLike/{LightningLikePayoutController.cs => UILightningLikePayoutController.cs} (98%) delete mode 100644 BTCPayServer/Views/AppsPublic/PointOfSale/Light.cshtml delete mode 100644 BTCPayServer/Views/Fido2/_ViewStart.cshtml delete mode 100644 BTCPayServer/Views/Server/_Nav.cshtml rename BTCPayServer/Views/{Account => UIAccount}/ForgotPassword.cshtml (100%) rename BTCPayServer/Views/{Account => UIAccount}/ForgotPasswordConfirmation.cshtml (100%) rename BTCPayServer/Views/{Account => UIAccount}/Lockout.cshtml (100%) rename BTCPayServer/Views/{Account => UIAccount}/Login.cshtml (98%) rename BTCPayServer/Views/{Account => UIAccount}/LoginWith2fa.cshtml (100%) rename BTCPayServer/Views/{Account => UIAccount}/LoginWithFido2.cshtml (100%) rename BTCPayServer/Views/{Account => UIAccount}/LoginWithRecoveryCode.cshtml (100%) rename BTCPayServer/Views/{Account => UIAccount}/Register.cshtml (98%) rename BTCPayServer/Views/{Account => UIAccount}/SecondaryLogin.cshtml (100%) rename BTCPayServer/Views/{Account => UIAccount}/SetPassword.cshtml (98%) rename BTCPayServer/Views/{Account => UIAccount}/SignedOut.cshtml (100%) rename BTCPayServer/Views/{Account => UIAccount}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{Apps => UIApps}/AppsNavPages.cs (100%) rename BTCPayServer/Views/{Apps => UIApps}/CreateApp.cshtml (100%) rename BTCPayServer/Views/{Apps => UIApps}/ListApps.cshtml (94%) rename BTCPayServer/Views/{Apps => UIApps}/TemplateEditor.cshtml (100%) rename BTCPayServer/Views/{Apps => UIApps}/UpdateCrowdfund.cshtml (96%) rename BTCPayServer/Views/{Apps => UIApps}/UpdatePointOfSale.cshtml (97%) rename BTCPayServer/Views/{Apps => UIApps}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{Apps => UIApps}/_ViewStart.cshtml (100%) rename BTCPayServer/Views/{AppsPublic => UIAppsPublic}/Crowdfund/ContributeForm.cshtml (100%) rename BTCPayServer/Views/{AppsPublic => UIAppsPublic}/PointOfSale/Cart.cshtml (99%) create mode 100644 BTCPayServer/Views/UIAppsPublic/PointOfSale/Light.cshtml rename BTCPayServer/Views/{AppsPublic => UIAppsPublic}/PointOfSale/MinimalLight.cshtml (95%) rename BTCPayServer/Views/{AppsPublic => UIAppsPublic}/PointOfSale/Print.cshtml (95%) rename BTCPayServer/Views/{AppsPublic => UIAppsPublic}/PointOfSale/Static.cshtml (93%) rename BTCPayServer/Views/{AppsPublic => UIAppsPublic}/PointOfSale/VueLight.cshtml (97%) rename BTCPayServer/Views/{AppsPublic => UIAppsPublic}/ViewCrowdfund.cshtml (99%) rename BTCPayServer/Views/{Error => UIError}/403.cshtml (100%) rename BTCPayServer/Views/{Error => UIError}/404.cshtml (100%) rename BTCPayServer/Views/{Error => UIError}/406.cshtml (100%) rename BTCPayServer/Views/{Error => UIError}/417.cshtml (100%) rename BTCPayServer/Views/{Error => UIError}/429.cshtml (100%) rename BTCPayServer/Views/{Error => UIError}/500.cshtml (100%) rename BTCPayServer/Views/{Error => UIError}/502.cshtml (100%) rename BTCPayServer/Views/{Error => UIError}/Handle.cshtml (94%) rename BTCPayServer/Views/{Error => UIError}/_LayoutError.cshtml (93%) rename BTCPayServer/Views/{Error => UIError}/_ViewStart.cshtml (100%) rename BTCPayServer/Views/{Fido2 => UIFido2}/Create.cshtml (100%) rename BTCPayServer/Views/{Fido2 => UIFido2}/_ViewImports.cshtml (100%) create mode 100644 BTCPayServer/Views/UIFido2/_ViewStart.cshtml rename BTCPayServer/Views/{Home => UIHome}/Home.cshtml (88%) rename BTCPayServer/Views/{Home => UIHome}/RecoverySeedBackup.cshtml (100%) rename BTCPayServer/Views/{Home => UIHome}/SwaggerDocs.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/Checkout-Body.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/Checkout-Spinner.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/Checkout-Testing.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/Checkout.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/CheckoutNoScript.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/CreateInvoice.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/Invoice.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/InvoiceNavPages.cs (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/InvoiceStatusChangePartial.cshtml (94%) rename BTCPayServer/Views/{Invoice => UIInvoice}/ListInvoices.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/ListInvoicesPaymentsPartial.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/PosData.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/Refund.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{Invoice => UIInvoice}/_ViewStart.cshtml (100%) rename BTCPayServer/Views/{LNURL => UILNURL}/EditLightningAddress.cshtml (99%) rename BTCPayServer/Views/{LightningLikePayout => UILightningLikePayout}/ConfirmLightningPayout.cshtml (97%) rename BTCPayServer/Views/{LightningLikePayout => UILightningLikePayout}/LightningPayoutResult.cshtml (93%) rename BTCPayServer/Views/{Manage => UIManage}/APIKeys.cshtml (88%) rename BTCPayServer/Views/{Manage => UIManage}/AddApiKey.cshtml (98%) rename BTCPayServer/Views/{Manage => UIManage}/AuthorizeAPIKey.cshtml (98%) rename BTCPayServer/Views/{Manage => UIManage}/ChangePassword.cshtml (100%) rename BTCPayServer/Views/{Manage => UIManage}/ConfirmAPIKey.cshtml (92%) rename BTCPayServer/Views/{Manage => UIManage}/EnableAuthenticator.cshtml (100%) rename BTCPayServer/Views/{Manage => UIManage}/GenerateRecoveryCodes.cshtml (100%) rename BTCPayServer/Views/{Manage => UIManage}/Index.cshtml (100%) rename BTCPayServer/Views/{Manage => UIManage}/LoginCodes.cshtml (100%) rename BTCPayServer/Views/{Manage => UIManage}/ManageNavPages.cs (100%) rename BTCPayServer/Views/{Manage => UIManage}/NotificationSettings.cshtml (95%) rename BTCPayServer/Views/{Manage => UIManage}/SetPassword.cshtml (100%) rename BTCPayServer/Views/{Manage => UIManage}/TwoFactorAuthentication.cshtml (93%) rename BTCPayServer/Views/{Manage => UIManage}/_Nav.cshtml (67%) rename BTCPayServer/Views/{Manage => UIManage}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{Manage => UIManage}/_ViewStart.cshtml (100%) rename BTCPayServer/Views/{MoneroLikeStore => UIMoneroLikeStore}/GetStoreMoneroLikePaymentMethod.cshtml (98%) rename BTCPayServer/Views/{MoneroLikeStore => UIMoneroLikeStore}/GetStoreMoneroLikePaymentMethods.cshtml (97%) rename BTCPayServer/Views/{Notifications => UINotifications}/Index.cshtml (95%) rename BTCPayServer/Views/{Notifications => UINotifications}/NotificationsNavPages.cs (100%) rename BTCPayServer/Views/{Notifications => UINotifications}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{Notifications => UINotifications}/_ViewStart.cshtml (100%) rename BTCPayServer/Views/{PaymentRequest => UIPaymentRequest}/EditPaymentRequest.cshtml (94%) rename BTCPayServer/Views/{PaymentRequest => UIPaymentRequest}/GetPaymentRequests.cshtml (96%) rename BTCPayServer/Views/{PaymentRequest => UIPaymentRequest}/PaymentRequestsNavPages.cs (100%) rename BTCPayServer/Views/{PaymentRequest => UIPaymentRequest}/ViewPaymentRequest.cshtml (100%) rename BTCPayServer/Views/{PaymentRequest => UIPaymentRequest}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{PaymentRequest => UIPaymentRequest}/_ViewStart.cshtml (100%) rename BTCPayServer/Views/{Public => UIPublic}/PayButtonHandle.cshtml (100%) rename BTCPayServer/Views/{PublicLightningNodeInfo => UIPublicLightningNodeInfo}/ShowLightningNodeInfo.cshtml (100%) rename BTCPayServer/Views/{PullPayment => UIPullPayment}/ViewPullPayment.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/CLightningRestServices.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/ConfiguratorService.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/CreateTemporaryFileUrl.cshtml (87%) rename BTCPayServer/Views/{Server => UIServer}/CreateUser.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/DynamicDnsService.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/DynamicDnsServices.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/EditAmazonS3StorageProvider.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/EditAzureBlobStorageStorageProvider.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/EditFileSystemStorageProvider.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/EditGoogleCloudStorageStorageProvider.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/Emails.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/Files.cshtml (93%) rename BTCPayServer/Views/{Server => UIServer}/LightningChargeServices.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/LightningWalletServices.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/ListPlugins.cshtml (99%) rename BTCPayServer/Views/{Server => UIServer}/ListUsers.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/LndSeedBackup.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/LndServices.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/Logs.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/Maintenance.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/P2PService.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/Policies.cshtml (99%) rename BTCPayServer/Views/{Server => UIServer}/RPCService.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/SSHService.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/ServerNavPages.cs (100%) rename BTCPayServer/Views/{Server => UIServer}/Services.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/Storage.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/Theme.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/User.cshtml (100%) create mode 100644 BTCPayServer/Views/UIServer/_Nav.cshtml rename BTCPayServer/Views/{Server => UIServer}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{Server => UIServer}/_ViewStart.cshtml (100%) rename BTCPayServer/Views/{Shopify => UIShopify}/EditShopifyIntegration.cshtml (100%) rename BTCPayServer/Views/{StorePullPayments => UIStorePullPayments}/NewPullPayment.cshtml (100%) rename BTCPayServer/Views/{StorePullPayments => UIStorePullPayments}/Payouts.cshtml (100%) rename BTCPayServer/Views/{StorePullPayments => UIStorePullPayments}/PullPayments.cshtml (99%) rename BTCPayServer/Views/{Stores => UIStores}/CheckoutAppearance.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/CreateToken.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/Dashboard.cshtml (78%) rename BTCPayServer/Views/{Stores => UIStores}/Emails.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/GeneralSettings.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/GenerateWallet.cshtml (85%) rename BTCPayServer/Views/{Stores => UIStores}/GenerateWalletOptions.cshtml (75%) rename BTCPayServer/Views/{Stores => UIStores}/ImportWallet/ConfirmAddresses.cshtml (93%) rename BTCPayServer/Views/{Stores => UIStores}/ImportWallet/File.cshtml (92%) rename BTCPayServer/Views/{Stores => UIStores}/ImportWallet/Hardware.cshtml (95%) rename BTCPayServer/Views/{Stores => UIStores}/ImportWallet/Scan.cshtml (94%) rename BTCPayServer/Views/{Stores => UIStores}/ImportWallet/Seed.cshtml (88%) rename BTCPayServer/Views/{Stores => UIStores}/ImportWallet/Xpub.cshtml (96%) rename BTCPayServer/Views/{Stores => UIStores}/ImportWalletOptions.cshtml (77%) rename BTCPayServer/Views/{Stores => UIStores}/Integrations.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/LightningSettings.cshtml (96%) rename BTCPayServer/Views/{Stores => UIStores}/ListTokens.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/ModifyWebhook.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/PayButton.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/PayButtonEnable.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/PaymentMethods.cshtml (98%) rename BTCPayServer/Views/{Stores => UIStores}/Rates.cshtml (98%) rename BTCPayServer/Views/{Stores => UIStores}/RequestPairing.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/SetupLightningNode.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/SetupWallet.cshtml (77%) rename BTCPayServer/Views/{Stores => UIStores}/ShowToken.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/StoreNavPages.cs (100%) rename BTCPayServer/Views/{Stores => UIStores}/StoreUsers.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/TestWebhook.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/WalletSettings.cshtml (97%) rename BTCPayServer/Views/{Stores => UIStores}/Webhooks.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/_GenerateWalletForm.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/_LayoutWalletSetup.cshtml (72%) rename BTCPayServer/Views/{Stores => UIStores}/_Nav.cshtml (54%) rename BTCPayServer/Views/{Stores => UIStores}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{Stores => UIStores}/_ViewStart.cshtml (100%) rename BTCPayServer/Views/{UserStores => UIUserStores}/CreateStore.cshtml (100%) rename BTCPayServer/Views/{UserStores => UIUserStores}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{UserStores => UIUserStores}/_ViewStart.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/CoinSelection.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/ListWallets.cshtml (96%) rename BTCPayServer/Views/{Wallets => UIWallets}/SignWithSeed.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/SigningContext.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletPSBT.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletPSBTCombine.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletPSBTDecoded.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletReceive.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletRescan.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletSend.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletSendVault.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletSigningOptions.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletTransactions.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/WalletsNavPages.cs (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/_Nav.cshtml (51%) rename BTCPayServer/Views/{Wallets => UIWallets}/_PSBTInfo.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/_ViewImports.cshtml (100%) rename BTCPayServer/Views/{Wallets => UIWallets}/_ViewStart.cshtml (100%) diff --git a/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml b/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml index 37530f946..9a7c63ae5 100644 --- a/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml +++ b/BTCPayServer.Plugins.Test/Views/Shared/TestExtensionNavExtension.cshtml @@ -1,2 +1,2 @@ -
  • Dear Nicolas Dorier
    • +
  • Dear Nicolas Dorier
    • diff --git a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs index 5e7598f76..8167d685c 100644 --- a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs +++ b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs @@ -69,7 +69,7 @@ namespace BTCPayServer.Tests Assert.Equal(3, invoice.CryptoInfo.Length); - var controller = user.GetController(); + var controller = user.GetController(); var lightningVm = (LightningNodeViewModel)Assert.IsType(await controller.SetupLightningNode(user.StoreId, cryptoCode)).Model; Assert.True(lightningVm.Enabled); var response = await controller.SetLightningNodeEnabled(user.StoreId, cryptoCode, false); @@ -200,7 +200,7 @@ namespace BTCPayServer.Tests invoice = user.BitPay.GetInvoice(invoice.Id); Assert.Equal("paid", invoice.Status); }); - var wallet = tester.PayTester.GetController(); + var wallet = tester.PayTester.GetController(); var psbt = wallet.CreatePSBT(btcNetwork, onchainBTC, new WalletSendModel() { @@ -310,7 +310,7 @@ namespace BTCPayServer.Tests Assert.Single(invoice.CryptoInfo); // Only BTC should be presented - var controller = tester.PayTester.GetController(null); + var controller = tester.PayTester.GetController(null); var checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id) .GetAwaiter().GetResult()).Value; @@ -493,7 +493,7 @@ namespace BTCPayServer.Tests Assert.Single(invoice.CryptoInfo); // Only BTC should be presented - var controller = tester.PayTester.GetController(null); + var controller = tester.PayTester.GetController(null); var checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, null) .GetAwaiter().GetResult()).Value; @@ -555,7 +555,7 @@ namespace BTCPayServer.Tests Assert.False((bool)((JValue)invoice.ExceptionStatus).Value); }); - controller = tester.PayTester.GetController(null); + controller = tester.PayTester.GetController(null); checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, "LTC") .GetAwaiter().GetResult()).Value; Assert.Equal(2, checkout.AvailableCryptos.Count); @@ -608,7 +608,7 @@ namespace BTCPayServer.Tests await user.GrantAccessAsync(); user.RegisterDerivationScheme("BTC"); user.RegisterDerivationScheme("LTC"); - var apps = user.GetController(); + var apps = user.GetController(); var vm = Assert.IsType(Assert.IsType(apps.CreateApp(user.StoreId)).Model); vm.AppName = "test"; vm.SelectedAppType = AppType.PointOfSale.ToString(); @@ -639,7 +639,7 @@ donation: .IsType(apps.UpdatePointOfSale(app.Id)).Model); Assert.Equal("hello", vmpos.Title); - var publicApps = user.GetController(); + var publicApps = user.GetController(); var vmview = Assert.IsType(Assert .IsType(publicApps.ViewPointOfSale(app.Id, PosViewType.Cart).Result).Model); @@ -673,7 +673,7 @@ donation: // testing custom amount var action = Assert.IsType(publicApps .ViewPointOfSale(app.Id, PosViewType.Cart, 6.6m, null, null, null, null, "donation").Result); - Assert.Equal(nameof(InvoiceController.Checkout), action.ActionName); + Assert.Equal(nameof(UIInvoiceController.Checkout), action.ActionName); invoices = user.BitPay.GetInvoices(); var donationInvoice = invoices.Single(i => i.Price == 6.6m); Assert.NotNull(donationInvoice); @@ -711,7 +711,7 @@ donation: custom: true "; Assert.IsType(apps.UpdatePointOfSale(app.Id, vmpos).Result); - publicApps = user.GetController(); + publicApps = user.GetController(); vmview = Assert.IsType(Assert .IsType(publicApps.ViewPointOfSale(app.Id, PosViewType.Cart).Result).Model); Assert.Equal(test.Code, vmview.CurrencyCode); @@ -768,7 +768,7 @@ noninventoryitem: Assert.NotNull(inventoryItemInvoice); //let's mark the inventoryitem invoice as invalid, this should return the item to back in stock - var controller = tester.PayTester.GetController(user.UserId, user.StoreId); + var controller = tester.PayTester.GetController(user.UserId, user.StoreId); var appService = tester.PayTester.GetService(); var eventAggregator = tester.PayTester.GetService(); Assert.IsType(await controller.ChangeInvoiceState(inventoryItemInvoice.Id, "invalid")); diff --git a/BTCPayServer.Tests/AltcoinTests/ElementsTests.cs b/BTCPayServer.Tests/AltcoinTests/ElementsTests.cs index 39bf31e29..bf48dc56f 100644 --- a/BTCPayServer.Tests/AltcoinTests/ElementsTests.cs +++ b/BTCPayServer.Tests/AltcoinTests/ElementsTests.cs @@ -40,7 +40,7 @@ namespace BTCPayServer.Tests user.RegisterDerivationScheme("BTC"); user.RegisterDerivationScheme("USDT"); - Assert.Equal(3, Assert.IsType(Assert.IsType(await user.GetController().ListWallets()).Model).Wallets.Count); + Assert.Equal(3, Assert.IsType(Assert.IsType(await user.GetController().ListWallets()).Model).Wallets.Count); } } diff --git a/BTCPayServer.Tests/CrowdfundTests.cs b/BTCPayServer.Tests/CrowdfundTests.cs index 98fa79c7c..0f6454579 100644 --- a/BTCPayServer.Tests/CrowdfundTests.cs +++ b/BTCPayServer.Tests/CrowdfundTests.cs @@ -33,8 +33,8 @@ namespace BTCPayServer.Tests await user.GrantAccessAsync(); var user2 = tester.NewAccount(); await user2.GrantAccessAsync(); - var apps = user.GetController(); - var apps2 = user2.GetController(); + var apps = user.GetController(); + var apps2 = user2.GetController(); var vm = Assert.IsType(Assert.IsType(apps.CreateApp(user.StoreId)).Model); Assert.NotNull(vm.SelectedAppType); Assert.Null(vm.AppName); @@ -72,7 +72,7 @@ namespace BTCPayServer.Tests var user = tester.NewAccount(); await user.GrantAccessAsync(); user.RegisterDerivationScheme("BTC"); - var apps = user.GetController(); + var apps = user.GetController(); var vm = Assert.IsType(Assert.IsType(apps.CreateApp(user.StoreId)).Model); vm.AppName = "test"; vm.SelectedAppType = AppType.Crowdfund.ToString(); @@ -90,8 +90,8 @@ namespace BTCPayServer.Tests Assert.IsType(apps.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result); - var anonAppPubsController = tester.PayTester.GetController(); - var publicApps = user.GetController(); + var anonAppPubsController = tester.PayTester.GetController(); + var publicApps = user.GetController(); Assert.IsType(await anonAppPubsController.ContributeToCrowdfund(app.Id, new ContributeToCrowdfund() { @@ -162,7 +162,7 @@ namespace BTCPayServer.Tests await user.GrantAccessAsync(); user.RegisterDerivationScheme("BTC"); await user.SetNetworkFeeMode(NetworkFeeMode.Never); - var apps = user.GetController(); + var apps = user.GetController(); var vm = Assert.IsType(Assert.IsType(apps.CreateApp(user.StoreId)).Model); vm.AppName = "test"; vm.SelectedAppType = AppType.Crowdfund.ToString(); @@ -182,8 +182,8 @@ namespace BTCPayServer.Tests crowdfundViewModel.EnforceTargetAmount = true; Assert.IsType(apps.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result); - var anonAppPubsController = tester.PayTester.GetController(); - var publicApps = user.GetController(); + var anonAppPubsController = tester.PayTester.GetController(); + var publicApps = user.GetController(); var model = Assert.IsType(Assert .IsType(publicApps.ViewCrowdfund(app.Id, String.Empty).Result).Model); diff --git a/BTCPayServer.Tests/FastTests.cs b/BTCPayServer.Tests/FastTests.cs index cbda65097..fda520e03 100644 --- a/BTCPayServer.Tests/FastTests.cs +++ b/BTCPayServer.Tests/FastTests.cs @@ -1208,7 +1208,7 @@ namespace BTCPayServer.Tests testCases.ForEach(tuple => { - Assert.Equal(tuple.expectedOutput, InvoiceController.PosDataParser.ParsePosData(tuple.input)); + Assert.Equal(tuple.expectedOutput, UIInvoiceController.PosDataParser.ParsePosData(tuple.input)); }); } [Fact] diff --git a/BTCPayServer.Tests/GreenfieldAPITests.cs b/BTCPayServer.Tests/GreenfieldAPITests.cs index aa63f320d..386e18295 100644 --- a/BTCPayServer.Tests/GreenfieldAPITests.cs +++ b/BTCPayServer.Tests/GreenfieldAPITests.cs @@ -977,7 +977,7 @@ namespace BTCPayServer.Tests var paymentTestPaymentRequest = await client.CreatePaymentRequest(user.StoreId, new CreatePaymentRequestRequest() { Amount = 0.1m, Currency = "BTC", Title = "Payment test title" }); - var invoiceId = Assert.IsType(Assert.IsType(await user.GetController() + var invoiceId = Assert.IsType(Assert.IsType(await user.GetController() .PayPaymentRequest(paymentTestPaymentRequest.Id, false)).Value); var invoice = user.BitPay.GetInvoice(invoiceId); await tester.WaitForEvent(async () => @@ -1332,7 +1332,7 @@ namespace BTCPayServer.Tests } }); Assert.EndsWith($"/i/{newInvoice.Id}", newInvoice.CheckoutLink); - var controller = tester.PayTester.GetController(user.UserId, user.StoreId); + var controller = tester.PayTester.GetController(user.UserId, user.StoreId); var model = (PaymentModel)((ViewResult)await controller.Checkout(newInvoice.Id)).Model; Assert.Equal("it-IT", model.DefaultLang); Assert.Equal("http://toto.com/lol", model.MerchantRefLink); diff --git a/BTCPayServer.Tests/POSTests.cs b/BTCPayServer.Tests/POSTests.cs index 34d8817fd..603345419 100644 --- a/BTCPayServer.Tests/POSTests.cs +++ b/BTCPayServer.Tests/POSTests.cs @@ -28,7 +28,7 @@ namespace BTCPayServer.Tests var user = tester.NewAccount(); await user.GrantAccessAsync(); user.RegisterDerivationScheme("BTC"); - var apps = user.GetController(); + var apps = user.GetController(); var vm = Assert.IsType(Assert.IsType(apps.CreateApp(user.StoreId)).Model); vm.AppName = "test"; vm.SelectedAppType = AppType.PointOfSale.ToString(); @@ -52,7 +52,7 @@ donation: Assert.IsType(apps.UpdatePointOfSale(app.Id, vmpos).Result); vmpos = Assert.IsType(Assert .IsType(apps.UpdatePointOfSale(app.Id)).Model); - var publicApps = user.GetController(); + var publicApps = user.GetController(); var vmview = Assert.IsType(Assert .IsType(publicApps.ViewPointOfSale(app.Id, PosViewType.Cart).Result).Model); diff --git a/BTCPayServer.Tests/PSBTTests.cs b/BTCPayServer.Tests/PSBTTests.cs index bc594bc38..e240753d9 100644 --- a/BTCPayServer.Tests/PSBTTests.cs +++ b/BTCPayServer.Tests/PSBTTests.cs @@ -47,7 +47,7 @@ namespace BTCPayServer.Tests Assert.Equal("paid", invoice.Status); }); - var walletController = user.GetController(); + var walletController = user.GetController(); var walletId = new WalletId(user.StoreId, "BTC"); var sendDestination = new Key().PubKey.Hash.GetAddress(user.SupportedNetwork.NBitcoinNetwork).ToString(); var sendModel = new WalletSendModel() diff --git a/BTCPayServer.Tests/PayJoinTests.cs b/BTCPayServer.Tests/PayJoinTests.cs index c6c64527d..f2f599f1a 100644 --- a/BTCPayServer.Tests/PayJoinTests.cs +++ b/BTCPayServer.Tests/PayJoinTests.cs @@ -469,7 +469,7 @@ namespace BTCPayServer.Tests changeIndex = i; } - var derivationSchemeSettings = alice.GetController().GetDerivationSchemeSettings(new WalletId(alice.StoreId, "BTC")); + var derivationSchemeSettings = alice.GetController().GetDerivationSchemeSettings(new WalletId(alice.StoreId, "BTC")); var signingAccount = derivationSchemeSettings.GetSigningAccountKeySettings(); psbt.SignAll(derivationSchemeSettings.AccountDerivation, alice.GenerateWalletResponseV.AccountHDKey, signingAccount.GetRootedKeyPath()); using var fakeServer = new FakeServer(); diff --git a/BTCPayServer.Tests/PaymentRequestTests.cs b/BTCPayServer.Tests/PaymentRequestTests.cs index 265a0afab..8c1746b7b 100644 --- a/BTCPayServer.Tests/PaymentRequestTests.cs +++ b/BTCPayServer.Tests/PaymentRequestTests.cs @@ -35,8 +35,8 @@ namespace BTCPayServer.Tests await user2.GrantAccessAsync(); - var paymentRequestController = user.GetController(); - var guestpaymentRequestController = user2.GetController(); + var paymentRequestController = user.GetController(); + var guestpaymentRequestController = user2.GetController(); var request = new UpdatePaymentRequestViewModel { @@ -104,7 +104,7 @@ namespace BTCPayServer.Tests await user.GrantAccessAsync(); user.RegisterDerivationScheme("BTC"); - var paymentRequestController = user.GetController(); + var paymentRequestController = user.GetController(); Assert.IsType( await paymentRequestController.PayPaymentRequest(Guid.NewGuid().ToString())); @@ -132,7 +132,7 @@ namespace BTCPayServer.Tests await paymentRequestController.PayPaymentRequest(response.Value.ToString())); Assert.Equal("Checkout", actionResult.ActionName); - Assert.Equal("Invoice", actionResult.ControllerName); + Assert.Equal("UIInvoice", actionResult.ControllerName); Assert.Contains(actionResult.RouteValues, pair => pair.Key == "Id" && pair.Value.ToString() == invoiceId); @@ -170,7 +170,7 @@ namespace BTCPayServer.Tests user.GrantAccess(); user.RegisterDerivationScheme("BTC"); - var paymentRequestController = user.GetController(); + var paymentRequestController = user.GetController(); Assert.IsType(await paymentRequestController.CancelUnpaidPendingInvoice(Guid.NewGuid().ToString(), false)); @@ -209,7 +209,7 @@ namespace BTCPayServer.Tests await paymentRequestController.PayPaymentRequest(response.Value.ToString())); Assert.Equal("Checkout", actionResult.ActionName); - Assert.Equal("Invoice", actionResult.ControllerName); + Assert.Equal("UIInvoice", actionResult.ControllerName); Assert.Contains(actionResult.RouteValues, pair => pair.Key == "Id" && pair.Value.ToString() == invoiceId); diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs index 100ec9cb4..24e166302 100644 --- a/BTCPayServer.Tests/SeleniumTests.cs +++ b/BTCPayServer.Tests/SeleniumTests.cs @@ -150,8 +150,8 @@ namespace BTCPayServer.Tests s.Driver.AssertNoError(); Assert.Contains("/login", s.Driver.Url); - s.GoToUrl("/Manage/Index"); - Assert.Contains("ReturnUrl=%2FManage%2FIndex", s.Driver.Url); + s.GoToUrl("/UIManage/Index"); + Assert.Contains("ReturnUrl=%2FUIManage%2FIndex", s.Driver.Url); // We should be redirected to login //Same User Can Log Back In @@ -160,7 +160,7 @@ namespace BTCPayServer.Tests s.Driver.FindElement(By.Id("LoginButton")).Click(); // We should be redirected to invoice - Assert.EndsWith("/Manage/Index", s.Driver.Url); + Assert.EndsWith("/UIManage/Index", s.Driver.Url); // Should not be able to reach server settings s.GoToUrl("/server/users"); @@ -668,6 +668,8 @@ namespace BTCPayServer.Tests s.Driver.FindElement(By.Id("Amount")).SendKeys("700"); s.Driver.FindElement(By.Id("Currency")).SendKeys("BTC"); s.Driver.FindElement(By.Id("SaveButton")).Click(); + var aaa = s.Driver.PageSource; + var url = s.Driver.Url; s.Driver.FindElement(By.Id("ViewAppButton")).Click(); s.Driver.SwitchTo().Window(s.Driver.WindowHandles.Last()); Assert.Equal("Amount due", s.Driver.FindElement(By.CssSelector("[data-test='amount-due-title']")).Text); diff --git a/BTCPayServer.Tests/TestAccount.cs b/BTCPayServer.Tests/TestAccount.cs index 0abe095b5..275665494 100644 --- a/BTCPayServer.Tests/TestAccount.cs +++ b/BTCPayServer.Tests/TestAccount.cs @@ -70,9 +70,9 @@ namespace BTCPayServer.Tests public async Task CreateClient(params string[] permissions) { - var manageController = parent.PayTester.GetController(UserId, StoreId, IsAdmin); + var manageController = parent.PayTester.GetController(UserId, StoreId, IsAdmin); var x = Assert.IsType(await manageController.AddApiKey( - new ManageController.AddApiKeyViewModel() + new UIManageController.AddApiKeyViewModel() { PermissionValues = permissions.Select(s => { @@ -82,11 +82,11 @@ namespace BTCPayServer.Tests { var stores = p.Where(permission => !string.IsNullOrEmpty(permission.Scope)) .Select(permission => permission.Scope).ToList(); - return new ManageController.AddApiKeyViewModel.PermissionValueItem() + return new UIManageController.AddApiKeyViewModel.PermissionValueItem() { Permission = p.Key, Forbidden = false, - StoreMode = stores.Any() ? ManageController.AddApiKeyViewModel.ApiKeyStoreMode.Specific : ManageController.AddApiKeyViewModel.ApiKeyStoreMode.AllStores, + StoreMode = stores.Any() ? UIManageController.AddApiKeyViewModel.ApiKeyStoreMode.Specific : UIManageController.AddApiKeyViewModel.ApiKeyStoreMode.AllStores, SpecificStores = stores, Value = true }; @@ -109,7 +109,7 @@ namespace BTCPayServer.Tests { await RegisterAsync(isAdmin); await CreateStoreAsync(); - var store = GetController(); + var store = GetController(); var pairingCode = BitPay.RequestClientAuthorization("test", Facade.Merchant); Assert.IsType(await store.RequestPairing(pairingCode.ToString())); await store.Pair(pairingCode.ToString(), StoreId); @@ -135,7 +135,7 @@ namespace BTCPayServer.Tests public async Task ModifyPayment(Action modify) { - var storeController = GetController(); + var storeController = GetController(); var response = storeController.PaymentMethods(); PaymentMethodsViewModel paymentMethods = (PaymentMethodsViewModel)((ViewResult)response).Model; modify(paymentMethods); @@ -144,7 +144,7 @@ namespace BTCPayServer.Tests public async Task ModifyWalletSettings(Action modify) { - var storeController = GetController(); + var storeController = GetController(); var response = await storeController.WalletSettings(StoreId, "BTC"); WalletSettingsViewModel walletSettings = (WalletSettingsViewModel)((ViewResult)response).Model; modify(walletSettings); @@ -153,7 +153,7 @@ namespace BTCPayServer.Tests public async Task ModifyOnchainPaymentSettings(Action modify) { - var storeController = GetController(); + var storeController = GetController(); var response = await storeController.WalletSettings(StoreId, "BTC"); WalletSettingsViewModel walletSettings = (WalletSettingsViewModel)((ViewResult)response).Model; modify(walletSettings); @@ -172,7 +172,7 @@ namespace BTCPayServer.Tests { await RegisterAsync(); } - var store = GetController(); + var store = GetController(); await store.CreateStore(new CreateStoreViewModel { Name = "Test Store" }); StoreId = store.CreatedStoreId; parent.Stores.Add(StoreId); @@ -191,7 +191,7 @@ namespace BTCPayServer.Tests if (StoreId is null) await CreateStoreAsync(); SupportedNetwork = parent.NetworkProvider.GetNetwork(cryptoCode); - var store = parent.PayTester.GetController(UserId, StoreId, true); + var store = parent.PayTester.GetController(UserId, StoreId, true); var generateRequest = new WalletSetupRequest { @@ -215,7 +215,7 @@ namespace BTCPayServer.Tests private async Task RegisterAsync(bool isAdmin = false) { - var account = parent.PayTester.GetController(); + var account = parent.PayTester.GetController(); RegisterDetails = new RegisterViewModel() { Email = Guid.NewGuid() + "@toto.com", @@ -271,7 +271,7 @@ namespace BTCPayServer.Tests } public async Task RegisterLightningNodeAsync(string cryptoCode, LightningConnectionType? connectionType, bool isMerchant = true, string storeId = null) { - var storeController = GetController(); + var storeController = GetController(); var connectionString = parent.GetLightningConnectionString(connectionType, isMerchant); var nodeType = connectionString == LightningSupportedPaymentMethod.InternalNode ? LightningNodeType.Internal : LightningNodeType.Custom; @@ -285,7 +285,7 @@ namespace BTCPayServer.Tests public async Task RegisterInternalLightningNodeAsync(string cryptoCode, string storeId = null) { - var storeController = GetController(); + var storeController = GetController(); var vm = new LightningNodeViewModel { ConnectionString = "", LightningNodeType = LightningNodeType.Internal, SkipPortTest = true }; await storeController.SetupLightningNode(storeId ?? StoreId, vm, "save", cryptoCode); diff --git a/BTCPayServer.Tests/ThirdPartyTests.cs b/BTCPayServer.Tests/ThirdPartyTests.cs index 484461a6d..49fc997cd 100644 --- a/BTCPayServer.Tests/ThirdPartyTests.cs +++ b/BTCPayServer.Tests/ThirdPartyTests.cs @@ -42,7 +42,7 @@ namespace BTCPayServer.Tests await tester.StartAsync(); var user = tester.NewAccount(); user.GrantAccess(); - var controller = tester.PayTester.GetController(user.UserId, user.StoreId); + var controller = tester.PayTester.GetController(user.UserId, user.StoreId); var azureBlobStorageConfiguration = Assert.IsType(Assert .IsType(await controller.StorageProvider(StorageProvider.AzureBlobStorage.ToString())) .Model); @@ -362,7 +362,7 @@ namespace BTCPayServer.Tests private static async Task CreateInvoice(ServerTester tester, TestAccount user, string exchange, string currency = "USD") { - var storeController = user.GetController(); + var storeController = user.GetController(); var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model; vm.PreferredExchange = exchange; await storeController.Rates(vm); diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs index bd2922f8e..fe83b3744 100644 --- a/BTCPayServer.Tests/UnitTest1.cs +++ b/BTCPayServer.Tests/UnitTest1.cs @@ -140,7 +140,7 @@ namespace BTCPayServer.Tests var acc = tester.NewAccount(); var sresp = Assert - .IsType(await tester.PayTester.GetController(acc.UserId, acc.StoreId) + .IsType(await tester.PayTester.GetController(acc.UserId, acc.StoreId) .Swagger()).Value.ToJson(); JObject swagger = JObject.Parse(sresp); var schema = JSchema.Parse(File.ReadAllText(TestUtils.GetTestDataFullPath("OpenAPI-Specification-schema.json"))); @@ -173,13 +173,13 @@ namespace BTCPayServer.Tests "BTCPay Server supports authenticating and authorizing users through an API Key that is generated by them. Send the API Key as a header value to Authorization with the format: `token {token}`. For a smoother experience, you can generate a url that redirects users to an API key creation screen.\n\n The following permissions are available to the context of the user creating the API Key:\n\n#OTHERPERMISSIONS#\n\nThe following permissions are available if the user is an administrator:\n\n#SERVERPERMISSIONS#\n\nThe following permissions applies to all stores of the user, you can limit to a specific store with the following format: `btcpay.store.cancreateinvoice:6HSHAEU4iYWtjxtyRs9KyPjM9GAQp8kw2T9VWbGG1FnZ`:\n\n#STOREPERMISSIONS#\n\nNote that API Keys only limits permission of a user and can never expand it. If an API Key has the permission `btcpay.server.canmodifyserversettings` but that the user account creating this API Key is not administrator, the API Key will not be able to modify the server settings.\nSome permissions may include other permissions, see [this operation](#operation/permissionsMetadata).\n"; var storePolicies = - ManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair => + UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair => Policies.IsStorePolicy(pair.Key) && !pair.Key.EndsWith(":", StringComparison.InvariantCulture)); var serverPolicies = - ManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair => + UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair => Policies.IsServerPolicy(pair.Key)); var otherPolicies = - ManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair => + UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.Where(pair => !Policies.IsStorePolicy(pair.Key) && !Policies.IsServerPolicy(pair.Key)); description = description.Replace("#OTHERPERMISSIONS#", @@ -191,7 +191,7 @@ namespace BTCPayServer.Tests TestLogs.LogInformation(description); var sresp = Assert - .IsType(await tester.PayTester.GetController(acc.UserId, acc.StoreId) + .IsType(await tester.PayTester.GetController(acc.UserId, acc.StoreId) .Swagger()).Value.ToJson(); JObject json = JObject.Parse(sresp); @@ -279,7 +279,7 @@ namespace BTCPayServer.Tests user.RegisterDerivationScheme("BTC"); // Set tolerance to 50% - var stores = user.GetController(); + var stores = user.GetController(); var response = stores.PaymentMethods(); var vm = Assert.IsType(Assert.IsType(response).Model); Assert.Equal(0.0, vm.PaymentTolerance); @@ -425,7 +425,7 @@ namespace BTCPayServer.Tests await tester.EnsureChannelsSetup(); var user = tester.NewAccount(); user.GrantAccess(true); - var storeController = user.GetController(); + var storeController = user.GetController(); var storeResponse = storeController.PaymentMethods(); Assert.IsType(storeResponse); Assert.IsType(await storeController.SetupLightningNode(user.StoreId, "BTC")); @@ -538,7 +538,7 @@ namespace BTCPayServer.Tests acc.Register(); acc.CreateStore(); - var controller = acc.GetController(); + var controller = acc.GetController(); var token = (RedirectToActionResult)await controller.CreateToken2( new Models.StoreViewModels.CreateTokenViewModel() { @@ -635,14 +635,14 @@ namespace BTCPayServer.Tests var acc = tester.NewAccount(); acc.Register(); acc.CreateStore(); - var store = acc.GetController(); + var store = acc.GetController(); var pairingCode = acc.BitPay.RequestClientAuthorization("test", Facade.Merchant); Assert.IsType(store.Pair(pairingCode.ToString(), acc.StoreId).GetAwaiter() .GetResult()); pairingCode = acc.BitPay.RequestClientAuthorization("test1", Facade.Merchant); acc.CreateStore(); - var store2 = acc.GetController(); + var store2 = acc.GetController(); await store2.Pair(pairingCode.ToString(), store2.CurrentStore.Id); Assert.Contains(nameof(PairingResult.ReusedKey), (string)store2.TempData[WellKnownTempData.ErrorMessage], StringComparison.CurrentCultureIgnoreCase); @@ -703,11 +703,11 @@ namespace BTCPayServer.Tests acc.RegisterDerivationScheme("BTC", ScriptPubKeyType.Segwit); var btcDerivationScheme = acc.DerivationScheme; - var walletController = acc.GetController(); + var walletController = acc.GetController(); var walletId = new WalletId(acc.StoreId, "BTC"); acc.IsAdmin = true; - walletController = acc.GetController(); + walletController = acc.GetController(); var rescan = Assert.IsType(Assert @@ -857,7 +857,7 @@ namespace BTCPayServer.Tests acc.RegisterDerivationScheme("BTC"); const string newVersion = "1.0.4.4"; - var ctrl = acc.GetController(); + var ctrl = acc.GetController(); var resp = await ctrl.Generate(newVersion); var vm = Assert.IsType( @@ -903,11 +903,11 @@ namespace BTCPayServer.Tests // We don't have any default currencies, so this should be failing Assert.Null(GetRatesResult?.Data); - var store = acc.GetController(); + var store = acc.GetController(); var ratesVM = (RatesViewModel)(Assert.IsType(store.Rates()).Model); ratesVM.DefaultCurrencyPairs = "BTC_USD,LTC_USD"; await store.Rates(ratesVM); - store = acc.GetController(); + store = acc.GetController(); rateController = acc.GetController(); GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, default) .GetAwaiter().GetResult()).Value.ToJson()).ToObject>(); @@ -940,7 +940,7 @@ namespace BTCPayServer.Tests private void AssertSearchInvoice(TestAccount acc, bool expected, string invoiceId, string filter, string storeId = null) { var result = - (InvoicesModel)((ViewResult)acc.GetController() + (InvoicesModel)((ViewResult)acc.GetController() .ListInvoices(new InvoicesModel { SearchTerm = filter, StoreId = storeId }).Result).Model; Assert.Equal(expected, result.Invoices.Any(i => i.InvoiceId == invoiceId)); } @@ -1124,7 +1124,7 @@ namespace BTCPayServer.Tests var payments = Assert.IsType( - Assert.IsType(await user.GetController().Invoice(invoice.Id)).Model) + Assert.IsType(await user.GetController().Invoice(invoice.Id)).Model) .Payments; Assert.Single(payments); var paymentData = payments.First().GetCryptoPaymentData() as BitcoinLikePaymentData; @@ -1181,7 +1181,7 @@ namespace BTCPayServer.Tests Assert.True(user.BitPay.TestAccess(Facade.Merchant)); // Test request pairing code client side - var storeController = user.GetController(); + var storeController = user.GetController(); storeController .CreateToken(user.StoreId, new CreateTokenViewModel() { Label = "test2", StoreId = user.StoreId }) .GetAwaiter().GetResult(); @@ -1201,14 +1201,14 @@ namespace BTCPayServer.Tests // Can generate API Key var repo = tester.PayTester.GetService(); Assert.Empty(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult()); - Assert.IsType(user.GetController() + Assert.IsType(user.GetController() .GenerateAPIKey(user.StoreId).GetAwaiter().GetResult()); var apiKey = Assert.Single(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult()); /////// // Generating a new one remove the previous - Assert.IsType(user.GetController() + Assert.IsType(user.GetController() .GenerateAPIKey(user.StoreId).GetAwaiter().GetResult()); var apiKey2 = Assert.Single(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult()); Assert.NotEqual(apiKey, apiKey2); @@ -1320,7 +1320,7 @@ namespace BTCPayServer.Tests }, Facade.Merchant); Assert.Equal(Money.Coins(1.0m), invoice1.BtcPrice); - var storeController = user.GetController(); + var storeController = user.GetController(); var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model; Assert.Equal(0.0, vm.Spread); vm.Spread = 40; @@ -1439,7 +1439,7 @@ namespace BTCPayServer.Tests user.GrantAccess(); user.RegisterDerivationScheme("BTC"); - var store = user.GetController(); + var store = user.GetController(); var rateVm = Assert.IsType(Assert.IsType(store.Rates()).Model); Assert.False(rateVm.ShowScripting); Assert.Equal(CoinGeckoRateProvider.CoinGeckoName, rateVm.PreferredExchange); @@ -1453,7 +1453,7 @@ namespace BTCPayServer.Tests rateVm.ScriptTest = "BTC_JPY,BTC_CAD"; rateVm.Spread = 10; - store = user.GetController(); + store = user.GetController(); rateVm = Assert.IsType(Assert.IsType(await store.Rates(rateVm, "Test")) .Model); Assert.NotNull(rateVm.TestRateRules); @@ -1466,7 +1466,7 @@ namespace BTCPayServer.Tests Assert.IsType(store.ShowRateRulesPost(true).Result); Assert.IsType(await store.Rates(rateVm, "Save")); - store = user.GetController(); + store = user.GetController(); rateVm = Assert.IsType(Assert.IsType(store.Rates()).Model); Assert.Equal(rateVm.StoreId, user.StoreId); Assert.Equal(rateVm.DefaultScript, rateVm.Script); @@ -1487,7 +1487,7 @@ namespace BTCPayServer.Tests .Model); Assert.True(rateVm.TestRateRules.All(t => !t.Error)); Assert.IsType(await store.Rates(rateVm, "Save")); - store = user.GetController(); + store = user.GetController(); rateVm = Assert.IsType(Assert.IsType(store.Rates()).Model); Assert.Equal(50, rateVm.Spread); Assert.True(rateVm.ShowScripting); @@ -1522,7 +1522,7 @@ namespace BTCPayServer.Tests Assert.Equal("EUR", invoice2.Currency); // via UI - var controller = user.GetController(); + var controller = user.GetController(); var model = await controller.CreateInvoice(); (await controller.CreateInvoice(new CreateInvoiceModel(), default)).AssertType(); invoice = await client.GetInvoice(user.StoreId, controller.CreatedInvoiceId); @@ -1530,7 +1530,7 @@ namespace BTCPayServer.Tests Assert.Equal(InvoiceType.TopUp, invoice.Type); // Check that the SendWallet use the default currency - var walletController = user.GetController(); + var walletController = user.GetController(); var walletSend = await walletController.WalletSend(new WalletId(user.StoreId, "BTC")).AssertViewModelAsync(); Assert.Equal("EUR", walletSend.Fiat); } @@ -1555,13 +1555,13 @@ namespace BTCPayServer.Tests // We allow BTC and LN, but not BTC under 5 USD, so only LN should be in the invoice var vm = Assert.IsType(Assert - .IsType(user.GetController().CheckoutAppearance()).Model); + .IsType(user.GetController().CheckoutAppearance()).Model); Assert.Equal(2, vm.PaymentMethodCriteria.Count); var criteria = Assert.Single(vm.PaymentMethodCriteria.Where(m => m.PaymentMethod == btcMethod.ToString())); Assert.Equal(new PaymentMethodId("BTC", BitcoinPaymentType.Instance).ToString(), criteria.PaymentMethod); criteria.Value = "5 USD"; criteria.Type = PaymentMethodCriteriaViewModel.CriteriaType.GreaterThan; - Assert.IsType(user.GetController().CheckoutAppearance(vm) + Assert.IsType(user.GetController().CheckoutAppearance(vm) .Result); var invoice = user.BitPay.CreateInvoice( @@ -1582,7 +1582,7 @@ namespace BTCPayServer.Tests // We allow BTC for more than 5 USD, and LN for less than 150. The default is LN, so the default // payment method should be LN. vm = Assert.IsType(Assert - .IsType(user.GetController().CheckoutAppearance()).Model); + .IsType(user.GetController().CheckoutAppearance()).Model); vm.DefaultPaymentMethod = lnMethod; criteria = vm.PaymentMethodCriteria.First(); criteria.Value = "150 USD"; @@ -1590,7 +1590,7 @@ namespace BTCPayServer.Tests criteria = vm.PaymentMethodCriteria.Skip(1).First(); criteria.Value = "5 USD"; criteria.Type = PaymentMethodCriteriaViewModel.CriteriaType.GreaterThan; - Assert.IsType(user.GetController().CheckoutAppearance(vm) + Assert.IsType(user.GetController().CheckoutAppearance(vm) .Result); invoice = user.BitPay.CreateInvoice( new Invoice() @@ -1602,14 +1602,14 @@ namespace BTCPayServer.Tests ItemDesc = "Some description", FullNotifications = true }, Facade.Merchant); - var checkout = (await user.GetController().Checkout(invoice.Id)).AssertViewModel(); + var checkout = (await user.GetController().Checkout(invoice.Id)).AssertViewModel(); Assert.Equal(lnMethod, checkout.PaymentMethodId); // If we change store's default, it should change the checkout's default vm.DefaultPaymentMethod = btcMethod; - Assert.IsType(user.GetController().CheckoutAppearance(vm) + Assert.IsType(user.GetController().CheckoutAppearance(vm) .Result); - checkout = (await user.GetController().Checkout(invoice.Id)).AssertViewModel(); + checkout = (await user.GetController().Checkout(invoice.Id)).AssertViewModel(); Assert.Equal(btcMethod, checkout.PaymentMethodId); } } @@ -1641,7 +1641,7 @@ namespace BTCPayServer.Tests }, Facade.Merchant); // validate that invoice data model doesn't have lightning string initially - var res = await user.GetController().Checkout(invoice.Id); + var res = await user.GetController().Checkout(invoice.Id); var paymentMethodFirst = Assert.IsType( Assert.IsType(res).Model ); @@ -1649,15 +1649,15 @@ namespace BTCPayServer.Tests // enable unified QR code in settings var vm = Assert.IsType(Assert - .IsType(await user.GetController().LightningSettings(user.StoreId, cryptoCode)).Model + .IsType(await user.GetController().LightningSettings(user.StoreId, cryptoCode)).Model ); vm.OnChainWithLnInvoiceFallback = true; Assert.IsType( - user.GetController().LightningSettings(vm).Result + user.GetController().LightningSettings(vm).Result ); // validate that QR code now has both onchain and offchain payment urls - res = await user.GetController().Checkout(invoice.Id); + res = await user.GetController().Checkout(invoice.Id); var paymentMethodSecond = Assert.IsType( Assert.IsType(res).Model ); @@ -1689,12 +1689,12 @@ namespace BTCPayServer.Tests var cryptoCode = "BTC"; user.GrantAccess(true); user.RegisterLightningNode(cryptoCode, LightningConnectionType.Charge); - var vm = user.GetController().CheckoutAppearance().AssertViewModel(); + var vm = user.GetController().CheckoutAppearance().AssertViewModel(); var criteria = Assert.Single(vm.PaymentMethodCriteria); Assert.Equal(new PaymentMethodId(cryptoCode, LightningPaymentType.Instance).ToString(), criteria.PaymentMethod); criteria.Value = "2 USD"; criteria.Type = PaymentMethodCriteriaViewModel.CriteriaType.LessThan; - Assert.IsType(user.GetController().CheckoutAppearance(vm) + Assert.IsType(user.GetController().CheckoutAppearance(vm) .Result); var invoice = user.BitPay.CreateInvoice( @@ -1709,14 +1709,14 @@ namespace BTCPayServer.Tests // Activating LNUrl, we should still have only 1 payment criteria that can be set. user.RegisterLightningNode(cryptoCode, LightningConnectionType.Charge); - var lnSettingsVm = await user.GetController().LightningSettings(user.StoreId, cryptoCode).AssertViewModelAsync(); + var lnSettingsVm = await user.GetController().LightningSettings(user.StoreId, cryptoCode).AssertViewModelAsync(); lnSettingsVm.LNURLEnabled = true; lnSettingsVm.LNURLStandardInvoiceEnabled = true; - Assert.IsType(user.GetController().LightningSettings(lnSettingsVm).Result); - vm = user.GetController().CheckoutAppearance().AssertViewModel(); + Assert.IsType(user.GetController().LightningSettings(lnSettingsVm).Result); + vm = user.GetController().CheckoutAppearance().AssertViewModel(); criteria = Assert.Single(vm.PaymentMethodCriteria); Assert.Equal(new PaymentMethodId(cryptoCode, LightningPaymentType.Instance).ToString(), criteria.PaymentMethod); - Assert.IsType(user.GetController().CheckoutAppearance(vm).Result); + Assert.IsType(user.GetController().CheckoutAppearance(vm).Result); // However, creating an invoice should show LNURL invoice = user.BitPay.CreateInvoice( @@ -1748,7 +1748,7 @@ namespace BTCPayServer.Tests user.GrantAccess(); user.RegisterDerivationScheme("BTC"); - var controller = tester.PayTester.GetController(null); + var controller = tester.PayTester.GetController(null); var testCases = new List<(string input, Dictionary expectedOutput)>() @@ -1818,7 +1818,7 @@ namespace BTCPayServer.Tests var networkFee = new FeeRate(invoice.MinerFees["BTC"].SatoshiPerBytes).GetFee(100); // ensure 0 invoices exported because there are no payments yet - var jsonResult = user.GetController().Export("json").GetAwaiter().GetResult(); + var jsonResult = user.GetController().Export("json").GetAwaiter().GetResult(); var result = Assert.IsType(jsonResult); Assert.Equal("application/json", result.ContentType); Assert.Equal("[]", result.Content); @@ -1842,7 +1842,7 @@ namespace BTCPayServer.Tests TestUtils.Eventually(() => { var jsonResultPaid = - user.GetController().Export("json").GetAwaiter().GetResult(); + user.GetController().Export("json").GetAwaiter().GetResult(); var paidresult = Assert.IsType(jsonResultPaid); Assert.Equal("application/json", paidresult.ContentType); @@ -1986,7 +1986,7 @@ namespace BTCPayServer.Tests TestUtils.Eventually(() => { var exportResultPaid = - user.GetController().Export("csv").GetAwaiter().GetResult(); + user.GetController().Export("csv").GetAwaiter().GetResult(); var paidresult = Assert.IsType(exportResultPaid); Assert.Equal("application/csv", paidresult.ContentType); Assert.Contains($",orderId,{invoice.Id},", paidresult.Content); @@ -2009,8 +2009,8 @@ namespace BTCPayServer.Tests await user.GrantAccessAsync(); var user2 = tester.NewAccount(); await user2.GrantAccessAsync(); - var apps = user.GetController(); - var apps2 = user2.GetController(); + var apps = user.GetController(); + var apps2 = user2.GetController(); var vm = Assert.IsType(Assert.IsType(apps.CreateApp(user.StoreId)).Model); Assert.NotNull(vm.SelectedAppType); Assert.Null(vm.AppName); @@ -2348,7 +2348,7 @@ namespace BTCPayServer.Tests user.GrantAccess(); user.RegisterDerivationScheme("BTC"); - var serverController = user.GetController(); + var serverController = user.GetController(); var vm = Assert.IsType( Assert.IsType(await serverController.LogsView()).Model); } @@ -2364,17 +2364,17 @@ namespace BTCPayServer.Tests var user = tester.NewAccount(); user.GrantAccess(); - var accountController = tester.PayTester.GetController(); + var accountController = tester.PayTester.GetController(); //no 2fa or fido2 enabled, login should work - Assert.Equal(nameof(HomeController.Index), + Assert.Equal(nameof(UIHomeController.Index), Assert.IsType(await accountController.Login(new LoginViewModel() { Email = user.RegisterDetails.Email, Password = user.RegisterDetails.Password })).ActionName); - var listController = user.GetController(); + var listController = user.GetController(); var manageController = user.GetController(); //by default no fido2 devices available @@ -2500,7 +2500,7 @@ namespace BTCPayServer.Tests Assert.Equal(MockVersionFetcher.MOCK_NEW_VERSION, lastVersion.LastVersion); // we should also have notification in UI - var ctrl = acc.GetController(); + var ctrl = acc.GetController(); var newVersion = MockVersionFetcher.MOCK_NEW_VERSION; var vm = Assert.IsType( @@ -2715,7 +2715,7 @@ namespace BTCPayServer.Tests Assert.Equal("admin@admin.com", (await Assert.IsType(await emailSenderFactory.GetEmailSender()).GetEmailSettings()).Login); Assert.Null(await Assert.IsType(await emailSenderFactory.GetEmailSender(acc.StoreId)).GetEmailSettings()); - Assert.IsType(await acc.GetController().Emails(acc.StoreId, new EmailsViewModel(new EmailSettings() + Assert.IsType(await acc.GetController().Emails(acc.StoreId, new EmailsViewModel(new EmailSettings() { From = "store@store.com", Login = "store@store.com", @@ -2738,7 +2738,7 @@ namespace BTCPayServer.Tests await tester.StartAsync(); var user = tester.NewAccount(); user.GrantAccess(); - var controller = tester.PayTester.GetController(user.UserId, user.StoreId); + var controller = tester.PayTester.GetController(user.UserId, user.StoreId); //Once we select a provider, redirect to its view @@ -2747,7 +2747,7 @@ namespace BTCPayServer.Tests { Provider = StorageProvider.FileSystem })); - Assert.Equal(nameof(ServerController.StorageProvider), localResult.ActionName); + Assert.Equal(nameof(UIServerController.StorageProvider), localResult.ActionName); Assert.Equal(StorageProvider.FileSystem.ToString(), localResult.RouteValues["provider"]); @@ -2756,7 +2756,7 @@ namespace BTCPayServer.Tests { Provider = StorageProvider.AmazonS3 })); - Assert.Equal(nameof(ServerController.StorageProvider), AmazonS3result.ActionName); + Assert.Equal(nameof(UIServerController.StorageProvider), AmazonS3result.ActionName); Assert.Equal(StorageProvider.AmazonS3.ToString(), AmazonS3result.RouteValues["provider"]); var GoogleResult = Assert @@ -2764,7 +2764,7 @@ namespace BTCPayServer.Tests { Provider = StorageProvider.GoogleCloudStorage })); - Assert.Equal(nameof(ServerController.StorageProvider), GoogleResult.ActionName); + Assert.Equal(nameof(UIServerController.StorageProvider), GoogleResult.ActionName); Assert.Equal(StorageProvider.GoogleCloudStorage.ToString(), GoogleResult.RouteValues["provider"]); @@ -2773,7 +2773,7 @@ namespace BTCPayServer.Tests { Provider = StorageProvider.AzureBlobStorage })); - Assert.Equal(nameof(ServerController.StorageProvider), AzureResult.ActionName); + Assert.Equal(nameof(UIServerController.StorageProvider), AzureResult.ActionName); Assert.Equal(StorageProvider.AzureBlobStorage.ToString(), AzureResult.RouteValues["provider"]); //Cool, we get redirected to the config pages @@ -2821,7 +2821,7 @@ namespace BTCPayServer.Tests await tester.StartAsync(); var user = tester.NewAccount(); user.GrantAccess(); - var controller = tester.PayTester.GetController(user.UserId, user.StoreId); + var controller = tester.PayTester.GetController(user.UserId, user.StoreId); var fileSystemStorageConfiguration = Assert.IsType(Assert .IsType(await controller.StorageProvider(StorageProvider.FileSystem.ToString())) @@ -2840,7 +2840,7 @@ namespace BTCPayServer.Tests } } - internal static async Task CanUploadRemoveFiles(ServerController controller) + internal static async Task CanUploadRemoveFiles(UIServerController controller) { var fileContent = "content"; List fileList = new List(); @@ -2868,11 +2868,11 @@ namespace BTCPayServer.Tests //create a temporary link to file var tmpLinkGenerate = Assert.IsType(await controller.CreateTemporaryFileUrl(fileId, - new ServerController.CreateTemporaryFileUrlViewModel() + new UIServerController.CreateTemporaryFileUrlViewModel() { IsDownload = true, TimeAmount = 1, - TimeType = ServerController.CreateTemporaryFileUrlViewModel.TmpFileTimeType.Minutes + TimeType = UIServerController.CreateTemporaryFileUrlViewModel.TmpFileTimeType.Minutes })); var statusMessageModel = controller.TempData.GetStatusMessageModel(); Assert.NotNull(statusMessageModel); diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index 663b529b4..6eb799fe4 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -20,13 +20,13 @@ - + false - + false - + false @@ -39,7 +39,7 @@ - + @@ -148,83 +148,83 @@ - + PreserveNewest $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) - + $(IncludeRazorContentInPack) diff --git a/BTCPayServer/Components/MainNav/Default.cshtml b/BTCPayServer/Components/MainNav/Default.cshtml index d8a4924c7..94d269d16 100644 --- a/BTCPayServer/Components/MainNav/Default.cshtml +++ b/BTCPayServer/Components/MainNav/Default.cshtml @@ -29,13 +29,13 @@
    diff --git a/BTCPayServer/Controllers/BitpayInvoiceController.cs b/BTCPayServer/Controllers/BitpayInvoiceController.cs index 0affe1e93..c389faa3b 100644 --- a/BTCPayServer/Controllers/BitpayInvoiceController.cs +++ b/BTCPayServer/Controllers/BitpayInvoiceController.cs @@ -18,10 +18,10 @@ namespace BTCPayServer.Controllers [Authorize(Policies.CanCreateInvoice, AuthenticationSchemes = AuthenticationSchemes.Bitpay)] public class BitpayInvoiceController : Controller { - private readonly InvoiceController _InvoiceController; + private readonly UIInvoiceController _InvoiceController; private readonly InvoiceRepository _InvoiceRepository; - public BitpayInvoiceController(InvoiceController invoiceController, + public BitpayInvoiceController(UIInvoiceController invoiceController, InvoiceRepository invoiceRepository) { _InvoiceController = invoiceController; diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs index 1f5dc272a..9ae511319 100644 --- a/BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs @@ -24,7 +24,7 @@ namespace BTCPayServer.Controllers.GreenField [EnableCors(CorsPolicies.All)] public class GreenfieldInvoiceController : Controller { - private readonly InvoiceController _invoiceController; + private readonly UIInvoiceController _invoiceController; private readonly InvoiceRepository _invoiceRepository; private readonly LinkGenerator _linkGenerator; private readonly BTCPayNetworkProvider _btcPayNetworkProvider; @@ -33,7 +33,7 @@ namespace BTCPayServer.Controllers.GreenField public LanguageService LanguageService { get; } - public GreenfieldInvoiceController(InvoiceController invoiceController, InvoiceRepository invoiceRepository, + public GreenfieldInvoiceController(UIInvoiceController invoiceController, InvoiceRepository invoiceRepository, LinkGenerator linkGenerator, LanguageService languageService, BTCPayNetworkProvider btcPayNetworkProvider, EventAggregator eventAggregator, PaymentMethodHandlerDictionary paymentMethodHandlerDictionary) { diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs index 37b6b168d..4aef72365 100644 --- a/BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs @@ -151,8 +151,8 @@ namespace BTCPayServer.Controllers.GreenField Period = ppBlob.Period, Archived = pp.Archived, ViewLink = _linkGenerator.GetUriByAction( - nameof(PullPaymentController.ViewPullPayment), - "PullPayment", + nameof(UIPullPaymentController.ViewPullPayment), + "UIPullPayment", new { pullPaymentId = pp.Id }, Request.Scheme, Request.Host, diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs index 96be0ba35..751837ef6 100644 --- a/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs @@ -43,7 +43,7 @@ namespace BTCPayServer.Controllers.GreenField private readonly ExplorerClientProvider _explorerClientProvider; private readonly ISettingsRepository _settingsRepository; private readonly NBXplorerDashboard _nbXplorerDashboard; - private readonly WalletsController _walletsController; + private readonly UIWalletsController _walletsController; private readonly PayjoinClient _payjoinClient; private readonly DelayedTransactionBroadcaster _delayedTransactionBroadcaster; private readonly EventAggregator _eventAggregator; @@ -58,7 +58,7 @@ namespace BTCPayServer.Controllers.GreenField ExplorerClientProvider explorerClientProvider, ISettingsRepository settingsRepository, NBXplorerDashboard nbXplorerDashboard, - WalletsController walletsController, + UIWalletsController walletsController, PayjoinClient payjoinClient, DelayedTransactionBroadcaster delayedTransactionBroadcaster, EventAggregator eventAggregator, diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldStoreWebhooksController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoreWebhooksController.cs index f497e7792..129b1ba2f 100644 --- a/BTCPayServer/Controllers/GreenField/GreenfieldStoreWebhooksController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoreWebhooksController.cs @@ -26,14 +26,14 @@ namespace BTCPayServer.Controllers.GreenField [EnableCors(CorsPolicies.All)] public class GreenfieldStoreWebhooksController : ControllerBase { - public StoreWebhooksController(StoreRepository storeRepository, WebhookSender webhookNotificationManager) + public GreenfieldStoreWebhooksController(StoreRepository storeRepository, WebhookSender webhookSender) { StoreRepository = storeRepository; - WebhookNotificationManager = webhookNotificationManager; + WebhookSender = webhookSender; } public StoreRepository StoreRepository { get; } - public WebhookSender WebhookNotificationManager { get; } + public WebhookSender WebhookSender { get; } [HttpGet("~/api/v1/stores/{storeId}/webhooks/{webhookId?}")] public async Task ListWebhooks(string storeId, string webhookId) @@ -152,7 +152,7 @@ namespace BTCPayServer.Controllers.GreenField var delivery = await StoreRepository.GetWebhookDelivery(CurrentStoreId, webhookId, deliveryId); if (delivery is null) return WebhookDeliveryNotFound(); - return this.Ok(new JValue(await WebhookNotificationManager.Redeliver(deliveryId))); + return this.Ok(new JValue(await WebhookSender.Redeliver(deliveryId))); } [HttpGet("~/api/v1/stores/{storeId}/webhooks/{webhookId}/deliveries/{deliveryId}/request")] diff --git a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs index fce28fcd7..2b02a157c 100644 --- a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs +++ b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs @@ -50,7 +50,7 @@ namespace BTCPayServer.Controllers.GreenField private readonly GreenfieldServerInfoController _greenFieldServerInfoController; private readonly GreenfieldStoreWebhooksController _storeWebhooksController; private readonly GreenfieldPullPaymentController _greenfieldPullPaymentController; - private readonly HomeController _homeController; + private readonly UIHomeController _homeController; private readonly GreenfieldStorePaymentMethodsController _storePaymentMethodsController; public BTCPayServerClientFactory(StoreRepository storeRepository, @@ -72,7 +72,7 @@ namespace BTCPayServer.Controllers.GreenField GreenfieldServerInfoController greenFieldServerInfoController, GreenfieldStoreWebhooksController storeWebhooksController, GreenfieldPullPaymentController greenfieldPullPaymentController, - HomeController homeController, + UIHomeController homeController, GreenfieldStorePaymentMethodsController storePaymentMethodsController) { _storeRepository = storeRepository; @@ -173,7 +173,7 @@ namespace BTCPayServer.Controllers.GreenField private readonly GreenfieldServerInfoController _greenFieldServerInfoController; private readonly GreenfieldStoreWebhooksController _storeWebhooksController; private readonly GreenfieldPullPaymentController _greenfieldPullPaymentController; - private readonly HomeController _homeController; + private readonly UIHomeController _homeController; private readonly GreenfieldStorePaymentMethodsController _storePaymentMethodsController; public LocalBTCPayServerClient(GreenfieldStoreOnChainPaymentMethodsController chainPaymentMethodsController, @@ -192,7 +192,7 @@ namespace BTCPayServer.Controllers.GreenField GreenfieldServerInfoController greenFieldServerInfoController, GreenfieldStoreWebhooksController storeWebhooksController, GreenfieldPullPaymentController greenfieldPullPaymentController, - HomeController homeController, + UIHomeController homeController, GreenfieldStorePaymentMethodsController storePaymentMethodsController, IHttpContextAccessor httpContextAccessor) : base(new Uri("https://dummy.local"), "", "") { diff --git a/BTCPayServer/Controllers/AccountController.cs b/BTCPayServer/Controllers/UIAccountController.cs similarity index 98% rename from BTCPayServer/Controllers/AccountController.cs rename to BTCPayServer/Controllers/UIAccountController.cs index 02462bf20..78ac68c08 100644 --- a/BTCPayServer/Controllers/AccountController.cs +++ b/BTCPayServer/Controllers/UIAccountController.cs @@ -24,7 +24,7 @@ using NicolasDorier.RateLimits; namespace BTCPayServer.Controllers { [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie)] - public class AccountController : Controller + public class UIAccountController : Controller { private readonly UserManager _userManager; private readonly SignInManager _signInManager; @@ -39,7 +39,7 @@ namespace BTCPayServer.Controllers public Logs Logs { get; } - public AccountController( + public UIAccountController( UserManager userManager, RoleManager roleManager, SignInManager signInManager, @@ -432,7 +432,7 @@ namespace BTCPayServer.Controllers } var policies = await _SettingsRepository.GetSettingAsync() ?? new PoliciesSettings(); if (policies.LockSubscription && !User.IsInRole(Roles.ServerAdmin)) - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); ViewData["ReturnUrl"] = returnUrl; return View(); } @@ -451,7 +451,7 @@ namespace BTCPayServer.Controllers ViewData["Logon"] = logon.ToString(CultureInfo.InvariantCulture).ToLowerInvariant(); var policies = await _SettingsRepository.GetSettingAsync() ?? new PoliciesSettings(); if (policies.LockSubscription && !User.IsInRole(Roles.ServerAdmin)) - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); if (ModelState.IsValid) { var user = new ApplicationUser @@ -513,7 +513,7 @@ namespace BTCPayServer.Controllers { await _signInManager.SignOutAsync(); _logger.LogInformation("User logged out."); - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); } [HttpGet("/register/confirm-email")] @@ -522,7 +522,7 @@ namespace BTCPayServer.Controllers { if (userId == null || code == null) { - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); } var user = await _userManager.FindByIdAsync(userId); if (user == null) @@ -663,7 +663,7 @@ namespace BTCPayServer.Controllers } else { - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); } } diff --git a/BTCPayServer/Controllers/AppsController.Crowdfund.cs b/BTCPayServer/Controllers/UIAppsController.Crowdfund.cs similarity index 99% rename from BTCPayServer/Controllers/AppsController.Crowdfund.cs rename to BTCPayServer/Controllers/UIAppsController.Crowdfund.cs index 3d417bde8..0688bc849 100644 --- a/BTCPayServer/Controllers/AppsController.Crowdfund.cs +++ b/BTCPayServer/Controllers/UIAppsController.Crowdfund.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc; namespace BTCPayServer.Controllers { - public partial class AppsController + public partial class UIAppsController { public class AppUpdated { diff --git a/BTCPayServer/Controllers/AppsController.PointOfSale.cs b/BTCPayServer/Controllers/UIAppsController.PointOfSale.cs similarity index 99% rename from BTCPayServer/Controllers/AppsController.PointOfSale.cs rename to BTCPayServer/Controllers/UIAppsController.PointOfSale.cs index f85f94e60..bf652f2a7 100644 --- a/BTCPayServer/Controllers/AppsController.PointOfSale.cs +++ b/BTCPayServer/Controllers/UIAppsController.PointOfSale.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc; namespace BTCPayServer.Controllers { - public partial class AppsController + public partial class UIAppsController { public class PointOfSaleSettings { diff --git a/BTCPayServer/Controllers/AppsController.cs b/BTCPayServer/Controllers/UIAppsController.cs similarity index 98% rename from BTCPayServer/Controllers/AppsController.cs rename to BTCPayServer/Controllers/UIAppsController.cs index 6b501e92b..678c14b0f 100644 --- a/BTCPayServer/Controllers/AppsController.cs +++ b/BTCPayServer/Controllers/UIAppsController.cs @@ -18,9 +18,9 @@ namespace BTCPayServer.Controllers [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] [AutoValidateAntiforgeryToken] [Route("apps")] - public partial class AppsController : Controller + public partial class UIAppsController : Controller { - public AppsController( + public UIAppsController( UserManager userManager, EventAggregator eventAggregator, CurrencyNameTable currencies, diff --git a/BTCPayServer/Controllers/AppsPublicController.cs b/BTCPayServer/Controllers/UIAppsPublicController.cs similarity index 97% rename from BTCPayServer/Controllers/AppsPublicController.cs rename to BTCPayServer/Controllers/UIAppsPublicController.cs index f631a902a..f1a0a4fbc 100644 --- a/BTCPayServer/Controllers/AppsPublicController.cs +++ b/BTCPayServer/Controllers/UIAppsPublicController.cs @@ -18,15 +18,15 @@ using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using NBitpayClient; -using static BTCPayServer.Controllers.AppsController; +using static BTCPayServer.Controllers.UIAppsController; namespace BTCPayServer.Controllers { - public class AppsPublicController : Controller + public class UIAppsPublicController : Controller { - public AppsPublicController(AppService appService, + public UIAppsPublicController(AppService appService, BTCPayServerOptions btcPayServerOptions, - InvoiceController invoiceController, + UIInvoiceController invoiceController, UserManager userManager) { _AppService = appService; @@ -37,7 +37,7 @@ namespace BTCPayServer.Controllers private readonly AppService _AppService; private readonly BTCPayServerOptions _BtcPayServerOptions; - private readonly InvoiceController _InvoiceController; + private readonly UIInvoiceController _InvoiceController; private readonly UserManager _UserManager; [HttpGet("/apps/{appId}")] @@ -236,7 +236,7 @@ namespace BTCPayServer.Controllers }, store, HttpContext.Request.GetAbsoluteRoot(), new List() { AppService.GetAppInternalTag(appId) }, cancellationToken); - return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id }); + return RedirectToAction(nameof(UIInvoiceController.Checkout), "UIInvoice", new { invoiceId = invoice.Data.Id }); } catch (BitpayHttpException e) { @@ -390,7 +390,7 @@ namespace BTCPayServer.Controllers cancellationToken: cancellationToken); if (request.RedirectToCheckout) { - return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", + return RedirectToAction(nameof(UIInvoiceController.Checkout), "UIInvoice", new { invoiceId = invoice.Data.Id }); } else diff --git a/BTCPayServer/Controllers/ErrorController.cs b/BTCPayServer/Controllers/UIErrorController.cs similarity index 94% rename from BTCPayServer/Controllers/ErrorController.cs rename to BTCPayServer/Controllers/UIErrorController.cs index 8fcdc00f2..7eb250b2c 100644 --- a/BTCPayServer/Controllers/ErrorController.cs +++ b/BTCPayServer/Controllers/UIErrorController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc; namespace BTCPayServer.Controllers { - public class ErrorController : Controller + public class UIErrorController : Controller { [Route("/errors/{statusCode:int}")] public IActionResult Handle(int? statusCode = null) diff --git a/BTCPayServer/Controllers/HomeController.cs b/BTCPayServer/Controllers/UIHomeController.cs similarity index 96% rename from BTCPayServer/Controllers/HomeController.cs rename to BTCPayServer/Controllers/UIHomeController.cs index 53a9f2286..26cbec145 100644 --- a/BTCPayServer/Controllers/HomeController.cs +++ b/BTCPayServer/Controllers/UIHomeController.cs @@ -36,7 +36,7 @@ using Newtonsoft.Json.Linq; namespace BTCPayServer.Controllers { - public class HomeController : Controller + public class UIHomeController : Controller { private readonly ISettingsRepository _settingsRepository; private readonly StoreRepository _storeRepository; @@ -46,7 +46,7 @@ namespace BTCPayServer.Controllers private SignInManager SignInManager { get; } public LanguageService LanguageService { get; } - public HomeController(IHttpClientFactory httpClientFactory, + public UIHomeController(IHttpClientFactory httpClientFactory, ISettingsRepository settingsRepository, IWebHostEnvironment webHostEnvironment, LanguageService languageService, @@ -69,7 +69,7 @@ namespace BTCPayServer.Controllers { if ((await _settingsRepository.GetTheme()).FirstRun) { - return RedirectToAction(nameof(AccountController.Register), "Account"); + return RedirectToAction(nameof(UIAccountController.Register), "UIAccount"); } if (SignInManager.IsSignedIn(User)) diff --git a/BTCPayServer/Controllers/InvoiceController.Testing.cs b/BTCPayServer/Controllers/UIInvoiceController.Testing.cs similarity index 98% rename from BTCPayServer/Controllers/InvoiceController.Testing.cs rename to BTCPayServer/Controllers/UIInvoiceController.Testing.cs index 57595b5f9..b7a94d5d5 100644 --- a/BTCPayServer/Controllers/InvoiceController.Testing.cs +++ b/BTCPayServer/Controllers/UIInvoiceController.Testing.cs @@ -10,7 +10,7 @@ using NBitcoin; namespace BTCPayServer.Controllers { - public partial class InvoiceController + public partial class UIInvoiceController { public class FakePaymentRequest { diff --git a/BTCPayServer/Controllers/InvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs similarity index 98% rename from BTCPayServer/Controllers/InvoiceController.UI.cs rename to BTCPayServer/Controllers/UIInvoiceController.UI.cs index d05aff47f..bc8611e8a 100644 --- a/BTCPayServer/Controllers/InvoiceController.UI.cs +++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs @@ -35,7 +35,7 @@ using StoreData = BTCPayServer.Data.StoreData; namespace BTCPayServer.Controllers { - public partial class InvoiceController + public partial class UIInvoiceController { [HttpGet("invoices/{invoiceId}/deliveries/{deliveryId}/request")] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie)] @@ -101,8 +101,8 @@ namespace BTCPayServer.Controllers { StoreId = store.Id, StoreName = store.StoreName, - StoreLink = Url.Action(nameof(StoresController.PaymentMethods), "Stores", new { storeId = store.Id }), - PaymentRequestLink = Url.Action(nameof(PaymentRequestController.ViewPaymentRequest), "PaymentRequest", new { payReqId = invoice.Metadata.PaymentRequestId }), + StoreLink = Url.Action(nameof(UIStoresController.PaymentMethods), "UIStores", new { storeId = store.Id }), + PaymentRequestLink = Url.Action(nameof(UIPaymentRequestController.ViewPaymentRequest), "UIPaymentRequest", new { payReqId = invoice.Metadata.PaymentRequestId }), Id = invoice.Id, State = invoiceState, TransactionSpeed = invoice.SpeedPolicy == SpeedPolicy.HighSpeed ? "high" : @@ -178,8 +178,8 @@ namespace BTCPayServer.Controllers if (invoice.CurrentRefund?.PullPaymentDataId is string ppId && !invoice.CurrentRefund.PullPaymentData.Archived) { // TODO: Having dedicated UI later on - return RedirectToAction(nameof(PullPaymentController.ViewPullPayment), - "PullPayment", + return RedirectToAction(nameof(UIPullPaymentController.ViewPullPayment), + "UIPullPayment", new { pullPaymentId = ppId }); } @@ -369,8 +369,8 @@ namespace BTCPayServer.Controllers }); await ctx.SaveChangesAsync(cancellationToken); // TODO: Having dedicated UI later on - return RedirectToAction(nameof(PullPaymentController.ViewPullPayment), - "PullPayment", + return RedirectToAction(nameof(UIPullPaymentController.ViewPullPayment), + "UIPullPayment", new { pullPaymentId = ppId }); } @@ -857,7 +857,7 @@ namespace BTCPayServer.Controllers if (!stores.Any()) { TempData[WellKnownTempData.ErrorMessage] = "You need to create at least one store before creating a transaction"; - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); } if (model?.StoreId != null) @@ -898,7 +898,7 @@ namespace BTCPayServer.Controllers TempData.SetStatusMessageModel(new StatusMessageModel { Severity = StatusMessageModel.StatusSeverity.Error, - Html = $"To create an invoice, you need to set up a payment method first", + Html = $"To create an invoice, you need to set up a payment method first", AllowDismiss = false }); return View(model); diff --git a/BTCPayServer/Controllers/InvoiceController.cs b/BTCPayServer/Controllers/UIInvoiceController.cs similarity index 99% rename from BTCPayServer/Controllers/InvoiceController.cs rename to BTCPayServer/Controllers/UIInvoiceController.cs index e9bfd5d58..adb8e2b51 100644 --- a/BTCPayServer/Controllers/InvoiceController.cs +++ b/BTCPayServer/Controllers/UIInvoiceController.cs @@ -29,7 +29,7 @@ using StoreData = BTCPayServer.Data.StoreData; namespace BTCPayServer.Controllers { [Filters.BitpayAPIConstraint(false)] - public partial class InvoiceController : Controller + public partial class UIInvoiceController : Controller { readonly InvoiceRepository _InvoiceRepository; readonly RateFetcher _RateProvider; @@ -45,7 +45,7 @@ namespace BTCPayServer.Controllers public WebhookSender WebhookNotificationManager { get; } - public InvoiceController( + public UIInvoiceController( InvoiceRepository invoiceRepository, CurrencyNameTable currencyNameTable, UserManager userManager, diff --git a/BTCPayServer/LNURL/LNURLController.cs b/BTCPayServer/Controllers/UILNURLController.cs similarity index 98% rename from BTCPayServer/LNURL/LNURLController.cs rename to BTCPayServer/Controllers/UILNURLController.cs index 9de779409..5fa81f82a 100644 --- a/BTCPayServer/LNURL/LNURLController.cs +++ b/BTCPayServer/Controllers/UILNURLController.cs @@ -35,7 +35,8 @@ using Newtonsoft.Json; namespace BTCPayServer { [Route("~/{cryptoCode}/[controller]/")] - public class LNURLController : Controller + [Route("~/{cryptoCode}/lnurl/")] + public class UILNURLController : Controller { private readonly InvoiceRepository _invoiceRepository; private readonly EventAggregator _eventAggregator; @@ -43,17 +44,17 @@ namespace BTCPayServer private readonly LightningLikePaymentHandler _lightningLikePaymentHandler; private readonly StoreRepository _storeRepository; private readonly AppService _appService; - private readonly InvoiceController _invoiceController; + private readonly UIInvoiceController _invoiceController; private readonly SettingsRepository _settingsRepository; private readonly LinkGenerator _linkGenerator; - public LNURLController(InvoiceRepository invoiceRepository, + public UILNURLController(InvoiceRepository invoiceRepository, EventAggregator eventAggregator, BTCPayNetworkProvider btcPayNetworkProvider, LightningLikePaymentHandler lightningLikePaymentHandler, StoreRepository storeRepository, AppService appService, - InvoiceController invoiceController, + UIInvoiceController invoiceController, SettingsRepository settingsRepository, LinkGenerator linkGenerator) { @@ -115,7 +116,7 @@ namespace BTCPayServer items = _appService.Parse(cfS.PerksTemplate, cfS.TargetCurrency); break; case nameof(AppType.PointOfSale): - var posS = app.GetSettings(); + var posS = app.GetSettings(); currencyCode = posS.Currency; items = _appService.Parse(posS.Template, posS.Currency); break; @@ -285,7 +286,7 @@ namespace BTCPayServer Metadata = JsonConvert.SerializeObject(lnurlMetadata), Callback = new Uri(_linkGenerator.GetUriByAction( action: nameof(GetLNURLForInvoice), - controller: "LNURL", + controller: "UILNURL", values: new { cryptoCode, invoiceId = i.Id }, Request.Scheme, Request.Host, Request.PathBase)) }); } @@ -462,7 +463,7 @@ namespace BTCPayServer Message = "LNURL is required for lightning addresses but has not yet been enabled.", Severity = StatusMessageModel.StatusSeverity.Error }); - return RedirectToAction("PaymentMethods", "Stores", new { storeId }); + return RedirectToAction("PaymentMethods", "UIStores", new { storeId }); } var lightningAddressSettings = await _settingsRepository.GetSettingAsync() ?? new LightningAddressSettings(); diff --git a/BTCPayServer/Controllers/ManageController.2FA.cs b/BTCPayServer/Controllers/UIManageController.2FA.cs similarity index 99% rename from BTCPayServer/Controllers/ManageController.2FA.cs rename to BTCPayServer/Controllers/UIManageController.2FA.cs index c5eb7d865..4500573ac 100644 --- a/BTCPayServer/Controllers/ManageController.2FA.cs +++ b/BTCPayServer/Controllers/UIManageController.2FA.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging; namespace BTCPayServer.Controllers { - public partial class ManageController + public partial class UIManageController { private const string RecoveryCodesKey = nameof(RecoveryCodesKey); private const string AuthenicatorUriFormat = "otpauth://totp/{0}:{1}?secret={2}&issuer={0}&digits=6"; diff --git a/BTCPayServer/Controllers/ManageController.APIKeys.cs b/BTCPayServer/Controllers/UIManageController.APIKeys.cs similarity index 99% rename from BTCPayServer/Controllers/ManageController.APIKeys.cs rename to BTCPayServer/Controllers/UIManageController.APIKeys.cs index fba6c9d8a..0d4471156 100644 --- a/BTCPayServer/Controllers/ManageController.APIKeys.cs +++ b/BTCPayServer/Controllers/UIManageController.APIKeys.cs @@ -16,7 +16,7 @@ using NBitcoin.DataEncoders; namespace BTCPayServer.Controllers { - public partial class ManageController + public partial class UIManageController { [HttpGet] public async Task APIKeys() diff --git a/BTCPayServer/Controllers/ManageController.LoginCodes.cs b/BTCPayServer/Controllers/UIManageController.LoginCodes.cs similarity index 92% rename from BTCPayServer/Controllers/ManageController.LoginCodes.cs rename to BTCPayServer/Controllers/UIManageController.LoginCodes.cs index 71104a49b..655085a81 100644 --- a/BTCPayServer/Controllers/ManageController.LoginCodes.cs +++ b/BTCPayServer/Controllers/UIManageController.LoginCodes.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc; namespace BTCPayServer.Controllers { - public partial class ManageController + public partial class UIManageController { [HttpGet] public async Task LoginCodes() diff --git a/BTCPayServer/Controllers/ManageController.Notifications.cs b/BTCPayServer/Controllers/UIManageController.Notifications.cs similarity index 98% rename from BTCPayServer/Controllers/ManageController.Notifications.cs rename to BTCPayServer/Controllers/UIManageController.Notifications.cs index 79bcc4b8c..12aca90ad 100644 --- a/BTCPayServer/Controllers/ManageController.Notifications.cs +++ b/BTCPayServer/Controllers/UIManageController.Notifications.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc.Rendering; namespace BTCPayServer.Controllers { - public partial class ManageController + public partial class UIManageController { [HttpGet("notifications")] public async Task NotificationSettings([FromServices] IEnumerable notificationHandlers) diff --git a/BTCPayServer/Controllers/ManageController.cs b/BTCPayServer/Controllers/UIManageController.cs similarity index 97% rename from BTCPayServer/Controllers/ManageController.cs rename to BTCPayServer/Controllers/UIManageController.cs index 4575e628a..aa76fd2a9 100644 --- a/BTCPayServer/Controllers/ManageController.cs +++ b/BTCPayServer/Controllers/UIManageController.cs @@ -24,7 +24,7 @@ namespace BTCPayServer.Controllers [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie, Policy = Policies.CanViewProfile)] [Route("[controller]/[action]")] - public partial class ManageController : Controller + public partial class UIManageController : Controller { private readonly UserManager _userManager; private readonly SignInManager _signInManager; @@ -40,11 +40,11 @@ namespace BTCPayServer.Controllers private readonly UserService _userService; readonly StoreRepository _StoreRepository; - public ManageController( + public UIManageController( UserManager userManager, SignInManager signInManager, EmailSenderFactory emailSenderFactory, - ILogger logger, + ILogger logger, UrlEncoder urlEncoder, StoreRepository storeRepository, BTCPayServerEnvironment btcPayServerEnvironment, @@ -278,7 +278,7 @@ namespace BTCPayServer.Controllers await _userService.DeleteUserAndAssociatedData(user); TempData[WellKnownTempData.SuccessMessage] = "Account successfully deleted."; await _signInManager.SignOutAsync(); - return RedirectToAction(nameof(AccountController.Login), "Account"); + return RedirectToAction(nameof(UIAccountController.Login), "UIAccount"); } diff --git a/BTCPayServer/Controllers/NotificationsController.cs b/BTCPayServer/Controllers/UINotificationsController.cs similarity index 97% rename from BTCPayServer/Controllers/NotificationsController.cs rename to BTCPayServer/Controllers/UINotificationsController.cs index 789cdaba7..cb6bd3629 100644 --- a/BTCPayServer/Controllers/NotificationsController.cs +++ b/BTCPayServer/Controllers/UINotificationsController.cs @@ -21,7 +21,7 @@ namespace BTCPayServer.Controllers [BitpayAPIConstraint(false)] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie, Policy = Policies.CanViewNotificationsForUser)] [Route("[controller]/[action]")] - public class NotificationsController : Controller + public class UINotificationsController : Controller { private readonly BTCPayServerEnvironment _env; private readonly NotificationSender _notificationSender; @@ -29,7 +29,7 @@ namespace BTCPayServer.Controllers private readonly NotificationManager _notificationManager; private readonly EventAggregator _eventAggregator; - public NotificationsController(BTCPayServerEnvironment env, + public UINotificationsController(BTCPayServerEnvironment env, NotificationSender notificationSender, UserManager userManager, NotificationManager notificationManager, @@ -106,7 +106,7 @@ namespace BTCPayServer.Controllers public async Task Index(int skip = 0, int count = 50, int timezoneOffset = 0) { if (!ValidUserClaim(out var userId)) - return RedirectToAction("Index", "Home"); + return RedirectToAction("Index", "UIHome"); var res = await _notificationManager.GetNotifications(new NotificationsQuery() { diff --git a/BTCPayServer/Controllers/PaymentRequestController.cs b/BTCPayServer/Controllers/UIPaymentRequestController.cs similarity index 97% rename from BTCPayServer/Controllers/PaymentRequestController.cs rename to BTCPayServer/Controllers/UIPaymentRequestController.cs index 5e48ace3e..8e681e6d2 100644 --- a/BTCPayServer/Controllers/PaymentRequestController.cs +++ b/BTCPayServer/Controllers/UIPaymentRequestController.cs @@ -25,9 +25,9 @@ namespace BTCPayServer.Controllers { [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] [Route("payment-requests")] - public class PaymentRequestController : Controller + public class UIPaymentRequestController : Controller { - private readonly InvoiceController _InvoiceController; + private readonly UIInvoiceController _InvoiceController; private readonly UserManager _UserManager; private readonly PaymentRequestRepository _PaymentRequestRepository; private readonly PaymentRequestService _PaymentRequestService; @@ -36,8 +36,8 @@ namespace BTCPayServer.Controllers private readonly InvoiceRepository _InvoiceRepository; private readonly LinkGenerator _linkGenerator; - public PaymentRequestController( - InvoiceController invoiceController, + public UIPaymentRequestController( + UIInvoiceController invoiceController, UserManager userManager, PaymentRequestRepository paymentRequestRepository, PaymentRequestService paymentRequestService, @@ -220,7 +220,7 @@ namespace BTCPayServer.Controllers { if (redirectToInvoice) { - return RedirectToAction("Checkout", "Invoice", new { currentInvoice.Id }); + return RedirectToAction("Checkout", "UIInvoice", new { currentInvoice.Id }); } return Ok(currentInvoice.Id); @@ -260,7 +260,7 @@ namespace BTCPayServer.Controllers if (redirectToInvoice) { - return RedirectToAction("Checkout", "Invoice", new { newInvoice.Id }); + return RedirectToAction("Checkout", "UIInvoice", new { newInvoice.Id }); } return Ok(newInvoice.Id); diff --git a/BTCPayServer/Controllers/PublicController.cs b/BTCPayServer/Controllers/UIPublicController.cs similarity index 95% rename from BTCPayServer/Controllers/PublicController.cs rename to BTCPayServer/Controllers/UIPublicController.cs index 488c2ec11..3b5c6b68a 100644 --- a/BTCPayServer/Controllers/PublicController.cs +++ b/BTCPayServer/Controllers/UIPublicController.cs @@ -11,16 +11,16 @@ using Microsoft.AspNetCore.Mvc; namespace BTCPayServer.Controllers { - public class PublicController : Controller + public class UIPublicController : Controller { - public PublicController(InvoiceController invoiceController, + public UIPublicController(UIInvoiceController invoiceController, StoreRepository storeRepository) { _InvoiceController = invoiceController; _StoreRepository = storeRepository; } - private readonly InvoiceController _InvoiceController; + private readonly UIInvoiceController _InvoiceController; private readonly StoreRepository _StoreRepository; [HttpGet] diff --git a/BTCPayServer/Controllers/PublicLightningNodeInfoController.cs b/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs similarity index 96% rename from BTCPayServer/Controllers/PublicLightningNodeInfoController.cs rename to BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs index 71ddca35e..b7201fe45 100644 --- a/BTCPayServer/Controllers/PublicLightningNodeInfoController.cs +++ b/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs @@ -16,13 +16,13 @@ namespace BTCPayServer.Controllers [Route("embed/{storeId}/{cryptoCode}/ln")] [AllowAnonymous] - public class PublicLightningNodeInfoController : Controller + public class UIPublicLightningNodeInfoController : Controller { private readonly BTCPayNetworkProvider _BtcPayNetworkProvider; private readonly LightningLikePaymentHandler _LightningLikePaymentHandler; private readonly StoreRepository _StoreRepository; - public PublicLightningNodeInfoController(BTCPayNetworkProvider btcPayNetworkProvider, + public UIPublicLightningNodeInfoController(BTCPayNetworkProvider btcPayNetworkProvider, LightningLikePaymentHandler lightningLikePaymentHandler, StoreRepository storeRepository) { _BtcPayNetworkProvider = btcPayNetworkProvider; diff --git a/BTCPayServer/Controllers/PullPaymentController.cs b/BTCPayServer/Controllers/UIPullPaymentController.cs similarity index 98% rename from BTCPayServer/Controllers/PullPaymentController.cs rename to BTCPayServer/Controllers/UIPullPaymentController.cs index 773f1fa2c..64c26e9be 100644 --- a/BTCPayServer/Controllers/PullPaymentController.cs +++ b/BTCPayServer/Controllers/UIPullPaymentController.cs @@ -19,7 +19,7 @@ using Microsoft.EntityFrameworkCore; namespace BTCPayServer.Controllers { [AllowAnonymous] - public class PullPaymentController : Controller + public class UIPullPaymentController : Controller { private readonly ApplicationDbContextFactory _dbContextFactory; private readonly BTCPayNetworkProvider _networkProvider; @@ -28,7 +28,7 @@ namespace BTCPayServer.Controllers private readonly BTCPayNetworkJsonSerializerSettings _serializerSettings; private readonly IEnumerable _payoutHandlers; - public PullPaymentController(ApplicationDbContextFactory dbContextFactory, + public UIPullPaymentController(ApplicationDbContextFactory dbContextFactory, BTCPayNetworkProvider networkProvider, CurrencyNameTable currencyNameTable, PullPaymentHostedService pullPaymentHostedService, diff --git a/BTCPayServer/Controllers/ServerController.Plugins.cs b/BTCPayServer/Controllers/UIServerController.Plugins.cs similarity index 99% rename from BTCPayServer/Controllers/ServerController.Plugins.cs rename to BTCPayServer/Controllers/UIServerController.Plugins.cs index 81cb1ec58..6788b630d 100644 --- a/BTCPayServer/Controllers/ServerController.Plugins.cs +++ b/BTCPayServer/Controllers/UIServerController.Plugins.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc; namespace BTCPayServer.Controllers { - public partial class ServerController + public partial class UIServerController { [HttpGet("server/plugins")] public async Task ListPlugins( diff --git a/BTCPayServer/Controllers/ServerController.Storage.cs b/BTCPayServer/Controllers/UIServerController.Storage.cs similarity index 99% rename from BTCPayServer/Controllers/ServerController.Storage.cs rename to BTCPayServer/Controllers/UIServerController.Storage.cs index b32139c84..42770710b 100644 --- a/BTCPayServer/Controllers/ServerController.Storage.cs +++ b/BTCPayServer/Controllers/UIServerController.Storage.cs @@ -27,7 +27,7 @@ using Newtonsoft.Json.Linq; namespace BTCPayServer.Controllers { - public partial class ServerController + public partial class UIServerController { [HttpGet("server/files")] public async Task Files([FromQuery] string[] fileIds = null) @@ -260,7 +260,7 @@ namespace BTCPayServer.Controllers [HttpPost("server/storage")] public IActionResult Storage(StorageSettings viewModel) { - return RedirectToAction("StorageProvider", "Server", new + return RedirectToAction("StorageProvider", "UIServer", new { provider = viewModel.Provider.ToString() }); diff --git a/BTCPayServer/Controllers/ServerController.Users.cs b/BTCPayServer/Controllers/UIServerController.Users.cs similarity index 99% rename from BTCPayServer/Controllers/ServerController.Users.cs rename to BTCPayServer/Controllers/UIServerController.Users.cs index c52625526..1893e2773 100644 --- a/BTCPayServer/Controllers/ServerController.Users.cs +++ b/BTCPayServer/Controllers/UIServerController.Users.cs @@ -16,7 +16,7 @@ using Microsoft.EntityFrameworkCore; namespace BTCPayServer.Controllers { - public partial class ServerController + public partial class UIServerController { [Route("server/users")] public async Task ListUsers( diff --git a/BTCPayServer/Controllers/ServerController.cs b/BTCPayServer/Controllers/UIServerController.cs similarity index 99% rename from BTCPayServer/Controllers/ServerController.cs rename to BTCPayServer/Controllers/UIServerController.cs index 31e912cd3..2285011de 100644 --- a/BTCPayServer/Controllers/ServerController.cs +++ b/BTCPayServer/Controllers/UIServerController.cs @@ -42,7 +42,7 @@ namespace BTCPayServer.Controllers { [Authorize(Policy = BTCPayServer.Client.Policies.CanModifyServerSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] - public partial class ServerController : Controller + public partial class UIServerController : Controller { private readonly UserManager _UserManager; private readonly UserService _userService; @@ -61,7 +61,7 @@ namespace BTCPayServer.Controllers private readonly FileService _FileService; private readonly IEnumerable _StorageProviderServices; - public ServerController( + public UIServerController( UserManager userManager, UserService userService, StoredFileRepository storedFileRepository, diff --git a/BTCPayServer/Controllers/StorageController.cs b/BTCPayServer/Controllers/UIStorageController.cs similarity index 82% rename from BTCPayServer/Controllers/StorageController.cs rename to BTCPayServer/Controllers/UIStorageController.cs index 835baa45c..6ae747151 100644 --- a/BTCPayServer/Controllers/StorageController.cs +++ b/BTCPayServer/Controllers/UIStorageController.cs @@ -5,11 +5,11 @@ using Microsoft.AspNetCore.Mvc; namespace BTCPayServer.Storage { [Route("Storage")] - public class StorageController : Controller + public class UIStorageController : Controller { private readonly FileService _FileService; - public StorageController(FileService fileService) + public UIStorageController(FileService fileService) { _FileService = fileService; } diff --git a/BTCPayServer/Controllers/StorePullPaymentsController.PullPayments.cs b/BTCPayServer/Controllers/UIStorePullPaymentsController.PullPayments.cs similarity index 98% rename from BTCPayServer/Controllers/StorePullPaymentsController.PullPayments.cs rename to BTCPayServer/Controllers/UIStorePullPaymentsController.PullPayments.cs index 57b78e234..7ae4c3104 100644 --- a/BTCPayServer/Controllers/StorePullPaymentsController.PullPayments.cs +++ b/BTCPayServer/Controllers/UIStorePullPaymentsController.PullPayments.cs @@ -28,7 +28,7 @@ namespace BTCPayServer.Controllers [Route("stores/{storeId}/pull-payments")] [Authorize(Policy = Policies.CanViewStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] [AutoValidateAntiforgeryToken] - public class StorePullPaymentsController : Controller + public class UIStorePullPaymentsController : Controller { private readonly BTCPayNetworkProvider _btcPayNetworkProvider; private readonly IEnumerable _payoutHandlers; @@ -44,7 +44,7 @@ namespace BTCPayServer.Controllers return HttpContext.GetStoreData(); } } - public StorePullPaymentsController(BTCPayNetworkProvider btcPayNetworkProvider, + public UIStorePullPaymentsController(BTCPayNetworkProvider btcPayNetworkProvider, IEnumerable payoutHandlers, CurrencyNameTable currencyNameTable, PullPaymentHostedService pullPaymentHostedService, @@ -74,7 +74,7 @@ namespace BTCPayServer.Controllers Message = "You must enable at least one payment method before creating a pull payment.", Severity = StatusMessageModel.StatusSeverity.Error }); - return RedirectToAction("PaymentMethods", "Stores", new { storeId }); + return RedirectToAction("PaymentMethods", "UIStores", new { storeId }); } return View(new NewPullPaymentModel { @@ -439,7 +439,7 @@ namespace BTCPayServer.Controllers Message = "You must enable at least one payment method before creating a payout.", Severity = StatusMessageModel.StatusSeverity.Error }); - return RedirectToAction("PaymentMethods", "Stores", new { storeId }); + return RedirectToAction("PaymentMethods", "UIStores", new { storeId }); } var vm = this.ParseListQuery(new PayoutsModel diff --git a/BTCPayServer/Controllers/StoresController.Email.cs b/BTCPayServer/Controllers/UIStoresController.Email.cs similarity index 98% rename from BTCPayServer/Controllers/StoresController.Email.cs rename to BTCPayServer/Controllers/UIStoresController.Email.cs index b9fbeb9ba..6ecaeb3fc 100644 --- a/BTCPayServer/Controllers/StoresController.Email.cs +++ b/BTCPayServer/Controllers/UIStoresController.Email.cs @@ -9,7 +9,7 @@ using MimeKit; namespace BTCPayServer.Controllers { - public partial class StoresController + public partial class UIStoresController { [Route("{storeId}/emails")] diff --git a/BTCPayServer/Controllers/StoresController.Integrations.cs b/BTCPayServer/Controllers/UIStoresController.Integrations.cs similarity index 99% rename from BTCPayServer/Controllers/StoresController.Integrations.cs rename to BTCPayServer/Controllers/UIStoresController.Integrations.cs index ed5d2cf19..f46ba076c 100644 --- a/BTCPayServer/Controllers/StoresController.Integrations.cs +++ b/BTCPayServer/Controllers/UIStoresController.Integrations.cs @@ -12,7 +12,7 @@ using NBitcoin.DataEncoders; namespace BTCPayServer.Controllers { - public partial class StoresController + public partial class UIStoresController { [HttpGet("{storeId}/integrations")] public IActionResult Integrations() diff --git a/BTCPayServer/Controllers/StoresController.LightningLike.cs b/BTCPayServer/Controllers/UIStoresController.LightningLike.cs similarity index 99% rename from BTCPayServer/Controllers/StoresController.LightningLike.cs rename to BTCPayServer/Controllers/UIStoresController.LightningLike.cs index 2b1423547..edfc9b1f1 100644 --- a/BTCPayServer/Controllers/StoresController.LightningLike.cs +++ b/BTCPayServer/Controllers/UIStoresController.LightningLike.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection; namespace BTCPayServer.Controllers { - public partial class StoresController + public partial class UIStoresController { [HttpGet("{storeId}/lightning/{cryptoCode}")] public async Task SetupLightningNode(string storeId, string cryptoCode) diff --git a/BTCPayServer/Controllers/StoresController.Onchain.cs b/BTCPayServer/Controllers/UIStoresController.Onchain.cs similarity index 99% rename from BTCPayServer/Controllers/StoresController.Onchain.cs rename to BTCPayServer/Controllers/UIStoresController.Onchain.cs index eaa12f1f1..fc9891659 100644 --- a/BTCPayServer/Controllers/StoresController.Onchain.cs +++ b/BTCPayServer/Controllers/UIStoresController.Onchain.cs @@ -26,7 +26,7 @@ using NBXplorer.Models; namespace BTCPayServer.Controllers { - public partial class StoresController + public partial class UIStoresController { [HttpGet("{storeId}/onchain/{cryptoCode}")] public ActionResult SetupWallet(WalletSetupViewModel vm) diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/UIStoresController.cs similarity index 99% rename from BTCPayServer/Controllers/StoresController.cs rename to BTCPayServer/Controllers/UIStoresController.cs index f128c041a..31e69174b 100644 --- a/BTCPayServer/Controllers/StoresController.cs +++ b/BTCPayServer/Controllers/UIStoresController.cs @@ -36,11 +36,11 @@ namespace BTCPayServer.Controllers [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie)] [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] [AutoValidateAntiforgeryToken] - public partial class StoresController : Controller + public partial class UIStoresController : Controller { readonly RateFetcher _RateFactory; public string CreatedStoreId { get; set; } - public StoresController( + public UIStoresController( IServiceProvider serviceProvider, BTCPayServerOptions btcpayServerOptions, BTCPayServerEnvironment btcpayEnv, @@ -701,7 +701,7 @@ namespace BTCPayServer.Controllers { await _Repo.DeleteStore(CurrentStore.Id); TempData[WellKnownTempData.SuccessMessage] = "Store successfully deleted."; - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); } private IEnumerable GetSupportedExchanges() @@ -873,7 +873,7 @@ namespace BTCPayServer.Controllers if (!model.Stores.Any()) { TempData[WellKnownTempData.ErrorMessage] = "You need to be owner of at least one store before pairing"; - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); } return View(model); } @@ -932,7 +932,7 @@ namespace BTCPayServer.Controllers if (pairing == null) { TempData[WellKnownTempData.ErrorMessage] = "Unknown pairing code"; - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); } else { diff --git a/BTCPayServer/Controllers/UserStoresController.cs b/BTCPayServer/Controllers/UIUserStoresController.cs similarity index 91% rename from BTCPayServer/Controllers/UserStoresController.cs rename to BTCPayServer/Controllers/UIUserStoresController.cs index 03ba145ee..188580751 100644 --- a/BTCPayServer/Controllers/UserStoresController.cs +++ b/BTCPayServer/Controllers/UIUserStoresController.cs @@ -16,12 +16,12 @@ namespace BTCPayServer.Controllers { [Route("stores")] [AutoValidateAntiforgeryToken] - public class UserStoresController : Controller + public class UIUserStoresController : Controller { private readonly StoreRepository _repo; private readonly UserManager _userManager; - public UserStoresController( + public UIUserStoresController( UserManager userManager, StoreRepository storeRepository) { @@ -47,7 +47,7 @@ namespace BTCPayServer.Controllers var store = await _repo.CreateStore(GetUserId(), vm.Name); CreatedStoreId = store.Id; TempData[WellKnownTempData.SuccessMessage] = "Store successfully created"; - return RedirectToAction(nameof(StoresController.Dashboard), "Stores", new + return RedirectToAction(nameof(UIStoresController.Dashboard), "UIStores", new { storeId = store.Id }); @@ -78,7 +78,7 @@ namespace BTCPayServer.Controllers return NotFound(); await _repo.RemoveStore(storeId, userId); TempData[WellKnownTempData.SuccessMessage] = "Store removed successfully"; - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(UIHomeController.Index), "UIHome"); } private string GetUserId() => _userManager.GetUserId(User); diff --git a/BTCPayServer/Controllers/VaultController.cs b/BTCPayServer/Controllers/UIVaultController.cs similarity index 99% rename from BTCPayServer/Controllers/VaultController.cs rename to BTCPayServer/Controllers/UIVaultController.cs index d2d39a448..73f0db864 100644 --- a/BTCPayServer/Controllers/VaultController.cs +++ b/BTCPayServer/Controllers/UIVaultController.cs @@ -20,11 +20,11 @@ namespace BTCPayServer.Controllers { [Route("vault")] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie, Policy = Policies.CanModifyStoreSettings)] - public class VaultController : Controller + public class UIVaultController : Controller { private readonly IAuthorizationService _authorizationService; - public VaultController(BTCPayNetworkProvider networks, IAuthorizationService authorizationService) + public UIVaultController(BTCPayNetworkProvider networks, IAuthorizationService authorizationService) { Networks = networks; _authorizationService = authorizationService; diff --git a/BTCPayServer/Controllers/WalletsController.PSBT.cs b/BTCPayServer/Controllers/UIWalletsController.PSBT.cs similarity index 99% rename from BTCPayServer/Controllers/WalletsController.PSBT.cs rename to BTCPayServer/Controllers/UIWalletsController.PSBT.cs index ee12e3c8f..8e23247ee 100644 --- a/BTCPayServer/Controllers/WalletsController.PSBT.cs +++ b/BTCPayServer/Controllers/UIWalletsController.PSBT.cs @@ -20,7 +20,7 @@ using NBXplorer.Models; namespace BTCPayServer.Controllers { - public partial class WalletsController + public partial class UIWalletsController { [NonAction] diff --git a/BTCPayServer/Controllers/WalletsController.cs b/BTCPayServer/Controllers/UIWalletsController.cs similarity index 99% rename from BTCPayServer/Controllers/WalletsController.cs rename to BTCPayServer/Controllers/UIWalletsController.cs index a0404dfad..55940ad85 100644 --- a/BTCPayServer/Controllers/WalletsController.cs +++ b/BTCPayServer/Controllers/UIWalletsController.cs @@ -37,7 +37,7 @@ namespace BTCPayServer.Controllers [Route("wallets")] [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] [AutoValidateAntiforgeryToken] - public partial class WalletsController : Controller + public partial class UIWalletsController : Controller { private StoreRepository Repository { get; } private WalletRepository WalletRepository { get; } @@ -64,7 +64,7 @@ namespace BTCPayServer.Controllers private readonly IEnumerable _payoutHandlers; readonly CurrencyNameTable _currencyTable; - public WalletsController(StoreRepository repo, + public UIWalletsController(StoreRepository repo, WalletRepository walletRepository, CurrencyNameTable currencyTable, BTCPayNetworkProvider networkProvider, @@ -802,7 +802,7 @@ namespace BTCPayServer.Controllers { SigningContext = signingContext, WalletId = walletId.ToString(), - WebsocketPath = this.Url.Action(nameof(VaultController.VaultBridgeConnection), "Vault", new { walletId = walletId.ToString() }) + WebsocketPath = this.Url.Action(nameof(UIVaultController.VaultBridgeConnection), "UIVault", new { walletId = walletId.ToString() }) }); } @@ -821,7 +821,7 @@ namespace BTCPayServer.Controllers { var redirectVm = new PostRedirectViewModel { - AspController = "Wallets", + AspController = "UIWallets", AspAction = nameof(WalletPSBTReady), Parameters = { @@ -854,7 +854,7 @@ namespace BTCPayServer.Controllers { var redirectVm = new PostRedirectViewModel { - AspController = "Wallets", + AspController = "UIWallets", AspAction = nameof(WalletPSBT), Parameters = { diff --git a/BTCPayServer/Data/Payouts/BitcoinLike/BitcoinLikePayoutHandler.cs b/BTCPayServer/Data/Payouts/BitcoinLike/BitcoinLikePayoutHandler.cs index 7af811ab8..401e6c012 100644 --- a/BTCPayServer/Data/Payouts/BitcoinLike/BitcoinLikePayoutHandler.cs +++ b/BTCPayServer/Data/Payouts/BitcoinLike/BitcoinLikePayoutHandler.cs @@ -264,8 +264,8 @@ public class BitcoinLikePayoutHandler : IPayoutHandler } } if (bip21.Any()) - return new RedirectToActionResult("WalletSend", "Wallets", new { walletId = new WalletId(storeId, paymentMethodId.CryptoCode).ToString(), bip21 }); - return new RedirectToActionResult("Payouts", "Wallets", new + return new RedirectToActionResult("WalletSend", "UIWallets", new { walletId = new WalletId(storeId, paymentMethodId.CryptoCode).ToString(), bip21 }); + return new RedirectToActionResult("Payouts", "UIWallets", new { walletId = new WalletId(storeId, paymentMethodId.CryptoCode).ToString(), pullPaymentId = pullPaymentIds.Length == 1 ? pullPaymentIds.First() : null diff --git a/BTCPayServer/Data/Payouts/LightningLike/LightningLikePayoutHandler.cs b/BTCPayServer/Data/Payouts/LightningLike/LightningLikePayoutHandler.cs index 0d1242664..baf4a0e84 100644 --- a/BTCPayServer/Data/Payouts/LightningLike/LightningLikePayoutHandler.cs +++ b/BTCPayServer/Data/Payouts/LightningLike/LightningLikePayoutHandler.cs @@ -165,7 +165,7 @@ namespace BTCPayServer.Data.Payouts.LightningLike public Task InitiatePayment(PaymentMethodId paymentMethodId, string[] payoutIds) { return Task.FromResult(new RedirectToActionResult("ConfirmLightningPayout", - "LightningLikePayout", new { cryptoCode = paymentMethodId.CryptoCode, payoutIds })); + "UILightningLikePayout", new { cryptoCode = paymentMethodId.CryptoCode, payoutIds })); } } } diff --git a/BTCPayServer/Data/Payouts/LightningLike/LightningLikePayoutController.cs b/BTCPayServer/Data/Payouts/LightningLike/UILightningLikePayoutController.cs similarity index 98% rename from BTCPayServer/Data/Payouts/LightningLike/LightningLikePayoutController.cs rename to BTCPayServer/Data/Payouts/LightningLike/UILightningLikePayoutController.cs index ff01e35d5..f376fc845 100644 --- a/BTCPayServer/Data/Payouts/LightningLike/LightningLikePayoutController.cs +++ b/BTCPayServer/Data/Payouts/LightningLike/UILightningLikePayoutController.cs @@ -23,7 +23,7 @@ namespace BTCPayServer.Data.Payouts.LightningLike { [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie)] [AutoValidateAntiforgeryToken] - public class LightningLikePayoutController : Controller + public class UILightningLikePayoutController : Controller { private readonly ApplicationDbContextFactory _applicationDbContextFactory; private readonly UserManager _userManager; @@ -34,7 +34,7 @@ namespace BTCPayServer.Data.Payouts.LightningLike private readonly IOptions _options; private readonly IAuthorizationService _authorizationService; - public LightningLikePayoutController(ApplicationDbContextFactory applicationDbContextFactory, + public UILightningLikePayoutController(ApplicationDbContextFactory applicationDbContextFactory, UserManager userManager, BTCPayNetworkJsonSerializerSettings btcPayNetworkJsonSerializerSettings, IEnumerable payoutHandlers, diff --git a/BTCPayServer/Extensions.cs b/BTCPayServer/Extensions.cs index 538d38e48..0aebb64b8 100644 --- a/BTCPayServer/Extensions.cs +++ b/BTCPayServer/Extensions.cs @@ -45,7 +45,7 @@ namespace BTCPayServer public static bool TryGetPayjoinEndpoint(this BitcoinUrlBuilder bip21, out Uri endpoint) { - endpoint = bip21.UnknowParameters.TryGetValue($"{PayjoinClient.BIP21EndpointKey}", out var uri) ? new Uri(uri, UriKind.Absolute) : null; + endpoint = bip21.UnknownParameters.TryGetValue($"{PayjoinClient.BIP21EndpointKey}", out var uri) ? new Uri(uri, UriKind.Absolute) : null; return endpoint != null; } @@ -493,7 +493,7 @@ namespace BTCPayServer { var redirectVm = new PostRedirectViewModel { - AspController = "Home", + AspController = "UIHome", AspAction = "RecoverySeedBackup", Parameters = { diff --git a/BTCPayServer/Extensions/UrlHelperExtensions.cs b/BTCPayServer/Extensions/UrlHelperExtensions.cs index ace01884b..d51394e09 100644 --- a/BTCPayServer/Extensions/UrlHelperExtensions.cs +++ b/BTCPayServer/Extensions/UrlHelperExtensions.cs @@ -11,15 +11,15 @@ namespace Microsoft.AspNetCore.Mvc { public static string EmailConfirmationLink(this LinkGenerator urlHelper, string userId, string code, string scheme, HostString host, string pathbase) { - return urlHelper.GetUriByAction(nameof(AccountController.ConfirmEmail), "Account", + return urlHelper.GetUriByAction(nameof(UIAccountController.ConfirmEmail), "UIAccount", new { userId, code }, scheme, host, pathbase); } public static string ResetPasswordCallbackLink(this LinkGenerator urlHelper, string userId, string code, string scheme, HostString host, string pathbase) { return urlHelper.GetUriByAction( - action: nameof(AccountController.SetPassword), - controller: "Account", + action: nameof(UIAccountController.SetPassword), + controller: "UIAccount", values: new { userId, code }, scheme: scheme, host: host, @@ -30,8 +30,8 @@ namespace Microsoft.AspNetCore.Mvc public static string PaymentRequestLink(this LinkGenerator urlHelper, string paymentRequestId, string scheme, HostString host, string pathbase) { return urlHelper.GetUriByAction( - action: nameof(PaymentRequestController.ViewPaymentRequest), - controller: "PaymentRequest", + action: nameof(UIPaymentRequestController.ViewPaymentRequest), + controller: "UIPaymentRequest", values: new { id = paymentRequestId }, scheme, host, pathbase); } @@ -39,8 +39,8 @@ namespace Microsoft.AspNetCore.Mvc public static string AppLink(this LinkGenerator urlHelper, string appId, string scheme, HostString host, string pathbase) { return urlHelper.GetUriByAction( - action: nameof(AppsPublicController.RedirectToApp), - controller: "AppsPublic", + action: nameof(UIAppsPublicController.RedirectToApp), + controller: "UIAppsPublic", values: new { appId }, scheme, host, pathbase); } @@ -48,8 +48,8 @@ namespace Microsoft.AspNetCore.Mvc public static string InvoiceLink(this LinkGenerator urlHelper, string invoiceId, string scheme, HostString host, string pathbase) { return urlHelper.GetUriByAction( - action: nameof(InvoiceController.Invoice), - controller: "Invoice", + action: nameof(UIInvoiceController.Invoice), + controller: "UIInvoice", values: new { invoiceId = invoiceId }, scheme, host, pathbase); } @@ -57,8 +57,8 @@ namespace Microsoft.AspNetCore.Mvc public static string CheckoutLink(this LinkGenerator urlHelper, string invoiceId, string scheme, HostString host, string pathbase) { return urlHelper.GetUriByAction( - action: nameof(InvoiceController.Checkout), - controller: "Invoice", + action: nameof(UIInvoiceController.Checkout), + controller: "UIInvoice", values: new { invoiceId = invoiceId }, scheme, host, pathbase); } @@ -67,8 +67,8 @@ namespace Microsoft.AspNetCore.Mvc { WalletId.TryParse(walletIdOrStoreId, out var wallet); return urlHelper.GetUriByAction( - action: nameof(StorePullPaymentsController.Payouts), - controller: "StorePullPayments", + action: nameof(UIStorePullPaymentsController.Payouts), + controller: "UIStorePullPayments", values: new { storeId = wallet?.StoreId ?? walletIdOrStoreId, pullPaymentId }, scheme, host, pathbase); } diff --git a/BTCPayServer/Fido2/Fido2Controller.cs b/BTCPayServer/Fido2/Fido2Controller.cs index 657bc60eb..adaff945b 100644 --- a/BTCPayServer/Fido2/Fido2Controller.cs +++ b/BTCPayServer/Fido2/Fido2Controller.cs @@ -90,7 +90,7 @@ namespace BTCPayServer.Fido2 private ActionResult RedirectToList() { - return RedirectToAction("TwoFactorAuthentication", "Manage"); + return RedirectToAction("TwoFactorAuthentication", "UIManage"); } } } diff --git a/BTCPayServer/HostedServices/AppInventoryUpdaterHostedService.cs b/BTCPayServer/HostedServices/AppInventoryUpdaterHostedService.cs index 4bfaf235d..c767aff18 100644 --- a/BTCPayServer/HostedServices/AppInventoryUpdaterHostedService.cs +++ b/BTCPayServer/HostedServices/AppInventoryUpdaterHostedService.cs @@ -37,7 +37,7 @@ namespace BTCPayServer.HostedServices switch (Enum.Parse(data.AppType)) { case AppType.PointOfSale: - var possettings = data.GetSettings(); + var possettings = data.GetSettings(); return (Data: data, Settings: (object)possettings, Items: _appService.Parse(possettings.Template, possettings.Currency)); case AppType.Crowdfund: @@ -69,7 +69,7 @@ namespace BTCPayServer.HostedServices { case AppType.PointOfSale: - ((AppsController.PointOfSaleSettings)valueTuple.Settings).Template = + ((UIAppsController.PointOfSaleSettings)valueTuple.Settings).Template = _appService.SerializeTemplate(valueTuple.Items); break; case AppType.Crowdfund: diff --git a/BTCPayServer/Hosting/BTCPayServerServices.cs b/BTCPayServer/Hosting/BTCPayServerServices.cs index 56a69097d..d8f082132 100644 --- a/BTCPayServer/Hosting/BTCPayServerServices.cs +++ b/BTCPayServer/Hosting/BTCPayServerServices.cs @@ -382,9 +382,9 @@ namespace BTCPayServer.Hosting services.TryAddScoped(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); // Add application services. services.AddSingleton(); diff --git a/BTCPayServer/Hosting/MigrationStartupTask.cs b/BTCPayServer/Hosting/MigrationStartupTask.cs index 08ab77445..116140618 100644 --- a/BTCPayServer/Hosting/MigrationStartupTask.cs +++ b/BTCPayServer/Hosting/MigrationStartupTask.cs @@ -236,7 +236,7 @@ namespace BTCPayServer.Hosting case nameof(AppType.PointOfSale): - var settings2 = app.GetSettings(); + var settings2 = app.GetSettings(); if (string.IsNullOrEmpty(settings2.Currency)) { settings2.Currency = app.StoreData.GetStoreBlob().DefaultCurrency; diff --git a/BTCPayServer/Hosting/Startup.cs b/BTCPayServer/Hosting/Startup.cs index a49946ead..d1f42f969 100644 --- a/BTCPayServer/Hosting/Startup.cs +++ b/BTCPayServer/Hosting/Startup.cs @@ -270,7 +270,7 @@ namespace BTCPayServer.Hosting PaymentRequestHub.Register(endpoints); endpoints.MapRazorPages(); endpoints.MapControllers(); - endpoints.MapControllerRoute("default", "{controller:validate=Home}/{action=Index}/{id?}"); + endpoints.MapControllerRoute("default", "{controller:validate=UIHome}/{action=Index}/{id?}"); }); app.UsePlugins(); } diff --git a/BTCPayServer/PaymentRequest/PaymentRequestHub.cs b/BTCPayServer/PaymentRequest/PaymentRequestHub.cs index 767b35172..8ad2e6a96 100644 --- a/BTCPayServer/PaymentRequest/PaymentRequestHub.cs +++ b/BTCPayServer/PaymentRequest/PaymentRequestHub.cs @@ -20,7 +20,7 @@ namespace BTCPayServer.PaymentRequest { public class PaymentRequestHub : Hub { - private readonly PaymentRequestController _PaymentRequestController; + private readonly UIPaymentRequestController _PaymentRequestController; public const string InvoiceCreated = "InvoiceCreated"; public const string PaymentReceived = "PaymentReceived"; public const string InfoUpdated = "InfoUpdated"; @@ -28,7 +28,7 @@ namespace BTCPayServer.PaymentRequest public const string CancelInvoiceError = "CancelInvoiceError"; public const string InvoiceCancelled = "InvoiceCancelled"; - public PaymentRequestHub(PaymentRequestController paymentRequestController) + public PaymentRequestHub(UIPaymentRequestController paymentRequestController) { _PaymentRequestController = paymentRequestController; } diff --git a/BTCPayServer/Plugins/Shopify/ShopifyController.cs b/BTCPayServer/Plugins/Shopify/ShopifyController.cs index c9c8246b5..af5d3e42f 100644 --- a/BTCPayServer/Plugins/Shopify/ShopifyController.cs +++ b/BTCPayServer/Plugins/Shopify/ShopifyController.cs @@ -38,7 +38,7 @@ namespace BTCPayServer.Plugins.Shopify private readonly IWebHostEnvironment _webHostEnvironment; private readonly StoreRepository _storeRepository; private readonly InvoiceRepository _invoiceRepository; - private readonly InvoiceController _invoiceController; + private readonly UIInvoiceController _invoiceController; private readonly IJsonHelper _jsonHelper; private readonly IHttpClientFactory _clientFactory; @@ -47,7 +47,7 @@ namespace BTCPayServer.Plugins.Shopify IWebHostEnvironment webHostEnvironment, StoreRepository storeRepository, InvoiceRepository invoiceRepository, - InvoiceController invoiceController, + UIInvoiceController invoiceController, IJsonHelper jsonHelper, IHttpClientFactory clientFactory) { diff --git a/BTCPayServer/Services/Apps/AppHub.cs b/BTCPayServer/Services/Apps/AppHub.cs index 14c30c44f..cc281dec6 100644 --- a/BTCPayServer/Services/Apps/AppHub.cs +++ b/BTCPayServer/Services/Apps/AppHub.cs @@ -16,9 +16,9 @@ namespace BTCPayServer.Services.Apps public const string PaymentReceived = "PaymentReceived"; public const string InfoUpdated = "InfoUpdated"; public const string InvoiceError = "InvoiceError"; - private readonly AppsPublicController _AppsPublicController; + private readonly UIAppsPublicController _AppsPublicController; - public AppHub(AppsPublicController appsPublicController) + public AppHub(UIAppsPublicController appsPublicController) { _AppsPublicController = appsPublicController; } diff --git a/BTCPayServer/Services/Apps/AppHubStreamer.cs b/BTCPayServer/Services/Apps/AppHubStreamer.cs index 041c30018..03fcbadce 100644 --- a/BTCPayServer/Services/Apps/AppHubStreamer.cs +++ b/BTCPayServer/Services/Apps/AppHubStreamer.cs @@ -25,7 +25,7 @@ namespace BTCPayServer.Services.Apps protected override void SubscribeToEvents() { Subscribe(); - Subscribe(); + Subscribe(); } protected override async Task ProcessEvent(object evt, CancellationToken cancellationToken) @@ -47,7 +47,7 @@ namespace BTCPayServer.Services.Apps await InfoUpdated(appId); } } - else if (evt is AppsController.AppUpdated app) + else if (evt is UIAppsController.AppUpdated app) { await InfoUpdated(app.AppId); } diff --git a/BTCPayServer/Services/Apps/AppService.cs b/BTCPayServer/Services/Apps/AppService.cs index dba256fda..f9d5ca0a5 100644 --- a/BTCPayServer/Services/Apps/AppService.cs +++ b/BTCPayServer/Services/Apps/AppService.cs @@ -262,7 +262,7 @@ namespace BTCPayServer.Services.Apps { AppType appTypeEnum = Enum.Parse(appType); AppData appData = await GetApp(appId, appTypeEnum, false); - var settings = appData.GetSettings(); + var settings = appData.GetSettings(); string style; switch (appTypeEnum) diff --git a/BTCPayServer/Services/Notifications/Blobs/ExternalPayoutTransactionNotification.cs b/BTCPayServer/Services/Notifications/Blobs/ExternalPayoutTransactionNotification.cs index b59a452d9..c2d9753b3 100644 --- a/BTCPayServer/Services/Notifications/Blobs/ExternalPayoutTransactionNotification.cs +++ b/BTCPayServer/Services/Notifications/Blobs/ExternalPayoutTransactionNotification.cs @@ -37,8 +37,8 @@ namespace BTCPayServer.Services.Notifications.Blobs { vm.Body = "A payment that was made to an approved payout by an external wallet is waiting for your confirmation."; - vm.ActionLink = _linkGenerator.GetPathByAction(nameof(StorePullPaymentsController.Payouts), - "StorePullPayments", + vm.ActionLink = _linkGenerator.GetPathByAction(nameof(UIStorePullPaymentsController.Payouts), + "UIStorePullPayments", new { storeId = notification.StoreId, diff --git a/BTCPayServer/Services/Notifications/Blobs/InvoiceEventNotification.cs b/BTCPayServer/Services/Notifications/Blobs/InvoiceEventNotification.cs index f97cf0ba5..42bee92bb 100644 --- a/BTCPayServer/Services/Notifications/Blobs/InvoiceEventNotification.cs +++ b/BTCPayServer/Services/Notifications/Blobs/InvoiceEventNotification.cs @@ -52,8 +52,8 @@ namespace BTCPayServer.Services.Notifications.Blobs { vm.Body = $"{baseStr} {TextMapping[notification.Event]}"; } - vm.ActionLink = _linkGenerator.GetPathByAction(nameof(InvoiceController.Invoice), - "Invoice", + vm.ActionLink = _linkGenerator.GetPathByAction(nameof(UIInvoiceController.Invoice), + "UIInvoice", new { invoiceId = notification.InvoiceId }, _options.RootPath); } } diff --git a/BTCPayServer/Services/Notifications/Blobs/PayoutNotification.cs b/BTCPayServer/Services/Notifications/Blobs/PayoutNotification.cs index 33c92d0ca..614bddcfb 100644 --- a/BTCPayServer/Services/Notifications/Blobs/PayoutNotification.cs +++ b/BTCPayServer/Services/Notifications/Blobs/PayoutNotification.cs @@ -33,8 +33,8 @@ namespace BTCPayServer.Services.Notifications.Blobs protected override void FillViewModel(PayoutNotification notification, NotificationViewModel vm) { vm.Body = "A new payout is awaiting for approval"; - vm.ActionLink = _linkGenerator.GetPathByAction(nameof(StorePullPaymentsController.Payouts), - "StorePullPayments", + vm.ActionLink = _linkGenerator.GetPathByAction(nameof(UIStorePullPaymentsController.Payouts), + "UIStorePullPayments", new { storeId = notification.StoreId, paymentMethodId = notification.PaymentMethod }, _options.RootPath); } } diff --git a/BTCPayServer/Views/AppsPublic/PointOfSale/Light.cshtml b/BTCPayServer/Views/AppsPublic/PointOfSale/Light.cshtml deleted file mode 100644 index 5fbbbd5d9..000000000 --- a/BTCPayServer/Views/AppsPublic/PointOfSale/Light.cshtml +++ /dev/null @@ -1,18 +0,0 @@ -@model BTCPayServer.Models.AppViewModels.ViewPointOfSaleViewModel -@{ - Layout = "_LayoutPos"; -} - - - -@if (Context.Request.Query.ContainsKey("simple")) -{ - -} -else -{ - - -} diff --git a/BTCPayServer/Views/Fido2/_ViewStart.cshtml b/BTCPayServer/Views/Fido2/_ViewStart.cshtml deleted file mode 100644 index 81d75eddf..000000000 --- a/BTCPayServer/Views/Fido2/_ViewStart.cshtml +++ /dev/null @@ -1,4 +0,0 @@ -@{ - Layout = "../Shared/_NavLayout.cshtml"; - ViewData["NavPartialName"] = "../Manage/_Nav"; -} diff --git a/BTCPayServer/Views/Server/_Nav.cshtml b/BTCPayServer/Views/Server/_Nav.cshtml deleted file mode 100644 index f6444dc34..000000000 --- a/BTCPayServer/Views/Server/_Nav.cshtml +++ /dev/null @@ -1,18 +0,0 @@ -@using BTCPayServer.Configuration -@inject BTCPayServerOptions BTCPayServerOptions - - - diff --git a/BTCPayServer/Views/Shared/LNURL/LightningAddressNav.cshtml b/BTCPayServer/Views/Shared/LNURL/LightningAddressNav.cshtml index fb61eb58d..de0b73e4b 100644 --- a/BTCPayServer/Views/Shared/LNURL/LightningAddressNav.cshtml +++ b/BTCPayServer/Views/Shared/LNURL/LightningAddressNav.cshtml @@ -15,7 +15,7 @@ @if (possible) {
  • - + Lightning Address diff --git a/BTCPayServer/Views/Shared/LNURL/LightningAddressOption.cshtml b/BTCPayServer/Views/Shared/LNURL/LightningAddressOption.cshtml index 4c73e6c56..7f13f0bbc 100644 --- a/BTCPayServer/Views/Shared/LNURL/LightningAddressOption.cshtml +++ b/BTCPayServer/Views/Shared/LNURL/LightningAddressOption.cshtml @@ -22,7 +22,7 @@ @if (possible) { - + Setup } @@ -30,7 +30,7 @@ { if (!isLightningEnabled) { - + You need to setup Lightning first } diff --git a/BTCPayServer/Views/Shared/Monero/StoreNavMoneroExtension.cshtml b/BTCPayServer/Views/Shared/Monero/StoreNavMoneroExtension.cshtml index 0739c0ecf..b775fdc6a 100644 --- a/BTCPayServer/Views/Shared/Monero/StoreNavMoneroExtension.cshtml +++ b/BTCPayServer/Views/Shared/Monero/StoreNavMoneroExtension.cshtml @@ -8,5 +8,5 @@ } @if (SignInManager.IsSignedIn(User) && User.IsInRole(Roles.ServerAdmin) && MoneroLikeConfiguration.MoneroLikeConfigurationItems.Any()) { - Monero + Monero } diff --git a/BTCPayServer/Views/Shared/NotificationEmailWarning.cshtml b/BTCPayServer/Views/Shared/NotificationEmailWarning.cshtml index bc07c886f..804bd2b70 100644 --- a/BTCPayServer/Views/Shared/NotificationEmailWarning.cshtml +++ b/BTCPayServer/Views/Shared/NotificationEmailWarning.cshtml @@ -2,5 +2,5 @@ - The Email settings have not been configured on this server or store yet. Setting this field will not send emails until then. Configure store email settings + The Email settings have not been configured on this server or store yet. Setting this field will not send emails until then. Configure store email settings diff --git a/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml b/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml index 7504eb749..a9deb2823 100644 --- a/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml +++ b/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml @@ -6,8 +6,8 @@ - - + + diff --git a/BTCPayServer/Views/Shared/_Layout.cshtml b/BTCPayServer/Views/Shared/_Layout.cshtml index 6a2c8bf2d..f54af4648 100644 --- a/BTCPayServer/Views/Shared/_Layout.cshtml +++ b/BTCPayServer/Views/Shared/_Layout.cshtml @@ -81,9 +81,9 @@
    - + BTCPay Server diff --git a/BTCPayServer/Views/Account/LoginWith2fa.cshtml b/BTCPayServer/Views/UIAccount/LoginWith2fa.cshtml similarity index 100% rename from BTCPayServer/Views/Account/LoginWith2fa.cshtml rename to BTCPayServer/Views/UIAccount/LoginWith2fa.cshtml diff --git a/BTCPayServer/Views/Account/LoginWithFido2.cshtml b/BTCPayServer/Views/UIAccount/LoginWithFido2.cshtml similarity index 100% rename from BTCPayServer/Views/Account/LoginWithFido2.cshtml rename to BTCPayServer/Views/UIAccount/LoginWithFido2.cshtml diff --git a/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml b/BTCPayServer/Views/UIAccount/LoginWithRecoveryCode.cshtml similarity index 100% rename from BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml rename to BTCPayServer/Views/UIAccount/LoginWithRecoveryCode.cshtml diff --git a/BTCPayServer/Views/Account/Register.cshtml b/BTCPayServer/Views/UIAccount/Register.cshtml similarity index 98% rename from BTCPayServer/Views/Account/Register.cshtml rename to BTCPayServer/Views/UIAccount/Register.cshtml index fa4e87df5..5966ae726 100644 --- a/BTCPayServer/Views/Account/Register.cshtml +++ b/BTCPayServer/Views/UIAccount/Register.cshtml @@ -11,7 +11,7 @@
    - + BTCPay Server diff --git a/BTCPayServer/Views/Account/SecondaryLogin.cshtml b/BTCPayServer/Views/UIAccount/SecondaryLogin.cshtml similarity index 100% rename from BTCPayServer/Views/Account/SecondaryLogin.cshtml rename to BTCPayServer/Views/UIAccount/SecondaryLogin.cshtml diff --git a/BTCPayServer/Views/Account/SetPassword.cshtml b/BTCPayServer/Views/UIAccount/SetPassword.cshtml similarity index 98% rename from BTCPayServer/Views/Account/SetPassword.cshtml rename to BTCPayServer/Views/UIAccount/SetPassword.cshtml index 7816f08ed..d6939ce2a 100644 --- a/BTCPayServer/Views/Account/SetPassword.cshtml +++ b/BTCPayServer/Views/UIAccount/SetPassword.cshtml @@ -10,7 +10,7 @@
    - + BTCPay Server diff --git a/BTCPayServer/Views/Account/SignedOut.cshtml b/BTCPayServer/Views/UIAccount/SignedOut.cshtml similarity index 100% rename from BTCPayServer/Views/Account/SignedOut.cshtml rename to BTCPayServer/Views/UIAccount/SignedOut.cshtml diff --git a/BTCPayServer/Views/Account/_ViewImports.cshtml b/BTCPayServer/Views/UIAccount/_ViewImports.cshtml similarity index 100% rename from BTCPayServer/Views/Account/_ViewImports.cshtml rename to BTCPayServer/Views/UIAccount/_ViewImports.cshtml diff --git a/BTCPayServer/Views/Apps/AppsNavPages.cs b/BTCPayServer/Views/UIApps/AppsNavPages.cs similarity index 100% rename from BTCPayServer/Views/Apps/AppsNavPages.cs rename to BTCPayServer/Views/UIApps/AppsNavPages.cs diff --git a/BTCPayServer/Views/Apps/CreateApp.cshtml b/BTCPayServer/Views/UIApps/CreateApp.cshtml similarity index 100% rename from BTCPayServer/Views/Apps/CreateApp.cshtml rename to BTCPayServer/Views/UIApps/CreateApp.cshtml diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/UIApps/ListApps.cshtml similarity index 94% rename from BTCPayServer/Views/Apps/ListApps.cshtml rename to BTCPayServer/Views/UIApps/ListApps.cshtml index 45c930f0a..c51264f4e 100644 --- a/BTCPayServer/Views/Apps/ListApps.cshtml +++ b/BTCPayServer/Views/UIApps/ListApps.cshtml @@ -79,7 +79,7 @@ @if (app.IsOwner) { - @app.StoreName + @app.StoreName } else { @@ -99,11 +99,11 @@ @if (app.IsOwner) { - Settings + Settings - } - View - View + - Delete diff --git a/BTCPayServer/Views/Apps/TemplateEditor.cshtml b/BTCPayServer/Views/UIApps/TemplateEditor.cshtml similarity index 100% rename from BTCPayServer/Views/Apps/TemplateEditor.cshtml rename to BTCPayServer/Views/UIApps/TemplateEditor.cshtml diff --git a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml b/BTCPayServer/Views/UIApps/UpdateCrowdfund.cshtml similarity index 96% rename from BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml rename to BTCPayServer/Views/UIApps/UpdateCrowdfund.cshtml index a6233a361..e6fe4de4b 100644 --- a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml +++ b/BTCPayServer/Views/UIApps/UpdateCrowdfund.cshtml @@ -233,15 +233,15 @@
    - Invoices - Invoices +
    @if (Model.ModelWithMinimumData) {
    - View Crowdfund - View Crowdfund +
    } diff --git a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml b/BTCPayServer/Views/UIApps/UpdatePointOfSale.cshtml similarity index 97% rename from BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml rename to BTCPayServer/Views/UIApps/UpdatePointOfSale.cshtml index bc5386bd1..a4e71d236 100644 --- a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml +++ b/BTCPayServer/Views/UIApps/UpdatePointOfSale.cshtml @@ -151,7 +151,7 @@
    You can embed this POS via an iframe. @{ - var iframe = $""; + var iframe = $""; } 
    @iframe
    @@ -238,13 +238,13 @@
    - Invoices - Invoices +
    - View Point of Sale - View Point of Sale +
    diff --git a/BTCPayServer/Views/Apps/_ViewImports.cshtml b/BTCPayServer/Views/UIApps/_ViewImports.cshtml similarity index 100% rename from BTCPayServer/Views/Apps/_ViewImports.cshtml rename to BTCPayServer/Views/UIApps/_ViewImports.cshtml diff --git a/BTCPayServer/Views/Apps/_ViewStart.cshtml b/BTCPayServer/Views/UIApps/_ViewStart.cshtml similarity index 100% rename from BTCPayServer/Views/Apps/_ViewStart.cshtml rename to BTCPayServer/Views/UIApps/_ViewStart.cshtml diff --git a/BTCPayServer/Views/AppsPublic/Crowdfund/ContributeForm.cshtml b/BTCPayServer/Views/UIAppsPublic/Crowdfund/ContributeForm.cshtml similarity index 100% rename from BTCPayServer/Views/AppsPublic/Crowdfund/ContributeForm.cshtml rename to BTCPayServer/Views/UIAppsPublic/Crowdfund/ContributeForm.cshtml diff --git a/BTCPayServer/Views/AppsPublic/PointOfSale/Cart.cshtml b/BTCPayServer/Views/UIAppsPublic/PointOfSale/Cart.cshtml similarity index 99% rename from BTCPayServer/Views/AppsPublic/PointOfSale/Cart.cshtml rename to BTCPayServer/Views/UIAppsPublic/PointOfSale/Cart.cshtml index 46567e600..18f6b448a 100644 --- a/BTCPayServer/Views/AppsPublic/PointOfSale/Cart.cshtml +++ b/BTCPayServer/Views/UIAppsPublic/PointOfSale/Cart.cshtml @@ -161,7 +161,7 @@
    + +@if (Context.Request.Query.ContainsKey("simple")) +{ + +} +else +{ + + +} diff --git a/BTCPayServer/Views/AppsPublic/PointOfSale/MinimalLight.cshtml b/BTCPayServer/Views/UIAppsPublic/PointOfSale/MinimalLight.cshtml similarity index 95% rename from BTCPayServer/Views/AppsPublic/PointOfSale/MinimalLight.cshtml rename to BTCPayServer/Views/UIAppsPublic/PointOfSale/MinimalLight.cshtml index 4fe5abf1b..9bfc59a4f 100644 --- a/BTCPayServer/Views/AppsPublic/PointOfSale/MinimalLight.cshtml +++ b/BTCPayServer/Views/UIAppsPublic/PointOfSale/MinimalLight.cshtml @@ -7,7 +7,7 @@ }
    - +
    @Model.CurrencySymbol diff --git a/BTCPayServer/Views/AppsPublic/PointOfSale/Print.cshtml b/BTCPayServer/Views/UIAppsPublic/PointOfSale/Print.cshtml similarity index 95% rename from BTCPayServer/Views/AppsPublic/PointOfSale/Print.cshtml rename to BTCPayServer/Views/UIAppsPublic/PointOfSale/Print.cshtml index f89631b9d..409cd2196 100644 --- a/BTCPayServer/Views/AppsPublic/PointOfSale/Print.cshtml +++ b/BTCPayServer/Views/UIAppsPublic/PointOfSale/Print.cshtml @@ -31,7 +31,7 @@ { @@ -74,7 +74,7 @@ else { if (supported != null) { - var lnurlEndpoint = new Uri(Url.Action("GetLNURLForApp", "LNURL", new + var lnurlEndpoint = new Uri(Url.Action("GetLNURLForApp", "UILNURL", new { cryptoCode = supported.CryptoCode, appid = Model.AppId, diff --git a/BTCPayServer/Views/AppsPublic/PointOfSale/Static.cshtml b/BTCPayServer/Views/UIAppsPublic/PointOfSale/Static.cshtml similarity index 93% rename from BTCPayServer/Views/AppsPublic/PointOfSale/Static.cshtml rename to BTCPayServer/Views/UIAppsPublic/PointOfSale/Static.cshtml index cbbae436c..7882d96de 100644 --- a/BTCPayServer/Views/AppsPublic/PointOfSale/Static.cshtml +++ b/BTCPayServer/Views/UIAppsPublic/PointOfSale/Static.cshtml @@ -35,7 +35,7 @@ { @if (item.Price.Type != ViewPointOfSaleViewModel.Item.ItemPrice.ItemPriceType.Topup) { - + @{PayFormInputContent(item.BuyButtonText ?? Model.CustomButtonText, item.Price.Type, item.Price.Value, item.Price.Value);} @@ -43,7 +43,7 @@ } else { - + diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml similarity index 100% rename from BTCPayServer/Views/Invoice/ListInvoices.cshtml rename to BTCPayServer/Views/UIInvoice/ListInvoices.cshtml diff --git a/BTCPayServer/Views/Invoice/ListInvoicesPaymentsPartial.cshtml b/BTCPayServer/Views/UIInvoice/ListInvoicesPaymentsPartial.cshtml similarity index 100% rename from BTCPayServer/Views/Invoice/ListInvoicesPaymentsPartial.cshtml rename to BTCPayServer/Views/UIInvoice/ListInvoicesPaymentsPartial.cshtml diff --git a/BTCPayServer/Views/Invoice/PosData.cshtml b/BTCPayServer/Views/UIInvoice/PosData.cshtml similarity index 100% rename from BTCPayServer/Views/Invoice/PosData.cshtml rename to BTCPayServer/Views/UIInvoice/PosData.cshtml diff --git a/BTCPayServer/Views/Invoice/Refund.cshtml b/BTCPayServer/Views/UIInvoice/Refund.cshtml similarity index 100% rename from BTCPayServer/Views/Invoice/Refund.cshtml rename to BTCPayServer/Views/UIInvoice/Refund.cshtml diff --git a/BTCPayServer/Views/Invoice/_ViewImports.cshtml b/BTCPayServer/Views/UIInvoice/_ViewImports.cshtml similarity index 100% rename from BTCPayServer/Views/Invoice/_ViewImports.cshtml rename to BTCPayServer/Views/UIInvoice/_ViewImports.cshtml diff --git a/BTCPayServer/Views/Invoice/_ViewStart.cshtml b/BTCPayServer/Views/UIInvoice/_ViewStart.cshtml similarity index 100% rename from BTCPayServer/Views/Invoice/_ViewStart.cshtml rename to BTCPayServer/Views/UIInvoice/_ViewStart.cshtml diff --git a/BTCPayServer/Views/LNURL/EditLightningAddress.cshtml b/BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml similarity index 99% rename from BTCPayServer/Views/LNURL/EditLightningAddress.cshtml rename to BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml index e564480f0..c7211ec45 100644 --- a/BTCPayServer/Views/LNURL/EditLightningAddress.cshtml +++ b/BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml @@ -1,6 +1,6 @@ @using BTCPayServer.Views.Stores @using BTCPayServer.Abstractions.Extensions -@model LNURLController.EditLightningAddressVM +@model UILNURLController.EditLightningAddressVM @{ ViewData.SetActivePage("LightningAddress", nameof(StoreNavPages), "Lightning Address", Context.GetStoreData().Id); } diff --git a/BTCPayServer/Views/LightningLikePayout/ConfirmLightningPayout.cshtml b/BTCPayServer/Views/UILightningLikePayout/ConfirmLightningPayout.cshtml similarity index 97% rename from BTCPayServer/Views/LightningLikePayout/ConfirmLightningPayout.cshtml rename to BTCPayServer/Views/UILightningLikePayout/ConfirmLightningPayout.cshtml index ed8983198..272c08729 100644 --- a/BTCPayServer/Views/LightningLikePayout/ConfirmLightningPayout.cshtml +++ b/BTCPayServer/Views/UILightningLikePayout/ConfirmLightningPayout.cshtml @@ -1,4 +1,4 @@ -@model System.Collections.Generic.List +@model System.Collections.Generic.List @{ Layout = "../Shared/_Layout.cshtml"; ViewData["Title"] = "Confirm Lightning Payout"; diff --git a/BTCPayServer/Views/LightningLikePayout/LightningPayoutResult.cshtml b/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml similarity index 93% rename from BTCPayServer/Views/LightningLikePayout/LightningPayoutResult.cshtml rename to BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml index 3692e223a..5273b9a5a 100644 --- a/BTCPayServer/Views/LightningLikePayout/LightningPayoutResult.cshtml +++ b/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml @@ -1,5 +1,5 @@ @using BTCPayServer.Lightning -@model System.Collections.Generic.List +@model System.Collections.Generic.List @{ Layout = "_Layout"; ViewData["Title"] = "Lightning Payout Result"; diff --git a/BTCPayServer/Views/Manage/APIKeys.cshtml b/BTCPayServer/Views/UIManage/APIKeys.cshtml similarity index 88% rename from BTCPayServer/Views/Manage/APIKeys.cshtml rename to BTCPayServer/Views/UIManage/APIKeys.cshtml index cf5de5464..9bb45c75c 100644 --- a/BTCPayServer/Views/Manage/APIKeys.cshtml +++ b/BTCPayServer/Views/UIManage/APIKeys.cshtml @@ -1,13 +1,13 @@ @namespace BTCPayServer.Client -@model BTCPayServer.Controllers.ManageController.ApiKeysViewModel +@model BTCPayServer.Controllers.UIManageController.ApiKeysViewModel @{ ViewData.SetActivePage(ManageNavPages.APIKeys, "API Keys"); }

    @ViewData["Title"]

    - The BTCPay Server Greenfield API offers programmatic access to your instance. You can manage your BTCPay + The BTCPay Server Greenfield API offers programmatic access to your instance. You can manage your BTCPay Server (e.g. stores, invoices, users) as well as automate workflows and integrations (see use case examples). - For that you need the API keys, which can be generated here. Find more information in the API authentication docs. + For that you need the API keys, which can be generated here. Find more information in the API authentication docs.

    @@ -63,7 +63,7 @@ } - Delete + Delete - @@ -115,4 +115,4 @@ }); }); -} \ No newline at end of file +} diff --git a/BTCPayServer/Views/Manage/AddApiKey.cshtml b/BTCPayServer/Views/UIManage/AddApiKey.cshtml similarity index 98% rename from BTCPayServer/Views/Manage/AddApiKey.cshtml rename to BTCPayServer/Views/UIManage/AddApiKey.cshtml index 2dc9a38f4..bb5a71e65 100644 --- a/BTCPayServer/Views/Manage/AddApiKey.cshtml +++ b/BTCPayServer/Views/UIManage/AddApiKey.cshtml @@ -1,7 +1,7 @@ @using BTCPayServer.Client @using BTCPayServer.Controllers @using BTCPayServer.Security.GreenField -@model ManageController.AddApiKeyViewModel +@model UIManageController.AddApiKeyViewModel @{ ViewData.SetActivePage(ManageNavPages.APIKeys, "Generate API Key"); @@ -54,7 +54,7 @@ @if (Policies.IsStorePolicy(Model.PermissionValues[i].Permission)) { - @if (Model.PermissionValues[i].StoreMode == ManageController.AddApiKeyViewModel.ApiKeyStoreMode.AllStores) + @if (Model.PermissionValues[i].StoreMode == UIManageController.AddApiKeyViewModel.ApiKeyStoreMode.AllStores) {
    diff --git a/BTCPayServer/Views/Manage/AuthorizeAPIKey.cshtml b/BTCPayServer/Views/UIManage/AuthorizeAPIKey.cshtml similarity index 98% rename from BTCPayServer/Views/Manage/AuthorizeAPIKey.cshtml rename to BTCPayServer/Views/UIManage/AuthorizeAPIKey.cshtml index 5f1b44478..78032b06f 100644 --- a/BTCPayServer/Views/Manage/AuthorizeAPIKey.cshtml +++ b/BTCPayServer/Views/UIManage/AuthorizeAPIKey.cshtml @@ -1,7 +1,7 @@ @using BTCPayServer.Client @using BTCPayServer.Controllers @using BTCPayServer.Security.GreenField -@model BTCPayServer.Controllers.ManageController.AuthorizeApiKeysViewModel +@model BTCPayServer.Controllers.UIManageController.AuthorizeApiKeysViewModel @{ Layout = "_Layout"; @@ -60,7 +60,7 @@ } @if (Policies.IsStorePolicy(Model.PermissionValues[i].Permission)) { - @if (Model.PermissionValues[i].StoreMode == ManageController.AddApiKeyViewModel.ApiKeyStoreMode.AllStores) + @if (Model.PermissionValues[i].StoreMode == UIManageController.AddApiKeyViewModel.ApiKeyStoreMode.AllStores) {
    diff --git a/BTCPayServer/Views/Manage/ChangePassword.cshtml b/BTCPayServer/Views/UIManage/ChangePassword.cshtml similarity index 100% rename from BTCPayServer/Views/Manage/ChangePassword.cshtml rename to BTCPayServer/Views/UIManage/ChangePassword.cshtml diff --git a/BTCPayServer/Views/Manage/ConfirmAPIKey.cshtml b/BTCPayServer/Views/UIManage/ConfirmAPIKey.cshtml similarity index 92% rename from BTCPayServer/Views/Manage/ConfirmAPIKey.cshtml rename to BTCPayServer/Views/UIManage/ConfirmAPIKey.cshtml index a30e7d4d9..353141c5b 100644 --- a/BTCPayServer/Views/Manage/ConfirmAPIKey.cshtml +++ b/BTCPayServer/Views/UIManage/ConfirmAPIKey.cshtml @@ -1,4 +1,4 @@ -@model BTCPayServer.Controllers.ManageController.AuthorizeApiKeysViewModel +@model BTCPayServer.Controllers.UIManageController.AuthorizeApiKeysViewModel @{ var displayName = Model.ApplicationName ?? Model.ApplicationIdentifier; @@ -23,7 +23,7 @@ @displayName with the URL @Model.RedirectUrl.
    - + diff --git a/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml b/BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml similarity index 100% rename from BTCPayServer/Views/Manage/EnableAuthenticator.cshtml rename to BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml diff --git a/BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml b/BTCPayServer/Views/UIManage/GenerateRecoveryCodes.cshtml similarity index 100% rename from BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml rename to BTCPayServer/Views/UIManage/GenerateRecoveryCodes.cshtml diff --git a/BTCPayServer/Views/Manage/Index.cshtml b/BTCPayServer/Views/UIManage/Index.cshtml similarity index 100% rename from BTCPayServer/Views/Manage/Index.cshtml rename to BTCPayServer/Views/UIManage/Index.cshtml diff --git a/BTCPayServer/Views/Manage/LoginCodes.cshtml b/BTCPayServer/Views/UIManage/LoginCodes.cshtml similarity index 100% rename from BTCPayServer/Views/Manage/LoginCodes.cshtml rename to BTCPayServer/Views/UIManage/LoginCodes.cshtml diff --git a/BTCPayServer/Views/Manage/ManageNavPages.cs b/BTCPayServer/Views/UIManage/ManageNavPages.cs similarity index 100% rename from BTCPayServer/Views/Manage/ManageNavPages.cs rename to BTCPayServer/Views/UIManage/ManageNavPages.cs diff --git a/BTCPayServer/Views/Manage/NotificationSettings.cshtml b/BTCPayServer/Views/UIManage/NotificationSettings.cshtml similarity index 95% rename from BTCPayServer/Views/Manage/NotificationSettings.cshtml rename to BTCPayServer/Views/UIManage/NotificationSettings.cshtml index 9244a0fc2..93a117767 100644 --- a/BTCPayServer/Views/Manage/NotificationSettings.cshtml +++ b/BTCPayServer/Views/UIManage/NotificationSettings.cshtml @@ -1,5 +1,5 @@ @using BTCPayServer.Abstractions.Contracts -@model BTCPayServer.Controllers.ManageController.NotificationSettingsViewModel +@model BTCPayServer.Controllers.UIManageController.NotificationSettingsViewModel @inject IEnumerable NotificationHandlers @{ ViewData.SetActivePage(ManageNavPages.Notifications, "Notification Settings"); diff --git a/BTCPayServer/Views/Manage/SetPassword.cshtml b/BTCPayServer/Views/UIManage/SetPassword.cshtml similarity index 100% rename from BTCPayServer/Views/Manage/SetPassword.cshtml rename to BTCPayServer/Views/UIManage/SetPassword.cshtml diff --git a/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml b/BTCPayServer/Views/UIManage/TwoFactorAuthentication.cshtml similarity index 93% rename from BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml rename to BTCPayServer/Views/UIManage/TwoFactorAuthentication.cshtml index ad12eda5a..1f8714e7a 100644 --- a/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml +++ b/BTCPayServer/Views/UIManage/TwoFactorAuthentication.cshtml @@ -103,13 +103,13 @@ var name = string.IsNullOrEmpty(device.Name) ? "Unnamed security device" : device.Name;
    @name
    - Remove + Remove
    }
    } - +
    diff --git a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml b/BTCPayServer/Views/UIMoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml similarity index 97% rename from BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml rename to BTCPayServer/Views/UIMoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml index 984a4dc54..174fb6dc6 100644 --- a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml +++ b/BTCPayServer/Views/UIMoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml @@ -5,7 +5,7 @@ @{ Layout = "../Shared/_NavLayout.cshtml"; ViewData.SetActivePage(StoreNavPages.OnchainSettings, "Monero Settings"); - ViewData["NavPartialName"] = "../Stores/_Nav"; + ViewData["NavPartialName"] = "../UIStores/_Nav"; }
    diff --git a/BTCPayServer/Views/Notifications/Index.cshtml b/BTCPayServer/Views/UINotifications/Index.cshtml similarity index 95% rename from BTCPayServer/Views/Notifications/Index.cshtml rename to BTCPayServer/Views/UINotifications/Index.cshtml index fe275095a..db6beecc9 100644 --- a/BTCPayServer/Views/Notifications/Index.cshtml +++ b/BTCPayServer/Views/UINotifications/Index.cshtml @@ -1,4 +1,4 @@ -@model BTCPayServer.Models.NotificationViewModels.IndexViewModel +@model BTCPayServer.Models.NotificationViewModels.IndexViewModel @{ ViewData["Title"] = "Notifications"; } @@ -7,7 +7,7 @@

    @ViewData["Title"]

    - + Settings @@ -136,7 +136,7 @@ else delegate('click', '.btn-toggle-seen', e => { const row = $(e.target).parents(".notification-row").toggleClass("loading"); const guid = row.data("guid"); - const url = "@Url.Action("FlipRead", "Notifications", new { id = "placeholder" })".replace("placeholder", guid); + const url = "@Url.Action("FlipRead", "UINotifications", new { id = "placeholder" })".replace("placeholder", guid); $.post(url, function (data) { row.toggleClass("seen loading"); }); diff --git a/BTCPayServer/Views/Notifications/NotificationsNavPages.cs b/BTCPayServer/Views/UINotifications/NotificationsNavPages.cs similarity index 100% rename from BTCPayServer/Views/Notifications/NotificationsNavPages.cs rename to BTCPayServer/Views/UINotifications/NotificationsNavPages.cs diff --git a/BTCPayServer/Views/Notifications/_ViewImports.cshtml b/BTCPayServer/Views/UINotifications/_ViewImports.cshtml similarity index 100% rename from BTCPayServer/Views/Notifications/_ViewImports.cshtml rename to BTCPayServer/Views/UINotifications/_ViewImports.cshtml diff --git a/BTCPayServer/Views/Notifications/_ViewStart.cshtml b/BTCPayServer/Views/UINotifications/_ViewStart.cshtml similarity index 100% rename from BTCPayServer/Views/Notifications/_ViewStart.cshtml rename to BTCPayServer/Views/UINotifications/_ViewStart.cshtml diff --git a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml similarity index 94% rename from BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml rename to BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml index ffc899af9..e3638d029 100644 --- a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml +++ b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml @@ -16,7 +16,7 @@ }

    @ViewData["Title"]

    - +
    @@ -111,16 +111,16 @@ Invoices Clone @if (!Model.Archived) { - Archive + Archive } else { - Unarchive + Unarchive } }
    diff --git a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml similarity index 96% rename from BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml rename to BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml index fef58911e..9989741e0 100644 --- a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml +++ b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml @@ -73,7 +73,7 @@ - View - - Invoices + Invoices - Pay - diff --git a/BTCPayServer/Views/PaymentRequest/PaymentRequestsNavPages.cs b/BTCPayServer/Views/UIPaymentRequest/PaymentRequestsNavPages.cs similarity index 100% rename from BTCPayServer/Views/PaymentRequest/PaymentRequestsNavPages.cs rename to BTCPayServer/Views/UIPaymentRequest/PaymentRequestsNavPages.cs diff --git a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml similarity index 100% rename from BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml rename to BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml diff --git a/BTCPayServer/Views/PaymentRequest/_ViewImports.cshtml b/BTCPayServer/Views/UIPaymentRequest/_ViewImports.cshtml similarity index 100% rename from BTCPayServer/Views/PaymentRequest/_ViewImports.cshtml rename to BTCPayServer/Views/UIPaymentRequest/_ViewImports.cshtml diff --git a/BTCPayServer/Views/PaymentRequest/_ViewStart.cshtml b/BTCPayServer/Views/UIPaymentRequest/_ViewStart.cshtml similarity index 100% rename from BTCPayServer/Views/PaymentRequest/_ViewStart.cshtml rename to BTCPayServer/Views/UIPaymentRequest/_ViewStart.cshtml diff --git a/BTCPayServer/Views/Public/PayButtonHandle.cshtml b/BTCPayServer/Views/UIPublic/PayButtonHandle.cshtml similarity index 100% rename from BTCPayServer/Views/Public/PayButtonHandle.cshtml rename to BTCPayServer/Views/UIPublic/PayButtonHandle.cshtml diff --git a/BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml b/BTCPayServer/Views/UIPublicLightningNodeInfo/ShowLightningNodeInfo.cshtml similarity index 100% rename from BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml rename to BTCPayServer/Views/UIPublicLightningNodeInfo/ShowLightningNodeInfo.cshtml diff --git a/BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml similarity index 100% rename from BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml rename to BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml diff --git a/BTCPayServer/Views/Server/CLightningRestServices.cshtml b/BTCPayServer/Views/UIServer/CLightningRestServices.cshtml similarity index 100% rename from BTCPayServer/Views/Server/CLightningRestServices.cshtml rename to BTCPayServer/Views/UIServer/CLightningRestServices.cshtml diff --git a/BTCPayServer/Views/Server/ConfiguratorService.cshtml b/BTCPayServer/Views/UIServer/ConfiguratorService.cshtml similarity index 100% rename from BTCPayServer/Views/Server/ConfiguratorService.cshtml rename to BTCPayServer/Views/UIServer/ConfiguratorService.cshtml diff --git a/BTCPayServer/Views/Server/CreateTemporaryFileUrl.cshtml b/BTCPayServer/Views/UIServer/CreateTemporaryFileUrl.cshtml similarity index 87% rename from BTCPayServer/Views/Server/CreateTemporaryFileUrl.cshtml rename to BTCPayServer/Views/UIServer/CreateTemporaryFileUrl.cshtml index 22ec60384..a03501f11 100644 --- a/BTCPayServer/Views/Server/CreateTemporaryFileUrl.cshtml +++ b/BTCPayServer/Views/UIServer/CreateTemporaryFileUrl.cshtml @@ -1,5 +1,5 @@ @using BTCPayServer.Controllers -@model BTCPayServer.Controllers.ServerController.CreateTemporaryFileUrlViewModel +@model BTCPayServer.Controllers.UIServerController.CreateTemporaryFileUrlViewModel @{ ViewData.SetActivePage(ServerNavPages.Services, $"Create temporary file link"); } @@ -22,7 +22,7 @@
    - +
    diff --git a/BTCPayServer/Views/Server/CreateUser.cshtml b/BTCPayServer/Views/UIServer/CreateUser.cshtml similarity index 100% rename from BTCPayServer/Views/Server/CreateUser.cshtml rename to BTCPayServer/Views/UIServer/CreateUser.cshtml diff --git a/BTCPayServer/Views/Server/DynamicDnsService.cshtml b/BTCPayServer/Views/UIServer/DynamicDnsService.cshtml similarity index 100% rename from BTCPayServer/Views/Server/DynamicDnsService.cshtml rename to BTCPayServer/Views/UIServer/DynamicDnsService.cshtml diff --git a/BTCPayServer/Views/Server/DynamicDnsServices.cshtml b/BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml similarity index 100% rename from BTCPayServer/Views/Server/DynamicDnsServices.cshtml rename to BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml diff --git a/BTCPayServer/Views/Server/EditAmazonS3StorageProvider.cshtml b/BTCPayServer/Views/UIServer/EditAmazonS3StorageProvider.cshtml similarity index 100% rename from BTCPayServer/Views/Server/EditAmazonS3StorageProvider.cshtml rename to BTCPayServer/Views/UIServer/EditAmazonS3StorageProvider.cshtml diff --git a/BTCPayServer/Views/Server/EditAzureBlobStorageStorageProvider.cshtml b/BTCPayServer/Views/UIServer/EditAzureBlobStorageStorageProvider.cshtml similarity index 100% rename from BTCPayServer/Views/Server/EditAzureBlobStorageStorageProvider.cshtml rename to BTCPayServer/Views/UIServer/EditAzureBlobStorageStorageProvider.cshtml diff --git a/BTCPayServer/Views/Server/EditFileSystemStorageProvider.cshtml b/BTCPayServer/Views/UIServer/EditFileSystemStorageProvider.cshtml similarity index 100% rename from BTCPayServer/Views/Server/EditFileSystemStorageProvider.cshtml rename to BTCPayServer/Views/UIServer/EditFileSystemStorageProvider.cshtml diff --git a/BTCPayServer/Views/Server/EditGoogleCloudStorageStorageProvider.cshtml b/BTCPayServer/Views/UIServer/EditGoogleCloudStorageStorageProvider.cshtml similarity index 100% rename from BTCPayServer/Views/Server/EditGoogleCloudStorageStorageProvider.cshtml rename to BTCPayServer/Views/UIServer/EditGoogleCloudStorageStorageProvider.cshtml diff --git a/BTCPayServer/Views/Server/Emails.cshtml b/BTCPayServer/Views/UIServer/Emails.cshtml similarity index 100% rename from BTCPayServer/Views/Server/Emails.cshtml rename to BTCPayServer/Views/UIServer/Emails.cshtml diff --git a/BTCPayServer/Views/Server/Files.cshtml b/BTCPayServer/Views/UIServer/Files.cshtml similarity index 93% rename from BTCPayServer/Views/Server/Files.cshtml rename to BTCPayServer/Views/UIServer/Files.cshtml index 3ea37eb57..c4136439b 100644 --- a/BTCPayServer/Views/Server/Files.cshtml +++ b/BTCPayServer/Views/UIServer/Files.cshtml @@ -55,7 +55,7 @@ else @file.Timestamp.ToBrowserDate() @file.ApplicationUser.UserName - Get Link + Get Link - Get Temp Link - Remove @@ -88,8 +88,8 @@ else
  • URL: - - @Url.Action("GetFile", "Storage", new + + @Url.Action("GetFile", "UIStorage", new { fileId = fileId }, Context.Request.Scheme, Context.Request.Host.ToString()) diff --git a/BTCPayServer/Views/Server/LightningChargeServices.cshtml b/BTCPayServer/Views/UIServer/LightningChargeServices.cshtml similarity index 100% rename from BTCPayServer/Views/Server/LightningChargeServices.cshtml rename to BTCPayServer/Views/UIServer/LightningChargeServices.cshtml diff --git a/BTCPayServer/Views/Server/LightningWalletServices.cshtml b/BTCPayServer/Views/UIServer/LightningWalletServices.cshtml similarity index 100% rename from BTCPayServer/Views/Server/LightningWalletServices.cshtml rename to BTCPayServer/Views/UIServer/LightningWalletServices.cshtml diff --git a/BTCPayServer/Views/Server/ListPlugins.cshtml b/BTCPayServer/Views/UIServer/ListPlugins.cshtml similarity index 99% rename from BTCPayServer/Views/Server/ListPlugins.cshtml rename to BTCPayServer/Views/UIServer/ListPlugins.cshtml index 4b42c3db9..1db2574c0 100644 --- a/BTCPayServer/Views/Server/ListPlugins.cshtml +++ b/BTCPayServer/Views/UIServer/ListPlugins.cshtml @@ -1,6 +1,6 @@ @using BTCPayServer.Configuration @using BTCPayServer.Abstractions.Contracts -@model BTCPayServer.Controllers.ServerController.ListPluginsViewModel +@model BTCPayServer.Controllers.UIServerController.ListPluginsViewModel @inject BTCPayServerOptions BTCPayServerOptions @{ Layout = "_Layout"; diff --git a/BTCPayServer/Views/Server/ListUsers.cshtml b/BTCPayServer/Views/UIServer/ListUsers.cshtml similarity index 100% rename from BTCPayServer/Views/Server/ListUsers.cshtml rename to BTCPayServer/Views/UIServer/ListUsers.cshtml diff --git a/BTCPayServer/Views/Server/LndSeedBackup.cshtml b/BTCPayServer/Views/UIServer/LndSeedBackup.cshtml similarity index 100% rename from BTCPayServer/Views/Server/LndSeedBackup.cshtml rename to BTCPayServer/Views/UIServer/LndSeedBackup.cshtml diff --git a/BTCPayServer/Views/Server/LndServices.cshtml b/BTCPayServer/Views/UIServer/LndServices.cshtml similarity index 100% rename from BTCPayServer/Views/Server/LndServices.cshtml rename to BTCPayServer/Views/UIServer/LndServices.cshtml diff --git a/BTCPayServer/Views/Server/Logs.cshtml b/BTCPayServer/Views/UIServer/Logs.cshtml similarity index 100% rename from BTCPayServer/Views/Server/Logs.cshtml rename to BTCPayServer/Views/UIServer/Logs.cshtml diff --git a/BTCPayServer/Views/Server/Maintenance.cshtml b/BTCPayServer/Views/UIServer/Maintenance.cshtml similarity index 100% rename from BTCPayServer/Views/Server/Maintenance.cshtml rename to BTCPayServer/Views/UIServer/Maintenance.cshtml diff --git a/BTCPayServer/Views/Server/P2PService.cshtml b/BTCPayServer/Views/UIServer/P2PService.cshtml similarity index 100% rename from BTCPayServer/Views/Server/P2PService.cshtml rename to BTCPayServer/Views/UIServer/P2PService.cshtml diff --git a/BTCPayServer/Views/Server/Policies.cshtml b/BTCPayServer/Views/UIServer/Policies.cshtml similarity index 99% rename from BTCPayServer/Views/Server/Policies.cshtml rename to BTCPayServer/Views/UIServer/Policies.cshtml index fbad8c0d1..577915171 100644 --- a/BTCPayServer/Views/Server/Policies.cshtml +++ b/BTCPayServer/Views/UIServer/Policies.cshtml @@ -57,7 +57,7 @@ @if (!isEmailConfigured) {
    - Your email server has not been configured. Please configure it first. + Your email server has not been configured. Please configure it first.
    } diff --git a/BTCPayServer/Views/Server/RPCService.cshtml b/BTCPayServer/Views/UIServer/RPCService.cshtml similarity index 100% rename from BTCPayServer/Views/Server/RPCService.cshtml rename to BTCPayServer/Views/UIServer/RPCService.cshtml diff --git a/BTCPayServer/Views/Server/SSHService.cshtml b/BTCPayServer/Views/UIServer/SSHService.cshtml similarity index 100% rename from BTCPayServer/Views/Server/SSHService.cshtml rename to BTCPayServer/Views/UIServer/SSHService.cshtml diff --git a/BTCPayServer/Views/Server/ServerNavPages.cs b/BTCPayServer/Views/UIServer/ServerNavPages.cs similarity index 100% rename from BTCPayServer/Views/Server/ServerNavPages.cs rename to BTCPayServer/Views/UIServer/ServerNavPages.cs diff --git a/BTCPayServer/Views/Server/Services.cshtml b/BTCPayServer/Views/UIServer/Services.cshtml similarity index 100% rename from BTCPayServer/Views/Server/Services.cshtml rename to BTCPayServer/Views/UIServer/Services.cshtml diff --git a/BTCPayServer/Views/Server/Storage.cshtml b/BTCPayServer/Views/UIServer/Storage.cshtml similarity index 100% rename from BTCPayServer/Views/Server/Storage.cshtml rename to BTCPayServer/Views/UIServer/Storage.cshtml diff --git a/BTCPayServer/Views/Server/Theme.cshtml b/BTCPayServer/Views/UIServer/Theme.cshtml similarity index 100% rename from BTCPayServer/Views/Server/Theme.cshtml rename to BTCPayServer/Views/UIServer/Theme.cshtml diff --git a/BTCPayServer/Views/Server/User.cshtml b/BTCPayServer/Views/UIServer/User.cshtml similarity index 100% rename from BTCPayServer/Views/Server/User.cshtml rename to BTCPayServer/Views/UIServer/User.cshtml diff --git a/BTCPayServer/Views/UIServer/_Nav.cshtml b/BTCPayServer/Views/UIServer/_Nav.cshtml new file mode 100644 index 000000000..62755f03b --- /dev/null +++ b/BTCPayServer/Views/UIServer/_Nav.cshtml @@ -0,0 +1,18 @@ +@using BTCPayServer.Configuration +@inject BTCPayServerOptions BTCPayServerOptions + + + diff --git a/BTCPayServer/Views/Server/_ViewImports.cshtml b/BTCPayServer/Views/UIServer/_ViewImports.cshtml similarity index 100% rename from BTCPayServer/Views/Server/_ViewImports.cshtml rename to BTCPayServer/Views/UIServer/_ViewImports.cshtml diff --git a/BTCPayServer/Views/Server/_ViewStart.cshtml b/BTCPayServer/Views/UIServer/_ViewStart.cshtml similarity index 100% rename from BTCPayServer/Views/Server/_ViewStart.cshtml rename to BTCPayServer/Views/UIServer/_ViewStart.cshtml diff --git a/BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml b/BTCPayServer/Views/UIShopify/EditShopifyIntegration.cshtml similarity index 100% rename from BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml rename to BTCPayServer/Views/UIShopify/EditShopifyIntegration.cshtml diff --git a/BTCPayServer/Views/StorePullPayments/NewPullPayment.cshtml b/BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml similarity index 100% rename from BTCPayServer/Views/StorePullPayments/NewPullPayment.cshtml rename to BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml diff --git a/BTCPayServer/Views/StorePullPayments/Payouts.cshtml b/BTCPayServer/Views/UIStorePullPayments/Payouts.cshtml similarity index 100% rename from BTCPayServer/Views/StorePullPayments/Payouts.cshtml rename to BTCPayServer/Views/UIStorePullPayments/Payouts.cshtml diff --git a/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml b/BTCPayServer/Views/UIStorePullPayments/PullPayments.cshtml similarity index 99% rename from BTCPayServer/Views/StorePullPayments/PullPayments.cshtml rename to BTCPayServer/Views/UIStorePullPayments/PullPayments.cshtml index f879692bf..8d645a6b7 100644 --- a/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml +++ b/BTCPayServer/Views/UIStorePullPayments/PullPayments.cshtml @@ -110,7 +110,7 @@ View - diff --git a/BTCPayServer/Views/Stores/CheckoutAppearance.cshtml b/BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml similarity index 100% rename from BTCPayServer/Views/Stores/CheckoutAppearance.cshtml rename to BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml diff --git a/BTCPayServer/Views/Stores/CreateToken.cshtml b/BTCPayServer/Views/UIStores/CreateToken.cshtml similarity index 100% rename from BTCPayServer/Views/Stores/CreateToken.cshtml rename to BTCPayServer/Views/UIStores/CreateToken.cshtml diff --git a/BTCPayServer/Views/Stores/Dashboard.cshtml b/BTCPayServer/Views/UIStores/Dashboard.cshtml similarity index 78% rename from BTCPayServer/Views/Stores/Dashboard.cshtml rename to BTCPayServer/Views/UIStores/Dashboard.cshtml index 808110ea7..78d5dbf96 100644 --- a/BTCPayServer/Views/Stores/Dashboard.cshtml +++ b/BTCPayServer/Views/UIStores/Dashboard.cshtml @@ -1,4 +1,4 @@ -@model StoreDashboardViewModel; +@model StoreDashboardViewModel; @{ ViewData.SetActivePage(StoreNavPages.Dashboard, Model.StoreName, Model.StoreId); var isReady = Model.WalletEnabled || Model.LightningEnabled; @@ -53,7 +53,7 @@ else { if (!Model.AltcoinsBuild) { - +
    Set up a wallet
    @@ -63,7 +63,7 @@ else } else { -     +
    Set up a wallet
    @@ -85,7 +85,7 @@ else { if (!Model.AltcoinsBuild) { -     +
    Set up a Lightning node
    @@ -95,7 +95,7 @@ else } else { -     +
    Set up a Lightning node
    diff --git a/BTCPayServer/Views/Stores/Emails.cshtml b/BTCPayServer/Views/UIStores/Emails.cshtml similarity index 100% rename from BTCPayServer/Views/Stores/Emails.cshtml rename to BTCPayServer/Views/UIStores/Emails.cshtml diff --git a/BTCPayServer/Views/Stores/GeneralSettings.cshtml b/BTCPayServer/Views/UIStores/GeneralSettings.cshtml similarity index 100% rename from BTCPayServer/Views/Stores/GeneralSettings.cshtml rename to BTCPayServer/Views/UIStores/GeneralSettings.cshtml diff --git a/BTCPayServer/Views/Stores/GenerateWallet.cshtml b/BTCPayServer/Views/UIStores/GenerateWallet.cshtml similarity index 85% rename from BTCPayServer/Views/Stores/GenerateWallet.cshtml rename to BTCPayServer/Views/UIStores/GenerateWallet.cshtml index a282552e3..23a74ebd5 100644 --- a/BTCPayServer/Views/Stores/GenerateWallet.cshtml +++ b/BTCPayServer/Views/UIStores/GenerateWallet.cshtml @@ -13,7 +13,7 @@ } @section Navbar { -     + } diff --git a/BTCPayServer/Views/Stores/GenerateWalletOptions.cshtml b/BTCPayServer/Views/UIStores/GenerateWalletOptions.cshtml similarity index 75% rename from BTCPayServer/Views/Stores/GenerateWalletOptions.cshtml rename to BTCPayServer/Views/UIStores/GenerateWalletOptions.cshtml index 1f5d3a37a..20fbed98b 100644 --- a/BTCPayServer/Views/Stores/GenerateWalletOptions.cshtml +++ b/BTCPayServer/Views/UIStores/GenerateWalletOptions.cshtml @@ -6,7 +6,7 @@ } @section Navbar { - + } @@ -16,7 +16,7 @@
    @if (Model.CanUseHotWallet) { - +
    @@ -46,7 +46,7 @@
    - +
    diff --git a/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml b/BTCPayServer/Views/UIStores/ImportWallet/ConfirmAddresses.cshtml similarity index 93% rename from BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml rename to BTCPayServer/Views/UIStores/ImportWallet/ConfirmAddresses.cshtml index 479598105..afd6a73c4 100644 --- a/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml +++ b/BTCPayServer/Views/UIStores/ImportWallet/ConfirmAddresses.cshtml @@ -6,7 +6,7 @@ } @section Navbar { -     + } @@ -46,7 +46,7 @@ - + @@ -98,7 +98,7 @@