Merge pull request #1798 from nextcloud/techdebt/noid/try-route-attri…

…bute feat(push): Try the new Route attribute
nextcloud · Mar 12, 2024 · 1681746 · 1681746
2 parents 65ccc26 + 94cf797
commit 1681746
Show file tree

Hide file tree

Showing 5 changed files with 214 additions and 214 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -31,8 +31,6 @@
 		['name' => 'Endpoint#confirmIdsForUser', 'url' => '/api/{apiVersion}/notifications/exists', 'verb' => 'POST', 'requirements' => ['apiVersion' => '(v1|v2)']],
 		['name' => 'Endpoint#deleteNotification', 'url' => '/api/{apiVersion}/notifications/{id}', 'verb' => 'DELETE', 'requirements' => ['apiVersion' => '(v1|v2)', 'id' => '\d+']],
 		['name' => 'Endpoint#deleteAllNotifications', 'url' => '/api/{apiVersion}/notifications', 'verb' => 'DELETE', 'requirements' => ['apiVersion' => '(v1|v2)']],
-		['name' => 'Push#registerDevice', 'url' => '/api/{apiVersion}/push', 'verb' => 'POST', 'requirements' => ['apiVersion' => '(v2)']],
-		['name' => 'Push#removeDevice', 'url' => '/api/{apiVersion}/push', 'verb' => 'DELETE', 'requirements' => ['apiVersion' => '(v2)']],
 
 		['name' => 'API#generateNotification', 'url' => '/api/{apiVersion}/admin_notifications/{userId}', 'verb' => 'POST', 'requirements' => ['apiVersion' => '(v1|v2)']],
 

diff --git a/lib/Controller/PushController.php b/lib/Controller/PushController.php
@@ -30,6 +30,8 @@
 use OC\Security\IdentityProof\Manager;
 use OCA\Notifications\ResponseDefinitions;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\ApiRoute;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\OpenAPI;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
@@ -79,8 +81,6 @@ public function __construct(string $appName,
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Register device for push notifications
 	 *
 	 * @param string $pushTokenHash Hash of the push token
@@ -93,6 +93,8 @@ public function __construct(string $appName,
 	 * 400: Registering device is not possible
 	 * 401: Missing permissions to register device
 	 */
+	#[NoAdminRequired]
+	#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/push', requirements: ['apiVersion' => '(v2)'])]
 	public function registerDevice(string $pushTokenHash, string $devicePublicKey, string $proxyServer): DataResponse {
 		$user = $this->userSession->getUser();
 		if (!$user instanceof IUser) {
@@ -163,8 +165,6 @@ public function registerDevice(string $pushTokenHash, string $devicePublicKey, s
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Remove a device from push notifications
 	 *
 	 * @return DataResponse<Http::STATUS_OK|Http::STATUS_ACCEPTED|Http::STATUS_UNAUTHORIZED, array<empty>, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array{message: string}, array{}>
@@ -174,6 +174,8 @@ public function registerDevice(string $pushTokenHash, string $devicePublicKey, s
 	 * 400: Removing device is not possible
 	 * 401: Missing permissions to remove device
 	 */
+	#[NoAdminRequired]
+	#[ApiRoute(verb: 'DELETE', url: '/api/{apiVersion}/push', requirements: ['apiVersion' => '(v2)'])]
 	public function removeDevice(): DataResponse {
 		$user = $this->userSession->getUser();
 		if (!$user instanceof IUser) {