Resolved #224 , Removed the 'SSL' option from the email notification …

…settings. We will now use the correct secure socket options (SSL/TLS) for your email host.
Ombi-app · May 23, 2016 · 8cce806 · 8cce806
1 parent d0e6a2a
commit 8cce806
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs b/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs
@@ -36,6 +36,5 @@ public class EmailNotificationSettings : Settings
         public bool Enabled { get; set; }
         public bool EnableUserEmailNotifications { get; set; }
         public string RecipientEmail { get; set; }
-        public bool Ssl { get; set; }
     }
 }
diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -25,9 +25,10 @@
 //  ************************************************************************/
 #endregion
 using System;
-using System.Net;
-using System.Net.Mail;
 using System.Threading.Tasks;
+
+using MailKit.Security;
+
 using MimeKit;
 using NLog;
 
@@ -162,7 +163,7 @@ private async Task Send(MimeMessage message, EmailNotificationSettings settings)
             {
                 using (var client = new SmtpClient())
                 {
-                    client.Connect(settings.EmailHost, settings.EmailPort, settings.Ssl);
+                    client.Connect(settings.EmailHost, settings.EmailPort, SecureSocketOptions.Auto); // Let MailKit figure out the correct SecureSocketOptions.
 
                     // Note: since we don't have an OAuth2 token, disable
                     // the XOAUTH2 authentication mechanism.

diff --git a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
@@ -30,20 +30,6 @@
 
                 </div>
             </div>
-            <div class="form-group">
-                <div class="checkbox">
-
-                        @if (Model.Ssl)
-                        {
-                            <input type="checkbox" id="Ssl" name="Ssl" checked="checked"><label for="Ssl">SSL Enabled</label>
-                        }
-                        else
-                        {
-                            <input type="checkbox" id="Ssl" name="Ssl"><label for="Ssl">SSL Enabled</label>
-                        }
-
-                </div>
-            </div>
             <div class="form-group">
                 <div class="checkbox">