Merge pull request #17 from Xelon-AG/feat/add-request-event

add request event, fix client props checking
Xelon-AG · Jun 20, 2023 · 3cc5cb4 · 3cc5cb4
2 parents 08723a3 + 5763c35
commit 3cc5cb4
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/src/Events/RequestEvent.php b/src/Events/RequestEvent.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Xelon\VmWareClient\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class RequestEvent
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    public string $requestBody;
+
+    public string $responseBody;
+
+    public string $status;
+
+    public function __construct($requestBody, $responseBody, $status)
+    {
+        $this->requestBody = $requestBody;
+        $this->responseBody = $responseBody;
+        $this->status = $status ? 'Success' : 'Error';
+    }
+}
diff --git a/src/Requests/SoapRequest.php b/src/Requests/SoapRequest.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use stdClass;
+use Xelon\VmWareClient\Events\RequestEvent;
 use Xelon\VmWareClient\Transform\SoapTransform;
 
 trait SoapRequest
@@ -23,6 +24,12 @@ public function request(string $method, array $requestBody, bool $convertToSoap
         try {
             $response = $this->soapClient->$method($convertToSoap ? $this->arrayToSoapVar($requestBody) : $requestBody);
 
+            RequestEvent::dispatch(
+                property_exists($this->soapClient, '__last_request') ? $this->soapClient->__last_request : '',
+                property_exists($this->soapClient, '__last_response') ? $this->soapClient->__last_response : '',
+                true
+            );
+
             if (config('vmware-php-client.enable_logs')) {
                 Log::info(
                     'SOAP REQUEST SUCCESS:'.
@@ -35,6 +42,12 @@ public function request(string $method, array $requestBody, bool $convertToSoap
 
             return $response;
         } catch (\Exception $exception) {
+            RequestEvent::dispatch(
+                property_exists($this->soapClient, '__last_request') ? $this->soapClient->__last_request : '',
+                property_exists($this->soapClient, '__last_response') ? $this->soapClient->__last_response : '',
+                false
+            );
+
             if ($exception->getMessage() === 'The session is not authenticated.' && $this->tries < $this->maxTries) {
                 $this->tries++;
                 $sessionInfo = Cache::get("vcenter-soap-session-$this->ip");
@@ -64,7 +77,7 @@ public function request(string $method, array $requestBody, bool $convertToSoap
                     ? "\nSOAP request start***".$this->soapClient->__last_request.'***SOAP request end'
                     : ''
             ).(
-                property_exists($this->soapClient, '__last_request')
+                property_exists($this->soapClient, '__last_response')
                     ? "\nSOAP response start***: ".$this->soapClient->__last_response.'***SOAP response end'
                     : ''
             );

diff --git a/src/Transform/SoapTransform.php b/src/Transform/SoapTransform.php
@@ -33,7 +33,7 @@ public function arrayToSoapVar(array $array): array
                     unset($value['@type']);
                 }
 
-                if (array_key_exists('type', $value)) {
+                if (array_key_exists('_', $value) && array_key_exists('type', $value)) {
                     $data[$key] = new SoapVar($value['_'], null, $value['type'], '', $key, '');
 
                     continue;
@@ -52,7 +52,7 @@ public function arrayToSoapVar(array $array): array
                                 unset($childItem['@type']);
                             }
 
-                            if (array_key_exists('type', $childItem)) {
+                            if (array_key_exists('_', $childItem) && array_key_exists('type', $childItem)) {
                                 $data[$key] = new SoapVar($childItem['_'], null, $childItem['type'], '', $key, '');
 
                                 continue;