hrynco/hrynco-notification-service
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(notification): save smtp sender without reentering password

Browse Source 
Preserve the saved SMTP password when connection settings are unchanged and keep it out of admin forms.

Ref: IT-1601
This commit is contained in:
Anatolii Hrynchuk
2026-10-18 00:35:17 +03:00
parent c5eee69018
commit 1c028313ba
5 changed files with 184 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HrynCo.NotificationService.Web/Controllers/Admin/AdminChannelsController.cs
+41 -11
View File
@@ -65,7 +65,6 @@ public class AdminChannelsController(IMediator mediator) : Controller
Host = smtp.Host,
Port = smtp.Port,
Username = smtp.Username,
Password = smtp.Password,
UseSsl = smtp.UseSsl,
FromEmail = smtp.FromEmail,
FromName = smtp.FromName
@@ -80,14 +79,21 @@ public class AdminChannelsController(IMediator mediator) : Controller
public async Task<IActionResult> Save(EmailChannelEditViewModel model, CancellationToken ct)
{
if (!ModelState.IsValid)
return View("Edit", model);
return EditWithErrors(model);
var (password, passwordError) = await ResolvePasswordForSave(model, ct);
if (passwordError is not null)
{
ModelState.AddModelError(nameof(model.Password), passwordError);
return EditWithErrors(model);
}
var smtpSettings = new SmtpChannelSettings
{
Host = model.Host,
Port = model.Port,
Username = model.Username,
Password = model.Password,
Password = password,
UseSsl = model.UseSsl,
FromEmail = model.FromEmail,
FromName = model.FromName
@@ -109,7 +115,7 @@ public class AdminChannelsController(IMediator mediator) : Controller
if (!result.IsSuccess)
{
ModelState.AddModelError("", result.Error?.Message ?? "Failed to create channel.");
return View("Edit", model);
return EditWithErrors(model);
}
}
else
@@ -127,13 +133,36 @@ public class AdminChannelsController(IMediator mediator) : Controller
if (!result.IsSuccess)
{
ModelState.AddModelError("", result.Error?.Message ?? "Failed to update channel.");
return View("Edit", model);
return EditWithErrors(model);
}
}
return RedirectToAction(nameof(Index));
}
private async Task<(string Password, string? Error)> ResolvePasswordForSave(
EmailChannelEditViewModel model, CancellationToken ct)
{
if (!string.IsNullOrEmpty(model.Password))
return (model.Password, null);
if (model.IsNew)
return ("", "The Password field is required.");
var channelResult = await mediator.Send(new GetEmailChannelQuery(model.Id), ct);
if (!channelResult.IsSuccess || channelResult.Result?.Settings is not SmtpChannelSettings saved)
return ("", "SMTP channel not found.");
if (!MatchesSavedSmtpConnection(model.Host, model.Port, model.Username, model.UseSsl, saved))
return ("", "Enter the password to save changed SMTP connection settings.");
return (saved.Password, null);
}
private IActionResult EditWithErrors(EmailChannelEditViewModel model)
{
model.Password = null;
return View("Edit", model);
}
// POST /admin/channels/test-smtp
[HttpPost("test-smtp")]
public async Task<IActionResult> TestSmtp([FromBody] TestSmtpRequest request, CancellationToken ct)
@@ -145,7 +174,7 @@ public class AdminChannelsController(IMediator mediator) : Controller
if (!channelResult.IsSuccess || channelResult.Result?.Settings is not SmtpChannelSettings saved)
return Ok(new { success = false, message = "SMTP channel not found." });
if (!MatchesSavedSmtpConnection(request, saved))
if (!MatchesSavedSmtpConnection(request.Host, request.Port, request.Username, request.UseSsl, saved))
return Ok(new { success = false, message = "Enter the password to test changed SMTP connection settings." });
password = saved.Password;
@@ -161,11 +190,12 @@ public class AdminChannelsController(IMediator mediator) : Controller
return Ok(new { success = true, message = $"Test email sent to {request.ToEmail}." });
}
private static bool MatchesSavedSmtpConnection(TestSmtpRequest request, SmtpChannelSettings saved) =>
string.Equals(request.Host, saved.Host, StringComparison.OrdinalIgnoreCase)
&& request.Port == saved.Port
&& string.Equals(request.Username, saved.Username, StringComparison.Ordinal)
&& request.UseSsl == saved.UseSsl;
private static bool MatchesSavedSmtpConnection(
string host, int port, string username, bool useSsl, SmtpChannelSettings saved) =>
string.Equals(host, saved.Host, StringComparison.OrdinalIgnoreCase)
&& port == saved.Port
&& string.Equals(username, saved.Username, StringComparison.Ordinal)
&& useSsl == saved.UseSsl;
// POST /admin/channels/{id}/test
[HttpPost("{id:guid}/test")]