Merge pull request #70 from RobvH/master

Removed race-condition in token handling
omniphx · Nov 21, 2015 · cda6876 · cda6876
2 parents d34681e + e2abcb4
commit cda6876
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 composer.phar
 composer.lock
 .DS_Store
+/.idea
 /src/config/local
 /src/config/production
 mm.log

diff --git a/src/Omniphx/Forrest/Client.php b/src/Omniphx/Forrest/Client.php
@@ -25,6 +25,13 @@ abstract class Client
      */
     protected $storage;
 
+    /**
+     * Token data.
+     *
+     * @var array
+     */
+    protected $tokenData;
+
     /**
      * Reqeust headers.
      *
@@ -535,7 +542,11 @@ public function __call($name, $arguments)
      */
     public function getTokenData()
     {
-        return $this->storage->getTokenData();
+        if (empty($this->tokenData)) {
+            $this->tokenData = $this->storage->getTokenData();
+        }
+
+        return $this->tokenData;
     }
 
     /**
@@ -647,7 +658,7 @@ private function setHeaders(array $options)
     {
         $format = $options['format'];
 
-        $authToken = $this->storage->getTokenData();
+        $authToken = $this->getTokenData();
 
         $accessToken = $authToken['access_token'];
         $tokenType = $authToken['token_type'];