Skip to content

Change the behaviour related with the 'prompt' authentication param #1176

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
julien-nc merged 2 commits into from
Aug 19, 2025
Merged

Change the behaviour related with the 'prompt' authentication param #1176

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
0b23813
fix: only use the prompt param for the authorization and token endpoi…
julien-nc Aug 18, 2025
c410e3e
fix: get the prompt config value in a safer way
julien-nc Aug 18, 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
4 changes: 3 additions & 1 deletion lib/Controller/LoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,11 @@ public function login(int $providerId, ?string $redirectUrl = null) {
'claims' => json_encode($claims),
'state' => $state,
'nonce' => $nonce,
'prompt' => $oidcConfig['prompt'] ?? 'consent'
];

if (isset($oidcConfig['prompt']) && is_string($oidcConfig['prompt'])) {
$data['prompt'] = $oidcConfig['prompt'];
}

if ($isPkceEnabled) {
$data['code_challenge'] = $this->toCodeChallenge($code_verifier);
Expand Down
35 changes: 20 additions & 15 deletions lib/Service/TokenService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,24 +255,29 @@ public function getExchangedToken(string $targetAudience, array $extraScopes = [
}
}
$this->logger->debug('[TokenService] Exchanging the token: ' . $discovery['token_endpoint']);
$tokenEndpointParams = [
'client_id' => $oidcProvider->getClientId(),
'client_secret' => $clientSecret,
'grant_type' => 'urn:ietf:params:oauth:grant-type:token-exchange',
'subject_token' => $loginToken->getAccessToken(),
'subject_token_type' => 'urn:ietf:params:oauth:token-type:access_token',
// can also be
// urn:ietf:params:oauth:token-type:access_token
// or urn:ietf:params:oauth:token-type:id_token
// this one will get us an access token and refresh token within the response
'requested_token_type' => 'urn:ietf:params:oauth:token-type:refresh_token',
'audience' => $targetAudience,
'scope' => $scope,
];
$oidcConfig = $this->config->getSystemValue('user_oidc', []);
if (isset($oidcConfig['prompt']) && is_string($oidcConfig['prompt'])) {
// none, consent, login and internal for oauth2 passport server
$tokenEndpointParams['prompt'] = $oidcConfig['prompt'];
}
// more in https://www.keycloak.org/securing-apps/token-exchange
$body = $this->clientService->post(
$discovery['token_endpoint'],
[
'client_id' => $oidcProvider->getClientId(),
'client_secret' => $clientSecret,
'grant_type' => 'urn:ietf:params:oauth:grant-type:token-exchange',
'subject_token' => $loginToken->getAccessToken(),
'subject_token_type' => 'urn:ietf:params:oauth:token-type:access_token',
// can also be
// urn:ietf:params:oauth:token-type:access_token
// or urn:ietf:params:oauth:token-type:id_token
// this one will get us an access token and refresh token within the response
'requested_token_type' => 'urn:ietf:params:oauth:token-type:refresh_token',
'audience' => $targetAudience,
'scope' => $scope,
'prompt' => $this->config->getSystemValue('user_oidc.prompt', 'consent') // none,consent,login and internal for oauth2 passport server
]
$tokenEndpointParams,
);
$this->logger->debug('[TokenService] Token exchange request params', [
'client_id' => $oidcProvider->getClientId(),
Expand Down
Loading