From b0e8dfc58327b39bdbe2201c63f0de530a2c4c8f Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Mon, 6 Jul 2020 00:54:41 +0300
Subject: [PATCH] Tests fixed?

---
 app/app.php                     | 10 ----------
 app/controllers/api/account.php |  2 ++
 app/controllers/api/teams.php   |  1 +
 app/workers/mails.php           | 24 +++++++++++++++++++++++-
 docker-compose.yml              |  3 ---
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/app.php b/app/app.php
index 1bb25cde38..1e7b1b2345 100644
--- a/app/app.php
+++ b/app/app.php
@@ -19,16 +19,6 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-// // Set project mail
-// $register->get('smtp')
-//     ->setFrom(
-//         App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
-//         ($project->getId() === 'console')
-//             ? \urldecode(App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server'))
-//             : \sprintf(Locale::getText('account.emails.team'), $project->getAttribute('name')
-//         )
-//     );
-
 App::init(function ($utopia, $request, $response, $console, $project, $user, $locale, $webhooks, $audits, $usage, $clients) {
     /** @var Appwrite\Utopia\Request $request */
     /** @var Appwrite\Utopia\Response $response */
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index d6e93b39bd..9605602906 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1189,6 +1189,7 @@ App::post('/v1/account/recovery')
 
         $mails
             ->setParam('event', 'account.recovery.create')
+            ->setParam('from', ($project->getId() === 'console') ? '' : \sprintf($locale->getText('account.emails.team'), $project->getAttribute('name')))
             ->setParam('recipient', $profile->getAttribute('email', ''))
             ->setParam('name', $profile->getAttribute('name', ''))
             ->setParam('subject', $locale->getText('account.emails.recovery.title'))
@@ -1355,6 +1356,7 @@ App::post('/v1/account/verification')
 
         $mails
             ->setParam('event', 'account.verification.create')
+            ->setParam('from', ($project->getId() === 'console') ? '' : \sprintf($locale->getText('account.emails.team'), $project->getAttribute('name')))
             ->setParam('recipient', $user->getAttribute('email'))
             ->setParam('name', $user->getAttribute('name'))
             ->setParam('subject', $locale->getText('account.emails.verification.title'))
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index fed4407ab3..676ee99d97 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -361,6 +361,7 @@ App::post('/v1/teams/:teamId/memberships')
         if (APP_MODE_ADMIN !== $mode) { // No need in comfirmation when in admin mode
             $mails
                 ->setParam('event', 'teams.membership.create')
+                ->setParam('from', ($project->getId() === 'console') ? '' : \sprintf($locale->getText('account.emails.team'), $project->getAttribute('name')))
                 ->setParam('recipient', $email)
                 ->setParam('name', $name)
                 ->setParam('subject', \sprintf($locale->getText('account.emails.invitation.title'), $team->getAttribute('name', '[TEAM-NAME]'), $project->getAttribute('name', ['[APP-NAME]'])))
diff --git a/app/workers/mails.php b/app/workers/mails.php
index 45f2c6609b..1ea82eec30 100644
--- a/app/workers/mails.php
+++ b/app/workers/mails.php
@@ -1,5 +1,7 @@
 <?php
 
+use Utopia\App;
+
 require_once __DIR__.'/../init.php';
 
 \cli_set_process_title('Mails V1 Worker');
@@ -22,13 +24,33 @@ class MailsV1
         global $register;
 
         $event = $this->args['event'];
+        $from = $this->args['from'];
         $recipient = $this->args['recipient'];
         $name = $this->args['name'];
         $subject = $this->args['subject'];
         $body = $this->args['body'];
         
-        $mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */
+        /** @var \PHPMailer\PHPMailer\PHPMailer $mail */
+        $mail = $register->get('smtp');
 
+        // Set project mail
+        /*$register->get('smtp')
+            ->setFrom(
+                App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
+                ($project->getId() === 'console')
+                    ? \urldecode(App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server'))
+                    : \sprintf(Locale::getText('account.emails.team'), $project->getAttribute('name')
+                )
+            );*/
+
+        $mail->clearAddresses();
+        $mail->clearAllRecipients();
+        $mail->clearReplyTos();
+        $mail->clearAttachments();
+        $mail->clearBCCs();
+        $mail->clearCCs();
+
+        $mail->setFrom(App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM), (empty($from) ? \urldecode(App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server')) : $from));
         $mail->addAddress($recipient, $name);
         $mail->Subject = $subject;
         $mail->Body = $body;
diff --git a/docker-compose.yml b/docker-compose.yml
index 5bca2e5b72..8645d61264 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,11 +60,8 @@ services:
     depends_on:
       - mariadb
       - redis
-      # - smtp
-      - maildev
       - clamav
       - influxdb
-      - telegraf
     environment:
       - _APP_ENV
       - _APP_OPTIONS_ABUSE