From f99a3c501fd6ed7b4914b8d6e855489c2ce5b219 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Fri, 16 Oct 2015 20:50:12 -0400 Subject: Make mail transports pluggable and move integrations to plugins - Postmark: https://github.com/kanboard/plugin-postmark - Mailgun: https://github.com/kanboard/plugin-mailgun - Sendgrid: https://github.com/kanboard/plugin-sendgrid --- app/Integration/Mailgun.php | 95 ------------------------------------------ app/Integration/Postmark.php | 94 ------------------------------------------ app/Integration/Sendgrid.php | 98 -------------------------------------------- app/Integration/Smtp.php | 71 -------------------------------- 4 files changed, 358 deletions(-) delete mode 100644 app/Integration/Mailgun.php delete mode 100644 app/Integration/Postmark.php delete mode 100644 app/Integration/Sendgrid.php delete mode 100644 app/Integration/Smtp.php (limited to 'app/Integration') diff --git a/app/Integration/Mailgun.php b/app/Integration/Mailgun.php deleted file mode 100644 index 045284d2..00000000 --- a/app/Integration/Mailgun.php +++ /dev/null @@ -1,95 +0,0 @@ - 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 receiveEmail(array $payload) - { - if (empty($payload['sender']) || empty($payload['subject']) || empty($payload['recipient'])) { - return false; - } - - // The user must exists in Kanboard - $user = $this->user->getByEmail($payload['sender']); - - if (empty($user)) { - $this->container['logger']->debug('Mailgun: ignored => user not found'); - return false; - } - - // The project must have a short name - $project = $this->project->getByIdentifier(Tool::getMailboxHash($payload['recipient'])); - - if (empty($project)) { - $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('Mailgun: ignored => user is not member of the project'); - return false; - } - - // Get the Markdown contents - if (! empty($payload['stripped-html'])) { - $description = $this->htmlConverter->convert($payload['stripped-html']); - } - else if (! empty($payload['stripped-text'])) { - $description = $payload['stripped-text']; - } - else { - $description = ''; - } - - // Finally, we create the task - return (bool) $this->taskCreation->create(array( - 'project_id' => $project['id'], - 'title' => $payload['subject'], - 'description' => $description, - 'creator_id' => $user['id'], - )); - } -} diff --git a/app/Integration/Postmark.php b/app/Integration/Postmark.php deleted file mode 100644 index b57f92d4..00000000 --- a/app/Integration/Postmark.php +++ /dev/null @@ -1,94 +0,0 @@ - sprintf('%s <%s>', $author, MAIL_FROM), - 'To' => sprintf('%s <%s>', $name, $email), - 'Subject' => $subject, - 'HtmlBody' => $html, - ); - - $this->httpClient->postJson('https://api.postmarkapp.com/email', $payload, $headers); - } - - /** - * Parse incoming email - * - * @access public - * @param array $payload Incoming email - * @return boolean - */ - public function receiveEmail(array $payload) - { - if (empty($payload['From']) || empty($payload['Subject']) || empty($payload['MailboxHash'])) { - return false; - } - - // The user must exists in Kanboard - $user = $this->user->getByEmail($payload['From']); - - if (empty($user)) { - $this->container['logger']->debug('Postmark: ignored => user not found'); - return false; - } - - // The project must have a short name - $project = $this->project->getByIdentifier($payload['MailboxHash']); - - if (empty($project)) { - $this->container['logger']->debug('Postmark: 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('Postmark: ignored => user is not member of the project'); - return false; - } - - // Get the Markdown contents - if (! empty($payload['HtmlBody'])) { - $description = $this->htmlConverter->convert($payload['HtmlBody']); - } - else if (! empty($payload['TextBody'])) { - $description = $payload['TextBody']; - } - else { - $description = ''; - } - - // Finally, we create the task - return (bool) $this->taskCreation->create(array( - 'project_id' => $project['id'], - 'title' => $payload['Subject'], - 'description' => $description, - 'creator_id' => $user['id'], - )); - } -} diff --git a/app/Integration/Sendgrid.php b/app/Integration/Sendgrid.php deleted file mode 100644 index 2da87119..00000000 --- a/app/Integration/Sendgrid.php +++ /dev/null @@ -1,98 +0,0 @@ - SENDGRID_API_USER, - 'api_key' => SENDGRID_API_KEY, - 'to' => $email, - 'toname' => $name, - 'from' => MAIL_FROM, - 'fromname' => $author, - 'html' => $html, - 'subject' => $subject, - ); - - $this->httpClient->postForm('https://api.sendgrid.com/api/mail.send.json', $payload); - } - - /** - * Parse incoming email - * - * @access public - * @param array $payload Incoming email - * @return boolean - */ - public function receiveEmail(array $payload) - { - if (empty($payload['envelope']) || empty($payload['subject'])) { - return false; - } - - $envelope = json_decode($payload['envelope'], true); - $sender = isset($envelope['to'][0]) ? $envelope['to'][0] : ''; - - // The user must exists in Kanboard - $user = $this->user->getByEmail($envelope['from']); - - if (empty($user)) { - $this->container['logger']->debug('SendgridWebhook: ignored => user not found'); - return false; - } - - // The project must have a short name - $project = $this->project->getByIdentifier(Tool::getMailboxHash($sender)); - - if (empty($project)) { - $this->container['logger']->debug('SendgridWebhook: 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('SendgridWebhook: ignored => user is not member of the project'); - return false; - } - - // Get the Markdown contents - if (! empty($payload['html'])) { - $description = $this->htmlConverter->convert($payload['html']); - } - else if (! empty($payload['text'])) { - $description = $payload['text']; - } - else { - $description = ''; - } - - // Finally, we create the task - return (bool) $this->taskCreation->create(array( - 'project_id' => $project['id'], - 'title' => $payload['subject'], - 'description' => $description, - 'creator_id' => $user['id'], - )); - } -} diff --git a/app/Integration/Smtp.php b/app/Integration/Smtp.php deleted file mode 100644 index 3ef6539d..00000000 --- a/app/Integration/Smtp.php +++ /dev/null @@ -1,71 +0,0 @@ -setSubject($subject) - ->setFrom(array(MAIL_FROM => $author)) - ->setBody($html, 'text/html') - ->setTo(array($email => $name)); - - Swift_Mailer::newInstance($this->getTransport())->send($message); - } - catch (Swift_TransportException $e) { - $this->container['logger']->error($e->getMessage()); - } - } - - /** - * Get SwiftMailer transport - * - * @access private - * @return \Swift_Transport - */ - private function getTransport() - { - switch (MAIL_TRANSPORT) { - case 'smtp': - $transport = Swift_SmtpTransport::newInstance(MAIL_SMTP_HOSTNAME, MAIL_SMTP_PORT); - $transport->setUsername(MAIL_SMTP_USERNAME); - $transport->setPassword(MAIL_SMTP_PASSWORD); - $transport->setEncryption(MAIL_SMTP_ENCRYPTION); - break; - case 'sendmail': - $transport = Swift_SendmailTransport::newInstance(MAIL_SENDMAIL_COMMAND); - break; - default: - $transport = Swift_MailTransport::newInstance(); - } - - return $transport; - } -} -- cgit v1.2.3