From 1eecc438a845a6e7b3f605dd848032ecbae85f21 Mon Sep 17 00:00:00 2001 From: Claus-Justus Heine Date: Thu, 17 Feb 2022 18:23:07 +0100 Subject: [PATCH 1/2] Allow delegation of admin settings. Signed-off-by: Claus-Justus Heine --- lib/Settings/Admin.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index e578dc3..286b9ce 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -23,14 +23,14 @@ use OCA\UserSQL\Properties; use OCP\AppFramework\Http\TemplateResponse; -use OCP\Settings\ISettings; +use OCP\Settings\IDelegatedSettings; /** * The administrator's settings page. * * @author Marcin Ɓojewski */ -class Admin implements ISettings +class Admin implements IDelegatedSettings { /** * @var string The application name. @@ -76,4 +76,12 @@ public function getPriority() { return 25; } + + public function getName(): ?string { + return null; // Only one setting in this section + } + + public function getAuthorizedAppConfig(): array { + return []; // Custom controller + } } From e4c49480319fc2d66a452ab179065f503a6d6db6 Mon Sep 17 00:00:00 2001 From: Claus-Justus Heine Date: Thu, 17 Feb 2022 19:37:35 +0100 Subject: [PATCH 2/2] Add @AuthorizedAdminSetting to all controller methods. Signed-off-by: Claus-Justus Heine --- lib/Controller/SettingsController.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 845abf9..8ae3668 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -92,6 +92,8 @@ public function __construct( * Verify the database connection parameters. * * @return array The request status. + * + * @AuthorizedAdminSetting(settings=OCA\UserSQL\Settings\Admin) */ public function verifyDbConnection() { @@ -189,6 +191,8 @@ private function getConnection() * Save application properties. * * @return array The request status. + * + * @AuthorizedAdminSetting(settings=OCA\UserSQL\Settings\Admin) */ public function saveProperties() { @@ -329,6 +333,8 @@ private function cryptoClassConfiguration($cryptoClass) * Clear the application cache memory. * * @return array The request status. + * + * @AuthorizedAdminSetting(settings=OCA\UserSQL\Settings\Admin) */ public function clearCache() { @@ -356,6 +362,8 @@ public function clearCache() * Autocomplete for table select options. * * @return array The database table list. + * + * @AuthorizedAdminSetting(settings=OCA\UserSQL\Settings\Admin) */ public function tableAutocomplete() { @@ -385,6 +393,8 @@ public function tableAutocomplete() * Autocomplete for column select options - user table. * * @return array The database table's column list. + * + * @AuthorizedAdminSetting(settings=OCA\UserSQL\Settings\Admin) */ public function userTableAutocomplete() { @@ -430,6 +440,8 @@ private function columnAutocomplete($table) * Autocomplete for column select options - user_group table. * * @return array The database table's column list. + * + * @AuthorizedAdminSetting(settings=OCA\UserSQL\Settings\Admin) */ public function userGroupTableAutocomplete() { @@ -451,6 +463,8 @@ public function userGroupTableAutocomplete() * Autocomplete for column select options - group table. * * @return array The database table's column list. + * + * @AuthorizedAdminSetting(settings=OCA\UserSQL\Settings\Admin) */ public function groupTableAutocomplete() { @@ -473,6 +487,8 @@ public function groupTableAutocomplete() * * @return array Password algorithm parameters. * @throws ReflectionException Whenever Opt class cannot be initiated. + * + * @AuthorizedAdminSetting(settings=OCA\UserSQL\Settings\Admin) */ public function cryptoParams() {