Merge pull request #5 from KOBASSoftware/multi-token-fix

Resolves an issue where using the library for multiple company's woul…

Author: seanmcn

src/Kobas/APIClient/Auth/Provider.php

@@ -16,9 +16,9 @@
 class Provider
 {
     /**
-     * @var AccessToken|null
+     * @var AccessToken[]
      */
-    protected static $token;
+    protected static $tokens;
     /**
      * @var int
      */
@@ -89,17 +89,24 @@ public function getAccessToken()
     {
         $provider = $this->getProvider();
 
-        if (!self::$token instanceof AccessToken || self::$token->hasExpired()) {
+        if (!is_array(self::$tokens) ||
+            !array_key_exists($provider->companyId, self::$tokens) ||
+            !self::$tokens[$provider->companyId] instanceof AccessToken ||
+            self::$tokens[$provider->companyId]->hasExpired()
+        ) {
             try {
-                self::$token = $provider->getAccessToken('client_credentials', ['scope' => $this->scopes]);
+                self::$tokens[$provider->companyId] = $provider->getAccessToken(
+                    'client_credentials',
+                    ['scope' => $this->scopes]
+                );
             } catch (IdentityProviderException $e) {
                 throw new AuthenticationException($e->getMessage(), $e->getCode());
             } catch (ConnectException $e) {
                 throw new CurlException($e->getMessage(), $e->getCode());
             }
         }
 
-        return self::$token->getToken();
+        return self::$tokens[$provider->companyId]->getToken();
     }
 
     /**

src/Kobas/APIClient/Client.php

@@ -110,22 +110,25 @@ public function setAPIVersion($version)
      * @param array $params
      * @param array $headers
      * @return mixed
-     * @throws HttpException
      * @throws CurlException
+     * @throws Exception\AuthenticationException
+     * @throws HttpException
      */
     public function get($route, array $params = array(), array $headers = array())
     {
         return $this->call('GET', $route, $params, $headers);
     }
 
+
     /**
      * @param $http_method
      * @param $route
      * @param array $params
      * @param array $headers
      * @return mixed
-     * @throws HttpException
      * @throws CurlException
+     * @throws Exception\AuthenticationException
+     * @throws HttpException
      */
     protected function call($http_method, $route, array $params = array(), array $headers = array())
     {
@@ -193,39 +196,45 @@ protected function call($http_method, $route, array $params = array(), array $he
         return json_decode($result, true);
     }
 
+
     /**
      * @param $route
      * @param array $params
      * @param array $headers
      * @return mixed
-     * @throws HttpException
      * @throws CurlException
+     * @throws Exception\AuthenticationException
+     * @throws HttpException
      */
     public function post($route, array $params = array(), array $headers = array())
     {
         return $this->call('POST', $route, $params, $headers);
     }
 
+
     /**
      * @param $route
      * @param array $params
      * @param array $headers
      * @return mixed
-     * @throws HttpException
      * @throws CurlException
+     * @throws Exception\AuthenticationException
+     * @throws HttpException
      */
     public function put($route, array $params = array(), array $headers = array())
     {
         return $this->call('PUT', $route, $params, $headers);
     }
 
+
     /**
      * @param $route
      * @param array $params
      * @param array $headers
      * @return mixed
-     * @throws HttpException
      * @throws CurlException
+     * @throws Exception\AuthenticationException
+     * @throws HttpException
      */
     public function delete($route, array $params = array(), array $headers = array())
     {