From af6dff3f5786c5c99720b20ce5dd514b78136ac2 Mon Sep 17 00:00:00 2001
From: stephb9959 <stephane.bourque@gmail.com>
Date: Tue, 12 Oct 2021 19:04:47 -0700
Subject: [PATCH] Fixing email and SMS notifications.

---
 build                         | 2 +-
 src/RESTAPI_email_handler.cpp | 7 -------
 src/SMTPMailerService.cpp     | 1 -
 test_scripts/curl/cli         | 2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/build b/build
index 7d37386..abc4eff 100644
--- a/build
+++ b/build
@@ -1 +1 @@
-45
\ No newline at end of file
+46
\ No newline at end of file
diff --git a/src/RESTAPI_email_handler.cpp b/src/RESTAPI_email_handler.cpp
index 65f7967..cfac5a8 100644
--- a/src/RESTAPI_email_handler.cpp
+++ b/src/RESTAPI_email_handler.cpp
@@ -21,16 +21,9 @@ namespace OpenWifi {
             Obj->has("recipients") &&
             Obj->isArray("recipients")) {
 
-            std::cout << "subject: " << Obj->get("subject").toString() << std::endl;
-            std::cout << "from: " << Obj->get("from").toString() << std::endl;
-            std::cout << "text: " << Obj->get("text").toString() << std::endl;
-
             Poco::JSON::Array::Ptr Recipients = Obj->getArray("recipients");
             auto Recipient = Recipients->get(0).toString();
-            std::cout << "Size: " << Recipients->size() << std::endl;
-            std::cout << "R: " << Recipient << std::endl;
             MessageAttributes Attrs;
-            std::cout << "Mailing to:" << Recipient << std::endl;
             Attrs[RECIPIENT_EMAIL] = Recipient;
             Attrs[SUBJECT] = Obj->get("subject").toString();
             Attrs[TEXT] = Obj->get("text").toString();
diff --git a/src/SMTPMailerService.cpp b/src/SMTPMailerService.cpp
index 0186309..ab3a3db 100644
--- a/src/SMTPMailerService.cpp
+++ b/src/SMTPMailerService.cpp
@@ -115,7 +115,6 @@ namespace OpenWifi {
 
             Poco::Net::MailMessage  Message;
             std::string             Recipient = Msg.Attrs.find(RECIPIENT_EMAIL)->second;
-            std::cout << "Mailer: " << Recipient << std::endl;
             Message.setSender(Sender_);
             Message.addRecipient(Poco::Net::MailRecipient(Poco::Net::MailRecipient::PRIMARY_RECIPIENT, Recipient));
             Message.setSubject(Msg.Attrs.find(SUBJECT)->second);
diff --git a/test_scripts/curl/cli b/test_scripts/curl/cli
index a0abf14..e90631e 100755
--- a/test_scripts/curl/cli
+++ b/test_scripts/curl/cli
@@ -354,7 +354,7 @@ case "$1" in
     "setavatar") login; setavatar "$2"; logout;;
     "getavatar") login; getavatar "$2"; logout;;
     "deleteavatar") login; deleteavatar "$2"; logout;;
-    "sendemail") login; sendemail ; logout;;
+    "sendemail") login; sendemail "$2" "$3"; logout;;
     "sendsms") login; sendsms "$2" "$3" ; logout;;
     "testlogout") login; testlogout ;;
     "setloglevel") login; setloglevel "$2" "$3"  ; logout ;;