-
Notifications
You must be signed in to change notification settings - Fork 66
feat: add Vonage Messages API adapter #111
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
bhardwajparth51
wants to merge
9
commits into
utopia-php:main
Choose a base branch
from
bhardwajparth51:feat/vonage-messages-adapter
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.
+173
−0
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
2af52bc
feat: add Vonage Messages API adapter
bhardwajparth51 6710210
fix: address code review feedback (Vonage domain, from formatting, te…
bhardwajparth51 81c75ee
test: refine type safety and isolate fallback logic in Vonage tests
bhardwajparth51 b0d9aec
docs: improve docstring coverage for Vonage methods to meet CI threshold
bhardwajparth51 62b741e
fix: move from field trimming before empty guard
bhardwajparth51 c071c03
docs: add Vonage Messages to supported SMS adapters list
bhardwajparth51 e792606
fix: address review feedback (remove base class/trait for Vonage)
bhardwajparth51 4b3388a
revert: remove documentation changes for Vonage Messages
bhardwajparth51 815454f
fix: address review feedback and harden error handling
bhardwajparth51 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <?php | ||
|
|
||
| namespace Utopia\Messaging\Adapter\SMS; | ||
|
|
||
| use Utopia\Messaging\Adapter\SMS as SMSAdapter; | ||
| use Utopia\Messaging\Messages\SMS as SMSMessage; | ||
| use Utopia\Messaging\Response; | ||
|
|
||
| // Vonage Messages API SMS Adapter. | ||
| // This adapter uses the modern Vonage Messages API (V1) which is more cost-effective | ||
| // and versatile than the legacy SMS API. | ||
| // https://developer.vonage.com/en/api/messages | ||
| class VonageMessages extends SMSAdapter | ||
| { | ||
| protected const NAME = 'Vonage Messages'; | ||
|
|
||
| public function __construct( | ||
| private string $apiKey, | ||
| private string $apiSecret, | ||
| private ?string $from = null | ||
| ) { | ||
| } | ||
|
|
||
| // Vonage Messages API endpoint. | ||
| protected function getApiEndpoint(): string | ||
| { | ||
| return 'https://api.vonage.com/v1/messages'; | ||
| } | ||
|
|
||
| // Generates the Basic Authorization header. | ||
| protected function getAuthorizationHeader(): string | ||
| { | ||
| return 'Basic ' . \base64_encode("{$this->apiKey}:{$this->apiSecret}"); | ||
| } | ||
|
|
||
| // Sets common headers for the API request. | ||
| protected function getRequestHeaders(): array | ||
| { | ||
| return [ | ||
| "Authorization: {$this->getAuthorizationHeader()}", | ||
| 'Content-Type: application/json', | ||
| 'Accept: application/json', | ||
| 'User-Agent: Utopia Messaging', | ||
| ]; | ||
| } | ||
|
|
||
| // Get adapter name. | ||
| public function getName(): string | ||
| { | ||
| return static::NAME; | ||
| } | ||
|
|
||
| // Get max messages per request. | ||
| 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(), | ||
greptile-apps[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| '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,65 @@ | ||
| <?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 | ||
| { | ||
| // Tests sending an SMS with the 'from' number set directly in the adapter. | ||
| public function testSendSMS(): void | ||
| { | ||
| $apiKey = \getenv('VONAGE_API_KEY'); | ||
| $apiSecret = \getenv('VONAGE_API_SECRET'); | ||
| $to = \getenv('VONAGE_TO'); | ||
|
|
||
| if (!$apiKey || !$apiSecret || !$to) { | ||
| $this->markTestSkipped('Vonage Messages credentials or recipient are not available.'); | ||
| } | ||
|
|
||
| $sender = new VonageMessages( | ||
| apiKey: $apiKey, | ||
| apiSecret: $apiSecret, | ||
| from: \getenv('VONAGE_FROM') ?: 'Vonage', | ||
| ); | ||
|
|
||
| $message = new SMS( | ||
| to: [$to], | ||
| content: 'Test Content', | ||
| ); | ||
|
|
||
| $response = $sender->send($message); | ||
|
|
||
| $this->assertResponse($response); | ||
| } | ||
|
|
||
| // Tests sending an SMS where the 'from' number is provided by the message object. | ||
| public function testSendSMSWithFallbackFrom(): void | ||
| { | ||
| $apiKey = \getenv('VONAGE_API_KEY'); | ||
ChiragAgg5k marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $apiSecret = \getenv('VONAGE_API_SECRET'); | ||
| $to = \getenv('VONAGE_TO'); | ||
| $from = \getenv('VONAGE_FROM') ?: null; | ||
|
|
||
| if (!$apiKey || !$apiSecret || !$to || !$from) { | ||
| $this->markTestSkipped('Vonage Messages credentials or sender/recipient are not available.'); | ||
| } | ||
|
|
||
| $sender = new VonageMessages( | ||
| apiKey: $apiKey, | ||
| apiSecret: $apiSecret, | ||
| ); | ||
|
|
||
| $message = new SMS( | ||
| to: [$to], | ||
| content: 'Test Content', | ||
| from: $from, | ||
| ); | ||
|
|
||
| $response = $sender->send($message); | ||
|
|
||
| $this->assertResponse($response); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.