Fix MSG91

src/Utopia/Messaging/Adapters/SMS/Msg91.php

@@ -10,6 +10,8 @@
 
 class Msg91 extends SMSAdapter
 {
+    private $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' => $recipient,
+                'content' => $message->getContent(),
+                'otp' => $message->getContent(),
+            ];
+        }
 
         return $this->request(
             method: 'POST',
@@ -52,28 +65,9 @@ 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,
             ]),
         );
     }
-
-    private function addTemplate(string $content, string $senderId, string $templateName, string $smsType = 'NORMAL')
-    {
-        return $this->request(
-            method: 'POST',
-            url: 'https://control.msg91.com/api/v5/sms/addTemplate',
-            headers: [
-                'content-type: application/json',
-                "authkey: {$this->authKey}",
-            ],
-            body: \json_encode([
-                'template' => $content,
-                'sender_id' => $senderId,
-                'template_name' => $templateName,
-                'smsType' => 'NORMAL',
-            ])
-        );
-    }
 }

tests/e2e/SMS/Msg91Test.php

@@ -12,19 +12,18 @@ class Msg91Test extends Base
      */
     public function testSendSMS()
     {
-        // $sender = new Msg91(getenv('MSG_91_SENDER_ID'), getenv('MSG_91_AUTH_KEY'));
+        $sender = new Msg91(getenv('MSG_91_SENDER_ID'), getenv('MSG_91_AUTH_KEY'));
+        $sender->setTemplate(getenv('MSG_91_FROM'));
 
-        // $message = new SMS(
-        //     to: [getenv('MSG_91_TO')],
-        //     content: 'Test Content',
-        //     from: getenv('MSG_91_FROM')
-        // );
+        $message = new SMS(
+            to: [getenv('MSG_91_TO')],
+            content: 'Test Content',
+        );
 
-        // $response = $sender->send($message);
-        // $result = \json_decode($response, true);
+        $response = $sender->send($message);
+        $result = \json_decode($response, true);
 
-        // $this->assertEquals('success', $result['type']);
-
-        $this->markTestSkipped('Msg91 requires business verification to use template and SMS api.');
+        $this->assertEquals('success', $result['type']);
+        $this->assertNotEmpty($result['message']);
     }
 }