Merge remote-tracking branch 'origin/main' into feat-app-adapters

# Conflicts: # composer.json # composer.lock # src/Utopia/Messaging/Adapter/Push/APNS.php # src/Utopia/Messaging/Messages/Email.php # src/Utopia/Messaging/Messages/Push.php # src/Utopia/Messaging/Messages/SMS.php # tests/Messaging/Adapter/Email/EmailTest.php # tests/Messaging/Adapter/Email/MailgunTest.php # tests/Messaging/Adapter/Email/SendgridTest.php # tests/Messaging/Adapter/Push/APNSTest.php # tests/Messaging/Adapter/Push/FCMTest.php # tests/Messaging/Adapter/SMS/GEOSMS/CallingCodeTest.php # tests/Messaging/Adapter/SMS/GEOSMSTest.php # tests/Messaging/Adapter/SMS/Msg91Test.php # tests/Messaging/Adapter/SMS/SMSTest.php # tests/Messaging/Adapter/SMS/TelesignTest.php # tests/Messaging/Adapter/SMS/TelnyxTest.php # tests/Messaging/Adapter/SMS/TwilioTest.php # tests/Messaging/Adapter/SMS/VonageTest.php
utopia-php · Nov 27, 2023 · 996cc78 · 996cc78
2 parents 40e2484 + fb2a096
commit 996cc78
Show file tree

Hide file tree

Showing 15 changed files with 142 additions and 116 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Utopia/Messaging/Adapter/Push/APNS.php b/src/Utopia/Messaging/Adapter/Push/APNS.php
@@ -16,7 +16,7 @@ public function __construct(
         private string $authKeyId,
         private string $teamId,
         private string $bundleId,
-        private string $endpoint
+        private bool $sandbox = false
     ) {
     }
 
@@ -93,12 +93,19 @@ private function notify(array $to, array $payload): array
             CURLOPT_HEADER => true,
         ]);
 
+        $response = '';
+        $endpoint = 'https://api.push.apple.com';
+
+        if ($this->sandbox) {
+            $endpoint = 'https://api.development.push.apple.com';
+        }
+
         $mh = \curl_multi_init();
         $handles = [];
 
         // Create a handle for each request
         foreach ($to as $token) {
-            \curl_setopt($ch, CURLOPT_URL, $this->endpoint.'/3/device/'.$token);
+            \curl_setopt($ch, CURLOPT_URL, $endpoint.'/3/device/'.$token);
 
             $handle = \curl_copy_handle($ch);
             \curl_multi_add_handle($mh, $handle);

diff --git a/src/Utopia/Messaging/Adapter/SMS/Clickatell.php b/src/Utopia/Messaging/Adapter/SMS/Clickatell.php
@@ -14,6 +14,7 @@ class Clickatell extends SMSAdapter
      */
     public function __construct(
         private string $apiKey,
+        private ?string $from = null
     ) {
     }
 
@@ -43,7 +44,7 @@ protected function process(SMS $message): string
             ],
             body: \json_encode([
                 'content' => $message->getContent(),
-                'from' => $message->getFrom(),
+                'from' => $this->from ?? $message->getFrom(),
                 'to' => $message->getTo(),
             ]),
         );

diff --git a/src/Utopia/Messaging/Adapter/SMS/Infobip.php b/src/Utopia/Messaging/Adapter/SMS/Infobip.php
@@ -15,7 +15,8 @@ class Infobip extends SMSAdapter
      */
     public function __construct(
         private string $apiBaseUrl,
-        private string $apiKey
+        private string $apiKey,
+        private ?string $from = null
     ) {
     }
 
@@ -48,7 +49,7 @@ protected function process(SMS $message): string
             body: \json_encode([
                 'messages' => [
                     'text' => $message->getContent(),
-                    'from' => $message->getFrom(),
+                    'from' => $this->from ?? $message->getFrom(),
                     'destinations' => $to,
                 ],
             ]),

diff --git a/src/Utopia/Messaging/Adapter/SMS/Msg91.php b/src/Utopia/Messaging/Adapter/SMS/Msg91.php
@@ -10,6 +10,8 @@
 
 class Msg91 extends SMSAdapter
 {
+    private string $templateId;
+
     /**
      * @param  string  $senderId Msg91 Sender ID
      * @param  string  $authKey Msg91 Auth Key
@@ -31,17 +33,28 @@ public function getMaxMessagesPerRequest(): int
         return 1000;
     }
 
+    public function setTemplate(string $templateId): self
+    {
+        $this->templateId = $templateId;
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      *
      * @throws \Exception
      */
     protected function process(SMS $message): string
     {
-        $to = \array_map(
-            fn ($to) => ['mobiles' => \ltrim($to, '+')],
-            $message->getTo()
-        );
+        $recipients = [];
+        foreach ($message->getTo() as $recipient) {
+            $recipients[] = [
+                'mobiles' => \ltrim($recipient, '+'),
+                'content' => $message->getContent(),
+                'otp' => $message->getContent(),
+            ];
+        }
 
         return $this->request(
             method: 'POST',
@@ -52,9 +65,8 @@ protected function process(SMS $message): string
             ],
             body: \json_encode([
                 'sender' => $this->senderId,
-                'otp' => $message->getContent(),
-                'flow_id' => $message->getFrom(),
-                'recipients' => [$to],
+                'template_id' => $this->templateId,
+                'recipients' => $recipients,
             ]),
         );
     }

diff --git a/src/Utopia/Messaging/Adapter/SMS/Plivo.php b/src/Utopia/Messaging/Adapter/SMS/Plivo.php
@@ -15,7 +15,8 @@ class Plivo extends SMSAdapter
      */
     public function __construct(
         private string $authId,
-        private string $authToken
+        private string $authToken,
+        private ?string $from = null
     ) {
     }
 
@@ -44,7 +45,7 @@ protected function process(SMS $message): string
             ],
             body: \http_build_query([
                 'text' => $message->getContent(),
-                'src' => $message->getFrom() ?? 'Plivo',
+                'src' => $this->from ?? $message->getFrom() ?? 'Plivo',
                 'dst' => \implode('<', $message->getTo()),
             ]),
         );

diff --git a/src/Utopia/Messaging/Adapter/SMS/Seven.php b/src/Utopia/Messaging/Adapter/SMS/Seven.php
@@ -13,7 +13,8 @@ class Seven extends SMSAdapter
      * @param  string  $apiKey Seven API token
      */
     public function __construct(
-        private string $apiKey
+        private string $apiKey,
+        private ?string $from = null
     ) {
     }
 
@@ -42,7 +43,7 @@ protected function process(SMS $message): string
                 'content-type: application/json',
             ],
             body: \json_encode([
-                'from' => $message->getFrom(),
+                'from' => $this->from ?? $message->getFrom(),
                 'to' => \implode(',', $message->getTo()),
                 'text' => $message->getContent(),
             ]),

diff --git a/src/Utopia/Messaging/Adapter/SMS/Sinch.php b/src/Utopia/Messaging/Adapter/SMS/Sinch.php
@@ -15,7 +15,8 @@ class Sinch extends SMSAdapter
      */
     public function __construct(
         private string $servicePlanId,
-        private string $apiToken
+        private string $apiToken,
+        private ?string $from = null
     ) {
     }
 
@@ -46,7 +47,7 @@ protected function process(SMS $message): string
                 'content-type: application/json',
             ],
             body: \json_encode([
-                'from' => $message->getFrom(),
+                'from' => $this->from ?? $message->getFrom(),
                 'to' => $to,
                 'body' => $message->getContent(),
             ]),

diff --git a/src/Utopia/Messaging/Adapter/SMS/Telnyx.php b/src/Utopia/Messaging/Adapter/SMS/Telnyx.php
@@ -12,6 +12,7 @@ class Telnyx extends SMSAdapter
      */
     public function __construct(
         private string $apiKey,
+        private ?string $from = null
     ) {
     }
 
@@ -41,7 +42,7 @@ protected function process(SMS $message): string
             ],
             body: \json_encode([
                 'text' => $message->getContent(),
-                'from' => $message->getFrom(),
+                'from' => $this->from ?? $message->getFrom(),
                 'to' => $message->getTo()[0],
             ]),
         );

diff --git a/src/Utopia/Messaging/Adapter/SMS/TextMagic.php b/src/Utopia/Messaging/Adapter/SMS/TextMagic.php
@@ -16,7 +16,8 @@ class TextMagic extends SMSAdapter
      */
     public function __construct(
         private string $username,
-        private string $apiKey
+        private string $apiKey,
+        private ?string $from = null
     ) {
     }
 
@@ -51,7 +52,7 @@ protected function process(SMS $message): string
             ],
             body: \http_build_query([
                 'text' => $message->getContent(),
-                'from' => \ltrim($message->getFrom(), '+'),
+                'from' => \ltrim($this->from ?? $message->getFrom(), '+'),
                 'phones' => \implode(',', $to),
             ]),
         );

diff --git a/src/Utopia/Messaging/Adapter/SMS/Twilio.php b/src/Utopia/Messaging/Adapter/SMS/Twilio.php
@@ -13,7 +13,8 @@ class Twilio extends SMSAdapter
      */
     public function __construct(
         private string $accountSid,
-        private string $authToken
+        private string $authToken,
+        private ?string $from = null
     ) {
     }
 
@@ -42,7 +43,7 @@ protected function process(SMS $message): string
             ],
             body: \http_build_query([
                 'Body' => $message->getContent(),
-                'From' => $message->getFrom(),
+                'From' => $this->from ?? $message->getFrom(),
                 'To' => $message->getTo()[0],
             ]),
         );

diff --git a/src/Utopia/Messaging/Adapter/SMS/Vonage.php b/src/Utopia/Messaging/Adapter/SMS/Vonage.php
@@ -16,7 +16,8 @@ class Vonage extends SMSAdapter
      */
     public function __construct(
         private string $apiKey,
-        private string $apiSecret
+        private string $apiSecret,
+        private ?string $from = null
     ) {
     }
 
@@ -47,7 +48,7 @@ protected function process(SMS $message): string
             url: 'https://rest.nexmo.com/sms/json',
             body: \http_build_query([
                 'text' => $message->getContent(),
-                'from' => $message->getFrom(),
+                'from' => $this->from ?? $message->getFrom(),
                 'to' => $to[0], //\implode(',', $to),
                 'api_key' => $this->apiKey,
                 'api_secret' => $this->apiSecret,

diff --git a/tests/Messaging/Adapter/App/DiscordTest.php → tests/Messaging/Adapter/Chat/DiscordTest.php b/tests/Messaging/Adapter/App/DiscordTest.php → tests/Messaging/Adapter/Chat/DiscordTest.php
diff --git a/tests/Messaging/Adapter/Push/APNSTest.php b/tests/Messaging/Adapter/Push/APNSTest.php
@@ -14,9 +14,8 @@ public function testSend(): void
         $authKeyId = \getenv('APNS_AUTH_ID');
         $teamId = \getenv('APNS_TEAM_ID');
         $bundleId = \getenv('APNS_BUNDLE_ID');
-        $endpoint = 'https://api.sandbox.push.apple.com:443';
 
-        $adapter = new APNSAdapter($authKey, $authKeyId, $teamId, $bundleId, $endpoint);
+        $adapter = new APNSAdapter($authKey, $authKeyId, $teamId, $bundleId);
 
         $message = new Push(
             to: [\getenv('APNS_TO')],

diff --git a/tests/Messaging/Adapter/SMS/GEOSMS/CallingCodeTest.php b/tests/Messaging/Adapter/SMS/GEOSMS/CallingCodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia\Tests\Messaging\Adapter\SMS\GEOSMS;
+namespace Utopia\Tests\Adapter\SMS\GEOSMS;
 
 use Utopia\Messaging\Adapter\SMS\GEOSMS\CallingCode;
 use Utopia\Tests\Adapter\Base;