fix(AdminSettings): Make compatible with nc 28

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
nextcloud · Jun 11, 2024 · df60692 · df60692
1 parent 33082e2
commit df60692
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -138,6 +138,11 @@
 		['name' => 'settings#set_setting', 'url' => '/settings/{key}', 'verb' => 'POST'],
 		['name' => 'settings#get_setting', 'url' => '/settings/{key}', 'verb' => 'GET'],
 
+		// admin
+		['name' => 'admin#check_previewer', 'url' => '/admin/previewers/{previewer}', 'verb' => 'GET'],
+		['name' => 'settings#set_setting', 'url' => '/admin/settings/{setting}', 'verb' => 'PUT'],
+		['name' => 'settings#get_setting', 'url' => '/admin/settings/{setting}', 'verb' => 'GET'],
+
 		# public link web view
 		['name' => 'web_view#link', 'url' => '/public/{token}', 'verb' => 'GET'],
 	],

diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php
@@ -52,7 +52,6 @@ public function __construct(
 	 * @param scalar $value
 	 * @return JSONResponse
 	 */
-	#[Http\Attribute\Route(Http\Attribute\Route::TYPE_FRONTPAGE, 'PUT', '/admin/settings/{setting}')]
 	public function setSetting(string $setting, float|bool|int|string $value): JSONResponse {
 		try {
 			$this->settingsService->setSetting($setting, (string) $value);
@@ -66,17 +65,15 @@ public function setSetting(string $setting, float|bool|int|string $value): JSONR
 	 * @param string $setting
 	 * @return JSONResponse
 	 */
-	#[Http\Attribute\Route(Http\Attribute\Route::TYPE_FRONTPAGE, 'GET', '/admin/settings/{setting}')]
 	public function getSetting(string $setting): JSONResponse {
 		return new JSONResponse(['value' => $this->settingsService->getSetting($setting)]);
 	}
 
 	/**
 	 * @param string $previewer
 	 * @return Http\Response
+	 * @NoCSRFRequired
 	 */
-	#[Http\Attribute\NoCSRFRequired]
-	#[Http\Attribute\Route(Http\Attribute\Route::TYPE_FRONTPAGE, 'GET', '/admin/previewers/{previewer}')]
 	public function checkPreviewer(string $previewer): Http\Response {
 		if (!isset($this->previewers[$previewer])) {
 			return new JSONResponse([], Http::STATUS_BAD_REQUEST);