diff --git a/app/Helpers/Mail/GmailTransport.php b/app/Helpers/Mail/GmailTransport.php index a42031e125f9..0fed18076486 100644 --- a/app/Helpers/Mail/GmailTransport.php +++ b/app/Helpers/Mail/GmailTransport.php @@ -18,6 +18,7 @@ use Dacastro4\LaravelGmail\Services\Message\Mail; use Symfony\Component\Mailer\SentMessage; use Symfony\Component\Mailer\Transport\AbstractTransport; use Symfony\Component\Mime\MessageConverter; + /** * GmailTransport. */ @@ -53,12 +54,9 @@ class GmailTransport extends AbstractTransport $message = MessageConverter::toEmail($message->getOriginalMessage()); $token = $message->getHeaders()->get('GmailToken')->getValue(); - // $message->getHeaders()->remove('GmailToken'); - - - - + $message->getHeaders()->remove('GmailToken'); // $this->beforeSendPerformed($message); + $this->gmail->using($token); $this->gmail->to($message->getTo()[0]->getAddress(), $message->getTo()[0]->getName()); $this->gmail->from($message->getFrom()[0]->getAddress(), $message->getFrom()[0]->getName()); diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index 680b493caa15..24cdcc3a02c1 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -229,7 +229,7 @@ class NinjaMailerJob implements ShouldQueue $user = User::find($this->decodePrimaryKey($sending_user)); - nlog("Sending via {$user->name()}"); + nlog("Gmail sending via {$user->name()}"); $google = (new Google())->init(); diff --git a/composer.lock b/composer.lock index 674aabe328b7..2d4da080fbdb 100644 --- a/composer.lock +++ b/composer.lock @@ -15242,5 +15242,5 @@ "platform-dev": { "php": "^7.4|^8.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.1.0" }