fix: add expires_in to default token callback (#1932)

googleapis · Sep 18, 2020 · f441bcf · f441bcf
1 parent 752850b
commit f441bcf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Google/Client.php b/src/Google/Client.php
@@ -176,6 +176,7 @@ public function __construct(array $config = array())
         $this->setAccessToken(
             [
               'access_token' => $newAccessToken,
+              'expires_in' => 3600, // Google default
               'created' => time(),
             ]
         );

diff --git a/tests/Google/ClientTest.php b/tests/Google/ClientTest.php
@@ -702,9 +702,11 @@ public function testTokenCallback()
     // set the token callback to the client
     $client->setTokenCallback($callback);
 
-    // make a silly request to obtain a new token
+    // make a silly request to obtain a new token (it's ok if it fails)
     $http = $client->authorize();
-    $http->get('https://www.googleapis.com/books/v1/volumes?q=Voltaire');
+    try {
+      $http->get('https://www.googleapis.com/books/v1/volumes?q=Voltaire');
+    } catch (Exception $e) {}
     $newToken = $client->getAccessToken();
 
     // go back to the previous cache
@@ -742,6 +744,8 @@ public function testDefaultTokenCallback()
       $accessToken['access_token'],
       $newToken['access_token']
     );
+
+    $this->assertFalse($client->isAccessTokenExpired());
   }
 
   public function testExecuteWithFormat()