Browse Source

Merge pull request #19252 from abpframework/EngincanV/check-emailaddress

pull/19254/head
maliming 3 years ago
committed by GitHub
parent
commit
d6b71d9f93
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 15
      framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderBase.cs
  2. 0
      framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/ValidationHelper.cs

15
framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderBase.cs

@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Volo.Abp.BackgroundJobs;
using Volo.Abp.Validation;
namespace Volo.Abp.Emailing;
@ -84,6 +85,8 @@ public abstract class EmailSenderBase : IEmailSender
public virtual async Task QueueAsync(string to, string subject, string body, bool isBodyHtml = true, AdditionalEmailSendingArgs? additionalEmailSendingArgs = null)
{
ValidateEmailAddress(to);
if (!BackgroundJobManager.IsAvailable())
{
await SendAsync(to, subject, body, isBodyHtml, additionalEmailSendingArgs);
@ -104,6 +107,8 @@ public abstract class EmailSenderBase : IEmailSender
public virtual async Task QueueAsync(string from, string to, string subject, string body, bool isBodyHtml = true, AdditionalEmailSendingArgs? additionalEmailSendingArgs = null)
{
ValidateEmailAddress(to);
if (!BackgroundJobManager.IsAvailable())
{
await SendAsync(from, to, subject, body, isBodyHtml, additionalEmailSendingArgs);
@ -161,4 +166,14 @@ public abstract class EmailSenderBase : IEmailSender
mail.BodyEncoding = Encoding.UTF8;
}
}
private static void ValidateEmailAddress(string emailAddress)
{
if(ValidationHelper.IsValidEmailAddress(emailAddress))
{
return;
}
throw new ArgumentException($"Email address '{emailAddress}' is not valid!");
}
}

0
framework/src/Volo.Abp.Validation/Volo/Abp/Validation/ValidationHelper.cs → framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/ValidationHelper.cs

Loading…
Cancel
Save