Added improvement to classes returned data

forward-force · Feb 11, 2021 · d7b04f2 · d7b04f2
1 parent 0fdb9df
commit d7b04f2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/src/Daxko.php b/src/Daxko.php
@@ -15,23 +15,23 @@
 
 class Daxko
 {
-    protected string $baseURL = 'https://api.partners.daxko.com/api/';
-    protected string $apiVersion = 'v1';
+    const BASE_URL = 'https://api.partners.daxko.com';
+    const API_VERSION = '/api/v1';
+
 
     /**
      * An HTTPClient to query Daxko's API
      */
     protected Client $client;
 
 
-    public function __construct(string $accessToken, array $options = [])
+    public function __construct(string $accessToken)
     {
         $clientConfig = [
-            // 'base_uri' => $options['base_uri'] ?? $this->baseURL.$this->apiVersion,
-            'base_uri' => 'https://api.partners.daxko.com',
+            'base_uri' => self::BASE_URL,
             'headers' => [
                 'Content-Type' => 'application/json',
-                'Authorization' => 'Bearer '.$accessToken,
+                'Authorization' => 'Bearer ' . $accessToken,
             ]
         ];
 
@@ -51,7 +51,7 @@ public static function getToken(string $clientId, string $clientSecret, string $
     {
         try {
             $response = (new Client())
-                ->post('https://api.partners.daxko.com/auth/token', [
+                ->post(self::BASE_URL . '/auth/token', [
                     'headers' => [ 'Content-Type' => 'application/json' ],
                     'json' => [
                         'client_id' => $clientId,
@@ -82,7 +82,7 @@ public static function refreshToken(string $clientId, string $refreshToken)
     {
         try {
             $response = (new Client())
-                ->post('https://api.partners.daxko.com/auth/token', [
+                ->post(self::BASE_URL . '/auth/token', [
                     'headers' => [ 'Content-Type' => 'application/json' ],
                     'json' => [
                         'client_id' => $clientId,

diff --git a/src/Entities/DaxkoClass.php b/src/Entities/DaxkoClass.php
@@ -2,9 +2,7 @@
 
 namespace ForwardForce\Daxko\Entities;
 
-use ForwardForce\Daxko\Client;
 use ForwardForce\Daxko\Contracts\ApiAwareContract;
-use ForwardForce\Daxko\Response;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Message;
@@ -198,13 +196,15 @@ public function all(array $params =[]): array
             $classes = [];
             $apiClasses = $this->responseToArray();
 
-            // foreach ($apiClasses as $class) {
-            //     $instance = new static($this->client);
-            //     $instance->response->withBody(new Message());
-            //     $instance->setProperties();
-            //     $classes[] = $instance;
-            // }
-                    $classes = $apiClasses;
+            foreach ($apiClasses as $class) {
+                // $instance = new static($this->client);
+                // $instance->response->withBody(new Message());
+                // $instance->setProperties();
+                // $classes[] = $instance;
+
+                $classes[] = $class['brief'];
+            }
+                    // $classes = $apiClasses;
         } catch (RequestException $e) {
             $error['request'] = Message::toString($e->getRequest());
 

diff --git a/src/Entities/DaxkoUser.php b/src/Entities/DaxkoUser.php
@@ -2,9 +2,7 @@
 
 namespace ForwardForce\Daxko\Entities;
 
-use ForwardForce\Daxko\Client;
 use ForwardForce\Daxko\Contracts\ApiAwareContract;
-use ForwardForce\Daxko\Response;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Message;