Fetch default privacy scopes and set properties appropriate #1048
+16
−10
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
bjalbor
force-pushed
the
feat/1047/user-provisioning-privacy-scopes
branch
2 times, most recently
from
5274df5 to
c1dd620
Compare
…stead of using 'v2-local' (closes nextcloud#1047) Signed-off-by: Björn Bores <[email protected]>
bjalbor
force-pushed
the
feat/1047/user-provisioning-privacy-scopes
branch
from
c1dd620 to
9aabd12
Compare
|
I had to force-push because I somehow missed to check if a default value for BIRTHDAY is already available for using in case of gender (which is - like PRONOUNS - not availible before NC v31). Sorry for that. |
julien-nc
requested changes
Feb 10, 2025
| @@ -227,7 +231,7 @@ public function provisionUser(string $tokenUserId, int $providerId, object $idTo | |||
| $this->eventDispatcher->dispatchTyped($event); | |||
| $this->logger->debug('Phone mapping event dispatched'); | |||
| if ($event->hasValue()) { | |||
| $account->setProperty('phone', $event->getValue(), $scope, '1', ''); | |||
| $account->setProperty('phone', $event->getValue(), $defaultScopes[\OCP\Accounts\IAccountManager::PROPERTY_PHONE] ?? $fallbackScope, '1', ''); | |||
There was a problem hiding this comment.
Suggested change
| $account->setProperty('phone', $event->getValue(), $defaultScopes[\OCP\Accounts\IAccountManager::PROPERTY_PHONE] ?? $fallbackScope, '1', ''); | |
| $account->setProperty('phone', $event->getValue(), $defaultScopes[IAccountManager::PROPERTY_PHONE] ?? $fallbackScope, '1', ''); |
IAccountManager is imported, you don't need the full class path.
Comment on lines
+156
to
+157
| $defaultScopes = array_merge(AccountManager::DEFAULT_SCOPES, | ||
| $this->config->getSystemValue('account_manager.default_property_scope', [])); |
There was a problem hiding this comment.
Suggested change
| $defaultScopes = array_merge(AccountManager::DEFAULT_SCOPES, | |
| $this->config->getSystemValue('account_manager.default_property_scope', [])); | |
| $defaultScopes = array_merge( | |
| AccountManager::DEFAULT_SCOPES, | |
| $this->config->getSystemValue('account_manager.default_property_scope', []) ?? [], | |
| ); |
The ?? [] will fix the PhpUnit tests (I'm not sure why they fail).
|
If you rebase on the main branch, you'll get rid of one Psalm issue ( The other one ( |
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.
Fetch default values for privacy scopes and use these for user provisioning instead of always take 'v2-local' which will reveal sensitive information on default (closes #1047)