From e9e3f17363de0a678a047453594db805d2474a8c Mon Sep 17 00:00:00 2001
From: CD Nguyen <cdnguyen.dr@gmail.com>
Date: Fri, 30 Mar 2018 11:35:37 +0200
Subject: [PATCH 1/2] support non TSL SMTP servers

---
 bin/NotificationHelper.py      | 26 ++++++++++++++++++++++++++
 bin/packages/config.cfg.sample |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/bin/NotificationHelper.py b/bin/NotificationHelper.py
index 6d396a5d..3f123d4a 100755
--- a/bin/NotificationHelper.py
+++ b/bin/NotificationHelper.py
@@ -73,3 +73,29 @@ def sendEmailNotification(recipient, term):
             
         except Exception as e:
             print str(e)
+            # raise e
+    elif (
+            sender is not None and
+            sender_host is not None and
+            sender_port is not None
+        ):
+        try:
+
+            server = smtplib.SMTP(sender_host, sender_port)
+
+            mime_msg = MIMEMultipart()
+            mime_msg['From'] = sender
+            mime_msg['To'] = recipient
+            mime_msg['Subject'] = "AIL Term Alert"
+            
+            body = "New occurrence for term: " + term
+            mime_msg.attach(MIMEText(body, 'plain'))
+            
+            server.sendmail(sender, recipient, mime_msg.as_string())
+            server.quit()
+
+        except Exception as e:
+            print str(e)
+            # raise e
+
+
diff --git a/bin/packages/config.cfg.sample b/bin/packages/config.cfg.sample
index 5f409d96..8cb7a295 100644
--- a/bin/packages/config.cfg.sample
+++ b/bin/packages/config.cfg.sample
@@ -23,7 +23,9 @@ sentiment_lexicon_file = sentiment/vader_lexicon.zip/vader_lexicon/vader_lexicon
 sender = sender@example.com
 sender_host = smtp.example.com
 sender_port = 1337
-sender_pw = securepassword
+
+# optional for using with authenticated SMTP over SSL
+# sender_pw = securepassword
 
 ##### Flask #####
 [Flask]

From 96259c53bc479d08ed26dddda6b60db7037b5368 Mon Sep 17 00:00:00 2001
From: CD Nguyen <cdnguyen.dr@gmail.com>
Date: Wed, 4 Apr 2018 09:41:13 +0200
Subject: [PATCH 2/2] refactor NotificationHelper code

---
 bin/NotificationHelper.py | 74 +++++++++++++++------------------------
 1 file changed, 28 insertions(+), 46 deletions(-)

diff --git a/bin/NotificationHelper.py b/bin/NotificationHelper.py
index 3f123d4a..dd15499a 100755
--- a/bin/NotificationHelper.py
+++ b/bin/NotificationHelper.py
@@ -47,55 +47,37 @@ def sendEmailNotification(recipient, term):
         
     if isinstance(sender_pw, tuple):
         sender_pw = sender_pw[0]    
-            
-    if (
-        sender is not None and
-        sender_host is not None and
-        sender_port is not None and
-        sender_pw is not None
-       ):
-        try:                    
-                                  
-            server_ssl = smtplib.SMTP_SSL(sender_host, sender_port)
-            server_ssl.ehlo()
-            server_ssl.login(sender, sender_pw)
-            
-            mime_msg = MIMEMultipart()
-            mime_msg['From'] = sender
-            mime_msg['To'] = recipient
-            mime_msg['Subject'] = "AIL Term Alert"
-            
-            body = "New occurrence for term: " + term
-            mime_msg.attach(MIMEText(body, 'plain'))
-            
-            server_ssl.sendmail(sender, recipient, mime_msg.as_string())
-            server_ssl.quit()
-            
-        except Exception as e:
-            print str(e)
-            # raise e
-    elif (
-            sender is not None and
-            sender_host is not None and
-            sender_port is not None
+
+    # raise an exception if any of these is None
+    if (sender is None or
+        sender_host is None or
+        sender_port is None
         ):
-        try:
+        raise Exception('SMTP configuration (host, port, sender) is missing or incomplete!')
 
-            server = smtplib.SMTP(sender_host, sender_port)
-
-            mime_msg = MIMEMultipart()
-            mime_msg['From'] = sender
-            mime_msg['To'] = recipient
-            mime_msg['Subject'] = "AIL Term Alert"
+    try:
+        if sender_pw is not None:
+            smtp_server = smtplib.SMTP_SSL(sender_host, sender_port)
+            smtp_server.ehlo()
+            smtp_server.login(sender, sender_pw)
+        else:
+            smtp_server = smtplib.SMTP(sender_host, sender_port)
             
-            body = "New occurrence for term: " + term
-            mime_msg.attach(MIMEText(body, 'plain'))
+        
+        mime_msg = MIMEMultipart()
+        mime_msg['From'] = sender
+        mime_msg['To'] = recipient
+        mime_msg['Subject'] = "AIL Term Alert"
+        
+        body = "New occurrence for term: " + term
+        mime_msg.attach(MIMEText(body, 'plain'))
+        
+        smtp_server.sendmail(sender, recipient, mime_msg.as_string())
+        smtp_server.quit()
             
-            server.sendmail(sender, recipient, mime_msg.as_string())
-            server.quit()
-
-        except Exception as e:
-            print str(e)
-            # raise e
+    except Exception as e:
+        print str(e)
+        # raise e
+