trying something different

Author: slakbal

src/CitrixAbstract.php

@@ -21,7 +21,7 @@ abstract class CitrixAbstract
 
     private $verify_ssl = false;
 
-    private $http_client;
+    private $client;
 
     private $authObject; //holds all the values after auth
 
@@ -172,9 +172,9 @@ public function getResponseCollection()
     public function sendRequest()
     {
 
-        if (!$this->http_client instanceof HttpClient) {
+        if (!$this->client instanceof HttpClient) {
 
-            $this->http_client = new HttpClient([
+            $this->client = new HttpClient([
                 'base_uri' => $this->base_uri,
                 'port'     => $this->port,
                 'timeout'  => $this->timeout,
@@ -189,7 +189,7 @@ public function sendRequest()
 
                 case 'GET':
 
-                    $this->httpResponse = $this->http_client->get($this->getUrl(), [
+                    $this->httpResponse = $this->client->get($this->getUrl(), [
                         'headers' => [
                             'Content-Type'  => 'application/json; charset=utf-8',
                             'Accept'        => 'application/json',
@@ -201,7 +201,7 @@ public function sendRequest()
 
                 case 'POST':
 
-                    $this->httpResponse = $this->http_client->post($this->getUrl(), [
+                    $this->httpResponse = $this->client->post($this->getUrl(), [
                         'headers' => [
                             'Content-Type'  => 'application/json; charset=utf-8',
                             'Accept'        => 'application/json',
@@ -213,7 +213,7 @@ public function sendRequest()
 
                 case 'PUT':
 
-                    $this->httpResponse = $this->http_client->put($this->getUrl(), [
+                    $this->httpResponse = $this->client->put($this->getUrl(), [
                         'headers' => [
                             'Content-Type'  => 'application/json; charset=utf-8',
                             'Accept'        => 'application/json',
@@ -225,7 +225,7 @@ public function sendRequest()
 
                 case 'DELETE':
 
-                    $this->httpResponse = $this->http_client->delete($this->getUrl(), [
+                    $this->httpResponse = $this->client->delete($this->getUrl(), [
                         'headers' => [
                             'Content-Type'  => 'application/json; charset=utf-8',
                             'Accept'        => 'application/json',

src/DirectAuthenticate.php

@@ -3,7 +3,6 @@
 namespace Slakbal\Citrix;
 
 use GuzzleHttp\Client as HttpClient;
-use GuzzleHttp\ClientInterface;
 
 class DirectAuthenticate
 {
@@ -51,24 +50,25 @@ public function authenticate()
             'client_id'  => $this->client_id,
         ];
 
-        if (version_compare(ClientInterface::VERSION, '6') === 1) {
-            $options = ['form_params' => $params];
-        } else {
-            $options = ['body' => $params];
-        }
+        $url = '/oauth/access_token?grant_type='.$this->grant_type.'&user_id='.$this->username.'&password='.$this->password.'&client_id='.$this->client_id;
 
-        $this->response = $this->client->post('/oauth/access_token', $options);
-
-        /*
-        $this->response = $this->http_client->get('/oauth/access_token', [
-            'header' => [
+        $this->response = $this->client->get($url, [
+            'header'      => [
                 'Content-Type' => 'application/x-www-form-urlencoded',
                 'Accept'       => 'application/json',
-            ],
-            'query' => $params,
-            'form_params' => $params,
+            ]
         ]);
-*/
+
+
+//        $this->response = $this->client->get('/oauth/access_token', [
+//            'header'      => [
+//                'Content-Type' => 'application/x-www-form-urlencoded',
+//                'Accept'       => 'application/json',
+//            ],
+//            'query'       => $params,
+//            //'form_params' => $params,
+//        ]);
+
         //            'headers'     => [
         //                'Content-Type' => 'application/x-www-form-urlencoded',
         //                'Accept'       => 'application/json',
@@ -90,8 +90,6 @@ public function authenticate()
 
         $this->response = $this->response->getBody();
 
-        //dd( (string)$this->response );
-
         $this->response = json_decode($this->response, false, 512, JSON_BIGINT_AS_STRING);
 
         return $this->response;