diff --git a/BTCPayServer.Abstractions/Extensions/ViewsRazor.cs b/BTCPayServer.Abstractions/Extensions/ViewsRazor.cs index 68fc29199..a182fa98f 100644 --- a/BTCPayServer.Abstractions/Extensions/ViewsRazor.cs +++ b/BTCPayServer.Abstractions/Extensions/ViewsRazor.cs @@ -97,6 +97,7 @@ namespace BTCPayServer.Abstractions.Extensions return categoryAndPageMatch && idMatch; } + [Obsolete()] public static bool IsPageActive(this ViewDataDictionary viewData, IEnumerable pages, object id = null) where T : IConvertible { diff --git a/BTCPayServer.Data/Data/EmailRuleData.cs b/BTCPayServer.Data/Data/EmailRuleData.cs index b0f37f006..cf836672d 100644 --- a/BTCPayServer.Data/Data/EmailRuleData.cs +++ b/BTCPayServer.Data/Data/EmailRuleData.cs @@ -69,16 +69,29 @@ public static partial class ApplicationDbContextExtensions public static IQueryable GetRules(this IQueryable query, string storeId) => query.Where(o => o.StoreId == storeId) .OrderBy(o => o.Id); + public static IQueryable GetServerRules(this IQueryable query) + => query.Where(o => o.StoreId == null).OrderBy(o => o.Id); public static Task GetMatches(this DbSet set, string? storeId, string trigger, JObject model) - => set - .FromSqlInterpolated($""" - SELECT * FROM email_rules - WHERE store_id IS NOT DISTINCT FROM {storeId} AND trigger = {trigger} AND (condition IS NULL OR jsonb_path_exists({model.ToString()}::JSONB, condition::JSONPATH)) - """) - .ToArrayAsync(); + => + storeId is null + ? set + .FromSqlInterpolated($""" + SELECT * FROM email_rules + WHERE store_id IS NULL AND trigger = {trigger} AND (condition IS NULL OR jsonb_path_exists({model.ToString()}::JSONB, condition::JSONPATH)) + """) + .ToArrayAsync() + : set + .FromSqlInterpolated($""" + SELECT * FROM email_rules + WHERE store_id = {storeId} AND trigger = {trigger} AND (condition IS NULL OR jsonb_path_exists({model.ToString()}::JSONB, condition::JSONPATH)) + """) + .ToArrayAsync(); public static Task GetRule(this IQueryable query, string storeId, long id) => query.Where(o => o.StoreId == storeId && o.Id == id) .FirstOrDefaultAsync(); + public static Task GetServerRule(this IQueryable query, long id) + => query.Where(o => o.StoreId == null && o.Id == id) + .FirstOrDefaultAsync(); } diff --git a/BTCPayServer.Tests/PMO/ConfigureEmailPMO.cs b/BTCPayServer.Tests/PMO/ConfigureEmailPMO.cs index 27ffa811a..b0746f1c1 100644 --- a/BTCPayServer.Tests/PMO/ConfigureEmailPMO.cs +++ b/BTCPayServer.Tests/PMO/ConfigureEmailPMO.cs @@ -1,5 +1,6 @@ #nullable enable using System.Threading.Tasks; +using BTCPayServer.Abstractions.Models; namespace BTCPayServer.Tests.PMO; @@ -14,6 +15,17 @@ public class ConfigureEmailPMO(PlaywrightTester s) public string? Password { get; set; } public bool? EnabledCertificateCheck { get; set; } } + public async Task UseMailPit() + { + await s.Page.ClickAsync("#mailpit"); + await s.FindAlertMessage(StatusMessageModel.StatusSeverity.Info); + } + + public async Task ConfigureEmailRules() + { + await s.Page.ClickAsync("#ConfigureEmailRules"); + return new EmailRulesPMO(s); + } public Task FillMailPit(Form form) => Fill(new() diff --git a/BTCPayServer.Tests/PMO/EmailRulePMO.cs b/BTCPayServer.Tests/PMO/EmailRulePMO.cs index 4aabe8ad9..30cac29a5 100644 --- a/BTCPayServer.Tests/PMO/EmailRulePMO.cs +++ b/BTCPayServer.Tests/PMO/EmailRulePMO.cs @@ -3,6 +3,15 @@ using System.Threading.Tasks; namespace BTCPayServer.Tests.PMO; +public class EmailRulesPMO(PlaywrightTester s) +{ + public async Task CreateEmailRule() + { + await s.Page.ClickAsync("#CreateEmailRule"); + return new EmailRulePMO(s); + } +} + public class EmailRulePMO(PlaywrightTester s) { public class Form @@ -13,6 +22,7 @@ public class EmailRulePMO(PlaywrightTester s) public string? Body { get; set; } public bool? CustomerEmail { get; set; } public string? Condition { get; set; } + public bool HtmlBody { get; set; } } public async Task Fill(Form form) @@ -26,7 +36,18 @@ public class EmailRulePMO(PlaywrightTester s) if (form.Subject is not null) await s.Page.FillAsync("#Subject", form.Subject); if (form.Body is not null) - await s.Page.Locator(".note-editable").FillAsync(form.Body); + { + if (form.HtmlBody) + { + await s.Page.ClickAsync(".btn-codeview"); + await s.Page.FillAsync(".note-codable", form.Body); + } + else + { + await s.Page.FillAsync(".note-editable", form.Body); + } + } + if (form.CustomerEmail is {} v) await s.Page.SetCheckedAsync("#AdditionalData_CustomerEmail", v); await s.ClickPagePrimary(); diff --git a/BTCPayServer.Tests/PlaywrightTester.cs b/BTCPayServer.Tests/PlaywrightTester.cs index d4add1fcb..97cc0eb69 100644 --- a/BTCPayServer.Tests/PlaywrightTester.cs +++ b/BTCPayServer.Tests/PlaywrightTester.cs @@ -25,7 +25,7 @@ namespace BTCPayServer.Tests public class PlaywrightTester : IAsyncDisposable { public Uri ServerUri; - private string CreatedUser; + public string CreatedUser; internal string InvoiceId; public Logging.ILog TestLogs => Server.TestLogs; public IPage Page { get; set; } @@ -369,7 +369,11 @@ namespace BTCPayServer.Tests public async Task GoToServer(ServerNavPages navPages = ServerNavPages.Policies) { await Page.ClickAsync("#menu-item-Policies"); - if (navPages != ServerNavPages.Policies) + if (navPages == ServerNavPages.Emails) + { + await Page.ClickAsync($"#menu-item-Server-{navPages}"); + } + else if (navPages != ServerNavPages.Policies) { await Page.ClickAsync($"#menu-item-{navPages}"); } diff --git a/BTCPayServer.Tests/PlaywrightTests.cs b/BTCPayServer.Tests/PlaywrightTests.cs index 228445917..66efb4120 100644 --- a/BTCPayServer.Tests/PlaywrightTests.cs +++ b/BTCPayServer.Tests/PlaywrightTests.cs @@ -1496,8 +1496,7 @@ namespace BTCPayServer.Tests await s.AddDerivationScheme(); await s.GoToInvoices(); - var sent = await s.Server.WaitForEvent(() => s.CreateInvoice(amount: 10m, currency: "USD")); - var message = await s.Server.AssertHasEmail(sent); + var message = await s.Server.AssertHasEmail(() => s.CreateInvoice(amount: 10m, currency: "USD")); Assert.Equal("Invoice has been created in USD for 10!", message.Text); await s.GoToUrl(rulesUrl); @@ -1529,11 +1528,27 @@ namespace BTCPayServer.Tests }); await s.GoToInvoices(); - sent = await s.Server.WaitForEvent(() => s.CreateInvoice(amount: 10m, currency: "USD", refundEmail: "john@test.com")); - message = await s.Server.AssertHasEmail(sent); + message = await s.Server.AssertHasEmail(() => s.CreateInvoice(amount: 10m, currency: "USD", refundEmail: "john@test.com")); Assert.Equal("Invoice Created in USD for " + storeName + "!", message.Subject); Assert.Equal("Invoice has been created in USD for 10!", message.Text); Assert.Equal("john@test.com", message.To[0].Address); + + await s.GoToServer(ServerNavPages.Emails); + + await mailPMO.UseMailPit(); + var rules = await mailPMO.ConfigureEmailRules(); + await rules.CreateEmailRule(); + await pmo.Fill(new() + { + Trigger = "SRV-PasswordReset", + HtmlBody = true, + Body = "

Hello, click here to reset the password

" + }); + await s.Logout(); + await s.Page.GetByRole(AriaRole.Link, new() { Name = "Forgot password?" }).ClickAsync(); + await s.Page.FillAsync("#Email", s.CreatedUser); + message = await s.Server.AssertHasEmail(() => s.ClickPagePrimary()); + Assert.Contains("

Hello, AssertHasEmail(Func action) + { + var sent = await WaitForEvent(action); + return await AssertHasEmail(sent); + } + public MailPitClient GetMailPitClient() { var http = PayTester.GetService().CreateClient("MAIL_PIT"); diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs index 68076042a..0e89febef 100644 --- a/BTCPayServer.Tests/UnitTest1.cs +++ b/BTCPayServer.Tests/UnitTest1.cs @@ -3352,7 +3352,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().StoreEmailSettings(acc.StoreId, new EmailsViewModel(new EmailSettings + Assert.IsType(await acc.GetController().ServerEmailSettings(new (new EmailSettings { From = "store@store.com", Login = "store@store.com", @@ -3363,13 +3363,11 @@ namespace BTCPayServer.Tests Assert.Equal("store@store.com", (await Assert.IsType(await emailSenderFactory.GetEmailSender(acc.StoreId)).GetEmailSettings()).Login); - var sent = await tester.WaitForEvent( - async () => - { - var sender = await emailSenderFactory.GetEmailSender(acc.StoreId); - sender.SendEmail(MailboxAddress.Parse("destination@test.com"), "test", "hello world"); - }); - var message = await tester.AssertHasEmail(sent); + var message = await tester.AssertHasEmail(async () => + { + var sender = await emailSenderFactory.GetEmailSender(acc.StoreId); + sender.SendEmail(MailboxAddress.Parse("destination@test.com"), "test", "hello world"); + }); Assert.Equal("test", message.Subject); Assert.Equal("hello world", message.Text); } diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index 2c1f1b0f3..e504a43da 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -51,6 +51,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -193,5 +197,12 @@ + + <_ContentIncludedByDefault Remove="Plugins\Emails\Views\UIStoreEmailRules\StoreEmailRulesList.cshtml" /> + <_ContentIncludedByDefault Remove="Plugins\Emails\Views\UIStoreEmailRules\StoreEmailRulesManage.cshtml" /> + <_ContentIncludedByDefault Remove="Plugins\Emails\Views\UIServerEmail\ServerEmailSettings.cshtml" /> + <_ContentIncludedByDefault Remove="Plugins\Emails\Views\UIStoresEmail\StoreEmailSettings.cshtml" /> + + diff --git a/BTCPayServer/Components/MainNav/Default.cshtml b/BTCPayServer/Components/MainNav/Default.cshtml index afae34451..23c874541 100644 --- a/BTCPayServer/Components/MainNav/Default.cshtml +++ b/BTCPayServer/Components/MainNav/Default.cshtml @@ -314,7 +314,7 @@ Roles

  • - Email + Email
  • Services diff --git a/BTCPayServer/Controllers/UIServerController.cs b/BTCPayServer/Controllers/UIServerController.cs index d922379b0..620843221 100644 --- a/BTCPayServer/Controllers/UIServerController.cs +++ b/BTCPayServer/Controllers/UIServerController.cs @@ -66,9 +66,9 @@ namespace BTCPayServer.Controllers private readonly IEnumerable _StorageProviderServices; private readonly CallbackGenerator _callbackGenerator; private readonly UriResolver _uriResolver; - private readonly EmailSenderFactory _emailSenderFactory; private readonly TransactionLinkProviders _transactionLinkProviders; private readonly LocalizerService _localizer; + private readonly EmailSenderFactory _emailSenderFactory; public IStringLocalizer StringLocalizer { get; } public UIServerController( @@ -76,6 +76,7 @@ namespace BTCPayServer.Controllers UserService userService, StoredFileRepository storedFileRepository, IFileService fileService, + EmailSenderFactory emailSenderFactory, IEnumerable storageProviderServices, BTCPayServerOptions options, SettingsRepository settingsRepository, @@ -92,7 +93,6 @@ namespace BTCPayServer.Controllers Logs logs, CallbackGenerator callbackGenerator, UriResolver uriResolver, - EmailSenderFactory emailSenderFactory, IHostApplicationLifetime applicationLifetime, IHtmlHelper html, TransactionLinkProviders transactionLinkProviders, @@ -119,9 +119,9 @@ namespace BTCPayServer.Controllers _eventAggregator = eventAggregator; _externalServiceOptions = externalServiceOptions; Logs = logs; + _emailSenderFactory = emailSenderFactory; _callbackGenerator = callbackGenerator; _uriResolver = uriResolver; - _emailSenderFactory = emailSenderFactory; ApplicationLifetime = applicationLifetime; Html = html; _transactionLinkProviders = transactionLinkProviders; @@ -1224,99 +1224,6 @@ namespace BTCPayServer.Controllers return View(vm); } - [HttpGet("server/emails")] - public async Task Emails() - { - var email = await _emailSenderFactory.GetSettings() ?? new EmailSettings(); - var vm = new ServerEmailsViewModel(email) - { - EnableStoresToUseServerEmailSettings = !_policiesSettings.DisableStoresToUseServerEmailSettings - }; - return View(vm); - } - - [HttpPost("server/emails")] - public async Task Emails(ServerEmailsViewModel model, string command) - { - if (command == "Test") - { - try - { - if (model.PasswordSet) - { - var settings = await _emailSenderFactory.GetSettings() ?? new EmailSettings(); - model.Settings.Password = settings.Password; - } - model.Settings.Validate("Settings.", ModelState); - if (string.IsNullOrEmpty(model.TestEmail)) - ModelState.AddModelError(nameof(model.TestEmail), new RequiredAttribute().FormatErrorMessage(nameof(model.TestEmail))); - if (!ModelState.IsValid) - return View(model); - var serverSettings = await _SettingsRepository.GetSettingAsync(); - var serverName = string.IsNullOrEmpty(serverSettings?.ServerName) ? "BTCPay Server" : serverSettings.ServerName; - using (var client = await model.Settings.CreateSmtpClient()) - using (var message = model.Settings.CreateMailMessage(MailboxAddress.Parse(model.TestEmail), $"{serverName}: Email test", "You received it, the BTCPay Server SMTP settings work.", false)) - { - await client.SendAsync(message); - await client.DisconnectAsync(true); - } - TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email sent to {0}. Please verify you received it.", model.TestEmail].Value; - } - catch (Exception ex) - { - TempData[WellKnownTempData.ErrorMessage] = ex.Message; - } - return View(model); - } - - if (_policiesSettings.DisableStoresToUseServerEmailSettings == model.EnableStoresToUseServerEmailSettings) - { - _policiesSettings.DisableStoresToUseServerEmailSettings = !model.EnableStoresToUseServerEmailSettings; - await _SettingsRepository.UpdateSetting(_policiesSettings); - } - - if (command == "ResetPassword") - { - var settings = await _SettingsRepository.GetSettingAsync() ?? new EmailSettings(); - settings.Password = null; - await _SettingsRepository.UpdateSetting(settings); - TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email server password reset"].Value; - } - else if (command == "mailpit") - { - model.Settings.Server = "localhost"; - model.Settings.Port = 34219; - model.Settings.EnabledCertificateCheck = false; - model.Settings.Login ??= "store@example.com"; - model.Settings.From ??= "store@example.com"; - model.Settings.Password ??= "password"; - await _SettingsRepository.UpdateSetting(model.Settings); - TempData.SetStatusMessageModel(new StatusMessageModel() - { - Severity = StatusMessageModel.StatusSeverity.Info, - AllowDismiss = true, - Html = "Mailpit is now running on localhost. You can use it to test your SMTP settings." - }); - } - else - { - // save if user provided valid email; this will also clear settings if no model.Settings.From - if (model.Settings.From is not null && !MailboxAddressValidator.IsMailboxAddress(model.Settings.From)) - { - ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]); - return View(model); - } - - var oldSettings = await _emailSenderFactory.GetSettings() ?? new EmailSettings(); - if (!string.IsNullOrEmpty(oldSettings.Password)) - model.Settings.Password = oldSettings.Password; - - await _SettingsRepository.UpdateSetting(model.Settings); - TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email settings saved"].Value; - } - return RedirectToAction(nameof(Emails)); - } - [Route("server/logs/{file?}")] public async Task LogsView(string? file = null, int offset = 0, bool download = false) { diff --git a/BTCPayServer/Extensions/EmailSenderExtensions.cs b/BTCPayServer/Extensions/EmailSenderExtensions.cs index cd5466a82..caa4e9eb6 100644 --- a/BTCPayServer/Extensions/EmailSenderExtensions.cs +++ b/BTCPayServer/Extensions/EmailSenderExtensions.cs @@ -34,12 +34,6 @@ namespace BTCPayServer.Services $"Your account has been approved and you can now login here.")); } - public static void SendResetPassword(this IEmailSender emailSender, MailboxAddress address, string link) - { - emailSender.SendEmail(address, "Update Password", CreateEmailBody( - $"A request has been made to reset your BTCPay Server password. Please set your password by clicking below.

    {CallToAction("Update Password", link)}")); - } - public static void SendInvitation(this IEmailSender emailSender, MailboxAddress address, string link) { emailSender.SendEmail(address, "Invitation", CreateEmailBody( diff --git a/BTCPayServer/HostedServices/UserEventHostedService.cs b/BTCPayServer/HostedServices/UserEventHostedService.cs index 6cff41d43..178663e87 100644 --- a/BTCPayServer/HostedServices/UserEventHostedService.cs +++ b/BTCPayServer/HostedServices/UserEventHostedService.cs @@ -1,8 +1,10 @@ +using System.Text.Encodings.Web; using System.Threading; using System.Threading.Tasks; using BTCPayServer.Data; using BTCPayServer.Events; using BTCPayServer.Logging; +using BTCPayServer.Plugins.Emails; using BTCPayServer.Services; using BTCPayServer.Services.Mails; using BTCPayServer.Services.Notifications; @@ -10,6 +12,7 @@ using BTCPayServer.Services.Notifications.Blobs; using BTCPayServer.Services.Stores; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; +using Newtonsoft.Json.Linq; namespace BTCPayServer.HostedServices; @@ -17,6 +20,7 @@ public class UserEventHostedService( EventAggregator eventAggregator, UserManager userManager, CallbackGenerator callbackGenerator, + ISettingsAccessor serverSettings, EmailSenderFactory emailSenderFactory, NotificationSender notificationSender, StoreRepository storeRepository, @@ -59,7 +63,7 @@ public class UserEventHostedService( Logs.PayServer.LogInformation(newUserInfo); // send notification if the user does not require email confirmation. - // inform admins only about qualified users and not annoy them with bot registrations. + // inform admins only about qualified users and not annoy them with bot registrations. if (requiresApproval && !requiresEmailConfirmation) { await NotifyAdminsAboutUserRequiringApproval(user, ev.ApprovalLink, newUserInfo); @@ -79,9 +83,11 @@ public class UserEventHostedService( break; case UserEvent.PasswordResetRequested pwResetEvent: - Logs.PayServer.LogInformation("User {Email} requested a password reset", user.Email); - emailSender = await emailSenderFactory.GetEmailSender(); - emailSender.SendResetPassword(user.GetMailboxAddress(), pwResetEvent.ResetLink); + EventAggregator.Publish(CreateTriggerEvent(ServerMailTriggers.PasswordReset, + new JObject() + { + ["ResetLink"] = HtmlEncoder.Default.Encode(pwResetEvent.ResetLink) + }, user)); break; case UserEvent.Approved approvedEvent: @@ -104,6 +110,23 @@ public class UserEventHostedService( } } + private TriggerEvent CreateTriggerEvent(string trigger, JObject model, ApplicationUser user) + { + model["User"] = new JObject() + { + ["Name"] = user.UserName, + ["Email"] = user.Email, + ["MailboxAddress"] = user.GetMailboxAddress().ToString(), + }; + model["Branding"] = new JObject() + { + ["ServerName"] = serverSettings.Settings.ServerName ?? "BTCPay Server", + ["ContactUrl"] = serverSettings.Settings.ContactUrl, + }; + var evt = new TriggerEvent(null, trigger, model, null); + return evt; + } + private async Task NotifyAdminsAboutUserRequiringApproval(ApplicationUser user, string approvalLink, string newUserInfo) { if (!user.RequiresApproval || user.Approved) return; diff --git a/BTCPayServer/Hosting/BTCPayServerServices.cs b/BTCPayServer/Hosting/BTCPayServerServices.cs index 4d89d6881..1d000a477 100644 --- a/BTCPayServer/Hosting/BTCPayServerServices.cs +++ b/BTCPayServer/Hosting/BTCPayServerServices.cs @@ -159,6 +159,7 @@ namespace BTCPayServer.Hosting // AddSettingsAccessor(services); AddSettingsAccessor(services); + AddSettingsAccessor(services); // AddOnchainWalletParsers(services); diff --git a/BTCPayServer/Hosting/Startup.cs b/BTCPayServer/Hosting/Startup.cs index 7747abbd9..037460f5a 100644 --- a/BTCPayServer/Hosting/Startup.cs +++ b/BTCPayServer/Hosting/Startup.cs @@ -45,16 +45,14 @@ namespace BTCPayServer.Hosting { public class Startup { - public Startup(IConfiguration conf, IWebHostEnvironment env, ILoggerFactory loggerFactory) + public Startup(IConfiguration conf, ILoggerFactory loggerFactory) { Configuration = conf; - _Env = env; LoggerFactory = loggerFactory; Logs = new Logs(); Logs.Configure(loggerFactory); } - readonly IWebHostEnvironment _Env; public IConfiguration Configuration { get; set; @@ -178,7 +176,6 @@ namespace BTCPayServer.Hosting o.AreaViewLocationFormats.Add("/Plugins/{2}/Views/{0}.cshtml"); o.AreaViewLocationFormats.Add("/Plugins/{2}/Views/Shared/{0}.cshtml"); - o.AreaViewLocationFormats.Add("/{0}.cshtml"); }) .AddNewtonsoftJson() diff --git a/BTCPayServer/Models/ServerViewModels/EmailsViewModel.cs b/BTCPayServer/Models/ServerViewModels/EmailsViewModel.cs deleted file mode 100644 index f710e6926..000000000 --- a/BTCPayServer/Models/ServerViewModels/EmailsViewModel.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using BTCPayServer.Services.Mails; - -namespace BTCPayServer.Models.ServerViewModels; - -public class ServerEmailsViewModel : EmailsViewModel -{ - [Display(Name = "Allow Stores use the Server's SMTP email settings as their default")] - public bool EnableStoresToUseServerEmailSettings { get; set; } - - public ServerEmailsViewModel() - { - } - - public ServerEmailsViewModel(EmailSettings settings) : base(settings) - { - } -} diff --git a/BTCPayServer/Plugins/Emails/Controllers/UIEmailControllerBase.cs b/BTCPayServer/Plugins/Emails/Controllers/UIEmailControllerBase.cs new file mode 100644 index 000000000..a1761fd47 --- /dev/null +++ b/BTCPayServer/Plugins/Emails/Controllers/UIEmailControllerBase.cs @@ -0,0 +1,127 @@ +#nullable enable +using System; +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; +using BTCPayServer.Abstractions.Constants; +using BTCPayServer.Abstractions.Extensions; +using BTCPayServer.Abstractions.Models; +using BTCPayServer.Client; +using BTCPayServer.Plugins.Emails.Views; +using BTCPayServer.Services; +using BTCPayServer.Services.Mails; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Localization; +using MimeKit; + +namespace BTCPayServer.Plugins.Emails.Controllers; + +public abstract class UIEmailControllerBase(IStringLocalizer stringLocalizer) : Controller +{ + public IStringLocalizer StringLocalizer { get; } = stringLocalizer; + + protected class Context + { + public Func CreateEmailViewModel { get; set; } = null!; + public string StoreId { get; set; } = null!; + } + + protected abstract Task GetEmailSettings(Context ctx); + + protected virtual Task GetEmailSettingsForTest(Context ctx, EmailsViewModel viewModel) + => Task.FromResult(viewModel.Settings); + + protected abstract Task SaveEmailSettings(Context ctx, EmailSettings settings, EmailsViewModel? viewModel = null); + protected abstract IActionResult RedirectToEmailSettings(Context ctx); + protected abstract Task<(string Subject, string Body)> GetTestMessage(Context ctx); + + protected async Task EmailSettingsCore(Context ctx) + { + var email = await GetEmailSettings(ctx); + var vm = ctx.CreateEmailViewModel(email); + return View("EmailSettings", vm); + } + protected async Task EmailSettingsCore(Context ctx, EmailsViewModel model, string command) + { + if (command == "Test") + { + try + { + if (model.PasswordSet) + { + var settings = await GetEmailSettings(ctx); + model.Settings.Password = settings.Password; + } + + model.Settings.Validate("Settings.", ModelState); + if (string.IsNullOrEmpty(model.TestEmail)) + ModelState.AddModelError(nameof(model.TestEmail), new RequiredAttribute().FormatErrorMessage(nameof(model.TestEmail))); + if (!ModelState.IsValid) + return await EmailSettingsCore(ctx); + var mess = await GetTestMessage(ctx); + var settingsForTest = await GetEmailSettingsForTest(ctx, model); + if (!settingsForTest.IsComplete()) + { + ModelState.AddModelError(nameof(model.TestEmail), "Email settings are not complete."); + return await EmailSettingsCore(ctx); + } + using (var client = await settingsForTest.CreateSmtpClient()) + using (var message = settingsForTest.CreateMailMessage(MailboxAddress.Parse(model.TestEmail), mess.Subject, + mess.Body, false)) + { + await client.SendAsync(message); + await client.DisconnectAsync(true); + } + + TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email sent to {0}. Please verify you received it.", model.TestEmail].Value; + } + catch (Exception ex) + { + TempData[WellKnownTempData.ErrorMessage] = ex.Message; + } + + return await EmailSettingsCore(ctx); + } + else if (command == "ResetPassword") + { + var settings = await GetEmailSettings(ctx); + settings.Password = null; + await SaveEmailSettings(ctx, settings); + TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email server password reset"].Value; + } + else if (command == "mailpit") + { + model.Settings.Server = "localhost"; + model.Settings.Port = 34219; + model.Settings.EnabledCertificateCheck = false; + model.Settings.Login ??= "store@example.com"; + model.Settings.From ??= "store@example.com"; + model.Settings.Password ??= "password"; + await SaveEmailSettings(ctx, model.Settings); + TempData.SetStatusMessageModel(new StatusMessageModel() + { + Severity = StatusMessageModel.StatusSeverity.Info, + AllowDismiss = true, + Html = + "Mailpit is now running on localhost. You can use it to test your SMTP settings." + }); + } + else + { + // save if user provided valid email; this will also clear settings if no model.Settings.From + if (model.Settings.From is not null && !MailboxAddressValidator.IsMailboxAddress(model.Settings.From)) + { + ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]); + return await EmailSettingsCore(ctx); + } + + var oldSettings = await GetEmailSettings(ctx); + if (!string.IsNullOrEmpty(oldSettings.Password)) + model.Settings.Password = oldSettings.Password; + + await SaveEmailSettings(ctx, model.Settings, model); + TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email settings saved"].Value; + } + + return RedirectToEmailSettings(ctx); + } +} diff --git a/BTCPayServer/Plugins/Emails/Controllers/UIEmailRuleControllerBase.cs b/BTCPayServer/Plugins/Emails/Controllers/UIEmailRuleControllerBase.cs new file mode 100644 index 000000000..997aead30 --- /dev/null +++ b/BTCPayServer/Plugins/Emails/Controllers/UIEmailRuleControllerBase.cs @@ -0,0 +1,191 @@ +#nullable enable +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using BTCPayServer.Abstractions.Extensions; +using BTCPayServer.Abstractions.Models; +using BTCPayServer.Client; +using BTCPayServer.Data; +using BTCPayServer.Plugins.Emails.Views; +using BTCPayServer.Plugins.Emails.Views.Shared; +using BTCPayServer.Services.Mails; +using Dapper; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Localization; +using Npgsql; + +namespace BTCPayServer.Plugins.Emails.Controllers; + +public class UIEmailRuleControllerBase( + ApplicationDbContextFactory dbContextFactory, + IStringLocalizer stringLocalizer, + EmailSenderFactory emailSenderFactory) : Controller +{ + public class EmailsRuleControllerContext + { + public string? StoreId { get; set; } + public string EmailSettingsLink { get; set; } = ""; + public List Triggers { get; set; } = new(); + public Func>>? Rules { get; set; } + public Action? ModifyViewModel { get; set; } + + public Func>? GetRule { get; set; } + + public Func RedirectToRuleList = null!; + } + + public ApplicationDbContextFactory DbContextFactory { get; } = dbContextFactory; + public IStringLocalizer StringLocalizer { get; } = stringLocalizer; + + protected async Task EmailRulesListCore(EmailsRuleControllerContext emailCtx) + { + await using var ctx = DbContextFactory.CreateContext(); + var store = HttpContext.GetStoreData(); + var configured = await emailSenderFactory.IsComplete(store.Id); + if (!configured && !TempData.HasStatusMessage()) + { + TempData.SetStatusMessageModel(new StatusMessageModel + { + Severity = StatusMessageModel.StatusSeverity.Warning, + Html = "You need to configure email settings before this feature works." + + $" Configure email settings." + }); + } + + var rules = emailCtx.Rules is null ? new() : await emailCtx.Rules(ctx); + var vm = new EmailRulesListViewModel() + { + StoreId = emailCtx.StoreId, + ModifyPermission = Policies.CanModifyStoreSettings, + Rules = rules.Select(r => new StoreEmailRuleViewModel(r, emailCtx.Triggers)).ToList() + }; + if (emailCtx.ModifyViewModel is not null) + emailCtx.ModifyViewModel(vm); + return View("EmailRulesList", vm); + } + + protected IActionResult EmailRulesCreateCore( + EmailsRuleControllerContext ctx, + string? offeringId = null, + string? trigger = null, + string? condition = null, + string? to = null, + string? redirectUrl = null) + { + return View("EmailRulesManage", new StoreEmailRuleViewModel(null, ctx.Triggers) + { + StoreId = ctx.StoreId, + CanChangeTrigger = trigger is null, + CanChangeCondition = offeringId is null, + Condition = condition, + Trigger = trigger, + OfferingId = offeringId, + RedirectUrl = redirectUrl, + To = to + }); + } + + protected async Task EmailRulesCreateCore( + EmailsRuleControllerContext emailCtx, + StoreEmailRuleViewModel model) + { + await ValidateCondition(model); + if (!ModelState.IsValid) + return EmailRulesCreateCore(emailCtx, + model.OfferingId, + model.CanChangeTrigger ? null : model.Trigger); + + await using var ctx = DbContextFactory.CreateContext(); + var c = new EmailRuleData() + { + StoreId = emailCtx.StoreId, + Trigger = model.Trigger, + Body = model.Body, + Subject = model.Subject, + Condition = string.IsNullOrWhiteSpace(model.Condition) ? null : model.Condition, + OfferingId = model.OfferingId, + To = model.ToAsArray() + }; + c.SetBTCPayAdditionalData(model.AdditionalData); + ctx.EmailRules.Add(c); + await ctx.SaveChangesAsync(); + + this.TempData.SetStatusSuccess(StringLocalizer["Email rule successfully created"]); + return emailCtx.RedirectToRuleList(model.RedirectUrl); + } + + public async Task EmailRulesEditCore(EmailsRuleControllerContext emailCtx, long ruleId, string? redirectUrl = null) + { + await using var ctx = DbContextFactory.CreateContext(); + var r = emailCtx.GetRule is null ? null : await emailCtx.GetRule(ctx, ruleId); + if (r is null) + return NotFound(); + return View("EmailRulesManage", new StoreEmailRuleViewModel(r, emailCtx.Triggers) + { + OfferingId = emailCtx.StoreId, + CanChangeTrigger = r.OfferingId is null, + CanChangeCondition = r.OfferingId is null, + RedirectUrl = redirectUrl + }); + } + + public async Task EmailRulesEditCore(EmailsRuleControllerContext emailCtx, long ruleId, StoreEmailRuleViewModel model) + { + await ValidateCondition(model); + if (!ModelState.IsValid) + return await EmailRulesEditCore(emailCtx, ruleId); + + await using var ctx = DbContextFactory.CreateContext(); + var rule = emailCtx.GetRule is null ? null : await emailCtx.GetRule(ctx, ruleId); + if (rule is null) return NotFound(); + + rule.Trigger = model.Trigger; + rule.SetBTCPayAdditionalData(model.AdditionalData); + rule.To = model.ToAsArray(); + rule.Subject = model.Subject; + rule.Condition = model.Condition; + rule.Body = model.Body; + await ctx.SaveChangesAsync(); + + this.TempData.SetStatusSuccess(StringLocalizer["Email rule successfully updated"]); + return emailCtx.RedirectToRuleList(model.RedirectUrl); + } + + protected async Task EmailRulesDeleteCore(EmailsRuleControllerContext emailCtx, long ruleId, string? redirectUrl) + { + await using var ctx = DbContextFactory.CreateContext(); + var r = emailCtx.GetRule is null ? null : await emailCtx.GetRule(ctx, ruleId); + if (r is not null) + { + ctx.EmailRules.Remove(r); + await ctx.SaveChangesAsync(); + this.TempData.SetStatusSuccess(StringLocalizer["Email rule successfully deleted"]); + } + + return emailCtx.RedirectToRuleList(redirectUrl); + } + + + protected async Task ValidateCondition(StoreEmailRuleViewModel model) + { + model.Condition = model.Condition?.Trim() ?? ""; + if (model.Condition.Length == 0) + model.Condition = null; + else + { + await using var ctx = DbContextFactory.CreateContext(); + try + { + ctx.Database + .GetDbConnection() + .ExecuteScalar("SELECT jsonb_path_exists('{}'::JSONB, @path::jsonpath)", new { path = model.Condition }); + } + catch(PostgresException ex) + { + ModelState.AddModelError(nameof(model.Condition), $"Invalid condition ({ex.MessageText})"); + } + } + } +} diff --git a/BTCPayServer/Plugins/Emails/Controllers/UIServerEmailController.cs b/BTCPayServer/Plugins/Emails/Controllers/UIServerEmailController.cs new file mode 100644 index 000000000..9b2509256 --- /dev/null +++ b/BTCPayServer/Plugins/Emails/Controllers/UIServerEmailController.cs @@ -0,0 +1,74 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; +using BTCPayServer.Abstractions.Constants; +using BTCPayServer.Abstractions.Extensions; +using BTCPayServer.Abstractions.Models; +using BTCPayServer.Client; +using BTCPayServer.Plugins.Emails.Views; +using BTCPayServer.Services; +using BTCPayServer.Services.Mails; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Localization; +using MimeKit; + +namespace BTCPayServer.Plugins.Emails.Controllers; + +[Area(EmailsPlugin.Area)] +[Authorize(Policy = Client.Policies.CanModifyServerSettings, + AuthenticationSchemes = AuthenticationSchemes.Cookie)] +[AutoValidateAntiforgeryToken] +public class UIServerEmailController( + EmailSenderFactory emailSenderFactory, + PoliciesSettings policiesSettings, + SettingsRepository settingsRepository, + IStringLocalizer stringLocalizer + ) : UIEmailControllerBase(stringLocalizer) +{ + protected override async Task GetEmailSettings(Context ctx) + => await emailSenderFactory.GetSettings() ?? new EmailSettings(); + + protected override async Task SaveEmailSettings(Context ctx, EmailSettings settings, EmailsViewModel viewModel = null) + { + await settingsRepository.UpdateSetting(settings); + if (viewModel is not null) + { + if (policiesSettings.DisableStoresToUseServerEmailSettings == viewModel.EnableStoresToUseServerEmailSettings) + { + policiesSettings.DisableStoresToUseServerEmailSettings = !viewModel.EnableStoresToUseServerEmailSettings; + await settingsRepository.UpdateSetting(policiesSettings); + } + } + } + + protected override IActionResult RedirectToEmailSettings(Context ctx) + => RedirectToAction(nameof(ServerEmailSettings)); + + protected override async Task<(string Subject, string Body)> GetTestMessage(Context ctx) + { + var serverSettings = await settingsRepository.GetSettingAsync(); + var serverName = string.IsNullOrEmpty(serverSettings?.ServerName) ? "BTCPay Server" : serverSettings.ServerName; + return ($"{serverName}: Email test", + "You received it, the BTCPay Server SMTP settings work."); + } + + private Context CreateContext() + => new() + { + CreateEmailViewModel = (email) => new EmailsViewModel(email) + { + EnableStoresToUseServerEmailSettings = !policiesSettings.DisableStoresToUseServerEmailSettings, + ModifyPermission = Policies.CanModifyServerSettings, + ViewPermission = Policies.CanModifyServerSettings + } + }; + + [HttpGet("server/emails")] + public Task ServerEmailSettings() + => EmailSettingsCore(CreateContext()); + + [HttpPost("server/emails")] + public Task ServerEmailSettings(EmailsViewModel model, string command) + => EmailSettingsCore(CreateContext(), model, command); +} diff --git a/BTCPayServer/Plugins/Emails/Controllers/UIServerEmailRulesController.cs b/BTCPayServer/Plugins/Emails/Controllers/UIServerEmailRulesController.cs new file mode 100644 index 000000000..f1ba89669 --- /dev/null +++ b/BTCPayServer/Plugins/Emails/Controllers/UIServerEmailRulesController.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using BTCPayServer.Abstractions.Constants; +using BTCPayServer.Abstractions.Extensions; +using BTCPayServer.Abstractions.Models; +using BTCPayServer.Client; +using BTCPayServer.Controllers; +using BTCPayServer.Data; +using BTCPayServer.Plugins.Emails.Views; +using BTCPayServer.Plugins.Emails.Views.Shared; +using BTCPayServer.Services.Mails; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Localization; + +namespace BTCPayServer.Plugins.Emails.Controllers; + +[Area(EmailsPlugin.Area)] +[Route("server/rules")] +[Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie)] +[Authorize(Policy = Policies.CanModifyServerSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] +[AutoValidateAntiforgeryToken] +public class UIServerEmailRulesController( + EmailSenderFactory emailSenderFactory, + IEnumerable triggers, + ApplicationDbContextFactory dbContextFactory, + IStringLocalizer stringLocalizer + ) : UIEmailRuleControllerBase(dbContextFactory, stringLocalizer, emailSenderFactory) +{ + + [HttpGet("")] + public Task ServerEmailRulesList() + => EmailRulesListCore(CreateContext()); + + private EmailsRuleControllerContext CreateContext() + => new() + { + EmailSettingsLink = Url.Action(nameof(UIServerEmailController.ServerEmailSettings), "UIServerEmail") ?? throw new InvalidOperationException("Bug 1928"), + Rules = (ctx) => ctx.EmailRules.GetServerRules().ToListAsync(), + Triggers = triggers.Where(t => t.ServerTrigger).ToList(), + ModifyViewModel = (vm) => + { + vm.ShowCustomerEmailColumn = false; + }, + GetRule = (ctx, ruleId) => ctx.EmailRules.GetServerRule(ruleId), + RedirectToRuleList = GoToStoreServerRulesList + }; + + private IActionResult GoToStoreServerRulesList(string redirectUrl) + { + if (redirectUrl != null) + return LocalRedirect(redirectUrl); + return RedirectToAction(nameof(ServerEmailRulesList)); + } + + [HttpGet("create")] + [Authorize(Policy = Policies.CanModifyServerSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] + public IActionResult ServerEmailRulesCreate( + string trigger = null, + string condition = null, + string to = null, + string redirectUrl = null) + => EmailRulesCreateCore(CreateContext(), null, trigger, condition, to, redirectUrl); + + + [HttpPost("create")] + [Authorize(Policy = Policies.CanModifyServerSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] + public Task ServerEmailRulesCreate(StoreEmailRuleViewModel model) + => EmailRulesCreateCore(CreateContext(), model); + + [HttpGet("{ruleId}/edit")] + [Authorize(Policy = Policies.CanModifyServerSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] + public Task ServerEmailRulesEdit(long ruleId, string redirectUrl = null) + => EmailRulesEditCore(CreateContext(), ruleId, redirectUrl); + + [HttpPost("{ruleId}/edit")] + [Authorize(Policy = Policies.CanModifyServerSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] + public Task ServerEmailRulesEdit(long ruleId, StoreEmailRuleViewModel model) + => EmailRulesEditCore(CreateContext(), ruleId, model); + + [HttpPost("{ruleId}/delete")] + [Authorize(Policy = Policies.CanModifyServerSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] + public Task ServerEmailRulesDelete(long ruleId, string redirectUrl = null) + => EmailRulesDeleteCore(CreateContext(), ruleId, redirectUrl); +} diff --git a/BTCPayServer/Plugins/Emails/Controllers/UIStoreEmailRulesController.cs b/BTCPayServer/Plugins/Emails/Controllers/UIStoreEmailRulesController.cs index 7f689f981..f2b4d44ba 100644 --- a/BTCPayServer/Plugins/Emails/Controllers/UIStoreEmailRulesController.cs +++ b/BTCPayServer/Plugins/Emails/Controllers/UIStoreEmailRulesController.cs @@ -3,19 +3,15 @@ using System.Linq; using System.Threading.Tasks; using BTCPayServer.Abstractions.Constants; using BTCPayServer.Abstractions.Extensions; -using BTCPayServer.Abstractions.Models; using BTCPayServer.Client; using BTCPayServer.Data; using BTCPayServer.Plugins.Emails.Views; -using BTCPayServer.Plugins.Subscriptions.Controllers; using BTCPayServer.Services.Mails; -using Dapper; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Localization; -using Npgsql; namespace BTCPayServer.Plugins.Emails.Controllers; @@ -29,28 +25,26 @@ public class UIStoreEmailRulesController( LinkGenerator linkGenerator, ApplicationDbContextFactory dbContextFactory, IEnumerable triggers, - IStringLocalizer stringLocalizer) : Controller + IStringLocalizer stringLocalizer) : UIEmailRuleControllerBase(dbContextFactory, stringLocalizer, emailSenderFactory) { - public IStringLocalizer StringLocalizer { get; set; } = stringLocalizer; [HttpGet("")] - public async Task StoreEmailRulesList(string storeId) - { - await using var ctx = dbContextFactory.CreateContext(); - var store = HttpContext.GetStoreData(); - var configured = await emailSenderFactory.IsComplete(store.Id); - if (!configured && !TempData.HasStatusMessage()) - { - TempData.SetStatusMessageModel(new StatusMessageModel - { - Severity = StatusMessageModel.StatusSeverity.Warning, - Html = "You need to configure email settings before this feature works." + - $" Configure store email settings." - }); - } + public Task StoreEmailRulesList(string storeId) + => EmailRulesListCore(CreateContext(storeId)); - var rules = await ctx.EmailRules.GetRules(storeId).ToListAsync(); - return View("StoreEmailRulesList", rules.Select(r => new StoreEmailRuleViewModel(r, triggers)).ToList()); - } + private EmailsRuleControllerContext CreateContext(string storeId) + => new() + { + StoreId = storeId, + EmailSettingsLink = linkGenerator.GetStoreEmailSettingsLink(storeId, Request.GetRequestBaseUrl()), + Rules = (ctx) => ctx.EmailRules.GetRules(storeId).ToListAsync(), + Triggers = triggers.Where(t => !t.ServerTrigger).ToList(), + ModifyViewModel = (vm) => + { + vm.ShowCustomerEmailColumn = true; + }, + GetRule = (ctx, ruleId) => ctx.EmailRules.GetRule(storeId, ruleId), + RedirectToRuleList = (redirectUrl) => GoToStoreEmailRulesList(storeId, redirectUrl) + }; [HttpGet("create")] [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] @@ -61,50 +55,13 @@ public class UIStoreEmailRulesController( string condition = null, string to = null, string redirectUrl = null) - { - return View("StoreEmailRulesManage", new StoreEmailRuleViewModel(null, triggers) - { - CanChangeTrigger = trigger is null, - CanChangeCondition = offeringId is null, - Condition = condition, - Trigger = trigger, - OfferingId = offeringId, - RedirectUrl = redirectUrl, - To = to - }); - } + => EmailRulesCreateCore(CreateContext(storeId), offeringId, trigger, condition, to, redirectUrl); [HttpPost("create")] [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] - public async Task StoreEmailRulesCreate(string storeId, StoreEmailRuleViewModel model) - { - await ValidateCondition(model); - if (!ModelState.IsValid) - return StoreEmailRulesCreate(storeId, - model.OfferingId, - model.CanChangeTrigger ? null : model.Trigger); + public Task StoreEmailRulesCreate(string storeId, StoreEmailRuleViewModel model) + => EmailRulesCreateCore(CreateContext(storeId), model); - await using var ctx = dbContextFactory.CreateContext(); - var c = new EmailRuleData() - { - StoreId = storeId, - Trigger = model.Trigger, - Body = model.Body, - Subject = model.Subject, - Condition = string.IsNullOrWhiteSpace(model.Condition) ? null : model.Condition, - OfferingId = model.OfferingId, - To = model.ToAsArray() - }; - c.SetBTCPayAdditionalData(model.AdditionalData); - ctx.EmailRules.Add(c); - await ctx.SaveChangesAsync(); - - this.TempData.SetStatusSuccess(StringLocalizer["Email rule successfully created"]); - return GoToStoreEmailRulesList(storeId, model); - } - - private IActionResult GoToStoreEmailRulesList(string storeId, StoreEmailRuleViewModel model) - => GoToStoreEmailRulesList(storeId, model.RedirectUrl); private IActionResult GoToStoreEmailRulesList(string storeId, string redirectUrl) { if (redirectUrl != null) @@ -114,78 +71,16 @@ public class UIStoreEmailRulesController( [HttpGet("{ruleId}/edit")] [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] - public async Task StoreEmailRulesEdit(string storeId, long ruleId, string redirectUrl = null) - { - await using var ctx = dbContextFactory.CreateContext(); - var r = await ctx.EmailRules.GetRule(storeId, ruleId); - if (r is null) - return NotFound(); - return View("StoreEmailRulesManage", new StoreEmailRuleViewModel(r, triggers) - { - CanChangeTrigger = r.OfferingId is null, - CanChangeCondition = r.OfferingId is null, - RedirectUrl = redirectUrl - }); - } + public Task StoreEmailRulesEdit(string storeId, long ruleId, string redirectUrl = null) + => EmailRulesEditCore(CreateContext(storeId), ruleId, redirectUrl); [HttpPost("{ruleId}/edit")] [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] - public async Task StoreEmailRulesEdit(string storeId, long ruleId, StoreEmailRuleViewModel model) - { - await ValidateCondition(model); - if (!ModelState.IsValid) - return await StoreEmailRulesEdit(storeId, ruleId); - - await using var ctx = dbContextFactory.CreateContext(); - var rule = await ctx.EmailRules.GetRule(storeId, ruleId); - if (rule is null) return NotFound(); - - rule.Trigger = model.Trigger; - rule.SetBTCPayAdditionalData(model.AdditionalData); - rule.To = model.ToAsArray(); - rule.Subject = model.Subject; - rule.Condition = model.Condition; - rule.Body = model.Body; - await ctx.SaveChangesAsync(); - - this.TempData.SetStatusSuccess(StringLocalizer["Email rule successfully updated"]); - return GoToStoreEmailRulesList(storeId, model); - } - - private async Task ValidateCondition(StoreEmailRuleViewModel model) - { - model.Condition = model.Condition?.Trim() ?? ""; - if (model.Condition.Length == 0) - model.Condition = null; - else - { - await using var ctx = dbContextFactory.CreateContext(); - try - { - ctx.Database - .GetDbConnection() - .ExecuteScalar("SELECT jsonb_path_exists('{}'::JSONB, @path::jsonpath)", new { path = model.Condition }); - } - catch(PostgresException ex) - { - ModelState.AddModelError(nameof(model.Condition), $"Invalid condition ({ex.MessageText})"); - } - } - } + public Task StoreEmailRulesEdit(string storeId, long ruleId, StoreEmailRuleViewModel model) + => EmailRulesEditCore(CreateContext(storeId), ruleId, model); [HttpPost("{ruleId}/delete")] [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] - public async Task StoreEmailRulesDelete(string storeId, long ruleId, string redirectUrl = null) - { - await using var ctx = dbContextFactory.CreateContext(); - var r = await ctx.EmailRules.GetRule(storeId, ruleId); - if (r is not null) - { - ctx.EmailRules.Remove(r); - await ctx.SaveChangesAsync(); - this.TempData.SetStatusSuccess(StringLocalizer["Email rule successfully deleted"]); - } - - return GoToStoreEmailRulesList(storeId, redirectUrl); - } + public Task StoreEmailRulesDelete(string storeId, long ruleId, string redirectUrl = null) + => EmailRulesDeleteCore(CreateContext(storeId), ruleId, redirectUrl); } diff --git a/BTCPayServer/Plugins/Emails/Controllers/UIStoresEmailController.cs b/BTCPayServer/Plugins/Emails/Controllers/UIStoresEmailController.cs index 7a7c0b37a..065566c7e 100644 --- a/BTCPayServer/Plugins/Emails/Controllers/UIStoresEmailController.cs +++ b/BTCPayServer/Plugins/Emails/Controllers/UIStoresEmailController.cs @@ -1,22 +1,16 @@ using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Globalization; -using System.Linq; using System.Threading.Tasks; using BTCPayServer.Abstractions.Constants; using BTCPayServer.Abstractions.Extensions; using BTCPayServer.Abstractions.Models; using BTCPayServer.Client; using BTCPayServer.Data; -using BTCPayServer.Models; -using BTCPayServer.Plugins.Emails; +using BTCPayServer.Plugins.Emails.Views; using BTCPayServer.Services.Mails; using BTCPayServer.Services.Stores; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Localization; using MimeKit; @@ -30,24 +24,33 @@ namespace BTCPayServer.Plugins.Emails.Controllers; public class UIStoresEmailController( EmailSenderFactory emailSenderFactory, StoreRepository storeRepository, - IStringLocalizer stringLocalizer) : Controller + IStringLocalizer stringLocalizer) : UIEmailControllerBase(stringLocalizer) { - public IStringLocalizer StringLocalizer { get; set; } = stringLocalizer; + private async Task CreateContext(string storeId) + { + var settings = await GetCustomSettings(storeId); + return new() + { + StoreId = storeId, + CreateEmailViewModel = (email) => new EmailsViewModel(email) + { + IsFallbackSetup = settings.Fallback is not null, + IsCustomSMTP = settings.Custom is not null || settings.Fallback is null, + StoreId = storeId, + ModifyPermission = Policies.CanModifyStoreSettings, + ViewPermission = Policies.CanViewStoreSettings, + } + }; + } + [HttpGet("email-settings")] public async Task StoreEmailSettings(string storeId) - { - var store = HttpContext.GetStoreData(); - if (store == null) - return NotFound(); + => await EmailSettingsCore(await CreateContext(storeId)); - var settings = await GetCustomSettings(store.Id); - - return View(new EmailsViewModel(settings.Custom ?? new()) - { - IsFallbackSetup = settings.Fallback is not null, - IsCustomSMTP = settings.Custom is not null || settings.Fallback is null - }); - } + [HttpPost("email-settings")] + [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] + public async Task StoreEmailSettings(string storeId, EmailsViewModel model, string command) + => await EmailSettingsCore(await CreateContext(storeId), model, command); record AllEmailSettings(EmailSettings Custom, EmailSettings Fallback); private async Task GetCustomSettings(string storeId) @@ -61,96 +64,35 @@ public class UIStoresEmailController( return new(await sender.GetCustomSettings(), fallback); } - [HttpPost("email-settings")] - [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)] - public async Task StoreEmailSettings(string storeId, EmailsViewModel model, string command) + protected override async Task GetEmailSettings(Context ctx) { - var store = HttpContext.GetStoreData(); - if (store == null) - return NotFound(); - var settings = await GetCustomSettings(store.Id); - model.IsFallbackSetup = settings.Fallback is not null; - if (!model.IsFallbackSetup) - model.IsCustomSMTP = true; - if (model.IsCustomSMTP) - { - model.Settings.Validate("Settings.", ModelState); - if (model.Settings.From is not null && !MailboxAddressValidator.IsMailboxAddress(model.Settings.From)) - { - ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]); - } - } + var store = await storeRepository.FindStore(ctx.StoreId); + return store?.GetStoreBlob().EmailSettings ?? new(); + } - var storeBlob = store.GetStoreBlob(); - var currentSettings = store.GetStoreBlob().EmailSettings; - if (model is { IsCustomSMTP: true, Settings: { Password: null } }) - model.Settings.Password = currentSettings?.Password; + protected override async Task GetEmailSettingsForTest(Context ctx, EmailsViewModel model) + { + var settings = await GetCustomSettings(ctx.StoreId); + return (model.IsCustomSMTP ? model.Settings : settings.Fallback) ?? new(); + } - if (!ModelState.IsValid && command is not ("ResetPassword" or "mailpit")) - return View(model); + protected override async Task SaveEmailSettings(Context ctx, EmailSettings settings, EmailsViewModel viewModel = null) + { + var store = await storeRepository.FindStore(ctx.StoreId); + var blob = store?.GetStoreBlob(); + if (blob is null) + return; + blob.EmailSettings = viewModel?.IsCustomSMTP is false ? null : settings; + store.SetStoreBlob(blob); + await storeRepository.UpdateStore(store); + } - if (command == "Test") - { - try - { - if (string.IsNullOrEmpty(model.TestEmail)) - ModelState.AddModelError(nameof(model.TestEmail), new RequiredAttribute().FormatErrorMessage(nameof(model.TestEmail))); - if (!ModelState.IsValid) - return View(model); - var clientSettings = (model.IsCustomSMTP ? model.Settings : settings.Fallback) ?? new(); - using var client = await clientSettings.CreateSmtpClient(); - var message = clientSettings.CreateMailMessage(MailboxAddress.Parse(model.TestEmail), $"{store.StoreName}: Email test", StringLocalizer["You received it, the BTCPay Server SMTP settings work."], false); - await client.SendAsync(message); - await client.DisconnectAsync(true); - TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email sent to {0}. Please verify you received it.", model.TestEmail].Value; - } - catch (Exception ex) - { - TempData[WellKnownTempData.ErrorMessage] = StringLocalizer["Error: {0}", ex.Message].Value; - } - return View(model); - } - else if (command == "mailpit") - { + protected override IActionResult RedirectToEmailSettings(Context ctx) + => RedirectToAction(nameof(StoreEmailSettings), new { storeId = ctx.StoreId }); - storeBlob.EmailSettings = model.Settings; - storeBlob.EmailSettings.Server = "localhost"; - storeBlob.EmailSettings.Port = 34219; - storeBlob.EmailSettings.EnabledCertificateCheck = false; - storeBlob.EmailSettings.Login ??= "store@example.com"; - storeBlob.EmailSettings.From ??= "store@example.com"; - storeBlob.EmailSettings.Password ??= "password"; - store.SetStoreBlob(storeBlob); - await storeRepository.UpdateStore(store); - TempData.SetStatusMessageModel(new StatusMessageModel() - { - Severity = StatusMessageModel.StatusSeverity.Info, - AllowDismiss = true, - Html = "Mailpit is now running on localhost. You can use it to test your SMTP settings." - }); - } - else if (command == "ResetPassword") - { - if (storeBlob.EmailSettings is not null) - storeBlob.EmailSettings.Password = null; - store.SetStoreBlob(storeBlob); - await storeRepository.UpdateStore(store); - TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email server password reset"].Value; - } - else if (!model.IsCustomSMTP && currentSettings is not null) - { - storeBlob.EmailSettings = null; - store.SetStoreBlob(storeBlob); - await storeRepository.UpdateStore(store); - TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["You are now using server's email settings"].Value; - } - else if (model.IsCustomSMTP) - { - storeBlob.EmailSettings = model.Settings; - store.SetStoreBlob(storeBlob); - await storeRepository.UpdateStore(store); - TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["Email settings saved"].Value; - } - return RedirectToAction(nameof(StoreEmailSettings), new { storeId }); + protected override async Task<(string Subject, string Body)> GetTestMessage(Context ctx) + { + var store = await storeRepository.FindStore(ctx.StoreId); + return ($"{store?.StoreName}: Email test", "You received it, the BTCPay Server SMTP settings work."); } } diff --git a/BTCPayServer/Plugins/Emails/StoreEmailRuleProcessorSender.cs b/BTCPayServer/Plugins/Emails/EmailRuleProcessorSender.cs similarity index 95% rename from BTCPayServer/Plugins/Emails/StoreEmailRuleProcessorSender.cs rename to BTCPayServer/Plugins/Emails/EmailRuleProcessorSender.cs index 25237532e..68dc707f7 100644 --- a/BTCPayServer/Plugins/Emails/StoreEmailRuleProcessorSender.cs +++ b/BTCPayServer/Plugins/Emails/EmailRuleProcessorSender.cs @@ -52,8 +52,7 @@ public class StoreEmailRuleProcessorSender( if (evt is TriggerEvent triggEvent) { await using var ctx = dbContextFactory.CreateContext(); - var actionableRules = await ctx.EmailRules - .GetMatches(triggEvent.StoreId, triggEvent.Trigger, triggEvent.Model); + var actionableRules = await ctx.EmailRules.GetMatches(triggEvent.StoreId, triggEvent.Trigger, triggEvent.Model); if (actionableRules.Length > 0) { diff --git a/BTCPayServer/Plugins/Emails/EmailsPlugin.cs b/BTCPayServer/Plugins/Emails/EmailsPlugin.cs index 0b8677523..73537c7ff 100644 --- a/BTCPayServer/Plugins/Emails/EmailsPlugin.cs +++ b/BTCPayServer/Plugins/Emails/EmailsPlugin.cs @@ -1,4 +1,6 @@ +using System.Collections.Generic; using BTCPayServer.Abstractions.Models; +using BTCPayServer.Plugins.Emails.Views; using BTCPayServer.Plugins.Webhooks; using BTCPayServer.Services; using Microsoft.Extensions.DependencyInjection; @@ -17,5 +19,50 @@ public class EmailsPlugin : BaseBTCPayServerPlugin { services.AddSingleton(); services.AddSingleton(); + RegisterServerEmailTriggers(services); + } + private static string BODY_STYLE = "font-family: Open Sans, Helvetica Neue,Arial,sans-serif; font-color: #292929;"; + private static string HEADER_HTML = "

    {Branding.ServerName}


    "; + private static string BUTTON_HTML = "{button_description}"; + + private static string CallToAction(string actionName, string actionLink) + { + var button = $"{BUTTON_HTML}".Replace("{button_description}", actionName, System.StringComparison.InvariantCulture); + return button.Replace("{button_link}", actionLink, System.StringComparison.InvariantCulture); + } + + private static string CreateEmailBody(string body) => $"{HEADER_HTML}{body}"; + private void RegisterServerEmailTriggers(IServiceCollection services) + { + + List vms = new(); + + var vm = new EmailTriggerViewModel() + { + Trigger = ServerMailTriggers.PasswordReset, + RecipientExample = "{User.MailboxAddress}", + SubjectExample = "Update Password", + BodyExample = CreateEmailBody($"A request has been made to reset your {{Branding.ServerName}} password. Please set your password by clicking below.

    {CallToAction("Update Password", "{ResetLink}")}"), + PlaceHolders = new() + { + new ("{ResetLink}", "The link to the password reset page") + }, + Description = "Password Reset Requested", + }; + vms.Add(vm); + var commonPlaceholders = new List() + { + new("{User.Name}", "The name of the user (eg. John Doe)"), + new("{User.Email}", "The email of the user (eg. john.doe@example.com)"), + new("{User.MailboxAddress}", "The formatted mailbox address to use when sending an email. (eg. \"John Doe\" )"), + new("{Branding.ServerName}", "The name of the server (You can configure this in Server Settings ➡ Branding)"), + new("{Branding.ContactUrl}", "The contact URL of the server (You can configure this in Server Settings ➡ Branding)"), + }; + foreach (var v in vms) + { + v.ServerTrigger = true; + v.PlaceHolders.InsertRange(0, commonPlaceholders); + services.AddSingleton(v); + } } } diff --git a/BTCPayServer/Plugins/Emails/ServerMailTriggers.cs b/BTCPayServer/Plugins/Emails/ServerMailTriggers.cs new file mode 100644 index 000000000..c5ee029b3 --- /dev/null +++ b/BTCPayServer/Plugins/Emails/ServerMailTriggers.cs @@ -0,0 +1,11 @@ +namespace BTCPayServer.Plugins.Emails; + +public class ServerMailTriggers +{ + public const string PasswordReset = "SRV-PasswordReset"; + public const string InvitePending = "SRV-InvitePending"; + public const string InviteConfirmed = "SRV-InviteConfirmed"; + public const string ApprovalConfirmed = "SRV-ApprovalConfirmed"; + public const string ApprovalPending = "SRV-ApprovalPending"; + public const string EmailConfirm = "SRV-EmailConfirmation"; +} diff --git a/BTCPayServer/Plugins/Emails/Views/EmailTriggerViewModel.cs b/BTCPayServer/Plugins/Emails/Views/EmailTriggerViewModel.cs index 02b03a674..66a81e672 100644 --- a/BTCPayServer/Plugins/Emails/Views/EmailTriggerViewModel.cs +++ b/BTCPayServer/Plugins/Emails/Views/EmailTriggerViewModel.cs @@ -20,4 +20,6 @@ public class EmailTriggerViewModel } public List PlaceHolders { get; set; } = new(); + public bool ServerTrigger { get; set; } + public string RecipientExample { get; set; } } diff --git a/BTCPayServer/Models/EmailsViewModel.cs b/BTCPayServer/Plugins/Emails/Views/EmailsViewModel.cs similarity index 67% rename from BTCPayServer/Models/EmailsViewModel.cs rename to BTCPayServer/Plugins/Emails/Views/EmailsViewModel.cs index 4c516c0f6..3a435c9ef 100644 --- a/BTCPayServer/Models/EmailsViewModel.cs +++ b/BTCPayServer/Plugins/Emails/Views/EmailsViewModel.cs @@ -2,13 +2,19 @@ using System.ComponentModel.DataAnnotations; using BTCPayServer.Services.Mails; using BTCPayServer.Validation; -namespace BTCPayServer.Models; +namespace BTCPayServer.Plugins.Emails.Views; public class EmailsViewModel { + public string ModifyPermission { get; set; } + public string ViewPermission { get; set; } + public string StoreId { get; set; } public EmailSettings Settings { get; set; } public bool PasswordSet { get; set; } + [Display(Name = "Allow Stores use the Server's SMTP email settings as their default")] + public bool EnableStoresToUseServerEmailSettings { get; set; } + [MailboxAddress] [Display(Name = "Test Email")] public string TestEmail { get; set; } diff --git a/BTCPayServer/Plugins/Emails/Views/Shared/EmailRulesList.cshtml b/BTCPayServer/Plugins/Emails/Views/Shared/EmailRulesList.cshtml new file mode 100644 index 000000000..9f6d5fb6f --- /dev/null +++ b/BTCPayServer/Plugins/Emails/Views/Shared/EmailRulesList.cshtml @@ -0,0 +1,120 @@ +@using BTCPayServer.Views.Server +@model EmailRulesListViewModel + +@{ + var storeId = Model.StoreId; + + if (storeId is null) + { + ViewData.SetLayoutModel(new LayoutModel("Server-" + nameof(ServerNavPages.Emails), StringLocalizer["Email Rules"]) + .SetCategory(WellKnownCategories.Server)); + } + else + { + ViewData.SetLayoutModel(new LayoutModel(nameof(StoreNavPages.Emails), StringLocalizer["Email Rules"]) + .SetCategory(WellKnownCategories.Store)); + } +} +
    + + @if (storeId is not null) + { + + Create Email Rule + + } + else + { + + Create Email Rule + + } +
    + + +@if (storeId is not null) +{ +

    + Email rules allow BTCPay Server to send customized emails from your store based on events. +

    +} +else +{ +

    + Email rules allow BTCPay Server to send customized emails from your server based on events. +

    +} + +@if (Model.Rules.Any()) +{ +
    + + + + + @if (Model.ShowCustomerEmailColumn) + { + + } + + + + + + + @foreach (var rule in Model.Rules) + { + + + @if (Model.ShowCustomerEmailColumn) + { + + } + + + + + } + +
    TriggerCustomer EmailToSubject
    @rule.Trigger@(rule.AdditionalData.CustomerEmail is true ? StringLocalizer["Yes"] : StringLocalizer["No"])@string.Join(", ", rule.To)@rule.Subject +
    + @if (storeId is not null) + { + + Edit + {0}.", Html.Encode(rule.Trigger)]" data-confirm-input="@StringLocalizer["Delete"]" text-translate="true">Remove + } + else + { + Edit + {0}.", Html.Encode(rule.Trigger)]" data-confirm-input="@StringLocalizer["Delete"]" text-translate="true">Remove + } +
    +
    +
    +} +else +{ +

    + There are no rules yet. +

    +} + + diff --git a/BTCPayServer/Plugins/Emails/Views/Shared/EmailRulesListViewModel.cs b/BTCPayServer/Plugins/Emails/Views/Shared/EmailRulesListViewModel.cs new file mode 100644 index 000000000..9bf6faba2 --- /dev/null +++ b/BTCPayServer/Plugins/Emails/Views/Shared/EmailRulesListViewModel.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; + +namespace BTCPayServer.Plugins.Emails.Views.Shared; + +public class EmailRulesListViewModel +{ + public string StoreId { get; set; } + public string ModifyPermission { get; set; } + public bool ShowCustomerEmailColumn { get; set; } + public List Rules { get; set; } +} diff --git a/BTCPayServer/Plugins/Emails/Views/UIStoreEmailRules/StoreEmailRulesManage.cshtml b/BTCPayServer/Plugins/Emails/Views/Shared/EmailRulesManage.cshtml similarity index 82% rename from BTCPayServer/Plugins/Emails/Views/UIStoreEmailRules/StoreEmailRulesManage.cshtml rename to BTCPayServer/Plugins/Emails/Views/Shared/EmailRulesManage.cshtml index a13088d95..2b3a4564e 100644 --- a/BTCPayServer/Plugins/Emails/Views/UIStoreEmailRules/StoreEmailRulesManage.cshtml +++ b/BTCPayServer/Plugins/Emails/Views/Shared/EmailRulesManage.cshtml @@ -1,29 +1,52 @@ +@using BTCPayServer.Views.Server @model StoreEmailRuleViewModel @{ - var storeId = Context.GetStoreData().Id; + var storeId = Model.StoreId; bool isEdit = Model.Trigger != null; - ViewData.SetLayoutModel(new LayoutModel(nameof(StoreNavPages.Emails), StringLocalizer[isEdit ? "Edit Email Rule" : "Create Email Rule"]) - .SetCategory(WellKnownCategories.Store)); + if (storeId is not null) + { + ViewData.SetLayoutModel(new LayoutModel(nameof(StoreNavPages.Emails), StringLocalizer[isEdit ? "Edit Email Rule" : "Create Email Rule"]) + .SetCategory(WellKnownCategories.Store)); + } + else + { + ViewData.SetLayoutModel(new LayoutModel("Server-" + nameof(ServerNavPages.Emails), StringLocalizer[isEdit ? "Edit Email Rule" : "Create Email Rule"]) + .SetCategory(WellKnownCategories.Server)); + } } @section PageHeadContent { } -
    +
    @@ -57,7 +80,7 @@ @if (Model.CanChangeCondition) { - + } else { @@ -115,6 +138,7 @@ const triggerSelect = document.querySelector('.email-rule-trigger') ?? document.querySelector('.email-rule-trigger-hidden'); const subjectInput = document.querySelector('.email-rule-subject'); + const recipientInput = document.querySelector('.email-rule-to'); const bodyTextarea = document.querySelector('.email-rule-body'); const placeholdersTd = document.querySelector('#placeholders'); @@ -131,6 +155,9 @@ if (isEmptyOrDefault(subjectInput.value, 'subjectExample')) { subjectInput.value = triggersByType[selectedTrigger].subjectExample; } + if (isEmptyOrDefault(recipientInput.value, 'recipientExample')) { + recipientInput.value = triggersByType[selectedTrigger].recipientExample; + } var body = triggersByType[selectedTrigger].bodyExample; if (isEmptyOrDefault(bodyTextarea.value, 'bodyExample')) { diff --git a/BTCPayServer/Plugins/Emails/Views/Shared/EmailSettings.cshtml b/BTCPayServer/Plugins/Emails/Views/Shared/EmailSettings.cshtml new file mode 100644 index 000000000..4f837274b --- /dev/null +++ b/BTCPayServer/Plugins/Emails/Views/Shared/EmailSettings.cshtml @@ -0,0 +1,192 @@ +@using BTCPayServer.Views.Server +@model EmailsViewModel +@{ + if (Model.StoreId is null) + { + ViewData.SetLayoutModel(new LayoutModel("Server-" + nameof(ServerNavPages.Emails), StringLocalizer["Emails"]).SetCategory(WellKnownCategories.Server)); + } + else + { + ViewData.SetLayoutModel(new LayoutModel(nameof(StoreNavPages.Emails), StringLocalizer["Email Rules"]) + .SetCategory(WellKnownCategories.Store)); + } +} + + +
    +

    @ViewData.GetTitle()

    +
    + + @if (Model.StoreId is null) + { + + Go to email rules + + } + else + { + + Go to email rules + + } + +
    +
    + +
    +
    + @if (!ViewContext.ModelState.IsValid) + { +
    + } + @if (Model.StoreId is null) + { +
    +
    + +
    + +
    + This can be overridden at the Store level. + + + +
    +
    +
    +
    + } + else + { + @if (Model.IsFallbackSetup) + { + + } + else + { + + } + } + +
    +
    +
    + + +
    + + +
    +
    + + + +
    +
    + + "]" /> + +
    +
    + + +
    For many email providers (like Gmail) your login is your email address.
    + +
    +
    + + @if (!Model.PasswordSet) + { + + + } + else + { +
    + + +
    + } +
    + +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +

    Testing

    +
    +
    +
    + + "]" class="form-control" /> + +
    + +
    +
    + + +@section PageFootContent { + + +} diff --git a/BTCPayServer/Plugins/Emails/Views/StoreEmailRuleViewModel.cs b/BTCPayServer/Plugins/Emails/Views/StoreEmailRuleViewModel.cs index 1fd81ecf9..f78f4138e 100644 --- a/BTCPayServer/Plugins/Emails/Views/StoreEmailRuleViewModel.cs +++ b/BTCPayServer/Plugins/Emails/Views/StoreEmailRuleViewModel.cs @@ -16,6 +16,7 @@ public class StoreEmailRuleViewModel { if (data is not null) { + StoreId = data.StoreId; Data = data; OfferingId = data.OfferingId; AdditionalData = data.GetBTCPayAdditionalData() ?? new(); @@ -51,6 +52,7 @@ public class StoreEmailRuleViewModel public bool CanChangeTrigger { get; set; } = true; public bool CanChangeCondition { get; set; } = true; public string OfferingId { get; set; } + public string StoreId { get; set; } public string[] ToAsArray() => (To ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries) diff --git a/BTCPayServer/Plugins/Emails/Views/UIStoreEmailRules/StoreEmailRulesList.cshtml b/BTCPayServer/Plugins/Emails/Views/UIStoreEmailRules/StoreEmailRulesList.cshtml deleted file mode 100644 index 4b2a2e630..000000000 --- a/BTCPayServer/Plugins/Emails/Views/UIStoreEmailRules/StoreEmailRulesList.cshtml +++ /dev/null @@ -1,69 +0,0 @@ -@model List - -@{ - var storeId = Context.GetStoreData().Id; - ViewData.SetLayoutModel(new LayoutModel(nameof(StoreNavPages.Emails), StringLocalizer["Email Rules"]) - .SetCategory(WellKnownCategories.Store)); -} -
    - - - Create Email Rule - -
    - - -

    - Email rules allow BTCPay Server to send customized emails from your store based on events. -

    - -@if (Model.Any()) -{ -
    - - - - - - - - - - - - @foreach (var rule in Model) - { - - - - - - - - } - -
    TriggerCustomer EmailToSubject
    @rule.Trigger@(rule.AdditionalData.CustomerEmail is true ? StringLocalizer["Yes"] : StringLocalizer["No"])@string.Join(", ", rule.To)@rule.Subject -
    - Edit - {0}.", Html.Encode(rule.Trigger)]" data-confirm-input="@StringLocalizer["Delete"]" text-translate="true">Remove -
    -
    -
    -} -else -{ -

    - There are no rules yet. -

    -} - - diff --git a/BTCPayServer/Plugins/Emails/Views/UIStoresEmail/StoreEmailSettings.cshtml b/BTCPayServer/Plugins/Emails/Views/UIStoresEmail/StoreEmailSettings.cshtml deleted file mode 100644 index c6411a96d..000000000 --- a/BTCPayServer/Plugins/Emails/Views/UIStoresEmail/StoreEmailSettings.cshtml +++ /dev/null @@ -1,56 +0,0 @@ -@using BTCPayServer.Client -@using BTCPayServer.Plugins.Emails -@using Microsoft.AspNetCore.Mvc.TagHelpers -@model BTCPayServer.Models.EmailsViewModel -@{ - var storeId = Context.GetStoreData().Id; - ViewData.SetLayoutModel(new LayoutModel(nameof(StoreNavPages.Emails), StringLocalizer["Email Rules"]) - .SetCategory(WellKnownCategories.Store)); -} - -
    -
    -

    Email Server

    -
    - - -
    -
    - - @if (Model.IsFallbackSetup) - { - - -
    - -
    - } - else - { - - - } - - - - -
    -

    Email Rules

    -

    Email rules allow BTCPay Server to send customized emails from your store based on events.

    - - Configure - -
    - -@section PageFootContent { - -} diff --git a/BTCPayServer/Program.cs b/BTCPayServer/Program.cs index cc183db6d..04e83632a 100644 --- a/BTCPayServer/Program.cs +++ b/BTCPayServer/Program.cs @@ -16,6 +16,9 @@ using Microsoft.Extensions.Logging; [assembly: InternalsVisibleTo("BTCPayServer.Tests")] +// This help JetBrains to find partial views referenced by views in plugins +[assembly: JetBrains.Annotations.AspMvcAreaPartialViewLocationFormat("/Plugins/{2}/Views/Shared/{0}.cshtml")] + namespace BTCPayServer { class Program diff --git a/BTCPayServer/Views/Shared/EmailsBody.cshtml b/BTCPayServer/Views/Shared/EmailsBody.cshtml deleted file mode 100644 index ceca7f7f3..000000000 --- a/BTCPayServer/Views/Shared/EmailsBody.cshtml +++ /dev/null @@ -1,101 +0,0 @@ -@using BTCPayServer.Client -@using Microsoft.AspNetCore.Mvc.TagHelpers -@using BTCPayServer.Abstractions.TagHelpers -@using BTCPayServer.Models.ServerViewModels -@model BTCPayServer.Models.EmailsViewModel - -
    -
    - @if (!ViewContext.ModelState.IsValid) - { -
    - } -
    -
    - - -
    - - -
    -
    - - - -
    -
    - - "]" /> - -
    -
    - - -
    For many email providers (like Gmail) your login is your email address.
    - -
    -
    - - @if (!Model.PasswordSet) - { - - - } - else - { -
    - - -
    - } -
    - -
    - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    - - diff --git a/BTCPayServer/Views/Shared/EmailsTest.cshtml b/BTCPayServer/Views/Shared/EmailsTest.cshtml deleted file mode 100644 index 038522826..000000000 --- a/BTCPayServer/Views/Shared/EmailsTest.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@model BTCPayServer.Models.EmailsViewModel - -

    Testing

    -
    -
    -
    - - "]" class="form-control" /> - -
    - -
    -
    diff --git a/BTCPayServer/Views/UIAccount/ForgotPassword.cshtml b/BTCPayServer/Views/UIAccount/ForgotPassword.cshtml index dba8c1617..d5f50c3b1 100644 --- a/BTCPayServer/Views/UIAccount/ForgotPassword.cshtml +++ b/BTCPayServer/Views/UIAccount/ForgotPassword.cshtml @@ -24,7 +24,7 @@
    - +
    } diff --git a/BTCPayServer/Views/UIServer/Emails.cshtml b/BTCPayServer/Views/UIServer/Emails.cshtml deleted file mode 100644 index f1b3d9c0c..000000000 --- a/BTCPayServer/Views/UIServer/Emails.cshtml +++ /dev/null @@ -1,35 +0,0 @@ -@model ServerEmailsViewModel -@{ - ViewData.SetLayoutModel(new LayoutModel("Server-" + nameof(ServerNavPages.Emails), StringLocalizer["Emails"]).SetCategory(WellKnownCategories.Server)); -} - -
    -
    -

    @ViewData["Title"]

    -
    - - -
    -
    - -
    -
    - -
    - -
    - This can be overridden at the Store level. - - - -
    -
    -
    -
    - - - - -@section PageFootContent { - -}