bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-18 09:13:19 +00:00
Code Issues Releases Wiki Activity

allow custom smtp auth type

Browse Source
This commit is contained in:
Kyle Spearrin
2018-08-22 23:40:50 -04:00
parent d992125b5f
commit 61d2ba644c
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/GlobalSettings.cs
View File

@@ -103,6 +103,7 @@ namespace Bit.Core
public string Username { get; set; } public string Username { get; set; }
public string Password { get; set; } public string Password { get; set; }
public bool UseDefaultCredentials { get; set; } = false; public bool UseDefaultCredentials { get; set; } = false;
public string AuthType { get; set; }
} }
} }

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

@@ -34,10 +34,22 @@ namespace Bit.Core.Services
if(!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Username) && if(!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Username) &&
!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Password)) !string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Password))
{
if(!string.IsNullOrWhiteSpace(_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, client.Credentials = new NetworkCredential(_globalSettings.Mail.Smtp.Username,
_globalSettings.Mail.Smtp.Password); _globalSettings.Mail.Smtp.Password);
} }
}
var smtpMessage = new MailMessage(); var smtpMessage = new MailMessage();
smtpMessage.From = new MailAddress(_globalSettings.Mail.ReplyToEmail, _globalSettings.SiteName); smtpMessage.From = new MailAddress(_globalSettings.Mail.ReplyToEmail, _globalSettings.SiteName);