Add Mailgun API as mail transport

4 files changed, 35 insertions, 9 deletions

diff --git a/app/Integration/HipchatWebhook.php b/app/Integration/HipchatWebhook.php
index 5cd01fb0..f1be0f34 100644
--- a/app/Integration/HipchatWebhook.php
+++ b/app/Integration/HipchatWebhook.php
@@ -89,7 +89,7 @@ class HipchatWebhook extends \Core\Base
                 $params['room_token']
             );
 
-            $this->httpClient->post($url, $payload);
+            $this->httpClient->postJson($url, $payload);
         }
     }
 }
diff --git a/app/Integration/MailgunWebhook.php b/app/Integration/Mailgun.php
index 50d96a4a..1451b211 100644
--- a/app/Integration/MailgunWebhook.php
+++ b/app/Integration/Mailgun.php
@@ -6,21 +6,47 @@ use HTML_To_Markdown;
 use Core\Tool;
 
 /**
- * Mailgun Webhook
+ * Mailgun Integration
  *
  * @package  integration
  * @author   Frederic Guillot
  */
-class MailgunWebhook extends \Core\Base
+class Mailgun extends \Core\Base
 {
     /**
+     * Send a HTML email
+     *
+     * @access public
+     * @param  string  $email
+     * @param  string  $name
+     * @param  string  $subject
+     * @param  string  $html
+     * @param  string  $author
+     */
+    public function sendEmail($email, $name, $subject, $html, $author)
+    {
+        $headers = array(
+            'Authorization: Basic '.base64_encode('api:'.MAILGUN_API_TOKEN)
+        );
+
+        $payload = array(
+            'from' => sprintf('%s <%s>', $author, MAIL_FROM),
+            'to' => sprintf('%s <%s>', $name, $email),
+            'subject' => $subject,
+            'html' => $html,
+        );
+
+        $this->httpClient->postForm('https://api.mailgun.net/v3/'.MAILGUN_DOMAIN.'/messages', $payload, $headers);
+    }
+
+    /**
      * Parse incoming email
      *
      * @access public
      * @param  array   $payload   Incoming email
      * @return boolean
      */
-    public function parsePayload(array $payload)
+    public function receiveEmail(array $payload)
     {
         if (empty($payload['sender']) || empty($payload['subject']) || empty($payload['recipient'])) {
             return false;
@@ -30,7 +56,7 @@ class MailgunWebhook extends \Core\Base
         $user = $this->user->getByEmail($payload['sender']);
 
         if (empty($user)) {
-            $this->container['logger']->debug('MailgunWebhook: ignored => user not found');
+            $this->container['logger']->debug('Mailgun: ignored => user not found');
             return false;
         }
 
@@ -38,13 +64,13 @@ class MailgunWebhook extends \Core\Base
         $project = $this->project->getByIdentifier(Tool::getMailboxHash($payload['recipient']));
 
         if (empty($project)) {
-            $this->container['logger']->debug('MailgunWebhook: ignored => project not found');
+            $this->container['logger']->debug('Mailgun: ignored => project not found');
             return false;
         }
 
         // The user must be member of the project
         if (! $this->projectPermission->isMember($project['id'], $user['id'])) {
-            $this->container['logger']->debug('MailgunWebhook: ignored => user is not member of the project');
+            $this->container['logger']->debug('Mailgun: ignored => user is not member of the project');
             return false;
         }
 
diff --git a/app/Integration/Postmark.php b/app/Integration/Postmark.php
index a367c23e..dbb70aee 100644
--- a/app/Integration/Postmark.php
+++ b/app/Integration/Postmark.php
@@ -36,7 +36,7 @@ class Postmark extends \Core\Base
             'HtmlBody' => $html,
         );
 
-        $this->httpClient->post('https://api.postmarkapp.com/email', $payload, $headers);
+        $this->httpClient->postJson('https://api.postmarkapp.com/email', $payload, $headers);
     }
 
     /**
diff --git a/app/Integration/SlackWebhook.php b/app/Integration/SlackWebhook.php
index 8be33496..975ea21f 100644
--- a/app/Integration/SlackWebhook.php
+++ b/app/Integration/SlackWebhook.php
@@ -69,7 +69,7 @@ class SlackWebhook extends \Core\Base
                 $payload['text'] .= '|'.t('view the task on Kanboard').'>';
             }
 
-            $this->httpClient->post($this->getWebhookUrl($project_id), $payload);
+            $this->httpClient->postJson($this->getWebhookUrl($project_id), $payload);
         }
     }
 }