nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

get rid of old smtp mail delivery service

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-27 09:23:03 -04:00
parent 1db442a5bf
commit 25a8640d80
2 changed files with 0 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/GlobalSettings.cs
View File

@ -125,10 +125,6 @@ namespace Bit.Core
public bool SslOverride { get; set; } = false;
public string Username { get; set; }
public string Password { get; set; }
[Obsolete]
public bool UseDefaultCredentials { get; set; } = false;
[Obsolete]
public string AuthType { get; set; }
public bool TrustServer { get; set; } = false;
}
}

117
src/Core/Services/Implementations/SmtpMailDeliveryService.cs
View File

@ -1,117 +0,0 @@
using System;
using System.Threading.Tasks;
using System.Net.Mail;
using System.Net;
using System.Text;
using Microsoft.Extensions.Logging;
using Bit.Core.Utilities;
namespace Bit.Core.Services
{
[Obsolete]
public class SmtpMailDeliveryService : IMailDeliveryService
{
private readonly GlobalSettings _globalSettings;
private readonly ILogger<SmtpMailDeliveryService> _logger;
private readonly string _replyDomain;
public SmtpMailDeliveryService(
GlobalSettings globalSettings,
ILogger<SmtpMailDeliveryService> logger)
{
if(globalSettings.Mail?.Smtp?.Host == null)
{
throw new ArgumentNullException(nameof(globalSettings.Mail.Smtp.Host));
}
if(globalSettings.Mail?.ReplyToEmail?.Contains("@") ?? false)
{
_replyDomain = globalSettings.Mail.ReplyToEmail.Split('@')[1];
}
_globalSettings = globalSettings;
_logger = logger;
}
public Task SendEmailAsync(Models.Mail.MailMessage message)
{
var client = new SmtpClient(_globalSettings.Mail.Smtp.Host, _globalSettings.Mail.Smtp.Port);
client.EnableSsl = _globalSettings.Mail.Smtp.Ssl;
client.UseDefaultCredentials = _globalSettings.Mail.Smtp.UseDefaultCredentials;
client.DeliveryMethod = SmtpDeliveryMethod.Network;
if(CoreHelpers.SettingHasValue(_globalSettings.Mail.Smtp.Username) &&
CoreHelpers.SettingHasValue(_globalSettings.Mail.Smtp.Password))
{
if(CoreHelpers.SettingHasValue(_globalSettings.Mail.Smtp.AuthType))
{
var cred = new NetworkCredential(_globalSettings.Mail.Smtp.Username,
_globalSettings.Mail.Smtp.Password);
var cache = new CredentialCache();
cache.Add(_globalSettings.Mail.Smtp.Host, _globalSettings.Mail.Smtp.Port,
_globalSettings.Mail.Smtp.AuthType, cred);
client.Credentials = cache;
}
else
{
client.Credentials = new NetworkCredential(_globalSettings.Mail.Smtp.Username,
_globalSettings.Mail.Smtp.Password);
}
}
var smtpMessage = new MailMessage();
smtpMessage.From = new MailAddress(_globalSettings.Mail.ReplyToEmail, _globalSettings.SiteName);
smtpMessage.Subject = message.Subject;
smtpMessage.SubjectEncoding = Encoding.UTF8;
smtpMessage.BodyEncoding = Encoding.UTF8;
smtpMessage.BodyTransferEncoding = System.Net.Mime.TransferEncoding.QuotedPrintable;
if(!string.IsNullOrWhiteSpace(_replyDomain))
{
smtpMessage.Headers.Add("Message-ID", $"<{Guid.NewGuid()}@{_replyDomain}>");
}
foreach(var address in message.ToEmails)
{
smtpMessage.To.Add(new MailAddress(address));
}
if(message.BccEmails != null)
{
foreach(var address in message.BccEmails)
{
smtpMessage.Bcc.Add(new MailAddress(address));
}
}
if(string.IsNullOrWhiteSpace(message.TextContent))
{
smtpMessage.IsBodyHtml = true;
smtpMessage.Body = message.HtmlContent;
}
else
{
smtpMessage.Body = message.TextContent;
var htmlView = AlternateView.CreateAlternateViewFromString(message.HtmlContent);
htmlView.ContentType = new System.Net.Mime.ContentType("text/html");
smtpMessage.AlternateViews.Add(htmlView);
}
client.SendCompleted += (sender, e) =>
{
if(e.Error != null)
{
_logger.LogError(e.Error, "Mail send failed.");
}
if(e.Cancelled)
{
_logger.LogWarning("Mail send canceled.");
}
smtpMessage.Dispose();
client.Dispose();
};
client.SendAsync(smtpMessage, null);
return Task.FromResult(0);
}
}
}