Merge pull request #100 from bshaffer/fixes-gce-last-received-token

fixes GCE::getLastReceivedToken
googleapis · Mar 3, 2016 · f328886 · f328886
2 parents c05fe66 + af14396
commit f328886
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/Credentials/GCECredentials.php b/src/Credentials/GCECredentials.php
@@ -165,6 +165,7 @@ public function fetchAuthToken(callable $httpHandler = null)
 
     // store this so we can retrieve it later
     $this->lastReceivedToken = $json;
+    $this->lastReceivedToken['expires_at'] = time() + $json['expires_in'];
 
     return $json;
   }
@@ -187,7 +188,7 @@ public function getLastReceivedToken()
     if ($this->lastReceivedToken) {
       return [
         'access_token' => $this->lastReceivedToken['access_token'],
-        'expires_at' => $this->lastReceivedToken['expiration_time'],
+        'expires_at' => $this->lastReceivedToken['expires_at'],
       ];
     }
 

diff --git a/tests/Credentials/GCECredentialsTest.php b/tests/Credentials/GCECredentialsTest.php
@@ -107,5 +107,6 @@ public function testShouldReturnTokenInfo()
     ]);
     $g = new GCECredentials();
     $this->assertEquals($wantedTokens, $g->fetchAuthToken($httpHandler));
+    $this->assertEquals(time() + 57, $g->getLastReceivedToken()['expires_at']);
   }
 }
diff --git a/tests/FetchAuthTokenTest.php b/tests/FetchAuthTokenTest.php
@@ -78,7 +78,7 @@ private function getGCECredentials()
     $credentials = new GCECredentials();
     $property->setValue($credentials, [
       'access_token' => 'xyz',
-      'expiration_time' => strtotime('2001'),
+      'expires_at' => strtotime('2001'),
     ]);
 
     return $credentials;