Skip to content

Fix conflicting access token cache for fetching user info from SSO. #21

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
marforon merged 8 commits into from
Apr 15, 2025
Merged

Fix conflicting access token cache for fetching user info from SSO. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e36d4e5
Upgrade
marforon Feb 25, 2025
7c414d0
Add timestamp to login redirect
marforon Feb 25, 2025
ba0caf9
Fix public method
marforon Mar 3, 2025
f4f1766
upgrade
marforon Mar 3, 2025
474bd58
upgrade
marforon Mar 3, 2025
a4c4d3a
upgrade
marforon Mar 3, 2025
84df5e0
Merge branch 'main' of github.com:anzusystems/auth-bundle into upgrade
marforon Apr 15, 2025
e3c76f1
Fix conflicting access token cache for fetching user info from SSO.
marforon Apr 15, 2025
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
2 changes: 1 addition & 1 deletion src/Configuration/OAuth2Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function getSsoAuthorizeUrl(): string
return $this->ssoAuthorizeUrl;
}

public function getSsoUserInfoUrl(?string $userId): string
public function getSsoUserInfoUrl(?string $userId = null): string
{
if (!$userId) {
return $this->ssoUserInfoUrl;
Expand Down
4 changes: 2 additions & 2 deletions src/Domain/Process/OAuth2/GrantAccessByOAuth2TokenProcess.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private function getAuthUser(AccessTokenDto $accessTokenDto): ?AnzuAuthUserInter
{
if (self::AUTH_METHOD_SSO_EMAIL === $this->authMethod) {
// fetch user info
$ssoUser = $this->OAuth2HttpClient->getSsoUserInfo();
$ssoUser = $this->OAuth2HttpClient->getCurrentSsoUserInfo($accessTokenDto);

return $this->oAuth2AuthUserRepository->findOneBySsoEmail($ssoUser->getEmail());
}
Expand All @@ -149,7 +149,7 @@ private function getAuthUser(AccessTokenDto $accessTokenDto): ?AnzuAuthUserInter
}

// otherwise fetch user info
$ssoUser = $this->OAuth2HttpClient->getSsoUserInfo();
$ssoUser = $this->OAuth2HttpClient->getCurrentSsoUserInfo($accessTokenDto);

return $this->oAuth2AuthUserRepository->findOneBySsoUserId($ssoUser->getId());
}
Expand Down
32 changes: 25 additions & 7 deletions src/HttpClient/OAuth2HttpClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

final class OAuth2HttpClient
{
private const CLIENT_SERVICE_ACCESS_TOKEN_CACHE_KEY = 'sso_access_token_client_service';
private const string CLIENT_SERVICE_ACCESS_TOKEN_CACHE_KEY = 'sso_access_token_client_service';

public function __construct(
private readonly HttpClientInterface $client,
Expand All @@ -34,24 +34,20 @@ public function __construct(
*/
public function requestAccessTokenByAuthCode(string $code): AccessTokenDto
{
$accessToken = $this->sendTokenRequest($this->configuration->getSsoAccessTokenUrl(), [
return $this->sendTokenRequest($this->configuration->getSsoAccessTokenUrl(), [
'grant_type' => 'authorization_code',
'code' => $code,
'client_id' => $this->configuration->getSsoClientId(),
'client_secret' => $this->configuration->getSsoClientSecret(),
'redirect_uri' => $this->configuration->getSsoRedirectUrl(),
]);

$this->storeAccessTokenToCache($this->getAccessTokenCacheItem(), $accessToken);

return $accessToken;
}

/**
* @throws UnsuccessfulAccessTokenRequestException
* @throws UnsuccessfulUserInfoRequestException
*/
public function getSsoUserInfo(?string $id = null): SsoUserDto
public function getSsoUserInfo(string $id): SsoUserDto
{
try {
$response = $this->client->request(
Expand All @@ -70,6 +66,28 @@ public function getSsoUserInfo(?string $id = null): SsoUserDto
}
}

/**
* @throws UnsuccessfulUserInfoRequestException
*/
public function getCurrentSsoUserInfo(AccessTokenDto $token): SsoUserDto
{
try {
$response = $this->client->request(
method: Request::METHOD_GET,
url: $this->configuration->getSsoUserInfoUrl(),
options: [
'auth_bearer' => $token->getAccessToken(),
]
);

return $this->serializer->deserialize($response->getContent(), $this->configuration->getSsoUserInfoClass());
} catch (ExceptionInterface $exception) {
throw UnsuccessfulUserInfoRequestException::create('User info request failed!', $exception);
} catch (SerializerException $exception) {
throw UnsuccessfulUserInfoRequestException::create('User info response deserialization failed!', $exception);
}
}

public function getSsoUserInfoByEmail(string $email): SsoUserDto
{
try {
Expand Down