PR self review

googleapis · Dec 19, 2023 · 1c383b0 · 1c383b0
1 parent 3fc4be9
commit 1c383b0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/src/Credentials/ServiceAccountCredentials.php b/src/Credentials/ServiceAccountCredentials.php
@@ -274,7 +274,7 @@ public function getProjectId(callable $httpHandler = null)
     public function updateMetadata(
         $metadata,
         $authUri = null,
-        callable $httpHandler = null,
+        callable $httpHandler = null
     ) {
         // scope exists. use oauth implementation
         if (!$this->useSelfSignedJwt()) {

diff --git a/src/Credentials/ServiceAccountJwtAccessCredentials.php b/src/Credentials/ServiceAccountJwtAccessCredentials.php
@@ -120,14 +120,15 @@ public function __construct($jsonKey, $scope = null)
     public function updateMetadata(
         $metadata,
         $authUri = null,
-        callable $httpHandler = null,
+        callable $httpHandler = null
     ) {
         $scope = $this->auth->getScope();
         if (empty($authUri) && empty($scope)) {
             return $metadata;
         }
 
         $this->auth->setAudience($authUri);
+
         return parent::updateMetadata($metadata, $authUri, $httpHandler);
     }
 

diff --git a/src/Credentials/UserRefreshCredentials.php b/src/Credentials/UserRefreshCredentials.php
@@ -107,7 +107,7 @@ public function __construct(
      * @param callable $httpHandler
      * @param array $metricsHeader [optional] Metrics headers to be inserted
      *     into the token endpoint request present.
-     *     This is passed from ImersonatedServiceAccountCredentials as it uses
+     *     This could be passed from ImersonatedServiceAccountCredentials as it uses
      *     UserRefreshCredentials as source credentials.
      *
      * @return array<mixed> {
@@ -123,7 +123,7 @@ public function __construct(
     public function fetchAuthToken(callable $httpHandler = null, array $metricsHeader = [])
     {
         // ImersonatedServiceAccountCredentials can propagate it's own header value, hence
-        // the check for empty metricsHeaders
+        // we'll pass them if present.
         if (empty($metricsHeader)) {
             // We don't support id token endpoint requests as of now for User Cred
             $isAccessTokenRequest = true;
@@ -135,22 +135,6 @@ public function fetchAuthToken(callable $httpHandler = null, array $metricsHeade
         return $this->auth->fetchAuthToken($httpHandler, $metricsHeader);
     }
 
-    /**
-     * Updates metadata with the authorization token.
-     *
-     * @param array<mixed> $metadata metadata hashmap
-     * @param string $authUri optional auth uri
-     * @param callable $httpHandler callback which delivers psr7 request
-     * @return array<mixed> updated metadata hashmap
-     */
-    public function updateMetadata(
-        $metadata,
-        $authUri = null,
-        callable $httpHandler = null,
-    ): array {
-        return parent::updateMetadata($metadata, $authUri, $httpHandler);
-    }
-
     /**
      * @return string
      */