CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-02 10:16:27 +13:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller

Browse source
This commit is contained in:
Prateek Banga 2023-10-04 17:32:16 +05:30
commit 0251703e3a
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/workers/messaging.php
View file

@ -106,15 +106,15 @@ class MessagingV1 extends Worker
$messageData = clone $messageRecord;
$messageData->setAttribute('to', $batch);
$message = match ($providerRecord->getAttribute('type')) {
'sms' => $this->buildSMSMessage($messageRecord, $providerRecord),
'push' => $this->buildPushMessage($messageRecord),
'email' => $this->buildEmailMessage($messageRecord, $providerRecord),
'sms' => $this->buildSMSMessage($messageData, $providerRecord),
'push' => $this->buildPushMessage($messageData),
'email' => $this->buildEmailMessage($messageData, $providerRecord),
default => throw new Exception(Exception::PROVIDER_INCORRECT_TYPE)
};
try {
$provider->send($message);
$deliveredTo += \count($batch);
} catch (Exception $e) {
} catch (\Exception $e) {
foreach ($batch as $identifier) {
$deliveryErrors[] = 'Failed to send message to target' . $identifier . ': ' . $e->getMessage();
}

18
tests/e2e/Services/Messaging/MessagingBase.php
View file

@ -12,55 +12,55 @@ trait MessagingBase
{
$providersParams = [
'sendgrid' => [
'providerId' => 'unique()',
'providerId' => ID::unique(),
'name' => 'Sengrid1',
'apiKey' => 'my-apikey',
],
'mailgun' => [
'providerId' => 'unique()',
'providerId' => ID::unique(),
'name' => 'Mailgun1',
'apiKey' => 'my-apikey',
'domain' => 'my-domain',
'from' => 'sender-email@my-domain',
],
'twilio' => [
'providerId' => 'unique()',
'providerId' => ID::unique(),
'name' => 'Twilio1',
'accountSid' => 'my-accountSid',
'authToken' => 'my-authToken',
],
'telesign' => [
'providerId' => 'unique()',
'providerId' => ID::unique(),
'name' => 'Telesign1',
'username' => 'my-username',
'password' => 'my-password',
],
'textmagic' => [
'providerId' => 'unique()',
'providerId' => ID::unique(),
'name' => 'Textmagic1',
'username' => 'my-username',
'apiKey' => 'my-apikey',
],
'msg91' => [
'providerId' => 'unique()',
'providerId' => ID::unique(),
'name' => 'Ms91-1',
'senderId' => 'my-senderid',
'authKey' => 'my-authkey',
'from' => '+123456789'
],
'vonage' => [
'providerId' => 'unique()',
'providerId' => ID::unique(),
'name' => 'Vonage1',
'apiKey' => 'my-apikey',
'apiSecret' => 'my-apisecret',
],
'fcm' => [
'providerId' => 'unique()',
'providerId' => ID::unique(),
'name' => 'FCM1',
'serverKey' => 'my-serverkey',
],
'apns' => [
'providerId' => 'unique()',
'providerId' => ID::unique(),
'name' => 'APNS1',
'authKey' => 'my-authkey',
'authKeyId' => 'my-authkeyid',