Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions ProcessMaker/Mail/MicrosoftGraphMessageConverter.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

namespace ProcessMaker\Mail;

use Symfony\Component\Mime\Address;
use Symfony\Component\Mime\Email;

class MicrosoftGraphMessageConverter
{
public static function toSendMailPayload(Email $email): array
{
$htmlBody = $email->getHtmlBody();
$textBody = $email->getTextBody();

$message = [
'subject' => $email->getSubject() ?? '',
'body' => [
'contentType' => $htmlBody !== null ? 'HTML' : 'Text',
'content' => $htmlBody ?? $textBody ?? '',
],
'toRecipients' => self::convertAddresses($email->getTo()),
];

$ccRecipients = self::convertAddresses($email->getCc());
if ($ccRecipients) {
$message['ccRecipients'] = $ccRecipients;
}

$bccRecipients = self::convertAddresses($email->getBcc());
if ($bccRecipients) {
$message['bccRecipients'] = $bccRecipients;
}

return [
'message' => $message,
'saveToSentItems' => true,
];
}

/**
* @param Address[] $addresses
*/
private static function convertAddresses(array $addresses): array
{
return array_map(function (Address $address) {
$emailAddress = ['address' => $address->getAddress()];

if ($address->getName()) {
$emailAddress['name'] = $address->getName();
}

return ['emailAddress' => $emailAddress];
}, $addresses);
}
}
2 changes: 1 addition & 1 deletion ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MicrosoftGraphTokenProvider
public function __construct(
private array $config,
private int|string $serverIndex = 0,
private ?Client $httpClient = null,
private ?Client $httpClient = null
) {
}

Expand Down
53 changes: 53 additions & 0 deletions ProcessMaker/Mail/Transports/MicrosoftGraphTransport.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php

namespace ProcessMaker\Mail\Transports;

use GuzzleHttp\Client;
use ProcessMaker\Mail\MicrosoftGraphMessageConverter;
use ProcessMaker\Mail\MicrosoftGraphTokenProvider;
use Symfony\Component\Mailer\Exception\TransportException;
use Symfony\Component\Mailer\SentMessage;
use Symfony\Component\Mailer\Transport\AbstractTransport;
use Symfony\Component\Mime\MessageConverter;

class MicrosoftGraphTransport extends AbstractTransport
{
public function __construct(
private MicrosoftGraphTokenProvider $tokenProvider,
private string $senderEmail,
private ?Client $client = null
) {
parent::__construct();

$this->client = $client ?? new Client([
'base_uri' => 'https://graph.microsoft.com/v1.0/',
]);
}

protected function doSend(SentMessage $message): void
{
$email = MessageConverter::toEmail($message->getOriginalMessage());
$payload = MicrosoftGraphMessageConverter::toSendMailPayload($email);
$token = $this->tokenProvider->getAccessToken();

$response = $this->client->post('users/' . rawurlencode($this->senderEmail) . '/sendMail', [
'headers' => [
'Authorization' => 'Bearer ' . $token,
'Content-Type' => 'application/json',
],
'json' => $payload,
'http_errors' => false,
]);

if ($response->getStatusCode() >= 400) {
throw new TransportException(
'Microsoft Graph send failed: ' . $response->getBody()->getContents()
);
}
}

public function __toString(): string
{
return 'microsoft-graph';
}
}
22 changes: 22 additions & 0 deletions ProcessMaker/Managers/OauthMailManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
use Google\Client as GoogleClient;
use GuzzleHttp\Client;
use Illuminate\Mail\MailManager;
use ProcessMaker\Mail\MicrosoftGraphTokenProvider;
use ProcessMaker\Mail\Transports\MicrosoftGraphTransport;
use ProcessMaker\Models\EnvironmentVariable;
use ProcessMaker\Models\Setting;
use ProcessMaker\Packages\Connectors\Email\EmailConfig;
Expand Down Expand Up @@ -77,6 +79,26 @@ protected function createSmtpTransport($config)
return $transport;
}

public function createTransport(array $config)
{
if ($this->app->config->get('mail.driver') === 'microsoft_graph') {
return $this->createMicrosoftGraphTransport($config);
}

return parent::createTransport($config);
}

protected function createMicrosoftGraphTransport(array $config)
{
return new MicrosoftGraphTransport(
new MicrosoftGraphTokenProvider(
$this->app->config->get('services.microsoft_graph', []),
$this->emailServerIndex ?? 0
),
$this->fromAddress
);
}

public function checkForExpiredAccessToken()
{
switch ($this->authMethod) {
Expand Down
4 changes: 4 additions & 0 deletions config/mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@
'transport' => 'array',
],

'microsoft_graph' => [
'transport' => 'microsoft_graph',
],

'failover' => [
'transport' => 'failover',
'mailers' => [
Expand Down
2 changes: 1 addition & 1 deletion resources/js/admin/settings/components/SettingsListing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ export default {
filterEmailServerButtons(groupName, groupData, btn) {
const authMethod = groupData.find(data => data.key.includes("EMAIL_CONNECTOR_MAIL_AUTH_METHOD"));
const selectedAuthMethod = authMethod ? authMethod.ui.options[authMethod.config] : null;
const showAuthAccBtn = selectedAuthMethod && selectedAuthMethod !== 'standard' ? true : false;
const showAuthAccBtn = selectedAuthMethod && selectedAuthMethod !== 'standard';

if (groupName.includes('Email Server') && !showAuthAccBtn) {
// Returns all 'top' position buttons except the '+ Mail Server' and 'Authorize Account' button for email server tabs
Expand Down
Loading