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

Fix: Unable to reset email settings (#6963)

Browse Source
This commit is contained in:
Nicolas Dorier
2025-10-23 17:29:42 +09:00
committed by GitHub
parent 02adde7fd5
commit 42490c389d
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BTCPayServer/Plugins/Emails/Controllers/UIStoresEmailController.cs
View File

@@ -79,8 +79,6 @@ public class UIStoresEmailController(
{ {
ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]); ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]);
} }
if (!ModelState.IsValid)
return View(model);
} }
var storeBlob = store.GetStoreBlob(); var storeBlob = store.GetStoreBlob();
@@ -88,6 +86,9 @@ public class UIStoresEmailController(
if (model is { IsCustomSMTP: true, Settings: { Password: null } }) if (model is { IsCustomSMTP: true, Settings: { Password: null } })
model.Settings.Password = currentSettings?.Password; model.Settings.Password = currentSettings?.Password;
if (!ModelState.IsValid && command is not ("ResetPassword" or "mailpit"))
return View(model);
if (command == "Test") if (command == "Test")
{ {
try try

30
BTCPayServer/Services/Mails/EmailSettings.cs
View File

@@ -27,7 +27,7 @@ namespace BTCPayServer.Services.Mails
get => !DisableCertificateCheck; get => !DisableCertificateCheck;
set { DisableCertificateCheck = !value; } set { DisableCertificateCheck = !value; }
} }
// Conversion functions for mapping to and from the client EmailSettingsData model // Conversion functions for mapping to and from the client EmailSettingsData model
#nullable enable #nullable enable
public static EmailSettings FromData(EmailSettingsData data, string? existingPassword) public static EmailSettings FromData(EmailSettingsData data, string? existingPassword)
@@ -37,12 +37,12 @@ namespace BTCPayServer.Services.Mails
Port = data.Port, Port = data.Port,
Login = data.Login, Login = data.Login,
// If login was provided but password was not, use the existing password from database // If login was provided but password was not, use the existing password from database
Password = !string.IsNullOrEmpty(data.Login) && string.IsNullOrEmpty(data.Password) ? Password = !string.IsNullOrEmpty(data.Login) && string.IsNullOrEmpty(data.Password) ?
existingPassword : data.Password, existingPassword : data.Password,
From = data.From, From = data.From,
DisableCertificateCheck = data.DisableCertificateCheck DisableCertificateCheck = data.DisableCertificateCheck
}; };
public T ToData<T>() where T : EmailSettingsData, new() public T ToData<T>() where T : EmailSettingsData, new()
=> new T() => new T()
{ {
@@ -54,34 +54,24 @@ namespace BTCPayServer.Services.Mails
DisableCertificateCheck = DisableCertificateCheck DisableCertificateCheck = DisableCertificateCheck
}; };
#nullable restore #nullable restore
// //
public bool IsComplete() public bool IsComplete()
{ {
return MailboxAddressValidator.IsMailboxAddress(From) return MailboxAddressValidator.IsMailboxAddress(From)
&& !string.IsNullOrWhiteSpace(Server) && !string.IsNullOrWhiteSpace(Server)
&& Port != null; && Port != null
&& !string.IsNullOrWhiteSpace(From)
&& MailboxAddressValidator.IsMailboxAddress(From);
} }
public void Validate(string prefixKey, ModelStateDictionary modelState) public void Validate(string prefixKey, ModelStateDictionary modelState)
{ {
if (string.IsNullOrWhiteSpace(From)) if (!string.IsNullOrEmpty(From) && !MailboxAddressValidator.IsMailboxAddress(From))
{
modelState.AddModelError($"{prefixKey}{nameof(From)}", new RequiredAttribute().FormatErrorMessage(nameof(From)));
}
if (!MailboxAddressValidator.IsMailboxAddress(From))
{ {
modelState.AddModelError($"{prefixKey}{nameof(From)}", MailboxAddressAttribute.ErrorMessageConst); modelState.AddModelError($"{prefixKey}{nameof(From)}", MailboxAddressAttribute.ErrorMessageConst);
} }
if (string.IsNullOrWhiteSpace(Server))
{
modelState.AddModelError($"{prefixKey}{nameof(Server)}", new RequiredAttribute().FormatErrorMessage(nameof(Server)));
}
if (Port is null)
{
modelState.AddModelError($"{prefixKey}{nameof(Port)}", new RequiredAttribute().FormatErrorMessage(nameof(Port)));
}
} }
public MimeMessage CreateMailMessage(MailboxAddress to, string subject, string message, bool isHtml) => public MimeMessage CreateMailMessage(MailboxAddress to, string subject, string message, bool isHtml) =>