Merge pull request #2 from dpdconnect/feature/meta-data

Updated SDK
dpdconnect · Jun 14, 2019 · 1394f81 · 1394f81
2 parents 1c339b7 + f236b25
commit 1394f81
Show file tree

Hide file tree

Showing 16 changed files with 708 additions and 79 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "dpdconnect/php-sdk",
-  "description": "DPD Connect PHP SDK",
-  "type": "library",
+  "description": "DPD Magento2 Shipping extension",
+  "type": "magento2-library",
   "license": "OSL-3.0",
   "authors": [
     {
@@ -19,10 +19,14 @@
       "DpdConnect\\Sdk\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "DpdConnect\\Sdk\\Test\\": "tests/"
+    }
+  },
   "require": {
     "php": "^5.5 || ^7.0",
-    "ext-json": "*",
-    "ext-curl": "*"
+    "ext-json": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "~6.5.0",

diff --git a/src/Client.php b/src/Client.php
@@ -70,6 +70,14 @@ public function __construct(
         $this->country = new Country($this->resourceClient);
     }
 
+    /**
+     * @return Authentication
+     */
+    public function getAuthentication()
+    {
+        return $this->authentication;
+    }
+
     /**
      * @return Shipment
      */

diff --git a/src/ClientBuilder.php b/src/ClientBuilder.php
@@ -28,10 +28,12 @@ class ClientBuilder implements ClientBuilderInterface
     /**
      * @param string $endpoint
      */
-    public function __construct($endpoint = null, $meta = null)
+    public function __construct($endpoint = null, $meta = [])
     {
-        if (!is_null($endpoint)) {
+        if (!is_null($endpoint) && $endpoint !== '') {
             $this->endpoint = $endpoint;
+        } else {
+            $this->endpoint = Client::ENDPOINT;
         }
 
         $this->meta = $meta;
@@ -51,7 +53,7 @@ public function getEndpoint()
     private function getHttpClient()
     {
         if (null === $this->httpClient) {
-            $this->httpClient = new HttpClient($this->endpoint, $this->meta);
+            $this->httpClient = new HttpClient($this->endpoint);
         }
 
         return $this->httpClient;
@@ -64,7 +66,6 @@ private function getHttpClient()
     public function setHttpClient(HttpClient $httpClient)
     {
         $this->httpClient = $httpClient;
-
         return $this;
     }
 
@@ -125,6 +126,7 @@ protected function setUp(Authentication $authentication)
             $authentication
         );
 
+
         $resourceClient = new ResourceClient(
             $authenticatedHttpClient
         );

diff --git a/src/Common/AuthenticatedHttpClient.php b/src/Common/AuthenticatedHttpClient.php
@@ -67,7 +67,8 @@ public function sendRequest($httpMethod, $resourceName, array $query = [], array
                 ->setRefreshToken($tokens['refresh_token']);
 
             $headers[] =  sprintf('Authorization: Bearer %s', $this->authentication->getAccessToken());
-            $response =  $this->basicHttpClient->sendRequest($httpMethod, $resourceName, $query, $headers, $body);
+            $response =  $this->basicHttpClient->sendRequest($httpMethod, $resourceName, $query, $headers, $body)
+                                               ->setAuthentication($this->authentication);
         }
 
         return $response;

diff --git a/src/Common/HttpClient.php b/src/Common/HttpClient.php
@@ -31,7 +31,7 @@ class HttpClient implements HttpClientInterface
     /**
      * @var Common\Authentication
      */
-    protected $Authentication;
+    protected $authentication;
 
     /**
      * @var int
@@ -41,7 +41,7 @@ class HttpClient implements HttpClientInterface
     /**
      * @var int
      */
-    private $connectionTimeout = 2;
+    private $connectionTimeout = 10;
 
     /**
      * @var array
@@ -53,13 +53,18 @@ class HttpClient implements HttpClientInterface
      */
     private $httpOptions = [];
 
+    /**
+     * @var array
+     */
+    private $meta;
+
     /**
      * @param string $endpoint
      * @param int    $timeout           > 0
      * @param int    $connectionTimeout >= 0
      * @param array  $headers
      */
-    public function __construct($endpoint, $timeout = 10, $connectionTimeout = 2, $headers = [])
+    public function __construct($endpoint, $timeout = 10, $connectionTimeout = 10, $headers = [])
     {
         $this->endpoint = $endpoint;
 
@@ -85,6 +90,14 @@ public function __construct($endpoint, $timeout = 10, $connectionTimeout = 2, $h
         $this->headers = $headers;
     }
 
+    /**
+     * @param array $meta
+     */
+    public function setMeta(array $meta = [])
+    {
+        $this->meta = $meta;
+    }
+
     /**
      * @param string $userAgent
      */
@@ -96,9 +109,9 @@ public function addUserAgentString($userAgent)
     /**
      * @param Common\Authentication $Authentication
      */
-    public function setAuthentication(Common\Authentication $Authentication)
+    public function setAuthentication(Common\Authentication $authentication)
     {
-        $this->Authentication = $Authentication;
+        $this->authentication = $authentication;
     }
 
     /**
@@ -161,7 +174,7 @@ public function sendRequest($method, $resourceName, $query = null, $headers = []
     {
         $curl = curl_init();
 
-//        if ($this->Authentication === null) {
+//        if ($this->authentication === null) {
 //            throw new Exceptions\AuthenticateException('Can not perform API Request without Authentication');
 //        }
 

diff --git a/src/Common/HttpClientInterface.php b/src/Common/HttpClientInterface.php
@@ -7,6 +7,11 @@
 
 interface HttpClientInterface
 {
+    /**
+     * @param array $meta
+     */
+    public function setMeta(array $meta = []);
+
     /**
      * @param string $userAgent
      */

diff --git a/src/Common/ResponseError.php b/src/Common/ResponseError.php
@@ -18,10 +18,12 @@ class ResponseError implements \JsonSerializable
 
     const NOT_FOUND = 20;
 
-    const NOT_ENOUGH_CREDIT = 25;
+    const NOT_ENOUGH_CREDIT = 'Bad credentials';
 
     const CHAT_API_AUTH_ERROR = 1001;
 
+    const ACCESS_DENIED = 401;
+
     public $errors = [];
     public $validation = [];
 
@@ -43,8 +45,8 @@ public function __construct($body, $validation = [])
         if (!empty($body['errors'])) {
             foreach ($body['errors'] as $error) {
                 if (isset($error['code'])) {
-                    if ($error['code'] === self::NOT_ENOUGH_CREDIT) {
-                        throw new Exceptions\BalanceException($this->getExceptionMessage($error));
+                    if ($error['code'] === self::ACCESS_DENIED) {
+                        throw new Exceptions\AuthenticateException($this->getExceptionMessage($error));
                     } elseif ($error['code'] === self::REQUEST_NOT_ALLOWED) {
                         throw new Exceptions\AuthenticateException($this->getExceptionMessage($error));
                     } elseif ($error['code'] === self::CHAT_API_AUTH_ERROR) {
@@ -58,6 +60,18 @@ public function __construct($body, $validation = [])
 
             return;
         }
+
+        if (isset($body['code'])) {
+            if ($body['code'] === self::ACCESS_DENIED) {
+                throw new Exceptions\AuthenticateException($body['message']);
+            } elseif ($body['code'] === self::REQUEST_NOT_ALLOWED) {
+                throw new Exceptions\AuthenticateException($body['message']);
+            } elseif ($body['code'] === self::CHAT_API_AUTH_ERROR) {
+                throw new Exceptions\AuthenticateException($body['message']);
+            } else {
+            }
+        }
+
         if (!empty($body['message'])) {
             $this->errors[] = $body['message'];
         }
@@ -96,8 +110,7 @@ public function getErrorString()
             }
         }
 
-
-        return implode(', ', $errorDescriptions);
+        return print_r($errorDescriptions, true);
     }
 
     /**