This commit is contained in:
parent
af6d7a8a0b
commit
eefc99e807
@ -276,7 +276,6 @@ func (a *AuthProviderOIDC) OIDCCallbackHandler(
|
||||
httpUserError(writer, fmt.Errorf("decoding ID token claims: %w", err))
|
||||
return
|
||||
}
|
||||
log.Debug().Int("groups_count_from_id_token", len(claims.Groups)).Strs("groups", claims.Groups).Msg("DEBUG: claims.Groups after id_token decode")
|
||||
|
||||
// Fetch user information (email, groups, name, etc) from the userinfo endpoint
|
||||
// https://openid.net/specs/openid-connect-core-1_0.html#UserInfo
|
||||
@ -300,11 +299,9 @@ func (a *AuthProviderOIDC) OIDCCallbackHandler(
|
||||
claims.Name = cmp.Or(userinfo2.Name, claims.Name)
|
||||
|
||||
claims.ProfilePictureURL = cmp.Or(userinfo2.Picture, claims.ProfilePictureURL)
|
||||
log.Debug().Int("groups_count_userinfo", len(userinfo2.Groups)).Strs("groups", userinfo2.Groups).Msg("DEBUG: userinfo2.Groups after userinfo decode")
|
||||
if userinfo2.Groups != nil {
|
||||
claims.Groups = userinfo2.Groups
|
||||
}
|
||||
log.Debug().Int("groups_count_after_merge", len(claims.Groups)).Strs("groups", claims.Groups).Msg("DEBUG: claims.Groups after userinfo merge")
|
||||
} else {
|
||||
util.LogErr(err, "could not get userinfo; only using claims from id token")
|
||||
}
|
||||
|
||||
@ -488,9 +488,5 @@ func (u *User) FromClaim(claims *OIDCClaims, emailVerifiedRequired bool) {
|
||||
u.Provider = util.RegisterMethodOIDC
|
||||
|
||||
// Store OIDC groups for role-based access control
|
||||
log.Debug().
|
||||
Int("groups_count", len(claims.Groups)).
|
||||
Strs("groups", claims.Groups).
|
||||
Msg("FromClaim: SetGroups input")
|
||||
u.SetGroups(claims.Groups)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user