Refactor OTPIQ API integration to improve error handling and update c…

…onfiguration
Rstacode · Jan 31, 2025 · da80977 · da80977
1 parent 17cd18d
commit da80977
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 39 deletions.
diff --git a/app/Http/Controllers/Welcome.php b/app/Http/Controllers/Welcome.php
@@ -3,7 +3,6 @@
 
 use Illuminate\Support\Facades\Cache;
 use Livewire\Component;
-use Rstacode\Otpiq\DTOs\SmsData;
 use Rstacode\Otpiq\Facades\Otpiq;
 use WireUi\Traits\WireUiActions;
 
@@ -19,12 +18,18 @@ public function setApiKey()
         $this->validate([
             'apiKey' => 'required|string|min:20',
         ]);
+
+        if (strpos($this->apiKey, 'sk_live_') !== 0) {
+            $this->addError('apiKey', 'API Key is invalid!');
+            return;
+        }
         Cache::put('otpiq_api_key', $this->apiKey, now()->addHours(24));
         $this->reset('apiKey');
         $this->dispatch('notify', [
             'message' => 'API Key set successfully!',
             'type'    => 'success',
         ]);
+
     }
 
     public function removeApiKey()
@@ -59,12 +64,13 @@ public function save()
     {
         $this->callApiKey();
         try {
-            $response = Otpiq::sendSms(new SmsData(
-                phoneNumber: $this->phoneNumber,
-                smsType: 'verification',
-                provider: $this->provider,
-                verificationCode: $this->verificationCode
-            ));
+            $response = Otpiq::sendSms([
+                'phoneNumber'      => $this->phoneNumber,
+                'smsType'          => 'verification',
+                'verificationCode' => $this->verificationCode,
+                'provider'         => $this->provider,
+            ]);
+
             return dd($response);
         } catch (\Exception $exception) {
             return dd($exception->getMessage());
@@ -74,12 +80,15 @@ public function save2()
     {
         $this->callApiKey();
         try {
-            $response = Otpiq::sendSms(new SmsData(
-                phoneNumber: $this->phoneNumber,
-                smsType: 'custom',
-                customMessage: $this->customMessage,
-                senderId: $this->senderId,
-            ));
+            $response = Otpiq::sendSms([
+                'phoneNumber'   => $this->phoneNumber,
+                'smsType'       => 'custom',
+                'customMessage' => $this->customMessage,
+                'senderId'      => $this->senderId,
+                'provider'      => 'sms', // Required for custom messages
+            ]);
+
+            return dd($response);
         } catch (\Exception $exception) {
             return dd($exception->getMessage());
         }

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "laravel/framework": "^11.31",
         "laravel/tinker": "^2.9",
         "livewire/livewire": "^3.5",
-        "rstacode/otpiq": "^1.0",
+        "rstacode/otpiq": "^1.2",
         "wireui/wireui": "^2.2"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/config/otpiq.php b/config/otpiq.php
@@ -1,15 +1,6 @@
 <?php
 
 return [
-    /*
-    |--------------------------------------------------------------------------
-    | OTPIQ API Configuration
-    |--------------------------------------------------------------------------
-    |
-    | Here you can specify your OTPIQ API credentials and other configuration
-    | options for the OTPIQ SMS service integration.
-    |
-    */
-
-    'api_key' => env('OTPIQ_API_KEY'),
+    'api_key'  => env('OTPIQ_API_KEY', ''),
+    'base_url' => env('OTPIQ_BASE_URL', 'https://api.otpiq.com/api/'),
 ];