Ensembia/nextcloud-side_menu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(controller): usage of attributes instead of annotations

Browse Source
This commit is contained in:
Simon Vieille
2025-03-05 21:54:59 +01:00
parent 37b9beb8f7
commit b03a7f7bad
8 changed files with 45 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Controller/AdminSettingController.php
+6 -6
View File
@@ -20,11 +20,13 @@ namespace OCA\SideMenu\Controller;
use OCA\SideMenu\AppInfo\Application;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\DataDownloadResponse;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class AdminSettingController extends Controller
{
@@ -37,9 +39,8 @@ class AdminSettingController extends Controller
parent::__construct($appName, $request);
}
/**
* @NoCSRFRequired
*/
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/admin/cache/remove')]
public function removeCache(): RedirectResponse
{
$this->config->setAppValue(Application::APP_ID, 'cache-categories', '[]');
@@ -49,9 +50,8 @@ class AdminSettingController extends Controller
]).'#more');
}
/**
* @NoCSRFRequired
*/
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/admin/config/export')]
public function exportConfiguration(): DataDownloadResponse
{
$keys = $this->config->getAppKeys(Application::APP_ID);
lib/Controller/AppController.php
+6 -4
View File
@@ -26,6 +26,9 @@ use OCP\AppFramework\Http\RedirectResponse;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class AppController extends Controller
{
@@ -39,10 +42,9 @@ class AppController extends Controller
parent::__construct($appName, $request);
}
/**
* @NoAdminRequired
* @NoCSRFRequired
*/
#[NoCSRFRequired]
#[NoAdminRequired]
#[FrontpageRoute(verb: 'GET', url: '/')]
public function index(): RedirectResponse
{
$user = OC::$server[IUserSession::class]->getUser();
lib/Controller/CssController.php
+6 -5
View File
@@ -29,6 +29,8 @@ use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class CssController extends Controller
{
@@ -46,11 +48,10 @@ class CssController extends Controller
$this->user = OC::$server[IUserSession::class]->getUser();
}
/**
* @NoAdminRequired
* @NoCSRFRequired
* @PublicPage
*/
#[NoCSRFRequired]
#[NoAdminRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/css/stylesheet')]
public function stylesheet(): TemplateResponse
{
$response = new TemplateResponse(Application::APP_ID, 'css/stylesheet', $this->getConfig(), 'blank');
lib/Controller/JsController.php
+12 -10
View File
@@ -29,6 +29,10 @@ use OCP\AppFramework\Http\TemplateResponse;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class JsController extends Controller
{
@@ -50,11 +54,10 @@ class JsController extends Controller
$this->l10nFactory = $l10nFactory;
}
/**
* @NoAdminRequired
* @NoCSRFRequired
* @PublicPage
*/
#[NoCSRFRequired]
#[NoAdminRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/js/script')]
public function script(): TemplateResponse
{
$response = new TemplateResponse(Application::APP_ID, 'js/script', $this->getConfig(), 'blank');
@@ -63,11 +66,10 @@ class JsController extends Controller
return $response;
}
/**
* @NoAdminRequired
* @NoCSRFRequired
* @PublicPage
*/
#[NoCSRFRequired]
#[NoAdminRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/js/config')]
public function config(): JSONResponse
{
return new JSONResponse($this->getConfig());
lib/Controller/NavController.php
+8 -5
View File
@@ -28,6 +28,10 @@ use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class NavController extends Controller
{
@@ -43,11 +47,10 @@ class NavController extends Controller
parent::__construct($appName, $request);
}
/**
* @NoAdminRequired
* @NoCSRFRequired
* @PublicPage
*/
#[NoCSRFRequired]
#[NoAdminRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/nav/items')]
public function items(): JSONResponse
{
$user = OC::$server[IUserSession::class]->getUser();
lib/Controller/PersonalSettingController.php
+6 -7
View File
@@ -24,6 +24,9 @@ use OCP\AppFramework\Controller;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class PersonalSettingController extends Controller
{
@@ -37,13 +40,9 @@ class PersonalSettingController extends Controller
parent::__construct($appName, $request);
}
/**
* @NoAdminRequired
* @NoCSRFRequired
*
* @param mixed $name
* @param mixed $value
*/
#[NoCSRFRequired]
#[NoAdminRequired]
#[FrontpageRoute(verb: 'POST', url: '/personalSetting/valueSet')]
public function valueSet($name, $value): array
{
$doSave = false;