Merge pull request #4 from dpdconnect/feature/jwt-useage

feature/jwt-useage

Author: dpdplugin

src/Client.php

@@ -15,7 +15,7 @@ class Client
 {
     const ENDPOINT = 'https://api.dpdconnect.nl';
 
-    const CLIENT_VERSION = '1.0.0';
+    const CLIENT_VERSION = '1.0.3';
 
     /**
      * @var string

src/ClientBuilder.php

@@ -73,7 +73,7 @@ public function setHttpClient(HttpClient $httpClient)
      * @param string $username Username to use for the authentication
      * @param string $password Password associated to the username
      *
-     * @return ClientInterface
+     * @return Client
      */
     public function buildAuthenticatedByPassword($username, $password)
     {
@@ -87,7 +87,7 @@ public function buildAuthenticatedByPassword($username, $password)
      *
      * @param string $jwtToken     JWT tokken for authentication
      *
-     * @return ClientInterface
+     * @return Client
      */
     public function buildAuthenticatedByJwtToken($jwtToken)
     {
@@ -99,7 +99,7 @@ public function buildAuthenticatedByJwtToken($jwtToken)
     /**
      * @param Authentication $authentication
      *
-     * @return ClientInterface
+     * @return Client
      */
     protected function buildAuthenticatedClient(Authentication $authentication)
     {

src/Common/AuthenticatedHttpClient.php

@@ -49,26 +49,36 @@ public function sendRequest($httpMethod, $resourceName, array $query = [], array
 
             $this->authentication
                 ->setJwtToken($tokens['token']);
+            if (is_callable($this->authentication->tokenUpdateCallback)) {
+                call_user_func($this->authentication->tokenUpdateCallback, $this->authentication->getJwtToken());
+            }
         }
 
         try {
-            $headers[] =  sprintf('Authorization: Bearer %s', $this->authentication->getJwtToken());
+            $headers[] = sprintf('Authorization: Bearer %s', $this->authentication->getJwtToken());
 
             $response = $this->basicHttpClient->sendRequest($httpMethod, $resourceName, $query, $headers, $body);
         } catch (AuthenticateException $e) {
-            $tokens = $this->authenticationResource->authenticateByRefreshToken(
-                $this->authentication->getClientId(),
-                $this->authentication->getSecret(),
-                $this->authentication->getRefreshToken()
-            );
 
-            $this->authentication
-                ->setAccessToken($tokens['access_token'])
-                ->setRefreshToken($tokens['refresh_token']);
+            try {
+                $token = $this->authenticationResource->authenticateByPassword(
+                    $this->authentication->getUsername(),
+                    $this->authentication->getPassword()
+                );
+
+                $this->authentication
+                    ->setJwtToken($token['token']);
+                if (is_callable($this->authentication->tokenUpdateCallback)) {
+                    call_user_func($this->authentication->tokenUpdateCallback, $this->authentication->getJwtToken());
+                }
+
+                // Since the Authorization Bearer always is the last added item, we overwrite it like this
+                $headers[count($headers) - 1] = sprintf('Authorization: Bearer %s', $this->authentication->getJwtToken());
+                $response = $this->basicHttpClient->sendRequest($httpMethod, $resourceName, $query, $headers, $body);
+            } catch (AuthenticateException $exception) {
+                throw $exception;
+            }
 
-            $headers[] =  sprintf('Authorization: Bearer %s', $this->authentication->getAccessToken());
-            $response =  $this->basicHttpClient->sendRequest($httpMethod, $resourceName, $query, $headers, $body)
-                                               ->setAuthentication($this->authentication);
         }
 
         return $response;

src/Common/Authentication.php

@@ -19,6 +19,11 @@ class Authentication
      */
     protected $jwtToken;
 
+    /**
+     * @var callable
+     */
+    public $tokenUpdateCallback;
+
     /**
      * @param $username
      * @param $password
@@ -79,4 +84,15 @@ public function setJwtToken($jwtToken)
 
         return $this;
     }
+
+    /**
+     * @param callable $callable
+     * @return $this
+     */
+    public function setTokenUpdateCallback(callable $callable)
+    {
+        $this->tokenUpdateCallback = $callable;
+
+        return $this;
+    }
 }

src/Common/HttpClient.php

@@ -6,6 +6,7 @@
 use DpdConnect\Sdk\Common;
 use DpdConnect\Sdk\Exceptions;
 use DpdConnect\Sdk\Exceptions\HttpException;
+use DpdConnect\Sdk\Exceptions\AuthenticateException;
 use DpdConnect\Sdk\Exceptions\ServerException;
 use DpdConnect\Sdk\Objects\MetaData;
 use DpdConnect\Sdk\Objects\ObjectFactory;
@@ -244,6 +245,8 @@ public function sendRequest($method, $resourceName, $query = null, $headers = []
         switch ($responseStatus) {
             case 500:
                 throw new ServerException($parts[1]);
+            case 401:
+                throw new AuthenticateException($parts[1]);
         }
 
         if (in_array($parts[0], ['HTTP/1.1 200 OK', 'HTTP/1.1 100 Continue'])) {