Webhooks fixes

Author: jeybin

NgeniusWebhooks/Purchase/HandleNgeniusPurchaseDeclined.php

@@ -42,8 +42,5 @@ public function handle()
          * Passing the payload/response from the webhook to the 
          * CreatedHandler function in CreateChargeController
          */
-
-         debug(">>>> inside purchase declined job");
-         debug($this->webhookCall);
     }
 }

src/App/Exceptions/NgeniusWebhookExceptions.php

@@ -10,17 +10,17 @@ class NgeniusWebhookExceptions extends Exception
 {
     public static function missingSignature()
     {
-        return new static('The request did not contain a header named `X-NGENIUS-Webhook-Signature`.');
+        return new static('The request did not contain a header named `'.config('ngenius-config.webhook-header').'`.');
     }
 
     public static function invalidSignature($signature)
     {
-        return new static("The signature `{$signature}` found in the header named `X-NGENIUS-Webhook-Signature` is invalid. Make sure that the `ngenius.webhookSecret` config key is set to the value you found on the ngenius dashboard. If you are caching your config try running `php artisan clear:cache` to resolve the problem.");
+        return new static("The signature `{$signature}` found in the header named `".config('ngenius-config.webhook-header')."` is invalid. Make sure that the `ngenius.webhookSecret` config key is set to the value you found on the ngenius dashboard. If you are caching your config try running `php artisan clear:cache` to resolve the problem.");
     }
 
     public static function sharedSecretNotSet()
     {
-        return new static('The ngenius Commerce webhook shared secret is not set. Make sure that the `ngenius.webhookSecret` config key is set to the value you found on the ngenius dashboard.');
+        return new static('The ngenius Commerce webhook shared secret is not set. Make sure that the `ngenius.webhook-secret` config key is set to the value you found on the ngenius dashboard.');
     }
 
     public static function jobClassDoesNotExist(string $jobClass, NgeniusGatewayWehooks $webhookCall)
@@ -33,6 +33,16 @@ public static function missingType()
         return new static('The webhook call did not contain a type. Valid ngenius Commerce webhook calls should always contain a type.');
     }
 
+    public static function missingModel()
+    {
+        return new static('The model for webhook is not configured.');
+    }
+
+    public static function emptyPayload()
+    {
+        return new static('The webhook payload is empty.');
+    }
+
     public function render($request)
     {
         return response(['code'=>400,

src/App/Http/Controllers/NgeniusWebhookController.php

@@ -6,6 +6,7 @@
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Jeybin\Networkintl\App\Exceptions\NgeniusWebhookExceptions;
 use Jeybin\Networkintl\App\Http\Middleware\VerifyWebhookSignature;
 
 class NgeniusWebhookController extends Controller
@@ -21,21 +22,31 @@ public function __invoke(Request $request){
          * The webhook model where the webhook 
          * datas to be inserted
          */
-        $model = config('ngenius-config.webhook-model');
+
+
+         $model = config('ngenius-config.webhook-model');
+
+        if(empty($model)){
+            throw NgeniusWebhookExceptions::missingModel();
+        }
 
         $payload = $request->all();
 
-        if($payload){
-            throwNgeniusPackageResponse('Empty event data',null,422);
+        if(empty($payload)){
+            throw NgeniusWebhookExceptions::emptyPayload();
         }
 
+        /**
+         * Converting payload to array 
+         */
         $payload = (!is_string($payload)) ?  $payload : json_decode(json_encode($payload),true);
 
         $currency  = config('ngenius-config.merchant-currency'); 
         $reference = $email = $orderDetails = $merchantOrderReference = null;
         $amount    = 0;
 
         if(!empty($payload['order'])){
+
             $orderDetails = $payload['order'];
 
             if(!empty($orderDetails['reference'])){
@@ -45,27 +56,32 @@ public function __invoke(Request $request){
             }
 
             if(!empty($orderDetails['amount'])){
-                $currency  = (string)$orderDetails['currencyCode'] ?? config('ngenius-config.merchant-currency');
-                $amount    = (integer)$orderDetails['amount']['value'] ?? 0;
+                $currency  = (string)(!empty($orderDetails['currencyCode'])) ? $orderDetails['currencyCode'] : config('ngenius-config.merchant-currency');
+                $amount    = (integer)(!empty($orderDetails['amount']['value'])) ? $orderDetails['amount']['value'] : 0;
                 if($amount > 0){
                     $amount = $amount/100;
                 }
             }
-            
-
         }
 
+        /**
+         * Event id
+         */
+        $eventId    = !empty($payload['eventId'])   ? $payload['eventId']   : null;
 
-        $insertData = ['event_id'=>$payload['eventId'] ?? null,
-                       'event_name'=>$payload['eventName'] ?? null,
-                       'order_data'=>json_encode($payload['order']) ?? null,
+        /**
+         * Event name from the order
+         */
+        $eventName  = !empty($payload['eventName']) ? $payload['eventName'] : null;
+
+        $insertData = ['event_id'=>$eventId,
+                       'event_name'=>$eventName,
                        'order_reference'=>$reference,
                        'merchant_order_reference'=>$merchantOrderReference,
                        'email'    => $email,
                        'currency' => $currency,
                        'amount'   => $amount,
-                       'payload'  => $payload];
-
+                       'payload'  => json_encode($payload)];
 
         $ngeniusWebhookCall = $model::create($insertData);
 

src/App/Models/NgeniusGatewayWehooks.php

@@ -44,7 +44,7 @@ public function process(){
          * order response
          * eg : if PURCHASE_DECLINED -> event will be ngenius::PURCHASE_DECLINED
          */
-        // event("ngenius::{$this->type}", $this);
+        // event("ngenius::{$this->event_name}", $this);
 
         /**
          * Determining the job classes
@@ -56,7 +56,7 @@ public function process(){
          * return null or if the class doesnt exists it will 
          * return exception or else dispatch the job 
          */
-        $jobClass = $this->determineJobClass($this->type);
+        $jobClass = $this->determineJobClass($this->event_name);
 
         if ($jobClass === '') {
             return;
@@ -66,7 +66,11 @@ public function process(){
             throw NgeniusWebhookExceptions::jobClassDoesNotExist($jobClass, $this);
         }
 
-        dispatch(new $jobClass($this));
+        try{
+            dispatch(new $jobClass($this));
+        }catch(Exception $e){
+            $this->saveException($e);
+        }
     }
 
     public function saveException(Exception $exception)
@@ -85,9 +89,11 @@ public function saveException(Exception $exception)
 
     protected function determineJobClass(string $eventType): string
     {   
+
         $jobConfigKey = str_replace('.', '_', $eventType);
 
         return config("ngenius-config.webhook-jobs.{$jobConfigKey}", '');
+        
     }
 
     protected function clearException()