Merge pull request #15 from dpdconnect/1.1.7

1.1.7
dpdconnect · Mar 7, 2022 · 7d7941d · 7d7941d
2 parents 991526a + 2fe1673
commit 7d7941d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/src/Common/AuthenticatedHttpClient.php b/src/Common/AuthenticatedHttpClient.php
@@ -52,10 +52,12 @@ public function sendRequest($httpMethod, $resourceName, array $query = [], array
                 $this->authentication->getPassword()
             );
 
-            $this->authentication
-                ->setJwtToken($tokens['token']);
-            if (is_callable($this->authentication->tokenUpdateCallback)) {
-                call_user_func($this->authentication->tokenUpdateCallback, $this->authentication->getJwtToken());
+            if (isset($tokens['token'])) {
+                $this->authentication
+                    ->setJwtToken($tokens['token']);
+                if (is_callable($this->authentication->tokenUpdateCallback)) {
+                    call_user_func($this->authentication->tokenUpdateCallback, $this->authentication->getJwtToken());
+                }
             }
         }
 
@@ -85,7 +87,7 @@ public function sendRequest($httpMethod, $resourceName, array $query = [], array
                 );
                 $response = $this->basicHttpClient->sendRequest($httpMethod, $resourceName, $query, $headers, $body);
             } catch (AuthenticateException $exception) {
-                throw $exception;
+                $response = [];
             }
 
         }

diff --git a/src/Resources/Authentication.php b/src/Resources/Authentication.php
@@ -54,16 +54,19 @@ protected function authenticate($requestBody)
         $headers = [
             'Content-Type' => 'application/json',
         ];
+        try {
+            $response = $this->httpClient->sendRequest(
+                HttpClient::REQUEST_POST,
+                self::RESOURCE_URI_AUTH,
+                false,
+                $headers,
+                json_encode($requestBody)
+            );
+            return $this->processRequest($response);
+        }catch (\Exception $exception){
+            return [];
+        }
 
-        $response = $this->httpClient->sendRequest(
-            HttpClient::REQUEST_POST,
-            self::RESOURCE_URI_AUTH,
-            false,
-            $headers,
-            json_encode($requestBody)
-        );
-
-        return $this->processRequest($response);
     }
 
     /**

diff --git a/src/Resources/Product.php b/src/Resources/Product.php
@@ -40,7 +40,11 @@ public function getList($query = [])
             $this->storeCachedList($products, $query);
             return $products;
         } catch (DpdException $e) {
-            throw $e;
+            $result = $this->getCachedList($query,31556926); //a year
+            if ($result) {
+                return $result;
+            }
+            return [];
         }
     }
 
@@ -49,11 +53,11 @@ public function getList($query = [])
      *
      * @return false|mixed
      */
-    private function getCachedList($query)
+    private function getCachedList($query, $maxAge = 3600)
     {
-        $filename = sys_get_temp_dir() . '/dpd/' . sha1('dpd-products' . date('YmdH') . serialize($query));
+        $filename = sys_get_temp_dir() . '/dpd/dpd-products' ;
 
-        if (!file_exists($filename) || filesize($filename) == 0) {
+        if (!file_exists($filename) || filesize($filename) == 0 || filemtime($filename) < time()-$maxAge) {
             return false;
         }
 
@@ -70,7 +74,7 @@ private function storeCachedList($products, $query)
             mkdir(sys_get_temp_dir() . '/dpd/');
         }
 
-        $filename = sys_get_temp_dir() .'/dpd/' . sha1('dpd-products' . date('YmdH') . serialize($query));
+        $filename = sys_get_temp_dir() .'/dpd/dpd-products';
         file_put_contents($filename, serialize($products));
     }
 }
diff --git a/src/Resources/Token.php b/src/Resources/Token.php
@@ -104,7 +104,7 @@ private function isTokenValid($token)
      */
     private function getCachedPublicJWTToken($username)
     {
-        $filename = sys_get_temp_dir() . '/dpd/' . sha1('dpd-products' . date('YmdH') . serialize($username));
+        $filename = sys_get_temp_dir() . '/dpd/' . sha1('dpd-token' . date('YmdH') . serialize($username));
 
         if (!file_exists($filename) || filesize($filename) == 0) {
             return false;
@@ -123,7 +123,7 @@ private function storeCachedPublicJWTToken($token, $username)
             mkdir(sys_get_temp_dir() . '/dpd/');
         }
 
-        $filename = sys_get_temp_dir() .'/dpd/' . sha1('dpd-products' . date('YmdH') . serialize($username));
+        $filename = sys_get_temp_dir() .'/dpd/' . sha1('dpd-token' . date('YmdH') . serialize($username));
         file_put_contents($filename, serialize($token));
     }
 }