From f8b27f98c6d391d31a37d46405360f5427943411 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 22 Sep 2016 20:33:45 -0300 Subject: [PATCH] Ivan - dev3 deploy implementation fixes --- client/src/lib-app/api-call.js | 25 +++++++++++++++++-------- server/libs/MailSender.php | 7 +++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/client/src/lib-app/api-call.js b/client/src/lib-app/api-call.js index 10d8593b..f65ba752 100644 --- a/client/src/lib-app/api-call.js +++ b/client/src/lib-app/api-call.js @@ -14,15 +14,24 @@ function processData (data) { module.exports = { call: function ({path, data}) { return new Promise(function (resolve, reject) { - APIUtils.post(root + path, processData(data)).then(function (result) { - console.log(result); + APIUtils.post(root + path, processData(data)) + .then(function (result) { + console.log(result); - if (result.status === 'success') { - resolve(result); - } else if (reject) { - reject(result); - } - }); + if (result.status === 'success') { + resolve(result); + } else if (reject) { + reject(result); + } + }) + .catch(function (result) { + console.log('INVALID REQUEST'); + console.log(result); + reject({ + status: 'fail', + message: 'Internal server error' + }); + }); }); } }; \ No newline at end of file diff --git a/server/libs/MailSender.php b/server/libs/MailSender.php index eeb3e3e0..e590667f 100644 --- a/server/libs/MailSender.php +++ b/server/libs/MailSender.php @@ -34,6 +34,13 @@ class MailSender { $mailer->Username = $this->mailOptions['smtp-user']; $mailer->Password = $this->mailOptions['smtp-pass']; $mailer->Timeout = 1000; + $mailer->SMTPOptions = [ + 'ssl' => [ + 'verify_peer' => false, + 'verify_peer_name' => false, + 'allow_self_signed' => true + ] + ]; if ($mailer->smtpConnect()) { $mailer->send();