From ef01caf829c6be3f72d7f3bdc711902cc51dc57b Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 11 Nov 2020 13:34:06 +0100
Subject: [PATCH] :bug: Fix sendmail to console unexpected exception.

---
 backend/src/app/config.clj         |  7 ++++---
 backend/src/app/tasks/sendmail.clj | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj
index b62dc29d00..42fd2b553a 100644
--- a/backend/src/app/config.clj
+++ b/backend/src/app/config.clj
@@ -37,7 +37,7 @@
 
    :image-process-max-threads 2
 
-   :smtp-enable false
+   :smtp-enabled false
    :smtp-default-reply-to "no-reply@example.com"
    :smtp-default-from "no-reply@example.com"
 
@@ -79,7 +79,7 @@
 (s/def ::media-uri ::us/string)
 (s/def ::media-directory ::us/string)
 (s/def ::secret-key ::us/string)
-(s/def ::smtp-enable ::us/boolean)
+(s/def ::smtp-enabled ::us/boolean)
 (s/def ::smtp-default-reply-to ::us/email)
 (s/def ::smtp-default-from ::us/email)
 (s/def ::smtp-host ::us/string)
@@ -138,7 +138,7 @@
                    ::secret-key
                    ::smtp-default-from
                    ::smtp-default-reply-to
-                   ::smtp-enable
+                   ::smtp-enabled
                    ::smtp-host
                    ::smtp-port
                    ::smtp-username
@@ -205,6 +205,7 @@
    :default-reply-to (:smtp-default-reply-to cfg)
    :default-from (:smtp-default-from cfg)
    :tls (:smtp-tls cfg)
+   :enabled (:smtp-enabled cfg)
    :username (:smtp-username cfg)
    :password (:smtp-password cfg)})
 
diff --git a/backend/src/app/tasks/sendmail.clj b/backend/src/app/tasks/sendmail.clj
index 54f779145e..54706b487e 100644
--- a/backend/src/app/tasks/sendmail.clj
+++ b/backend/src/app/tasks/sendmail.clj
@@ -17,9 +17,9 @@
    [app.metrics :as mtx]))
 
 (defn- send-console!
-  [cfg email]
+  [config email]
   (let [baos (java.io.ByteArrayOutputStream.)
-        mesg (emails/smtp-message cfg email)]
+        mesg (emails/smtp-message config email)]
     (.writeTo mesg baos)
     (let [out (with-out-str
                 (println "email console dump:")
@@ -31,10 +31,10 @@
 (defn handler
   {:app.tasks/name "sendmail"}
   [{:keys [props] :as task}]
-  (if (:smtp-enable cfg/config)
-    (-> (cfg/smtp cfg/config)
-        (emails/send! props))
-    (send-console! props)))
+  (let [config (cfg/smtp cfg/config)]
+    (if (:enabled config)
+      (emails/send! config props)
+      (send-console! config props))))
 
 (mtx/instrument-with-summary!
  {:var #'handler