fixes issue with BC breaking google/auth change (#1028)

* fixes issue with BC breaking google/auth change

Author: bshaffer

src/Google/AuthHandler/Guzzle5AuthHandler.php

@@ -2,6 +2,7 @@
 
 use Google\Auth\CredentialsLoader;
 use Google\Auth\HttpHandler\HttpHandlerFactory;
+use Google\Auth\FetchAuthTokenCache;
 use Google\Auth\Subscriber\AuthTokenSubscriber;
 use Google\Auth\Subscriber\ScopedAccessTokenSubscriber;
 use Google\Auth\Subscriber\SimpleSubscriber;
@@ -28,15 +29,21 @@ public function attachCredentials(
       CredentialsLoader $credentials,
       callable $tokenCallback = null
   ) {
+    // use the provided cache
+    if ($this->cache) {
+      $credentials = new FetchAuthTokenCache(
+          $credentials,
+          $this->cacheConfig,
+          $this->cache
+      );
+    }
     // if we end up needing to make an HTTP request to retrieve credentials, we
     // can use our existing one, but we need to throw exceptions so the error
     // bubbles up.
     $authHttp = $this->createAuthHttp($http);
     $authHttpHandler = HttpHandlerFactory::build($authHttp);
     $subscriber = new AuthTokenSubscriber(
         $credentials,
-        $this->cacheConfig,
-        $this->cache,
         $authHttpHandler,
         $tokenCallback
     );
@@ -56,7 +63,7 @@ public function attachToken(ClientInterface $http, array $token, array $scopes)
     $subscriber = new ScopedAccessTokenSubscriber(
         $tokenFunc,
         $scopes,
-        [],
+        $this->cacheConfig,
         $this->cache
     );
 

src/Google/AuthHandler/Guzzle6AuthHandler.php

@@ -2,6 +2,7 @@
 
 use Google\Auth\CredentialsLoader;
 use Google\Auth\HttpHandler\HttpHandlerFactory;
+use Google\Auth\FetchAuthTokenCache;
 use Google\Auth\Middleware\AuthTokenMiddleware;
 use Google\Auth\Middleware\ScopedAccessTokenMiddleware;
 use Google\Auth\Middleware\SimpleMiddleware;
@@ -28,15 +29,21 @@ public function attachCredentials(
       CredentialsLoader $credentials,
       callable $tokenCallback = null
   ) {
+    // use the provided cache
+    if ($this->cache) {
+      $credentials = new FetchAuthTokenCache(
+          $credentials,
+          $this->cacheConfig,
+          $this->cache
+      );
+    }
     // if we end up needing to make an HTTP request to retrieve credentials, we
     // can use our existing one, but we need to throw exceptions so the error
     // bubbles up.
     $authHttp = $this->createAuthHttp($http);
     $authHttpHandler = HttpHandlerFactory::build($authHttp);
     $middleware = new AuthTokenMiddleware(
         $credentials,
-        $this->cacheConfig,
-        $this->cache,
         $authHttpHandler,
         $tokenCallback
     );
@@ -59,7 +66,7 @@ public function attachToken(ClientInterface $http, array $token, array $scopes)
     $middleware = new ScopedAccessTokenMiddleware(
         $tokenFunc,
         $scopes,
-        [],
+        $this->cacheConfig,
         $this->cache
     );