From 2912dfd1e328b9803501e0e7e6772f0bcded77d1 Mon Sep 17 00:00:00 2001
From: Chris Caron <lead2gold@gmail.com>
Date: Sat, 12 Nov 2022 14:44:59 -0500
Subject: [PATCH] Fixed Outlook.com email template (#755)

---
 apprise/plugins/NotifyEmail.py | 17 ++++++++++++++++-
 test/test_plugin_email.py      | 26 ++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/apprise/plugins/NotifyEmail.py b/apprise/plugins/NotifyEmail.py
index 405bf820..b1089a32 100644
--- a/apprise/plugins/NotifyEmail.py
+++ b/apprise/plugins/NotifyEmail.py
@@ -112,7 +112,7 @@ EMAIL_TEMPLATES = (
         'Microsoft Hotmail',
         re.compile(
             r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(outlook|hotmail|live)\.com(\.au)?)$', re.I),
+            r'(?P<domain>(hotmail|live)\.com(\.au)?)$', re.I),
         {
             'port': 587,
             'smtp_host': 'smtp-mail.outlook.com',
@@ -122,6 +122,21 @@ EMAIL_TEMPLATES = (
         },
     ),
 
+    # Microsoft Outlook
+    (
+        'Microsoft Outlook',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>(smtp\.)?outlook\.com(\.au)?)$', re.I),
+        {
+            'port': 587,
+            'smtp_host': 'smtp.outlook.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.STARTTLS,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
     # Microsoft Office 365 (Email Server)
     # You must specify an authenticated sender address in the from= settings
     # and a valid email in the to= to deliver your emails to
diff --git a/test/test_plugin_email.py b/test/test_plugin_email.py
index ad43531a..da6e6534 100644
--- a/test/test_plugin_email.py
+++ b/test/test_plugin_email.py
@@ -971,7 +971,7 @@ def test_plugin_email_url_parsing(mock_smtp, mock_smtp_ssl):
         'mailtos://user:pass123@outlook.com')
     obj = Apprise.instantiate(results, suppress_exceptions=False)
     assert isinstance(obj, NotifyEmail) is True
-    assert obj.smtp_host == 'smtp-mail.outlook.com'
+    assert obj.smtp_host == 'smtp.outlook.com'
     # No entries in the reply_to
     assert not obj.reply_to
 
@@ -979,10 +979,32 @@ def test_plugin_email_url_parsing(mock_smtp, mock_smtp_ssl):
         'mailtos://user:pass123@outlook.com.au')
     obj = Apprise.instantiate(results, suppress_exceptions=False)
     assert isinstance(obj, NotifyEmail) is True
-    assert obj.smtp_host == 'smtp-mail.outlook.com'
+    assert obj.smtp_host == 'smtp.outlook.com'
     # No entries in the reply_to
     assert not obj.reply_to
 
+    # Consisitency Checks
+    results = NotifyEmail.parse_url(
+        'mailtos://outlook.com?smtp=smtp.outlook.com'
+        '&user=user@outlook.com&pass=app.pw')
+    obj1 = Apprise.instantiate(results, suppress_exceptions=False)
+    assert isinstance(obj1, NotifyEmail) is True
+    assert obj1.smtp_host == 'smtp.outlook.com'
+    assert obj1.user == 'user@outlook.com'
+    assert obj1.password == 'app.pw'
+    assert obj1.secure_mode == 'starttls'
+    assert obj1.port == 587
+
+    results = NotifyEmail.parse_url(
+        'mailtos://user:app.pw@outlook.com')
+    obj2 = Apprise.instantiate(results, suppress_exceptions=False)
+    assert isinstance(obj2, NotifyEmail) is True
+    assert obj2.smtp_host == obj1.smtp_host
+    assert obj2.user == obj1.user
+    assert obj2.password == obj1.password
+    assert obj2.secure_mode == obj1.secure_mode
+    assert obj2.port == obj1.port
+
     results = NotifyEmail.parse_url(
         'mailtos://user:pass123@live.com')
     obj = Apprise.instantiate(results, suppress_exceptions=False)