From 6d4e34b229bb20a9ec85fdebc6720364d149faef Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 7 Aug 2019 19:39:37 -0400 Subject: [PATCH] use SettingHasValue for smtp services --- .../Implementations/MailKitSmtpMailDeliveryService.cs | 5 +++-- .../Services/Implementations/SmtpMailDeliveryService.cs | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs b/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs index 4ef2d86709..7471f78cbd 100644 --- a/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs +++ b/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using Bit.Core.Utilities; using MailKit.Net.Smtp; using Microsoft.Extensions.Logging; using MimeKit; @@ -80,8 +81,8 @@ namespace Bit.Core.Services await client.ConnectAsync(_globalSettings.Mail.Smtp.Host, _globalSettings.Mail.Smtp.Port, useSsl); } - if(!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Username) && - !string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Password)) + if(CoreHelpers.SettingHasValue(_globalSettings.Mail.Smtp.Username) && + CoreHelpers.SettingHasValue(_globalSettings.Mail.Smtp.Password)) { await client.AuthenticateAsync(_globalSettings.Mail.Smtp.Username, _globalSettings.Mail.Smtp.Password); diff --git a/src/Core/Services/Implementations/SmtpMailDeliveryService.cs b/src/Core/Services/Implementations/SmtpMailDeliveryService.cs index 65c7ea8a07..3e70b37109 100644 --- a/src/Core/Services/Implementations/SmtpMailDeliveryService.cs +++ b/src/Core/Services/Implementations/SmtpMailDeliveryService.cs @@ -4,6 +4,7 @@ using System.Net.Mail; using System.Net; using System.Text; using Microsoft.Extensions.Logging; +using Bit.Core.Utilities; namespace Bit.Core.Services { @@ -38,10 +39,10 @@ namespace Bit.Core.Services client.UseDefaultCredentials = _globalSettings.Mail.Smtp.UseDefaultCredentials; client.DeliveryMethod = SmtpDeliveryMethod.Network; - if(!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Username) && - !string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Password)) + if(CoreHelpers.SettingHasValue(_globalSettings.Mail.Smtp.Username) && + CoreHelpers.SettingHasValue(_globalSettings.Mail.Smtp.Password)) { - if(!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.AuthType)) + if(CoreHelpers.SettingHasValue(_globalSettings.Mail.Smtp.AuthType)) { var cred = new NetworkCredential(_globalSettings.Mail.Smtp.Username, _globalSettings.Mail.Smtp.Password);