Skip to content

Pass user id from old refresh token to finalizeScopes() #1414

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pass user id from old refresh token to finalizeScopes() #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3985380
Pass user id from old refresh token to finalizeScopes()
pl-github Jun 7, 2024
246782c
Ensure userId is a string
pl-github Feb 14, 2025
163834b
Remove redundant code
pl-github Feb 14, 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
11 changes: 6 additions & 5 deletions src/Grant/RefreshTokenGrant.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,12 @@ public function respondToAccessTokenRequest(
}
}

$scopes = $this->scopeRepository->finalizeScopes($scopes, $this->getIdentifier(), $client);
$userId = $oldRefreshToken['user_id'];
if (is_int($userId)) {
$userId = (string) $userId;
}

$scopes = $this->scopeRepository->finalizeScopes($scopes, $this->getIdentifier(), $client, $userId);

// Expire old tokens
$this->accessTokenRepository->revokeAccessToken($oldRefreshToken['access_token_id']);
Expand All @@ -78,10 +83,6 @@ public function respondToAccessTokenRequest(
}

// Issue and persist new access token
$userId = $oldRefreshToken['user_id'];
if (is_int($userId)) {
$userId = (string) $userId;
}
$accessToken = $this->issueAccessToken($accessTokenTTL, $client, $userId, $scopes);
$this->getEmitter()->emit(new RequestAccessTokenEvent(RequestEvent::ACCESS_TOKEN_ISSUED, $request, $accessToken));
$responseType->setAccessToken($accessToken);
Expand Down
2 changes: 1 addition & 1 deletion tests/Grant/RefreshTokenGrantTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ public function testRespondToRequestFinalizeScopes(): void
$scopeRepositoryMock
->expects(self::once())
->method('finalizeScopes')
->with($scopes, $grant->getIdentifier(), $client)
->with($scopes, $grant->getIdentifier(), $client, '123', null)
->willReturn($finalizedScopes);

$accessToken = new AccessTokenEntity();
Expand Down