From 8b0dd5433cb37752faa0d669a86d7516a421435d Mon Sep 17 00:00:00 2001 From: Andrey Borysenko Date: Thu, 13 Jul 2023 19:05:09 +0300 Subject: [PATCH] Dev: use also annotations to support NC26 relied on annotations --- lib/Controller/AppConfigController.php | 9 ++++++++ lib/Controller/ConfigController.php | 2 ++ lib/Controller/ExAppController.php | 9 +++++++- lib/Controller/OcsApiController.php | 29 ++++++++++++++++++++++++ lib/Controller/PreferencesController.php | 9 ++++++++ 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/lib/Controller/AppConfigController.php b/lib/Controller/AppConfigController.php index ef881d5d..58732f4b 100644 --- a/lib/Controller/AppConfigController.php +++ b/lib/Controller/AppConfigController.php @@ -61,6 +61,9 @@ public function __construct( } /** + * @PublicPage + * @NoCSRFRequired + * * @param string $configKey * @param mixed $configValue * @param string $format @@ -84,6 +87,9 @@ public function setAppConfigValue(string $configKey, mixed $configValue, string } /** + * @PublicPage + * @NoCSRFRequired + * * @param array $configKeys * @param string $format * @@ -99,6 +105,9 @@ public function getAppConfigValues(array $configKeys, string $format = 'json'): } /** + * @PublicPage + * @NoCSRFRequired + * * @param array $configKeys * @param string $format * diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php index 29dbb472..b4fea80c 100644 --- a/lib/Controller/ConfigController.php +++ b/lib/Controller/ConfigController.php @@ -52,6 +52,8 @@ public function __construct( } /** + * @NoCSRFRequired + * * Set Admin config values * * @param array $values diff --git a/lib/Controller/ExAppController.php b/lib/Controller/ExAppController.php index 1b233f32..4e70b11d 100644 --- a/lib/Controller/ExAppController.php +++ b/lib/Controller/ExAppController.php @@ -31,7 +31,6 @@ namespace OCA\AppEcosystemV2\Controller; -use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\Attribute\NoCSRFRequired; use OCP\IRequest; use OCP\AppFramework\OCSController; @@ -54,6 +53,14 @@ public function __construct( $this->service = $service; } + /** + * @NoCSRFRequired + * + * @param bool $extended + * @param string $format + * + * @return Response + */ #[NoCSRFRequired] public function getExApps(bool $extended = false, string $format = 'json'): Response { return $this->buildResponse(new DataResponse($this->service->getExAppsList($extended), Http::STATUS_OK), $format); diff --git a/lib/Controller/OcsApiController.php b/lib/Controller/OcsApiController.php index c086ab95..b2333fb1 100644 --- a/lib/Controller/OcsApiController.php +++ b/lib/Controller/OcsApiController.php @@ -83,6 +83,10 @@ public function __construct( } /** + * @PublicPage + * @NoAdminRequired + * @NoCSRFRequired + * * @param int $level * @param string $message * @param string $format @@ -122,6 +126,8 @@ public function log( } /** + * @NoCSRFRequired + * * @param string $appId * @param array $appData * @param string $format @@ -139,6 +145,8 @@ public function registerExternalApp(string $appId, array $appData, string $forma } /** + * @NoCSRFRequired + * * @param string $appId * @param string $format * @@ -161,6 +169,9 @@ public function unregisterExternalApp(string $appId, string $format = 'json'): R } /** + * @NoAdminRequired + * @NoCSRFRequired + * * @param string $appId * @param string $format * @@ -180,6 +191,9 @@ public function getAppStatus(string $appId, string $format = 'json'): Response { } /** + * @PublicPage + * @NoCSRFRequired + * * @param array $fileActionMenuParams [name, display_name, mime, permissions, order, icon, icon_class, action_handler] * @param string $format * @@ -198,6 +212,9 @@ public function registerFileActionMenu(array $fileActionMenuParams, string $form } /** + * @PublicPage + * @NoCSRFRequired + * * @param string $fileActionMenuName * @param string $format * @@ -216,6 +233,9 @@ public function unregisterFileActionMenu(string $fileActionMenuName, string $for } /** + * @NoCSRFRequired + * @NoAdminRequired + * * @param string $appId * @param string $actionName * @param array $actionFile @@ -235,6 +255,9 @@ public function handleFileAction(string $appId, string $actionName, array $actio } /** + * @NoAdminRequired + * @NoCSRFRequired + * * @param string $appId * @param string $exFileActionName * @@ -257,6 +280,9 @@ public function loadFileActionIcon(string $appId, string $exFileActionName): Dat } /** + * @PublicPage + * @NoCSRFRequired + * * @param string $format * * @return Response @@ -269,6 +295,9 @@ public function getExAppUsers(string $format = 'json'): Response { } /** + * @PublicPage + * @NoCSRFRequired + * * @param string $apiRoute * @param int $scopeGroup * @param string $name diff --git a/lib/Controller/PreferencesController.php b/lib/Controller/PreferencesController.php index 0270084b..bd33b6a3 100644 --- a/lib/Controller/PreferencesController.php +++ b/lib/Controller/PreferencesController.php @@ -64,6 +64,9 @@ public function __construct( } /** + * @PublicPage + * @NoCSRFRequired + * * @param string $configKey * @param mixed $configValue * @param string $format @@ -88,6 +91,9 @@ public function setUserConfigValue(string $configKey, mixed $configValue, string } /** + * @PublicPage + * @NoCSRFRequired + * * @param array $configKeys * @param string $format * @@ -104,6 +110,9 @@ public function getUserConfigValues(array $configKeys, string $format = 'json'): } /** + * @PublicPage + * @NoCSRFRequired + * * @param array $configKeys * @param string $format *