mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-01-19 05:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename CanGenerateWallet to CanUseHotWallet, small refactoring on generatewallet

Browse Source
This commit is contained in:
nicolas.dorier 2019-12-18 22:28:03 +09:00
parent ed6a01469a
commit 47eb087d1b
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
9 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer.Tests/SeleniumTests.cs
View File

@ -415,7 +415,7 @@ namespace BTCPayServer.Tests
var mnemonic = s.GenerateWallet("BTC", "", true, false);
var invoiceId = s.CreateInvoice(storeId.storeId);
var invoice = await s.Server.PayTester.InvoiceRepository.GetInvoice( invoiceId);
var invoice = await s.Server.PayTester.InvoiceRepository.GetInvoice(invoiceId);
var address = invoice.EntityToDTO().Addresses["BTC"];
var result = await s.Server.ExplorerNode.GetAddressInfoAsync(BitcoinAddress.Create(address, Network.RegTest));

42
BTCPayServer/Controllers/StoresController.BTCLike.cs
View File

@ -1,4 +1,5 @@
using System;
using Microsoft.AspNetCore.Authorization;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
@ -27,7 +28,7 @@ namespace BTCPayServer.Controllers
{
[HttpGet]
[Route("{storeId}/derivations/{cryptoCode}")]
public IActionResult AddDerivationScheme(string storeId, string cryptoCode)
public async Task<IActionResult> AddDerivationScheme(string storeId, string cryptoCode)
{
var store = HttpContext.GetStoreData();
if (store == null)
@ -42,7 +43,14 @@ namespace BTCPayServer.Controllers
vm.CryptoCode = cryptoCode;
vm.RootKeyPath = network.GetRootKeyPath();
vm.Network = network;
SetExistingValues(store, vm);
var derivation = GetExistingDerivationStrategy(vm.CryptoCode, store);
if (derivation != null)
{
vm.DerivationScheme = derivation.AccountDerivation.ToString();
vm.Config = derivation.ToJson();
}
vm.Enabled = !store.GetStoreBlob().IsExcluded(new PaymentMethodId(vm.CryptoCode, PaymentTypes.BTCLike));
vm.CanUseHotWallet = await CanUseHotWallet();
return View(vm);
}
@ -121,20 +129,6 @@ namespace BTCPayServer.Controllers
return new EmptyResult();
}
private void SetExistingValues(StoreData store, DerivationSchemeViewModel vm)
{
var derivation = GetExistingDerivationStrategy(vm.CryptoCode, store);
if (derivation != null)
{
vm.DerivationScheme = derivation.AccountDerivation.ToString();
vm.Config = derivation.ToJson();
}
vm.Enabled = !store.GetStoreBlob().IsExcluded(new PaymentMethodId(vm.CryptoCode, PaymentTypes.BTCLike));
vm.CanUseGenerateWallet = CanUseGenerateWallet();
}
private DerivationSchemeSettings GetExistingDerivationStrategy(string cryptoCode, StoreData store)
{
var id = new PaymentMethodId(cryptoCode, PaymentTypes.BTCLike);
@ -326,7 +320,7 @@ namespace BTCPayServer.Controllers
public async Task<IActionResult> GenerateNBXWallet(string storeId, string cryptoCode,
GenerateWalletRequest request)
{
if (!CanUseGenerateWallet())
if (!await CanUseHotWallet())
{
return NotFound();
}
@ -363,6 +357,15 @@ namespace BTCPayServer.Controllers
return result;
}
private async Task<bool> CanUseHotWallet()
{
var isAdmin = (await _authorizationService.AuthorizeAsync(User, BTCPayServer.Security.Policies.CanModifyServerSettings.Key)).Succeeded;
if (isAdmin)
return true;
var policies = await _settingsRepository.GetSettingAsync<PoliciesSettings>();
return policies?.AllowHotWalletForAll is true;
}
private async Task<string> ReadAllText(IFormFile file)
{
using (var stream = new StreamReader(file.OpenReadStream()))
@ -391,10 +394,5 @@ namespace BTCPayServer.Controllers
ModelState.Remove(nameof(vm.Config)); // Remove the cached value
return View(nameof(AddDerivationScheme),vm);
}
private bool CanUseGenerateWallet()
{
return (_BTCPayEnv.IsDevelopping || User.IsInRole(Roles.ServerAdmin) || _CssThemeManager.AllowGenerateWalletForAll);
}
}
}

6
BTCPayServer/Controllers/StoresController.cs
View File

@ -63,6 +63,8 @@ namespace BTCPayServer.Controllers
ChangellyClientProvider changellyClientProvider,
IWebHostEnvironment env, IHttpClientFactory httpClientFactory,
PaymentMethodHandlerDictionary paymentMethodHandlerDictionary,
SettingsRepository settingsRepository,
IAuthorizationService authorizationService,
CssThemeManager cssThemeManager)
{
_RateFactory = rateFactory;
@ -76,6 +78,8 @@ namespace BTCPayServer.Controllers
_Env = env;
_httpClientFactory = httpClientFactory;
_paymentMethodHandlerDictionary = paymentMethodHandlerDictionary;
_settingsRepository = settingsRepository;
_authorizationService = authorizationService;
_CssThemeManager = cssThemeManager;
_NetworkProvider = networkProvider;
_ExplorerProvider = explorerProvider;
@ -100,6 +104,8 @@ namespace BTCPayServer.Controllers
IWebHostEnvironment _Env;
private IHttpClientFactory _httpClientFactory;
private readonly PaymentMethodHandlerDictionary _paymentMethodHandlerDictionary;
private readonly SettingsRepository _settingsRepository;
private readonly IAuthorizationService _authorizationService;
private readonly CssThemeManager _CssThemeManager;
[TempData]

3
BTCPayServer/HostedServices/CssThemeManager.cs
View File

@ -88,11 +88,8 @@ namespace BTCPayServer.HostedServices
RootAppId = data.RootAppId;
DomainToAppMapping = data.DomainToAppMapping;
AllowLightningInternalNodeForAll = data.AllowLightningInternalNodeForAll;
AllowGenerateWalletForAll = data.AllowGenerateWalletForAll;
}
public bool AllowGenerateWalletForAll { get; set; }
public bool AllowLightningInternalNodeForAll { get; set; }
}

2
BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs
View File

@ -41,7 +41,7 @@ namespace BTCPayServer.Models.StoreViewModels
public string DerivationSchemeFormat { get; set; }
public string AccountKey { get; set; }
public BTCPayNetwork Network { get; set; }
public bool CanUseGenerateWallet { get; set; }
public bool CanUseHotWallet { get; set; }
public RootedKeyPath GetAccountKeypath()
{

4
BTCPayServer/Services/PoliciesSettings.cs
View File

@ -23,8 +23,8 @@ namespace BTCPayServer.Services
public bool DiscourageSearchEngines { get; set; }
[Display(Name = "Allow non-admins to use the internal lightning node in their stores")]
public bool AllowLightningInternalNodeForAll { get; set; }
[Display(Name = "Allow non-admins to use the NBXplorer wallet generator in their stores")]
public bool AllowGenerateWalletForAll { get; set; }
[Display(Name = "Allow non-admins to create hot wallets for their stores")]
public bool AllowHotWalletForAll { get; set; }
[Display(Name = "Display app on website root")]
public string RootAppId { get; set; }

6
BTCPayServer/Views/Server/Policies.cshtml
View File

@ -33,9 +33,9 @@
<span asp-validation-for="AllowLightningInternalNodeForAll" class="text-danger"></span>
</div>
<div class="form-check">
<input asp-for="AllowGenerateWalletForAll" type="checkbox" class="form-check-input"/>
<label asp-for="AllowGenerateWalletForAll" class="form-check-label"></label>
<span asp-validation-for="AllowGenerateWalletForAll" class="text-danger"></span>
<input asp-for="AllowHotWalletForAll" type="checkbox" class="form-check-input"/>
<label asp-for="AllowHotWalletForAll" class="form-check-label"></label>
<span asp-validation-for="AllowHotWalletForAll" class="text-danger"></span>
</div>
</div>
<div class="form-group">

2
BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
View File

@ -85,7 +85,7 @@
{
<button class="dropdown-item check-for-vault" type="button">... the vault (preview)</button>
}
@if (Model.CanUseGenerateWallet)
@if (Model.CanUseHotWallet)
{
<button class="dropdown-item" data-toggle="modal" data-target="#nbxplorergeneratewallet" type="button" id="nbxplorergeneratewalletbtn">... a new/existing seed.</button>
}

2
BTCPayServer/Views/Stores/AddDerivationSchemes_HardwareWalletDialogs.cshtml
View File

@ -1,6 +1,6 @@
@using NBXplorer.Models
@model DerivationSchemeViewModel
@if (Model.CanUseGenerateWallet)
@if (Model.CanUseHotWallet)
{
<partial name="AddDerivationSchemes_NBXWalletGenerate" model="@(new GenerateWalletRequest())"/>
}