fix: add eager threshold (#416)

googleapis · Aug 23, 2022 · 99eb172 · 99eb172
1 parent a9355c7
commit 99eb172
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/CredentialsWrapper.php b/src/CredentialsWrapper.php
@@ -57,6 +57,9 @@ class CredentialsWrapper
     private $credentialsFetcher;
     private $authHttpHandler;
 
+    /** @var int */
+    private static $eagerRefreshThresholdSeconds = 10;
+
     /**
      * CredentialsWrapper constructor.
      * @param FetchAuthTokenInterface $credentialsFetcher A credentials loader
@@ -297,6 +300,6 @@ private static function isExpired($token)
     {
         return !(self::isValid($token)
             && array_key_exists('expires_at', $token)
-            && $token['expires_at'] > time());
+            && $token['expires_at'] > time() + self::$eagerRefreshThresholdSeconds);
     }
 }
diff --git a/tests/Tests/Unit/CredentialsWrapperTest.php b/tests/Tests/Unit/CredentialsWrapperTest.php
@@ -206,6 +206,17 @@ public function getBearerStringData()
                 'access_token' => 456,
                 'expires_at' => time() + 1000
             ]);
+        $eagerExpiredFetcher = $this->prophesize(FetchAuthTokenInterface::class);
+        $eagerExpiredFetcher->getLastReceivedToken()
+            ->willReturn([
+                'access_token' => 123,
+                'expires_at' => time() + 1
+            ]);
+        $eagerExpiredFetcher->fetchAuthToken(Argument::any())
+            ->willReturn([
+                'access_token' => 456,
+                'expires_at' => time() + 10 // within 10 second eager threshold
+            ]);
         $unexpiredFetcher = $this->prophesize(FetchAuthTokenInterface::class);
         $unexpiredFetcher->getLastReceivedToken()
             ->willReturn([
@@ -226,6 +237,7 @@ public function getBearerStringData()
             ]);
         return [
             [$expiredFetcher->reveal(), 'Bearer 456'],
+            [$eagerExpiredFetcher->reveal(), 'Bearer 456'],
             [$unexpiredFetcher->reveal(), 'Bearer 123'],
             [$insecureFetcher->reveal(), ''],
             [$nullFetcher->reveal(), '']

diff --git a/tests/Tests/Unit/OperationResponseTest.php b/tests/Tests/Unit/OperationResponseTest.php
@@ -377,7 +377,7 @@ public function getSleeps()
         return $this->sleeps;
     }
 
-    public function sleepMillis($millis)
+    public function sleepMillis(int $millis)
     {
         $this->currentTime += $millis;
         $this->sleeps[] = $millis;