Improve Validator, Add Debugger and API Version

src/Http/ApiClient.php

@@ -12,28 +12,108 @@
 
 class ApiClient
 {
-    const API_VERSION = 'v1';
-
+    /**
+     * HTTP Client
+     *
+     * @var HTTPClient $httpClient
+     */
     protected $httpClient;
+
+    /**
+     * Token Manager
+     *
+     * @var TokenManager $tokenManager
+     */
     protected $tokenManager;
+
+    /**
+     * Validator
+     *
+     * @var Validator $validator
+     */
     protected $validator;
+
+    /**
+     * Base URL
+     *
+     * @var string $baseUrl
+     */
+    protected $baseUrl;
+
+    /**
+     * Grant type
+     *
+     * @var string $grantType
+     */
     protected $grantType;
+
+    /**
+     * Grant type
+     *
+     * @var string $grantType
+     */
     protected $clientId;
+
+    /**
+     * Client Secret
+     *
+     * @var string $clientSecret
+     */
     protected $clientSecret;
+
+    /**
+     * Response Type
+     *
+     * @var string $responseType
+     */
     protected $responseType;
+
+    /**
+     * Redirect URI
+     *
+     * @var string $redirectUri
+     */
     protected $redirectUri;
+
+    /**
+     * Authorization Code
+     *
+     * @var string $authorizationCode
+     */
     protected $authorizationCode;
+
+    /**
+     * Username
+     *
+     * @var string $username
+     */
     protected $username;
+
+    /**
+     * Password
+     *
+     * @var string $password
+     */
     protected $password;
 
+    /**
+     * Debug
+     *
+     * @var string $debug
+     */
+    protected $debug;
+
     /**
      * Constructor
      *
      * @param array $configs
      */
-    public function __construct(array $configs)
+    public function __construct(array $configs, $apiVersion = 'v1')
     {
-        $this->httpClient = new HttpClient('https://api.moloni.pt/' . self::API_VERSION . '/');
+        $this->baseUrl = 'https://api.moloni.pt/' . $apiVersion . '/';
+        $this->debug = false;
+
+        $this->httpClient = new HttpClient($this->baseUrl, $this->debug);
         $this->tokenManager = new TokenManager();
         $this->validator = new Validator();
 
@@ -58,6 +138,18 @@ private function setConfigs(array $configs): void
         $this->password = $configs['password'] ?? null;
     }
 
+    /**
+     * Set Guzzle Debug
+     *
+     * @param bool $debug
+     * @return void
+     */
+    public function setDebug(bool $debug): void
+    {
+        $this->debug = $debug;
+        $this->httpClient->restartClient($this->baseUrl, $this->debug);
+    }
+
     /**
      * Validate
      *

src/Http/HttpClient.php

@@ -6,24 +6,76 @@
 
 class HttpClient
 {
+    /**
+     * Base URL
+     *
+     * @var string
+     */
     protected $baseUrl;
+
+    /**
+     * Client
+     *
+     * @var Client $client
+     */
     protected $client;
+
+    /**
+     * Access Token
+     *
+     * @var string $accessToken
+     */
     protected $accessToken;
 
+    /**
+     * Debug
+     *
+     * @var bool $debug
+     */
+    protected $debug;
+
     /**
      * Http Client
      *
      * @param string $baseUrl
+     * @param bool $debug
      */
-    public function __construct(string $baseUrl)
+    public function __construct(string $baseUrl, bool $debug = false)
     {
         $this->baseUrl = $baseUrl;
+        $this->debug = $debug;
+
+        $this->startClient();
+    }
+
+    /**
+     * Start Client
+     *
+     * @return void
+     */
+    protected function startClient()
+    {
         $this->client = new Client([
-            'base_uri' => $baseUrl,
-            'http_errors' => false
+            'base_uri' => $this->baseUrl,
+            'http_errors' => $this->debug
         ]);
     }
 
+    /**
+     * Restart Client
+     *
+     * @param string $baseUrl
+     * @param bool $debug
+     * @return void
+     */
+    public function restartClient(string $baseUrl, bool $debug = false)
+    {
+        $this->baseUrl = $baseUrl;
+        $this->debug = $debug;
+
+        $this->startClient();
+    }
+
     /**
      * Set Access Token
      *
@@ -43,12 +95,6 @@ public function setAccessToken(string $accessToken)
      */
     public function getProcessedOptions(array $options): array
     {
-        $options = array_merge_recursive($options, [
-            'query' => [
-                'json' => true
-            ]
-        ]);
-
         if ($this->accessToken) {
             $options = array_merge_recursive($options, [
                 'query' => [
@@ -57,6 +103,13 @@ public function getProcessedOptions(array $options): array
             ]);
         }
 
+        $options = array_merge_recursive($options, [
+            'query' => [
+                'json' => true
+            ],
+            'debug' => $this->debug
+        ]);
+
         return $options;
     }
 
@@ -73,13 +126,17 @@ public function request(string $method, string $endpoint, array $options = [])
     {
         $url = $this->baseUrl . $endpoint;
         $options = $this->getProcessedOptions($options);
+
         $response = $this->client->request($method, $url, $options);
 
-        if ($response->getStatusCode() != 200) {
-            throw new ApiException($response, $response->getStatusCode());
+        $responseCode = $response->getStatusCode();
+        $responseContents = $response->getBody()->getContents();
+
+        if ($responseCode != 200) {
+            throw new ApiException($response, $responseCode);
         }
 
-        return json_decode($response->getBody()->getContents(), true);
+        return json_decode($responseContents, true);
     }
 
     /**

src/Http/TokenManager.php

@@ -14,7 +14,7 @@ class TokenManager
      * @param array $response
      * @return void
      */
-    public function setTokens(array $response)
+    public function setTokens($response = [])
     {
         if (isset($response['refresh_token'])) {
             $this->refreshToken = $response['refresh_token'];

src/Moloni.php

@@ -70,17 +70,41 @@
 
 class Moloni
 {
+    /**
+     * API Client
+     *
+     * @var ApiClient $apiClient
+     */
     protected $apiClient;
-    protected $configs;
 
     /**
      * Constructor
      *
      * @param array $configs
      */
-    public function __construct(array $configs)
+    public function __construct(array $configs, $apiVersion = 'v1')
+    {
+        $this->apiClient = new ApiClient($configs, $apiVersion);
+    }
+
+    /**
+     * Start Debug
+     *
+     * @return void
+     */
+    public function startDebug()
+    {
+        $this->apiClient->setDebug(true);
+    }
+
+    /**
+     * Stop Debug
+     *
+     * @return void
+     */
+    public function stopDebug()
     {
-        $this->apiClient = new ApiClient($configs);
+        $this->apiClient->setDebug(false);
     }
 
     // ACCOUNT AND PROFILE