-
Notifications
You must be signed in to change notification settings - Fork 69
feat: add Vonage Messages API adapter #127
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
deepshekhardas
wants to merge
2
commits into
utopia-php:main
Choose a base branch
from
deepshekhardas:fix/111-vonage-messages-api
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| <?php | ||
|
|
||
| namespace Utopia\Messaging\Adapter\SMS; | ||
|
|
||
| use Utopia\Messaging\Adapter\SMS as SMSAdapter; | ||
| use Utopia\Messaging\Messages\SMS as SMSMessage; | ||
| use Utopia\Messaging\Response; | ||
|
|
||
| class VonageMessages extends SMSAdapter | ||
| { | ||
| protected const NAME = 'Vonage Messages'; | ||
|
|
||
| public function __construct( | ||
| private string $apiKey, | ||
| private string $apiSecret, | ||
| private ?string $from = null | ||
| ) { | ||
| } | ||
|
|
||
| protected function getApiEndpoint(): string | ||
| { | ||
| return 'https://api.vonage.com/v1/messages'; | ||
| } | ||
|
|
||
| protected function getAuthorizationHeader(): string | ||
| { | ||
| return 'Basic ' . \base64_encode("{$this->apiKey}:{$this->apiSecret}"); | ||
| } | ||
|
|
||
| /** | ||
| * @return array<string> | ||
| */ | ||
| protected function getRequestHeaders(): array | ||
| { | ||
| return [ | ||
| "Authorization: {$this->getAuthorizationHeader()}", | ||
| 'Content-Type: application/json', | ||
| 'Accept: application/json', | ||
| 'User-Agent: Utopia Messaging', | ||
| ]; | ||
| } | ||
|
|
||
| public function getName(): string | ||
| { | ||
| return static::NAME; | ||
| } | ||
|
|
||
| public function getMaxMessagesPerRequest(): int | ||
| { | ||
| return 1; | ||
| } | ||
|
|
||
| protected function process(SMSMessage $message): array | ||
| { | ||
| $to = \ltrim($message->getTo()[0], '+'); | ||
| $from = $this->from ?? $message->getFrom(); | ||
| $from = $from !== null ? \ltrim($from, '+') : null; | ||
|
|
||
| $response = new Response($this->getType()); | ||
|
|
||
| if (empty($from)) { | ||
| $response->addResult($message->getTo()[0], 'The "from" field is required for the Vonage Messages API.'); | ||
| return $response->toArray(); | ||
| } | ||
|
|
||
| $result = $this->request( | ||
| method: 'POST', | ||
| url: $this->getApiEndpoint(), | ||
| headers: $this->getRequestHeaders(), | ||
| body: [ | ||
| 'message_type' => 'text', | ||
| 'to' => $to, | ||
| 'from' => $from, | ||
| 'text' => $message->getContent(), | ||
| 'channel' => 'sms', | ||
| ], | ||
| ); | ||
|
|
||
| if ($result['statusCode'] === 202) { | ||
| $response->setDeliveredTo(1); | ||
| $response->addResult($message->getTo()[0]); | ||
| } else { | ||
| $errorMessage = "Error {$result['statusCode']}"; | ||
|
|
||
| if (\is_array($result['response'])) { | ||
| if (isset($result['response']['detail'])) { | ||
| $errorMessage = $result['response']['detail']; | ||
| } elseif (isset($result['response']['title'])) { | ||
| $errorMessage = $result['response']['title']; | ||
| } | ||
| } elseif (!empty($result['error'])) { | ||
| $errorMessage = $result['error']; | ||
| } elseif (\is_string($result['response']) && !empty($result['response'])) { | ||
| $errorMessage = "Error {$result['statusCode']}: " . \mb_strimwidth(\strip_tags($result['response']), 0, 100, '...'); | ||
| } | ||
|
|
||
| $response->addResult($message->getTo()[0], $errorMessage); | ||
| } | ||
|
|
||
| return $response->toArray(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?php | ||
|
|
||
| namespace Utopia\Tests\Adapter\SMS; | ||
|
|
||
| use Utopia\Tests\Adapter\Base; | ||
|
|
||
| class VonageLegacyTest extends Base | ||
| { | ||
| /** | ||
| * @throws \Exception | ||
| */ | ||
| public function testSendSMS(): void | ||
| { | ||
| $this->markTestSkipped('Vonage credentials are not available.'); | ||
|
|
||
| /* | ||
| $apiKey = \getenv('VONAGE_API_KEY'); | ||
| $apiSecret = \getenv('VONAGE_API_SECRET'); | ||
|
|
||
| $sender = new Vonage($apiKey, $apiSecret); | ||
|
|
||
| $message = new SMS( | ||
| to: [\getenv('VONAGE_TO')], | ||
| content: 'Test Content', | ||
| from: \getenv('VONAGE_FROM') | ||
| ); | ||
|
|
||
| $response = $sender->send($message); | ||
|
|
||
| $result = \json_decode($response, true); | ||
|
|
||
| $this->assertResponse($result); | ||
| */ | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?php | ||
|
|
||
| namespace Utopia\Tests\Adapter\SMS; | ||
|
|
||
| use Utopia\Messaging\Adapter\SMS\VonageMessages; | ||
| use Utopia\Messaging\Messages\SMS; | ||
| use Utopia\Tests\Adapter\Base; | ||
|
|
||
| class VonageMessagesTest extends Base | ||
| { | ||
| /** | ||
| * @throws \Exception | ||
| */ | ||
| public function testSendSMS(): void | ||
| { | ||
| $this->markTestSkipped('Vonage Messages credentials are not available.'); | ||
|
|
||
| /* | ||
| $apiKey = \getenv('VONAGE_MESSAGES_API_KEY'); | ||
| $apiSecret = \getenv('VONAGE_MESSAGES_API_SECRET'); | ||
|
|
||
| $sender = new VonageMessages($apiKey, $apiSecret); | ||
|
|
||
| $message = new SMS( | ||
| to: [\getenv('VONAGE_MESSAGES_TO')], | ||
| content: 'Test Content', | ||
| from: \getenv('VONAGE_MESSAGES_FROM'), | ||
| ); | ||
|
|
||
| $response = $sender->send($message); | ||
|
|
||
| $this->assertNotEmpty($response['results']); | ||
| $this->assertNotEmpty($response['results'][0]['success']); | ||
| */ | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
parent::__construct()causes fatal error on every sendThe original
Vonage.phpcalledparent::__construct(), which this PR explicitly removes. The baseAdapterclass initializes two typed properties there —$sendCounter(non-nullableCounter) and$clientFactory(readonly?Closure) — both via constructor promotion or direct assignment. Without that call, both properties remain uninitialized. PHP throwsFatal error: Typed property Utopia\Messaging\Adapter::$sendCounter must not be accessed before initializationthe first timesend()callsrecordResponse(), which is every successful delivery. Every other SMS adapter in the codebase (Twilio,Clickatell,Sinch, etc.) callsparent::__construct().Prompt To Fix With AI