From 7d3359b710af6f09371cfdce08d9d8f8becf93b5 Mon Sep 17 00:00:00 2001
From: Guillaume Alviset <44084050+galviset@users.noreply.github.com>
Date: Wed, 22 Nov 2023 08:10:16 +0100
Subject: [PATCH] Fix: login auth type mail options (#113)

* added mail options test to catch auth type case

* fixed auth type mail options not being saved
---
 lib/ontologies_linked_data/utils/notifier.rb |  2 +-
 test/util/test_notifications.rb              | 26 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/ontologies_linked_data/utils/notifier.rb b/lib/ontologies_linked_data/utils/notifier.rb
index c4d9ad71..70f109e0 100644
--- a/lib/ontologies_linked_data/utils/notifier.rb
+++ b/lib/ontologies_linked_data/utils/notifier.rb
@@ -111,7 +111,7 @@ def self.mail_options
         }
 
         if LinkedData.settings.smtp_auth_type && LinkedData.settings.smtp_auth_type != :none
-          options.merge({
+          options.merge!({
                           user_name: LinkedData.settings.smtp_user,
                           password: LinkedData.settings.smtp_password,
                           authentication: LinkedData.settings.smtp_auth_type
diff --git a/test/util/test_notifications.rb b/test/util/test_notifications.rb
index f3d93a99..c8bc7017 100644
--- a/test/util/test_notifications.rb
+++ b/test/util/test_notifications.rb
@@ -148,4 +148,30 @@ def test_remote_ontology_pull_notification
       end
     end
   end
+
+  def test_mail_options
+    options = LinkedData::Utils::Notifier.mail_options
+    expected_options = {
+      address: LinkedData.settings.smtp_host,
+      port: LinkedData.settings.smtp_port,
+      domain: LinkedData.settings.smtp_domain
+    }
+    assert_equal options, expected_options
+
+    # testing SMTP authentification-based login
+    current_auth_type = LinkedData.settings.smtp_auth_type
+    LinkedData.settings.smtp_auth_type = :plain
+    options = LinkedData::Utils::Notifier.mail_options
+    expected_options = {
+      address: LinkedData.settings.smtp_host,
+      port: LinkedData.settings.smtp_port,
+      domain: LinkedData.settings.smtp_domain,
+      user_name: LinkedData.settings.smtp_user,
+      password: LinkedData.settings.smtp_password,
+      authentication: LinkedData.settings.smtp_auth_type
+    }
+    assert_equal options, expected_options
+
+    LinkedData.settings.smtp_auth_type = current_auth_type
+  end
 end