fixes subscriber and middleware options (#184)

* fixes subscriber and middleware options
googleapis · Jan 24, 2018 · 383ab84 · 383ab84
1 parent 6308640
commit 383ab84
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/src/ApplicationDefaultCredentials.php b/src/ApplicationDefaultCredentials.php
@@ -86,7 +86,7 @@ public static function getSubscriber(
     ) {
         $creds = self::getCredentials($scope, $httpHandler, $cacheConfig, $cache);
 
-        return new AuthTokenSubscriber($creds, $cacheConfig);
+        return new AuthTokenSubscriber($creds, $httpHandler);
     }
 
     /**
@@ -114,7 +114,7 @@ public static function getMiddleware(
     ) {
         $creds = self::getCredentials($scope, $httpHandler, $cacheConfig, $cache);
 
-        return new AuthTokenMiddleware($creds, $cacheConfig);
+        return new AuthTokenMiddleware($creds, $httpHandler);
     }
 
     /**

diff --git a/tests/ApplicationDefaultCredentialsTest.php b/tests/ApplicationDefaultCredentialsTest.php
@@ -157,6 +157,26 @@ public function testFailsIfNotOnGceAndNoDefaultFileFound()
         ApplicationDefaultCredentials::getMiddleware('a scope', $httpHandler);
     }
 
+    public function testWithCacheOptions()
+    {
+        $keyFile = __DIR__ . '/fixtures' . '/private.json';
+        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
+
+        $httpHandler = getHandler([
+            buildResponse(200),
+        ]);
+
+        $cacheOptions = [];
+        $cachePool = $this->getMock('Psr\Cache\CacheItemPoolInterface');
+
+        $middleware = ApplicationDefaultCredentials::getMiddleware(
+            'a scope',
+            $httpHandler,
+            $cacheOptions,
+            $cachePool
+        );
+    }
+
     public function testSuccedsIfNoDefaultFilesButIsOnGCE()
     {
         $wantedTokens = [
@@ -280,6 +300,26 @@ public function testFailsIfNotOnGceAndNoDefaultFileFound()
         ApplicationDefaultCredentials::getSubscriber('a scope', $httpHandler);
     }
 
+    public function testWithCacheOptions()
+    {
+        $keyFile = __DIR__ . '/fixtures' . '/private.json';
+        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
+
+        $httpHandler = getHandler([
+            buildResponse(200),
+        ]);
+
+        $cacheOptions = [];
+        $cachePool = $this->getMock('Psr\Cache\CacheItemPoolInterface');
+
+        $subscriber = ApplicationDefaultCredentials::getSubscriber(
+            'a scope',
+            $httpHandler,
+            $cacheOptions,
+            $cachePool
+        );
+    }
+
     public function testSuccedsIfNoDefaultFilesButIsOnGCE()
     {
         $wantedTokens = [