Skip to content

fix: ImpersonatedCredentials getLastReceivedToken returns correct token #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bshaffer merged 2 commits into from
Mar 18, 2026
Merged

fix: ImpersonatedCredentials getLastReceivedToken returns correct token #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
626d22c
fix: ImpersonatedCredentials getLastReceivedToken returns correct token
bshaffer Mar 18, 2026
578393e
fix phpstan
bshaffer Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Credentials/ImpersonatedServiceAccountCredentials.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,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.
Expand Down Expand Up @@ -252,7 +257,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'],
Expand All @@ -279,7 +284,7 @@ public function getCacheKey()
*/
public function getLastReceivedToken()
{
return $this->sourceCredentials->getLastReceivedToken();
return $this->lastReceivedToken;
}

protected function getCredType(): string
Expand Down
7 changes: 7 additions & 0 deletions tests/Credentials/ImpersonatedServiceAccountCredentialsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

/**
Expand Down Expand Up @@ -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());
}

/**
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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());
}

/**
Expand Down Expand Up @@ -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());
}

/**
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
Loading