Merge pull request #434 from shadowhand/hotfix/431-access-token-stora…

…ge-expiration

Allow access tokens to be created from storage

src/Token/AccessToken.php

@@ -77,11 +77,28 @@ public function __construct(array $options = [])
             // Some providers supply the seconds until expiration rather than
             // the exact timestamp. Take a best guess at which we received.
             $expires = $options['expires'];
-            $expiresInFuture = $expires > time();
-            $this->expires = $expiresInFuture ? $expires : time() + ((int) $expires);
+
+            if (!$this->isExpirationTimestamp($expires)) {
+                $expires += time();
+            }
+
+            $this->expires = $expires;
         }
     }
 
+    /**
+     * Check if a value is an expiration timestamp or second value.
+     *
+     * @return boolean
+     */
+    protected function isExpirationTimestamp($value)
+    {
+        // If the given value is larger than the original OAuth 2 draft date,
+        // assume that it is meant to be a (possible expired) timestamp.
+        $oauth2InceptionDate = 1349067600; // 2012-10-01
+        return ($value > $oauth2InceptionDate);
+    }
+
     /**
      * Returns the access token string of this instance.
      *

test/src/Token/AccessTokenTest.php

@@ -32,6 +32,19 @@ public function testExpiresInCorrection()
         $this->assertLessThan(time() + 200, $expires);
     }
 
+    public function testExpiresPastTimestamp()
+    {
+        $options = ['access_token' => 'access_token', 'expires' => strtotime('5 days ago')];
+        $token = $this->getAccessToken($options);
+
+        $this->assertTrue($token->hasExpired());
+
+        $options = ['access_token' => 'access_token', 'expires' => 3600];
+        $token = $this->getAccessToken($options);
+
+        $this->assertFalse($token->hasExpired());
+    }
+
     public function testGetRefreshToken()
     {
         $options = [