Allow to disable default quota, displayName, groups and email claims #883
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
artonge
approved these changes
Jun 17, 2024
lib/Controller/LoginController.php
Outdated
| // by default: default claims are ENABLED | ||
| // default claims are historically for quota, email, displayName and groups | ||
| $isDefaultClaimsEnabled = !isset($oidcSystemConfig['enable_default_claims']) | ||
| || in_array($oidcSystemConfig['enable_default_claims'], [true, 'true', 1, '1'], true); |
There was a problem hiding this comment.
Maybe we can be stricter and only disable default claims if enable_default_claims => false. Just to ease our life.
There was a problem hiding this comment.
Better like this?
$isDefaultClaimsEnabled = !isset($oidcSystemConfig['enable_default_claims'])
|| $oidcSystemConfig['enable_default_claims'] !== false;
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
julien-nc
force-pushed
the
enh/allow-disabling-default-claims
branch
from
d5047f1 to
8c58113
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Even if an Oidc client is configured with no attribute mapping for quota, email, displayName or groups, those claims are included by default.
This allows using a global config switch (in config.php) to disable those default claims and only use them if a mapping is set in the client's settings (user_oidc's admin settings).
Default claims are enabled by default (to not break existing setups).