Token retrieve should grab a new token if soon to expire

Author: bajb

src/OAuth/TokenStorage/TempFileTokenStorage.php

@@ -34,9 +34,15 @@ public function storeToken($key, IToken $token)
   public function retrieveToken($key, callable $retrieve = null)
   {
     $location = $this->_createFileName($key);
+    $token = null;
     if(file_exists($location))
     {
-      return unserialize(file_get_contents($location));
+      $token = unserialize(file_get_contents($location));
+    }
+
+    if($token instanceof IToken && $token->getExpiryTime() > time() + 60)
+    {
+      return $token;
     }
 
     if($retrieve !== null)
@@ -45,11 +51,10 @@ public function retrieveToken($key, callable $retrieve = null)
       if($token instanceof IToken)
       {
         $this->storeToken($key, $token);
-        return $token;
       }
     }
 
-    return null;
+    return $token instanceof IToken ? $token : null;
   }
 
   /**

src/OAuth/Tokens/IToken.php

@@ -6,4 +6,6 @@ interface IToken
   public function getType();
 
   public function getToken();
+
+  public function getExpiryTime();
 }