Merge branch 'main' into trust-boundaries

Author: bshaffer

CHANGELOG.md

@@ -2,6 +2,14 @@
 
  * [feat]: add support for Firebase v6.0 (#391)
 
+## [1.50.1](https://github.com/googleapis/google-auth-library-php/compare/v1.50.0...v1.50.1) (2026-03-18)
+
+
+### Bug Fixes
+
+* ImpersonatedCredentials getLastReceivedToken returns correct token ([#655](https://github.com/googleapis/google-auth-library-php/issues/655)) ([a4fe69c](https://github.com/googleapis/google-auth-library-php/commit/a4fe69c11c0c8bbe78e33eb1433c6dbcec72af2a))
+* Support psr/log 2 ([#654](https://github.com/googleapis/google-auth-library-php/issues/654)) ([4b746b8](https://github.com/googleapis/google-auth-library-php/commit/4b746b844ff60d86c6dcc940eb250a0753919181))
+
 ## [1.50.0](https://github.com/googleapis/google-auth-library-php/compare/v1.49.0...v1.50.0) (2026-01-08)
 
 

VERSION

@@ -1 +1 @@
-1.50.0
+1.50.1

composer.json

@@ -15,7 +15,7 @@
     "guzzlehttp/psr7": "^2.4.5",
     "psr/http-message": "^1.1||^2.0",
     "psr/cache": "^2.0||^3.0",
-    "psr/log": "^3.0"
+    "psr/log": "^2.0||^3.0"
   },
   "require-dev": {
     "guzzlehttp/promises": "^2.0",

src/Credentials/ImpersonatedServiceAccountCredentials.php

@@ -78,6 +78,11 @@ class ImpersonatedServiceAccountCredentials extends CredentialsLoader implements
 
     private int $lifetime;
 
+    /**
+     * @var array<mixed>|null
+     */
+    protected array|null $lastReceivedToken = null;
+
     /**
      * Instantiate an instance of ImpersonatedServiceAccountCredentials from a credentials file that
      * has be created with the --impersonate-service-account flag.
@@ -263,7 +268,7 @@ public function fetchAuthToken(?callable $httpHandler = null)
         $response = $httpHandler($request);
         $body = json_decode((string) $response->getBody(), true);
 
-        return match ($this->isIdTokenRequest()) {
+        return $this->lastReceivedToken = match ($this->isIdTokenRequest()) {
             true => ['id_token' => $body['token']],
             false => [
                 'access_token' => $body['accessToken'],
@@ -290,7 +295,7 @@ public function getCacheKey()
      */
     public function getLastReceivedToken()
     {
-        return $this->sourceCredentials->getLastReceivedToken();
+        return $this->lastReceivedToken;
     }
 
     protected function getCredType(): string

tests/Credentials/ImpersonatedServiceAccountCredentialsTest.php

@@ -186,6 +186,7 @@ public function testGetAccessTokenWithServiceAccountAndUserRefreshCredentials(ar
         $token = $creds->fetchAuthToken($httpHandler);
         $this->assertEquals('test-impersonated-access-token', $token['access_token']);
         $this->assertEquals(2, $requestCount);
+        $this->assertEquals($token, $creds->getLastReceivedToken());
     }
 
     /**
@@ -225,6 +226,7 @@ public function testGetAccessTokenWithExternalAccountCredentials()
         $token = $creds->fetchAuthToken($httpHandler);
         $this->assertEquals('test-impersonated-access-token', $token['access_token']);
         $this->assertEquals(3, $requestCount);
+        $this->assertEquals($token, $creds->getLastReceivedToken());
     }
 
     /**
@@ -266,6 +268,7 @@ public function testGetIdTokenWithServiceAccountAndUserRefreshCredentials(array
         $token = $creds->fetchAuthToken($httpHandler);
         $this->assertEquals('test-impersonated-id-token', $token['id_token']);
         $this->assertEquals(2, $requestCount);
+        $this->assertEquals($token, $creds->getLastReceivedToken());
     }
 
     public function provideAuthTokenJson()
@@ -307,6 +310,7 @@ public function testGetIdTokenWithServiceAccountCredentialsAndUniverseDomain()
         $creds = new ImpersonatedServiceAccountCredentials(null, $json, self::TARGET_AUDIENCE);
         $token = $creds->fetchAuthToken($httpHandler);
         $this->assertEquals('test-impersonated-id-token', $token['id_token']);
+        $this->assertEquals($token, $creds->getLastReceivedToken());
     }
 
     /**
@@ -378,6 +382,7 @@ public function testGetIdTokenWithExternalAccountCredentials(?string $universeDo
         $token = $creds->fetchAuthToken($httpHandler);
         $this->assertEquals('test-impersonated-id-token', $token['id_token']);
         $this->assertEquals(3, $requestCount);
+        $this->assertEquals($token, $creds->getLastReceivedToken());
     }
 
     /**
@@ -416,6 +421,7 @@ public function testGetIdTokenWithArbitraryCredentials(?string $universeDomain =
 
         $token = $creds->fetchAuthToken($httpHandler);
         $this->assertEquals('test-impersonated-id-token', $token['id_token']);
+        $this->assertEquals($token, $creds->getLastReceivedToken());
     }
 
     public function provideUniverseDomain()
@@ -455,6 +461,7 @@ public function testGetAccessTokenWithArbitraryCredentials()
 
         $token = $creds->fetchAuthToken($httpHandler);
         $this->assertEquals('test-impersonated-access-token', $token['access_token']);
+        $this->assertEquals($token, $creds->getLastReceivedToken());
     }
 
     public function testIdTokenWithAuthTokenMiddleware()