aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 14:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2308 from dennisreimann/policies-ui

Browse Source 
Improve policies structure and wordings
This commit is contained in:
Nicolas Dorier
2021-02-26 11:49:00 +09:00
committed by GitHub
parent 6d9b93a407 c0aa320f0a
commit 1e00c63146
2 changed files with 109 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
BTCPayServer/Services/PoliciesSettings.cs
View File

@@ -8,11 +8,11 @@ namespace BTCPayServer.Services
{ {
public class PoliciesSettings public class PoliciesSettings
{ {
[Display(Name = "Requires a confirmation mail for registering")] [Display(Name = "Require a confirmation email for registering")]
public bool RequiresConfirmedEmail { get; set; } public bool RequiresConfirmedEmail { get; set; }
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)] [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
[Display(Name = "Disable registration")] [Display(Name = "Disable new user registration on the server")]
public bool LockSubscription { get; set; } public bool LockSubscription { get; set; }
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)] [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
@@ -22,15 +22,15 @@ namespace BTCPayServer.Services
public bool AllowLightningInternalNodeForAll { get; set; } public bool AllowLightningInternalNodeForAll { get; set; }
[Display(Name = "Allow non-admins to create hot wallets for their stores")] [Display(Name = "Allow non-admins to create hot wallets for their stores")]
public bool AllowHotWalletForAll { get; set; } public bool AllowHotWalletForAll { get; set; }
[Display(Name = "Allow non-admins to import their hot wallets to the node wallet")] [Display(Name = "Allow non-admins to import hot wallets for their stores")]
public bool AllowHotWalletRPCImportForAll { get; set; } public bool AllowHotWalletRPCImportForAll { get; set; }
[Display(Name = "Check releases on GitHub and alert when new BTCPayServer version is available")] [Display(Name = "Check releases on GitHub and notify when new BTCPay Server version is available")]
public bool CheckForNewVersions { get; set; } public bool CheckForNewVersions { get; set; }
[Display(Name = "Disable notifications automatically showing (no websockets)")] [Display(Name = "Disable notifications from automatically showing (no websockets)")]
public bool DisableInstantNotifications { get; set; } public bool DisableInstantNotifications { get; set; }
[Display(Name = "Disable stores falling back to using the server's email settings")] [Display(Name = "Disable stores from using the server's email settings as backup")]
public bool DisableStoresToUseServerEmailSettings { get; set; } public bool DisableStoresToUseServerEmailSettings { get; set; }
[Display(Name = "Only allow admins to use the user creation API")] [Display(Name = "Disable non-admins access to the user creation API endpoint")]
public bool DisableNonAdminCreateUserApi { get; set; } public bool DisableNonAdminCreateUserApi { get; set; }
[Display(Name = "Display app on website root")] [Display(Name = "Display app on website root")]

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

@@ -1,93 +1,115 @@
@using BTCPayServer.Services @using BTCPayServer.Services
@using BTCPayServer.Services.Mails; @using BTCPayServer.Services.Mails;
@model BTCPayServer.Services.PoliciesSettings @model BTCPayServer.Services.PoliciesSettings
@inject BTCPayServer.Services.SettingsRepository _SettingsRepository @inject SettingsRepository _SettingsRepository
@{ @{
ViewData.SetActivePageAndTitle(ServerNavPages.Policies); ViewData.SetActivePageAndTitle(ServerNavPages.Policies);
} }
<partial name="_StatusMessage"/> <partial name="_StatusMessage"/>
@if (!this.ViewContext.ModelState.IsValid)
@if (!ViewContext.ModelState.IsValid)
{ {
<div asp-validation-summary="All" class="text-danger"></div> <div asp-validation-summary="All" class="text-danger"></div>
} }
<form method="post"> <form method="post">
<div class="form-group"> <div class="form-group mb-4">
<div class="form-check"> <h5>Existing User Settings</h5>
@{ <div class="form-check my-1">
var emailSettings = (await _SettingsRepository.GetSettingAsync<EmailSettings>()) ?? new EmailSettings();
/**
* The "|| Model.RequiresConfirmedEmail" check is for the case when a user had checked
* the checkbox without first configuring the e-mail settings so that they can uncheck it.
**/
var isEmailConfigured = emailSettings.IsComplete() || Model.RequiresConfirmedEmail;
}
<input asp-for="RequiresConfirmedEmail" type="checkbox" class="form-check-input" disabled="@(isEmailConfigured ? null : "disabled")" />
<label asp-for="RequiresConfirmedEmail" class="form-check-label"></label>
<span asp-validation-for="RequiresConfirmedEmail" class="text-danger"></span>
@if (!isEmailConfigured) {
<div>
<span class="text-secondary">Your email server has not been configured. <a asp-controller="Server" asp-action="Emails">Please configure it first.</a></span>
</div>
}
</div>
<div class="form-check">
<input asp-for="LockSubscription" type="checkbox" class="form-check-input"/>
<label asp-for="LockSubscription" class="form-check-label"></label>
<span asp-validation-for="LockSubscription" class="text-danger"></span>
</div>
<div class="form-check">
<input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-input"/>
<label asp-for="DiscourageSearchEngines" class="form-check-label"></label>
<span asp-validation-for="DiscourageSearchEngines" class="text-danger"></span>
</div>
<div class="form-check">
<input asp-for="AllowLightningInternalNodeForAll" type="checkbox" class="form-check-input"/> <input asp-for="AllowLightningInternalNodeForAll" type="checkbox" class="form-check-input"/>
<label asp-for="AllowLightningInternalNodeForAll" class="form-check-label"></label> <label asp-for="AllowLightningInternalNodeForAll" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-LightningNetwork/#how-many-users-can-use-lightning-network-in-btcpay" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
<span asp-validation-for="AllowLightningInternalNodeForAll" class="text-danger"></span> <span asp-validation-for="AllowLightningInternalNodeForAll" class="text-danger"></span>
</div> </div>
<div class="form-check"> <div class="form-check my-1">
<input asp-for="AllowHotWalletForAll" type="checkbox" class="form-check-input"/> <input asp-for="AllowHotWalletForAll" type="checkbox" class="form-check-input"/>
<label asp-for="AllowHotWalletForAll" class="form-check-label"></label> <label asp-for="AllowHotWalletForAll" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/HotWallet/#requirements-for-hot-wallet" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
<span asp-validation-for="AllowHotWalletForAll" class="text-danger"></span> <span asp-validation-for="AllowHotWalletForAll" class="text-danger"></span>
</div> </div>
<div class="form-check"> <div class="form-check my-1">
<input asp-for="AllowHotWalletRPCImportForAll" type="checkbox" class="form-check-input"/> <input asp-for="AllowHotWalletRPCImportForAll" type="checkbox" class="form-check-input"/>
<label asp-for="AllowHotWalletRPCImportForAll" class="form-check-label"></label> <label asp-for="AllowHotWalletRPCImportForAll" class="form-check-label"></label>
<span asp-validation-for="AllowHotWalletRPCImportForAll" class="text-danger"></span> <span asp-validation-for="AllowHotWalletRPCImportForAll" class="text-danger"></span>
</div> </div>
<div class="form-check"> </div>
<input asp-for="DisableInstantNotifications" type="checkbox" class="form-check-input"/>
<label asp-for="DisableInstantNotifications" class="form-check-label"></label> <div class="form-group mb-4">
<span asp-validation-for="DisableInstantNotifications" class="text-danger"></span> <h5>New User Settings</h5>
<div class="form-check my-1">
@{
var emailSettings = (await _SettingsRepository.GetSettingAsync<EmailSettings>()) ?? new EmailSettings();
/* The "|| Model.RequiresConfirmedEmail" check is for the case when a user had checked
the checkbox without first configuring the e-mail settings so that they can uncheck it. */
var isEmailConfigured = emailSettings.IsComplete() || Model.RequiresConfirmedEmail;
}
<input asp-for="RequiresConfirmedEmail" type="checkbox" class="form-check-input" disabled="@(isEmailConfigured ? null : "disabled")"/>
<label asp-for="RequiresConfirmedEmail" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-allow-registration-on-my-btcpay-server" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
<span asp-validation-for="RequiresConfirmedEmail" class="text-danger"></span>
@if (!isEmailConfigured)
{
<div class="mb-2">
<span class="text-secondary">Your email server has not been configured. <a asp-controller="Server" asp-action="Emails">Please configure it first.</a></span>
</div>
}
</div> </div>
<div class="form-check"> <div class="form-check my-1">
<input asp-for="DisableStoresToUseServerEmailSettings" type="checkbox" class="form-check-input"/> <input asp-for="LockSubscription" type="checkbox" class="form-check-input"/>
<label asp-for="DisableStoresToUseServerEmailSettings" class="form-check-label"></label> <label asp-for="LockSubscription" class="form-check-label"></label>
<span asp-validation-for="DisableStoresToUseServerEmailSettings" class="text-danger"></span> <span asp-validation-for="LockSubscription" class="text-danger"></span>
</div> </div>
<div class="form-check">
<div class="form-check my-1">
<input asp-for="DisableNonAdminCreateUserApi" type="checkbox" class="form-check-input"/> <input asp-for="DisableNonAdminCreateUserApi" type="checkbox" class="form-check-input"/>
<label asp-for="DisableNonAdminCreateUserApi" class="form-check-label"></label> <label asp-for="DisableNonAdminCreateUserApi" class="form-check-label"></label>
<span asp-validation-for="DisableNonAdminCreateUserApi" class="text-danger"></span> <span asp-validation-for="DisableNonAdminCreateUserApi" class="text-danger"></span>
</div> </div>
</div>
<div class="form-group mb-4">
<h5>Notification Settings</h5>
<div class="form-check my-1">
<input asp-for="DisableInstantNotifications" type="checkbox" class="form-check-input"/>
<label asp-for="DisableInstantNotifications" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/Notifications/#notifications" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
<span asp-validation-for="DisableInstantNotifications" class="text-danger"></span>
</div>
<div class="form-check my-1">
<input asp-for="DisableStoresToUseServerEmailSettings" type="checkbox" class="form-check-input"/>
<label asp-for="DisableStoresToUseServerEmailSettings" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/Notifications/#server-emails" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
<span asp-validation-for="DisableStoresToUseServerEmailSettings" class="text-danger"></span>
</div>
</div>
<div class="form-group mb-4">
<h5>Maintenance Settings</h5>
@if (ViewBag.UpdateUrlPresent) @if (ViewBag.UpdateUrlPresent)
{ {
<div class="form-check"> <div class="form-check my-1">
<input asp-for="CheckForNewVersions" type="checkbox" class="form-check-input"/> <input asp-for="CheckForNewVersions" type="checkbox" class="form-check-input"/>
<label asp-for="CheckForNewVersions" class="form-check-label"></label> <label asp-for="CheckForNewVersions" class="form-check-label"></label>
<span asp-validation-for="CheckForNewVersions" class="text-danger"></span> <span asp-validation-for="CheckForNewVersions" class="text-danger"></span>
</div> </div>
} }
<div class="form-check my-1">
<input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-input"/>
<label asp-for="DiscourageSearchEngines" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-hide-my-btcpay-server-from-search-engines" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
<span asp-validation-for="DiscourageSearchEngines" class="text-danger"></span>
</div>
</div> </div>
<h5>Customization Settings</h5>
<div class="form-group"> <div class="form-group">
<label asp-for="RootAppId"></label> <label asp-for="RootAppId"></label>
<select asp-for="RootAppId" asp-items="@(new SelectList(ViewBag.AppsList, nameof(SelectListItem.Value), nameof(SelectListItem.Text), Model.RootAppId))" class="form-control"></select> <select asp-for="RootAppId" asp-items="@(new SelectList(ViewBag.AppsList, nameof(SelectListItem.Value), nameof(SelectListItem.Text), Model.RootAppId))" class="form-control w-auto"></select>
@if (!Model.DomainToAppMapping.Any()) @if (!Model.DomainToAppMapping.Any())
{ {
<button type="submit" name="command" value="add-domain" class="btn btn-link"> Map specific domains to specific apps</button> <button type="submit" name="command" value="add-domain" class="btn btn-link px-0">Map specific domains to specific apps</button>
} }
</div> </div>
@@ -135,40 +157,43 @@
</div> </div>
} }
<div class="form-group card">
<div class="cursor-pointer p-2" data-target="#explorer-links" data-toggle="collapse">
<label asp-for="BlockExplorerLinks" class="pb-0 cursor-pointer"></label>
<span class="fa fa-chevron-down float-right pt-1"></span>
</div>
<ul class="list-group list-group-flush collapse show collapse-on-js" id="explorer-links">
@inject BTCPayNetworkProvider BTCPayNetworkProvider
@{
var networks = BTCPayNetworkProvider.GetAll().ToArray();
}
@for (int i = 0; i < networks.Count(); i++) <button class="btn btn-link px-0" type="button" id="ExplorerLinksButton" data-toggle="collapse" data-target="#explorer-links" aria-expanded="false" aria-controls="explorer-links">
{ Override the block explorers used
var network = networks.ElementAt(i); </button>
var existingOverride = Model.BlockExplorerLinks?.SingleOrDefault(tuple => tuple.CryptoCode.Equals(network.CryptoCode, StringComparison.InvariantCultureIgnoreCase));
var linkValue = existingOverride?.Link ?? network.BlockExplorerLinkDefault; <div class="mb-3">
if (Model.BlockExplorerLinks.Count < i + 1) <div class="card collapse show collapse-on-js" id="explorer-links">
{ <ul class="list-group list-group-flush">
Model.BlockExplorerLinks.Add(new PoliciesSettings.BlockExplorerOverrideItem() {CryptoCode = network.CryptoCode, Link = network.BlockExplorerLinkDefault}); @inject BTCPayNetworkProvider BTCPayNetworkProvider
@{
var networks = BTCPayNetworkProvider.GetAll().ToArray();
} }
<li class="list-group-item">
<label > @network.DisplayName (@network.CryptoCode)</label>
<input type="hidden" asp-for="BlockExplorerLinks[i].CryptoCode" value="@network.CryptoCode"/>
<div class="input-group">
<input type="text" class="form-control" asp-for="BlockExplorerLinks[i].Link" value="@linkValue" data-default-link="@network.BlockExplorerLinkDefault"/>
<div class="input-group-btn only-for-js">
<button type="button" class="text-decoration-none btn btn-link revert-default fa fa-refresh " title="Revert to default"></button>
</div>
</div>
</li> @for (int i = 0; i < networks.Count(); i++)
} {
</ul> var network = networks.ElementAt(i);
var existingOverride = Model.BlockExplorerLinks?.SingleOrDefault(tuple => tuple.CryptoCode.Equals(network.CryptoCode, StringComparison.InvariantCultureIgnoreCase));
var linkValue = existingOverride?.Link ?? network.BlockExplorerLinkDefault;
if (Model.BlockExplorerLinks.Count < i + 1)
{
Model.BlockExplorerLinks.Add(new PoliciesSettings.BlockExplorerOverrideItem() {CryptoCode = network.CryptoCode, Link = network.BlockExplorerLinkDefault});
}
<li class="list-group-item">
<label > @network.DisplayName (@network.CryptoCode)</label>
<input type="hidden" asp-for="BlockExplorerLinks[i].CryptoCode" value="@network.CryptoCode"/>
<div class="input-group">
<input type="text" class="form-control" asp-for="BlockExplorerLinks[i].Link" value="@linkValue" data-default-link="@network.BlockExplorerLinkDefault"/>
<div class="input-group-btn only-for-js">
<button type="button" class="text-decoration-none btn btn-link revert-default fa fa-refresh " title="Revert to default"></button>
</div>
</div>
</li>
}
</ul>
</div>
</div> </div>
<button type="submit" class="btn btn-primary" name="command" value="Save">Save</button> <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
</form> </form>