turn LDAP's treat remnants as disabled feature config-independent #46992
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,54 @@ | ||||||
| <?php | ||||||
|
|
||||||
| declare(strict_types=1); | ||||||
| /** | ||||||
| * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||||||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||||||
| */ | ||||||
|
|
||||||
| namespace OCA\User_LDAP\Migration; | ||||||
|
|
||||||
| use OCP\IAppConfig; | ||||||
| use OCP\IDBConnection; | ||||||
| use OCP\Migration\IOutput; | ||||||
| use OCP\Migration\IRepairStep; | ||||||
|
|
||||||
| class RearrangeMarkRemnantsAsDisabled implements IRepairStep { | ||||||
| public function __construct( | ||||||
| protected IAppConfig $appConfig, | ||||||
| protected IDBConnection $dbc, | ||||||
| ) { | ||||||
|
|
||||||
| } | ||||||
| public function getName(): string { | ||||||
| return 'Rearrange the configuration of ldap_mark_remnants_as_disabled'; | ||||||
| } | ||||||
|
|
||||||
| public function run(IOutput $output): void { | ||||||
| $allKeys = $this->appConfig->getKeys('user_ldap'); | ||||||
|
|
||||||
| if (in_array('backend_mark_remnants_as_disabled', $allKeys, true)) { | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| // if it was enabled for at least one configuration, use it as global configuration | ||||||
| $filteredKeys = array_filter($allKeys, static function (string $key): bool { | ||||||
| return str_contains($key, 'ldap_mark_remnants_as_disabled'); | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| }); | ||||||
| $newValue = false; | ||||||
| foreach ($filteredKeys as $filteredKey) { | ||||||
| $newValue = $newValue || $this->appConfig->getValueBool('user_ldap', $filteredKey); | ||||||
| } | ||||||
|
|
||||||
| // set the new value | ||||||
| $this->appConfig->setValueBool('user_ldap', 'backend_mark_remnants_as_disabled', $newValue); | ||||||
| if ($newValue) { | ||||||
| $output->info('The option "Disable missing users from LDAP" is activated.'); | ||||||
| } | ||||||
|
|
||||||
| // clean up now that the new value is saved | ||||||
| foreach ($filteredKeys as $filteredKey) { | ||||||
| $this->appConfig->deleteKey('user_ldap', $filteredKey); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <?php | ||
|
|
||
| namespace OCA\User_LDAP\Settings; | ||
|
|
||
| use OCP\AppFramework\Http\TemplateResponse; | ||
| use OCP\AppFramework\Services\IInitialState; | ||
| use OCP\IAppConfig; | ||
| use OCP\IL10N; | ||
| use OCP\Settings\IDelegatedSettings; | ||
|
|
||
| class AppSettings implements IDelegatedSettings { | ||
|
|
||
| public function __construct( | ||
| protected IL10N $l, | ||
| protected IInitialState $initialState, | ||
| protected IAppConfig $appConfig, | ||
| ) { | ||
| } | ||
|
|
||
| public function getName(): ?string { | ||
| return $this->l->t('Configuration-independent settings'); | ||
| } | ||
|
|
||
| public function getAuthorizedAppConfig(): array { | ||
| return []; | ||
| } | ||
|
|
||
| public function getForm(): TemplateResponse { | ||
| $this->initialState->provideInitialState('config', [ | ||
| 'backend_mark_remnants_as_disabled' => $this->appConfig->getValueBool('user_ldap', 'backend_mark_remnants_as_disabled'), | ||
| ]); | ||
|
|
||
| return new TemplateResponse('user_ldap', 'app-settings'); | ||
| } | ||
|
|
||
| public function getSection(): string { | ||
| return 'ldap'; | ||
| } | ||
|
|
||
| public function getPriority(): int { | ||
| return 9; | ||
| } | ||
| } |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <!-- | ||
| - SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
| - SPDX-License-Identifier: AGPL-3.0-or-later | ||
| --> | ||
|
|
||
| <template> | ||
| <NcSettingsSection :name="t('user_ldap', 'Configuration-independent settings')"> | ||
| <ul class="user_ldap__app-settings-list"> | ||
| <li> | ||
| <NcCheckboxRadioSwitch :checked="config.backend_mark_remnants_as_disabled" | ||
| type="switch" | ||
| @update:checked="updateBoolSetting('backend_mark_remnants_as_disabled')"> | ||
| {{ t('user_ldap', 'Disable users missing from LDAP') }} | ||
| </NcCheckboxRadioSwitch> | ||
| </li> | ||
| </ul> | ||
| </NcSettingsSection> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { showError, showSuccess } from '@nextcloud/dialogs' | ||
| import { loadState } from '@nextcloud/initial-state' | ||
|
|
||
| import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js' | ||
| import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js' | ||
|
|
||
| export default { | ||
| name: 'AppSettings', | ||
| components: { | ||
| NcCheckboxRadioSwitch, | ||
| NcSettingsSection, | ||
| }, | ||
|
|
||
| data() { | ||
| return { | ||
| config: loadState('user_ldap', 'config'), | ||
| } | ||
| }, | ||
|
|
||
| methods: { | ||
| async updateBoolSetting(setting) { | ||
| OCP.AppConfig.setValue('user_ldap', setting, this.config[setting] ? '0' : '1', { | ||
| success: () => { | ||
| showSuccess(t('user_ldap', 'Settings saved')) | ||
| this.config[setting] = !this.config[setting] | ||
| }, | ||
| error: () => showError(t('user_ldap', 'Error while saving settings')), | ||
| }) | ||
| }, | ||
| }, | ||
| } | ||
| </script> | ||
|
|
||
Oops, something went wrong.
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.
As it returns bool the magic property in phpdoc before the class should be typed to bool I think.
Also the default value in getDefaults is now unused for this property I think.