From b1b6b51c111e70b4f09700bdab604e2f5ac74afa Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 25 Jul 2024 13:14:51 +0200
Subject: [PATCH] refactor(weather_status): Replace security annotations with
 respective attributes

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 .../Controller/WeatherStatusController.php    | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/apps/weather_status/lib/Controller/WeatherStatusController.php b/apps/weather_status/lib/Controller/WeatherStatusController.php
index 8f3ceaa36aed4..953e09f2f2de4 100644
--- a/apps/weather_status/lib/Controller/WeatherStatusController.php
+++ b/apps/weather_status/lib/Controller/WeatherStatusController.php
@@ -11,6 +11,7 @@
 use OCA\WeatherStatus\ResponseDefinitions;
 use OCA\WeatherStatus\Service\WeatherStatusService;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\IRequest;
@@ -33,21 +34,18 @@ public function __construct(
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Try to use the address set in user personal settings as weather location
 	 *
 	 * @return DataResponse<Http::STATUS_OK, WeatherStatusLocationWithSuccess, array{}>
 	 *
 	 * 200: Address updated
 	 */
+	#[NoAdminRequired]
 	public function usePersonalAddress(): DataResponse {
 		return new DataResponse($this->service->usePersonalAddress());
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Change the weather status mode. There are currently 2 modes:
 	 * - ask the browser
 	 * - use the user defined address
@@ -57,13 +55,12 @@ public function usePersonalAddress(): DataResponse {
 	 *
 	 * 200: Weather status mode updated
 	 */
+	#[NoAdminRequired]
 	public function setMode(int $mode): DataResponse {
 		return new DataResponse($this->service->setMode($mode));
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Set address and resolve it to get coordinates
 	 * or directly set coordinates and get address with reverse geocoding
 	 *
@@ -74,28 +71,26 @@ public function setMode(int $mode): DataResponse {
 	 *
 	 * 200: Location updated
 	 */
+	#[NoAdminRequired]
 	public function setLocation(?string $address, ?float $lat, ?float $lon): DataResponse {
 		$currentWeather = $this->service->setLocation($address, $lat, $lon);
 		return new DataResponse($currentWeather);
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Get stored user location
 	 *
 	 * @return DataResponse<Http::STATUS_OK, WeatherStatusLocationWithMode, array{}>
 	 *
 	 * 200: Location returned
 	 */
+	#[NoAdminRequired]
 	public function getLocation(): DataResponse {
 		$location = $this->service->getLocation();
 		return new DataResponse($location);
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Get forecast for current location
 	 *
 	 * @return DataResponse<Http::STATUS_OK, WeatherStatusForecast[]|array{error: string}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, WeatherStatusSuccess, array{}>
@@ -103,6 +98,7 @@ public function getLocation(): DataResponse {
 	 * 200: Forecast returned
 	 * 404: Forecast not found
 	 */
+	#[NoAdminRequired]
 	public function getForecast(): DataResponse {
 		$forecast = $this->service->getForecast();
 		if (isset($forecast['success']) && $forecast['success'] === false) {
@@ -113,21 +109,18 @@ public function getForecast(): DataResponse {
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Get favorites list
 	 *
 	 * @return DataResponse<Http::STATUS_OK, string[], array{}>
 	 *
 	 * 200: Favorites returned
 	 */
+	#[NoAdminRequired]
 	public function getFavorites(): DataResponse {
 		return new DataResponse($this->service->getFavorites());
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Set favorites list
 	 *
 	 * @param string[] $favorites Favorite addresses
@@ -135,6 +128,7 @@ public function getFavorites(): DataResponse {
 	 *
 	 * 200: Favorites updated
 	 */
+	#[NoAdminRequired]
 	public function setFavorites(array $favorites): DataResponse {
 		return new DataResponse($this->service->setFavorites($favorites));
 	}