feat: Allow RequestWrapperTrait to use its auth cache when fetching A…

…DC (#3959) * feat: Allow RequestWrapperTrait to use the its auth cache when fetching ADC * Avoid nested `FetchAuthTokenCache`s. * Use instanceof instead of is_a Co-authored-by: Brent Shaffer <[email protected]> * Update RequestWrapperTrait.php Co-authored-by: Brent Shaffer <[email protected]>
googleapis · Apr 23, 2021 · e7e8a8b · e7e8a8b
1 parent 1181c07
commit e7e8a8b
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/RequestWrapperTrait.php b/src/RequestWrapperTrait.php
@@ -178,11 +178,17 @@ public function getCredentialsFetcher()
             }
         }
 
-        return new FetchAuthTokenCache(
-            $fetcher,
-            $this->authCacheOptions,
-            $this->authCache
-        );
+        if ($fetcher instanceof FetchAuthTokenCache) {
+            // The fetcher has already been wrapped in a cache by `ApplicationDefaultCredentials`;
+            // no need to wrap it another time.
+            return $fetcher;
+        } else {
+            return new FetchAuthTokenCache(
+                $fetcher,
+                $this->authCacheOptions,
+                $this->authCache
+            );
+        }
     }
 
     /**
@@ -196,8 +202,8 @@ protected function getADC()
         return ApplicationDefaultCredentials::getCredentials(
             $this->scopes,
             $this->authHttpHandler,
-            null,
-            null,
+            $this->authCacheOptions,
+            $this->authCache,
             $this->quotaProject
         );
     }