Skip to content

Fix bug with missing group claims when using AAD for OIDC #2066

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
joshlove007 wants to merge 1 commit into
base: v2-develop
Choose a base branch
from
+11 −3
Open

Fix bug with missing group claims when using AAD for OIDC #2066

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions api/functions/oidc-functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,10 +429,18 @@ public function processOIDCCallback($provider, $code, $state)
$this->setAPIResponse('error', 'Failed to exchange authorization code', 500);
return false;
}
// Get user info from userinfo endpoint or ID token
// Get user info from userinfo endpoint (primary source).
$userInfo = $this->getOIDCUserInfo($provider, $tokens['access_token']);
if (!$userInfo && !empty($tokens['id_token'])) {
$userInfo = $this->decodeOIDCIdToken($tokens['id_token']);
// Fill in any claims missing from userinfo using the ID token. Some providers
// (e.g. Microsoft Entra ID) omit claims like `groups` and `preferred_username`
// from /userinfo even when present in the ID token.
if (!empty($tokens['id_token'])) {
$idTokenClaims = $this->decodeOIDCIdToken($tokens['id_token']);
if (is_array($idTokenClaims)) {
$userInfo = is_array($userInfo)
? array_merge($idTokenClaims, $userInfo)
: $idTokenClaims;
}
}
if (!$userInfo) {
$this->setAPIResponse('error', 'Failed to get user information', 500);
Expand Down