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

IsMailboxAddress already checks for null, simplifying code

Browse Source
This commit is contained in:
rockstardev
2025-03-05 21:11:22 -06:00
parent be8ecb823e
commit 8094800cfc
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs
View File

@@ -306,14 +306,12 @@ namespace BTCPayServer.Controllers.Greenfield
{ {
if (request.Email is null) if (request.Email is null)
ModelState.AddModelError(nameof(request.Email), "Email is missing"); ModelState.AddModelError(nameof(request.Email), "Email is missing");
if (!string.IsNullOrEmpty(request.Email) && !MailboxAddressValidator.IsMailboxAddress(request.Email)) if (!MailboxAddressValidator.IsMailboxAddress(request.Email))
{
ModelState.AddModelError(nameof(request.Email), "Invalid email"); ModelState.AddModelError(nameof(request.Email), "Invalid email");
}
if (!ModelState.IsValid) if (!ModelState.IsValid)
{
return this.CreateValidationError(ModelState); return this.CreateValidationError(ModelState);
}
if (User.Identity is null) if (User.Identity is null)
throw new JsonHttpException(this.StatusCode(401)); throw new JsonHttpException(this.StatusCode(401));
var anyAdmin = (await _userManager.GetUsersInRoleAsync(Roles.ServerAdmin)).Any(); var anyAdmin = (await _userManager.GetUsersInRoleAsync(Roles.ServerAdmin)).Any();

2
BTCPayServer/Controllers/UIServerController.cs
View File

@@ -1257,7 +1257,7 @@ namespace BTCPayServer.Controllers
} }
// save // save
if (model.Settings.From is not null && !MailboxAddressValidator.IsMailboxAddress(model.Settings.From)) if (!MailboxAddressValidator.IsMailboxAddress(model.Settings.From))
{ {
ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]); ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]);
return View(model); return View(model);

2
BTCPayServer/Controllers/UIStoresController.Email.cs
View File

@@ -209,7 +209,7 @@ public partial class UIStoresController
if (model.IsCustomSMTP) if (model.IsCustomSMTP)
{ {
model.Settings.Validate("Settings.", ModelState); model.Settings.Validate("Settings.", ModelState);
if (model.Settings.From is not null && !MailboxAddressValidator.IsMailboxAddress(model.Settings.From)) if (!MailboxAddressValidator.IsMailboxAddress(model.Settings.From))
{ {
ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]); ModelState.AddModelError("Settings.From", StringLocalizer["Invalid email"]);
} }