Can delete user

BTCPayServer.Tests/UnitTest1.cs

@@ -251,6 +251,17 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        public void CanParseFilter()
+        {
+            var filter = "storeid:abc status:abed blabhbalh ";
+            var search = new SearchString(filter);
+            Assert.Equal("storeid:abc status:abed blabhbalh", search.ToString());
+            Assert.Equal("blabhbalh", search.TextSearch);
+            Assert.Equal("abc", search.Filters["storeid"]);
+            Assert.Equal("abed", search.Filters["status"]);
+        }
+
         [Fact]
         public void InvoiceFlowThroughDifferentStatesCorrectly()
         {

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.0.34</Version>
+		<Version>1.0.0.37</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
@@ -22,7 +22,7 @@
     <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="NBitcoin" Version="4.0.0.48" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.12" />	  
+    <PackageReference Include="NBitpayClient" Version="1.0.0.13" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
     <PackageReference Include="NBXplorer.Client" Version="1.0.0.18" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />

BTCPayServer/Controllers/AccountController.cs

@@ -235,8 +235,11 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [AllowAnonymous]
-        public IActionResult Register(string returnUrl = null)
+        public async Task<IActionResult> Register(string returnUrl = null)
         {
+            var policies = await _SettingsRepository.GetSettingAsync<PoliciesSettings>() ?? new PoliciesSettings();
+            if (policies.LockSubscription)
+                return RedirectToAction(nameof(HomeController.Index), "Home");
             ViewData["ReturnUrl"] = returnUrl;
             return View();
         }
@@ -247,9 +250,11 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> Register(RegisterViewModel model, string returnUrl = null)
         {
             ViewData["ReturnUrl"] = returnUrl;
+            var policies = await _SettingsRepository.GetSettingAsync<PoliciesSettings>() ?? new PoliciesSettings();
+            if (policies.LockSubscription)
+                return RedirectToAction(nameof(HomeController.Index), "Home");
             if (ModelState.IsValid)
             {
-                var policies = await _SettingsRepository.GetSettingAsync<PoliciesSettings>() ?? new PoliciesSettings();
                 var user = new ApplicationUser { UserName = model.Email, Email = model.Email, RequiresEmailConfirmation = policies.RequiresConfirmedEmail };
                 var result = await _userManager.CreateAsync(user, model.Password);
                 if (result.Succeeded)

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -15,6 +15,7 @@ using System.Linq;
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 
 namespace BTCPayServer.Controllers
 {
@@ -118,8 +119,7 @@ namespace BTCPayServer.Controllers
                 return null;
             var store = await _StoreRepository.FindStore(invoice.StoreId);
             var dto = invoice.EntityToDTO();
-
-            var cryptoFormat = _CurrencyNameTable.GetCurrencyProvider("BTC");
+            var currency = invoice.ProductInformation.Currency;
             var model = new PaymentModel()
             {
                 ServerUrl = HttpContext.Request.GetAbsoluteRoot(),
@@ -133,7 +133,7 @@ namespace BTCPayServer.Controllers
                 ExpirationSeconds = Math.Max(0, (int)(invoice.ExpirationTime - DateTimeOffset.UtcNow).TotalSeconds),
                 MaxTimeSeconds = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalSeconds,
                 ItemDesc = invoice.ProductInformation.ItemDesc,
-                Rate = invoice.Rate.ToString("C", _CurrencyNameTable.GetCurrencyProvider(invoice.ProductInformation.Currency)),
+                Rate = invoice.Rate.ToString("C", _CurrencyNameTable.GetCurrencyProvider(currency)) + $" ({currency})",
                 MerchantRefLink = invoice.RedirectURL ?? "/",
                 StoreName = store.StoreName,
                 TxFees = invoice.TxFee.ToString(),
@@ -188,12 +188,15 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 20)
         {
             var model = new InvoicesModel();
+            var filterString = new SearchString(searchTerm);
             foreach (var invoice in await _InvoiceRepository.GetInvoices(new InvoiceQuery()
             {
-                TextSearch = searchTerm,
+                TextSearch = filterString.TextSearch,
                 Count = count,
                 Skip = skip,
-                UserId = GetUserId()
+                UserId = GetUserId(),
+                Status = filterString.Filters.TryGet("status"),
+                StoreId = filterString.Filters.TryGet("storeid")
             }))
             {
                 model.SearchTerm = searchTerm;
@@ -246,21 +249,30 @@ namespace BTCPayServer.Controllers
                     storeId = store.Id
                 });
             }
-            var result = await CreateInvoiceCore(new Invoice()
-            {
-                Price = model.Amount.Value,
-                Currency = "USD",
-                PosData = model.PosData,
-                OrderId = model.OrderId,
-                //RedirectURL = redirect + "redirect",
-                NotificationURL = model.NotificationUrl,
-                ItemDesc = model.ItemDesc,
-                FullNotifications = true,
-                BuyerEmail = model.BuyerEmail,
-            }, store, HttpContext.Request.GetAbsoluteRoot());
 
-            StatusMessage = $"Invoice {result.Data.Id} just created!";
-            return RedirectToAction(nameof(ListInvoices));
+            try
+            {
+                var result = await CreateInvoiceCore(new Invoice()
+                {
+                    Price = model.Amount.Value,
+                    Currency = model.Currency,
+                    PosData = model.PosData,
+                    OrderId = model.OrderId,
+                    //RedirectURL = redirect + "redirect",
+                    NotificationURL = model.NotificationUrl,
+                    ItemDesc = model.ItemDesc,
+                    FullNotifications = true,
+                    BuyerEmail = model.BuyerEmail,
+                }, store, HttpContext.Request.GetAbsoluteRoot());
+
+                StatusMessage = $"Invoice {result.Data.Id} just created!";
+                return RedirectToAction(nameof(ListInvoices));
+            }
+            catch (RateUnavailableException)
+            {
+                ModelState.TryAddModelError(nameof(model.Currency), "Unsupported currency");
+                return View(model);
+            }
         }
 
         private async Task<SelectList> GetStores(string userId, string storeId = null)

BTCPayServer/Controllers/ServerController.cs

@@ -32,15 +32,50 @@ namespace BTCPayServer.Controllers
         public IActionResult ListUsers()
         {
             var users = new UsersViewModel();
+            users.StatusMessage = StatusMessage;
             users.Users
                 = _UserManager.Users.Select(u => new UsersViewModel.UserViewModel()
                 {
                     Name = u.UserName,
-                    Email = u.Email
+                    Email = u.Email,
+                    Id = u.Id
                 }).ToList();
             return View(users);
         }
 
+
+        [Route("server/users/{userId}/delete")]
+        public async Task<IActionResult> DeleteUser(string userId)
+        {
+            var user = userId == null ? null : await _UserManager.FindByIdAsync(userId);
+            if (user == null)
+                return NotFound();
+            return View("Confirm", new ConfirmModel()
+            {
+                Title = "Delete user " + user.Email,
+                Description = "This user will be permanently deleted",
+                Action = "Delete"
+            });
+        }
+
+        [Route("server/users/{userId}/delete")]
+        [HttpPost]
+        public async Task<IActionResult> DeleteUserPost(string userId)
+        {
+            var user = userId == null ? null : await _UserManager.FindByIdAsync(userId);
+            if (user == null)
+                return NotFound();
+            await _UserManager.DeleteAsync(user);
+            StatusMessage = "User deleted";
+            return RedirectToAction(nameof(ListUsers));
+        }
+
+        [TempData]
+        public string StatusMessage
+        {
+            get; set;
+        }
+
         [Route("server/emails")]
         public async Task<IActionResult> Emails()
         {

BTCPayServer/Controllers/StoresController.cs

@@ -146,6 +146,7 @@ namespace BTCPayServer.Controllers
 
             var storeBlob = store.GetStoreBlob(_Network);
             var vm = new StoreViewModel();
+            vm.Id = store.Id;
             vm.StoreName = store.StoreName;
             vm.StoreWebsite = store.StoreWebsite;
             vm.NetworkFee = !storeBlob.NetworkFeeDisabled;

BTCPayServer/Models/InvoicingModels/CreateInvoiceModel.cs

@@ -9,12 +9,22 @@ namespace BTCPayServer.Models.InvoicingModels
 {
     public class CreateInvoiceModel
     {
+        public CreateInvoiceModel()
+        {
+            Currency = "USD";
+        }
         [Required]
         public double? Amount
         {
             get; set;
         }
 
+        [Required]
+        public string Currency
+        {
+            get; set;
+        }
+
         [Required]
         public string StoreId
         {

BTCPayServer/Models/ServerViewModels/UsersViewModel.cs

@@ -9,6 +9,7 @@ namespace BTCPayServer.Models.ServerViewModels
     {
         public class UserViewModel
         {
+            public string Id { get; set; }
             public string Name
             {
                 get; set;

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -10,6 +10,7 @@ namespace BTCPayServer.Models.StoreViewModels
 {
     public class StoreViewModel
     {
+        public string Id { get; set; }
         [Display(Name = "Store Name")]
         [Required]
         [MaxLength(50)]

BTCPayServer/SearchString.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace BTCPayServer
+{
+    public class SearchString
+    {
+        string _OriginalString;
+        public SearchString(string str)
+        {
+            str = str ?? string.Empty;
+            str = str.Trim();
+            _OriginalString = str.Trim();
+            TextSearch = _OriginalString;
+            var splitted = str.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+            Filters
+                = splitted
+                    .Select(t => t.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries))
+                    .Where(kv => kv.Length == 2)
+                    .Select(kv => new KeyValuePair<string, string>(kv[0].ToLowerInvariant(), kv[1]))
+                    .ToDictionary(o => o.Key, o => o.Value);
+
+            foreach(var filter in splitted)
+            {
+                if(filter.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Length == 2)
+                { 
+                    TextSearch = TextSearch.Replace(filter, string.Empty);
+                }
+            }
+            TextSearch = TextSearch.Trim();
+        }
+
+        public string TextSearch
+        {
+            get;
+            private set;
+        }
+
+        public Dictionary<string, string> Filters { get; private set; }
+
+        public override string ToString()
+        {
+            return _OriginalString;
+        }
+    }
+}

BTCPayServer/Services/PoliciesSettings.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace BTCPayServer.Services
 {
@@ -11,5 +12,8 @@ namespace BTCPayServer.Services
         {
             get; set;
         }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public bool LockSubscription { get; set; }
     }
 }

BTCPayServer/Views/Invoice/CreateInvoice.cshtml

@@ -19,6 +19,11 @@
                         <input asp-for="Amount" class="form-control" />
                         <span asp-validation-for="Amount" class="text-danger"></span>
                     </div>
+                    <div class="form-group">
+                        <label asp-for="Currency" class="control-label"></label>*
+                        <input asp-for="Currency" class="form-control" />
+                        <span asp-validation-for="Currency" class="text-danger"></span>
+                    </div>
                     <div class="form-group">
                         <label asp-for="OrderId" class="control-label"></label>
                         <input asp-for="OrderId" class="form-control" />

BTCPayServer/Views/Invoice/ListInvoices.cshtml

@@ -16,7 +16,15 @@
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading">@ViewData["Title"]</h2>
                 <hr class="primary">
-                <p>Create, search or pay an invoice.</p>
+                <p>Create, search or pay an invoice. (<a href="#help" data-toggle="collapse">Help</a>)</p>
+                <div id="help" class="collapse text-left">
+                    <p>You can search for invoice Id, deposit address, price, order id, store id, any buyer information and any product information.</br>
+                    You can also apply filters to your search by searching for `filtername:value`, here is a list of supported filters</p>
+                    <ul>
+                        <li><b>storeid:id</b> for filtering a specific store</li>
+                        <li><b>status:(expired|invalid|complete|confirmed|paid|new)</b> for filtering a specific status</li>
+                    </ul>
+                </div>
                 <div class="form-group">
                     <form asp-action="SearchInvoice" method="post">
                         <input asp-for="SearchTerm" class="form-control" />
@@ -43,12 +51,12 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach (var invoice in Model.Invoices)
+                    @foreach(var invoice in Model.Invoices)
                     {
                         <tr>
                             <td>@invoice.Date</td>
                             <td>@invoice.InvoiceId</td>
-                            @if (invoice.Status == "paid")
+                            @if(invoice.Status == "paid")
                             {
                                 <td>
                                     <div class="btn-group">
@@ -72,7 +80,7 @@
                 </tbody>
             </table>
             <span>
-                @if (Model.Skip != 0)
+                @if(Model.Skip != 0)
                 {
                     <a href="@Url.Action("ListInvoices", new
                         {

BTCPayServer/Views/Server/ListUsers.cshtml

@@ -14,6 +14,7 @@
         <tr>
             <th>Name</th>
             <th>Email</th>
+            <th>Actions</th>
         </tr>
     </thead>
     <tbody>
@@ -22,6 +23,7 @@
             <tr>
                 <td>@user.Name</td>
                 <td>@user.Email</td>
+                <td><a asp-action="DeleteUser" asp-route-userId="@user.Id">Remove</a></td>
             </tr>}
     </tbody>
 </table>

BTCPayServer/Views/Server/Policies.cshtml

@@ -19,6 +19,10 @@
                 <label asp-for="RequiresConfirmedEmail"></label>
                 <input asp-for="RequiresConfirmedEmail" type="checkbox" class="form-check-inline" />
             </div>
+            <div class="form-group">
+                <label asp-for="LockSubscription"></label>
+                <input asp-for="LockSubscription" type="checkbox" class="form-check-inline" />
+            </div>
             <button type="submit" class="btn btn-success" name="command" value="Save">Save</button>
         </form>
     </div>

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -16,6 +16,15 @@
 <div class="row">
     <div class="col-md-6">
         <form method="post">
+            <div class="form-group">
+                <label asp-for="Id"></label>
+                <input asp-for="Id" readonly class="form-control" />
+            </div>
+            <div class="form-group">
+                <label asp-for="StoreName"></label>
+                <input asp-for="StoreName" class="form-control" />
+                <span asp-validation-for="StoreName" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="StoreName"></label>
                 <input asp-for="StoreName" class="form-control" />

btcpayserver.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
+VisualStudioVersion = 15.0.27004.2005
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer", "BTCPayServer\BTCPayServer.csproj", "{949A0870-8D8C-4DE5-8845-DDD560489177}"
 EndProject