1 files changed, 13 insertions, 40 deletions
diff --git a/apps/dav/lib/Controller/DirectController.php b/apps/dav/lib/Controller/DirectController.php
index 4e3e29d0e6b..ea209168123 100644
--- a/apps/dav/lib/Controller/DirectController.php
+++ b/apps/dav/lib/Controller/DirectController.php
@@ -11,6 +11,7 @@ namespace OCA\DAV\Controller;
 use OCA\DAV\Db\Direct;
 use OCA\DAV\Db\DirectMapper;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSForbiddenException;
@@ -27,50 +28,21 @@ use OCP\Security\ISecureRandom;
 
 class DirectController extends OCSController {
 
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var string */
-	private $userId;
-
-	/** @var DirectMapper */
-	private $mapper;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	public function __construct(string $appName,
+	public function __construct(
+		string $appName,
 		IRequest $request,
-		IRootFolder $rootFolder,
-		string $userId,
-		DirectMapper $mapper,
-		ISecureRandom $random,
-		ITimeFactory $timeFactory,
-		IURLGenerator $urlGenerator,
-		IEventDispatcher $eventDispatcher) {
+		private IRootFolder $rootFolder,
+		private string $userId,
+		private DirectMapper $mapper,
+		private ISecureRandom $random,
+		private ITimeFactory $timeFactory,
+		private IURLGenerator $urlGenerator,
+		private IEventDispatcher $eventDispatcher,
+	) {
 		parent::__construct($appName, $request);
-
-		$this->rootFolder = $rootFolder;
-		$this->userId = $userId;
-		$this->mapper = $mapper;
-		$this->random = $random;
-		$this->timeFactory = $timeFactory;
-		$this->urlGenerator = $urlGenerator;
-		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Get a direct link to a file
 	 *
 	 * @param int $fileId ID of the file
@@ -82,6 +54,7 @@ class DirectController extends OCSController {
 	 *
 	 * 200: Direct link returned
 	 */
+	#[NoAdminRequired]
 	public function getUrl(int $fileId, int $expirationTime = 60 * 60 * 8): DataResponse {
 		$userFolder = $this->rootFolder->getUserFolder($this->userId);
 
@@ -117,7 +90,7 @@ class DirectController extends OCSController {
 
 		$this->mapper->insert($direct);
 
-		$url = $this->urlGenerator->getAbsoluteURL('remote.php/direct/'.$token);
+		$url = $this->urlGenerator->getAbsoluteURL('remote.php/direct/' . $token);
 
 		return new DataResponse([
 			'url' => $url,