ajura tech adde

laraflow · Apr 9, 2024 · e4e774c · e4e774c
1 parent 0d387b7
commit e4e774c
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 59 deletions.
diff --git a/CONFIGURATION.md b/CONFIGURATION.md
@@ -41,48 +41,48 @@ after existing general configuration variables.
 
 ### Bangladesh only SMS API Providers
 
-| Driver            | Credentials                                                             | Region |     Configured     | Tested |
-|-------------------|-------------------------------------------------------------------------|:------:|:------------------:|:------:|
-| `adn`             | `SMS_ADN_API_KEY=null`<br>`SMS_ADN_API_SECRET=null`                     |  BAN   | :white_check_mark: |  :x:   |
-| `ajuratech`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `alpha`           | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `banglalink`      | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `bdbulksms`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `boomcast`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `brilliant`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `bulksmsbd`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `customgateway`   | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `dianahost`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `dianasms`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `dnsbd`           | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `elitbuzz`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `esms`            | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `grameenphone`    | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `greenweb`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `lpeek`           | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `mdl`             | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `metronet`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `mimsms`          | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `mobireach`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `mobishasra`      | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `muthofun`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `novocombd`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `onnorokom`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `quicksms`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `redmoitsms`      | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `smartlabsms`     | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `sms4bd`          | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `smsnet24`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `smsnoc`          | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `smsinbd`         | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `smsnetbd`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `smsq`            | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `ssl`             | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `tense`           | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `trubosms`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `twentyfoursmsbd` | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `viatech`         | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
-| `twenty4bulksms`  | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`                |  BAN   |        :x:         |  :x:   |
+| Driver            | Credentials                                                     | Region |     Configured     | Tested |
+|-------------------|-----------------------------------------------------------------|:------:|:------------------:|:------:|
+| `adn`             | `SMS_ADN_API_KEY=null`<br>`SMS_ADN_API_SECRET=null`             |  BAN   | :white_check_mark: |  :x:   |
+| `ajuratech`       | `SMS_AJURATECH_API_KEY=null`<br>`SMS_AJURATECH_SECRET_KEY=null` |  BAN   | :white_check_mark: |  :x:   |
+| `alpha`           | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `banglalink`      | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `bdbulksms`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `boomcast`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `brilliant`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `bulksmsbd`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `customgateway`   | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `dianahost`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `dianasms`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `dnsbd`           | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `elitbuzz`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `esms`            | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `grameenphone`    | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `greenweb`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `lpeek`           | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `mdl`             | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `metronet`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `mimsms`          | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `mobireach`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `mobishasra`      | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `muthofun`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `novocombd`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `onnorokom`       | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `quicksms`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `redmoitsms`      | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `smartlabsms`     | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `sms4bd`          | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `smsnet24`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `smsnoc`          | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `smsinbd`         | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `smsnetbd`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `smsq`            | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `ssl`             | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `tense`           | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `trubosms`        | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `twentyfoursmsbd` | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `viatech`         | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
+| `twenty4bulksms`  | `SMS_TWILIO_USERNAME=null`<br>`SMS_TWILIO_PASSWORD=null`        |  BAN   |        :x:         |  :x:   |
 
 
 ## Notification Class

diff --git a/config/sms.php b/config/sms.php
@@ -162,16 +162,12 @@
         Providers::AJURA_TECH => [
             'driver' => \Laraflow\Sms\Drivers\AjuraTech::class,
             'live' => [
-                'url' => 'https://api.twilio.com/2010-04-01/Accounts/$TWILIO_ACCOUNT_SID$/Messages.json',
-                'apikey' => env('SMS_AjuraTechReveSms_API_KEY', ''),
-                'secretkey' => env('SMS_AjuraTechReveSms_API_SECRET_KEY', ''),
-                'callerID' => env('SMS_AjuraTechReveSms_CALLER_ID', ''),
+                'api_key' => env('SMS_AJURATECH_API_KEY', ''),
+                'secret_key' => env('SMS_AJURATECH_SECRET_KEY', ''),
             ],
             'sandbox' => [
-                'url' => 'https://api.twilio.com/2010-04-01/Accounts/$TWILIO_ACCOUNT_SID$/Messages.json',
-                'apikey' => env('SMS_AjuraTechReveSms_API_KEY', ''),
-                'secretkey' => env('SMS_AjuraTechReveSms_API_SECRET_KEY', ''),
-                'callerID' => env('SMS_AjuraTechReveSms_CALLER_ID', ''),
+                'api_key' => env('SMS_AJURATECH_API_KEY', ''),
+                'secret_key' => env('SMS_AJURATECH_SECRET_KEY', ''),
             ],
         ],
         Providers::ALPHA => [

diff --git a/src/Drivers/AjuraTech.php b/src/Drivers/AjuraTech.php
@@ -33,8 +33,8 @@ public function rules(): array
     {
         return [
             'url' => 'required|url:http,https',
-            'apiKey' => 'required|string',
-            'username' => 'required|string',
+            'api_key' => 'required|string',
+            'secret_key' => 'required|string',
         ];
     }
 
@@ -47,19 +47,17 @@ public function rules(): array
     public function send(SmsMessage $message): Response
     {
         $this->payload = [
-            'username' => $this->config['username'],
-            'to' => $message->getReceiver(),
-            'from' => $message->getSender(),
-            'message' => $message->getContent(),
+            'apikey' => $this->config['api_key'],
+            'secretkey' => $this->config['secret_key'],
+            'toUser' => $message->getReceiver(),
+            'callerID' => $message->getSender(),
+            'messageContent' => $message->getContent(),
         ];
 
         $this->removeEmptyParams();
 
         return Http::withoutVerifying()
             ->timeout(30)
-            ->withHeader('Content-Type', 'application/json')
-            ->withHeader('Accept', 'application/json')
-            ->withHeader('apiKey', $this->config['apiKey'])
             ->get($this->config['url'], $this->payload);
 
     }