chore: Mark IUserConfig entries as lazy #173
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| namespace OCA\Zammad\Migration; | ||
|
|
||
| use Closure; | ||
| use OCA\Zammad\AppInfo\Application; | ||
| use OCP\Config\IUserConfig; | ||
| use OCP\IAppConfig; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\SimpleMigrationStep; | ||
| use OCP\Security\ICrypto; | ||
|
|
||
| class Version040000Date20260129225956 extends SimpleMigrationStep { | ||
|
|
||
| public function __construct( | ||
| private ICrypto $crypto, | ||
| private IUserConfig $userConfig, | ||
| private IAppConfig $appConfig, | ||
| ) { | ||
| } | ||
|
|
||
| /** | ||
| * @param IOutput $output | ||
| * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` | ||
| * @param array $options | ||
| */ | ||
| public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) { | ||
| foreach ($this->userConfig->getUserIds(Application::APP_ID) as $userId) { | ||
| // store user config as lazy and sensitive | ||
| foreach (['token', 'refresh_token'] as $key) { | ||
| if ($this->userConfig->hasKey($userId, Application::APP_ID, $key)) { | ||
| $value = $this->userConfig->getValueString($userId, Application::APP_ID, $key); | ||
| $decryptedValue = $this->crypto->decrypt($value); | ||
| $this->userConfig->setValueString($userId, Application::APP_ID, $key, $decryptedValue, lazy: true, flags: IUserConfig::FLAG_SENSITIVE); | ||
| } | ||
| } | ||
| // store user config as lazy (except 'navigation_enabled' and 'url') | ||
| foreach (['token_type', 'token_expires_at', 'oauth_state', 'redirect_uri', 'search_enabled', 'link_preview_enabled', 'notification_enabled', 'user_id', 'user_name', 'last_open_check'] as $key) { | ||
| if ($this->userConfig->hasKey($userId, Application::APP_ID, $key)) { | ||
| $value = $this->userConfig->getValueString($userId, Application::APP_ID, $key); | ||
| $this->userConfig->setValueString($userId, Application::APP_ID, $key, $value, lazy: true); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // store oauth_instance_url as non-lazy | ||
|
Member
There was a problem hiding this comment. Maybe do the same for the I know those values are not supposed to have been stored previously as lazy but why not?
Member
Author
There was a problem hiding this comment. They are queried on each request, that's why I didn't make them lazy.
Member
There was a problem hiding this comment. Sorry for the confusion. I'm not saying
Member
Author
There was a problem hiding this comment. But they're not stored as lazy? :D |
||
| foreach (['oauth_instance_url'] as $key) { | ||
| if ($this->appConfig->hasKey(Application::APP_ID, $key, lazy: true)) { | ||
| $this->appConfig->deleteKey(Application::APP_ID, $key); | ||
| $this->appConfig->setValueString(Application::APP_ID, $key, $value, lazy: false); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh nice, i didn't know about
userConfig->getUserIds.