chore(refactor): hand the user to the fileContextFactory

Signed-off-by: Max <max@nextcloud.com>

Author: max-nextcloud

lib/Context/FileContextFactory.php

@@ -12,9 +12,8 @@
 use OCP\DirectEditing\IToken;
 use OCP\Files\File;
 use OCP\Files\NotFoundException;
-use OCP\Files\NotPermittedException;
 use OCP\IL10N;
-use OCP\IUserSession;
+use OCP\IUser;
 use Psr\Log\LoggerInterface;
 
 class FileContextFactory {
@@ -24,7 +23,6 @@ public function __construct(
 		private readonly IL10N $l10n,
 		private readonly LockService $lockService,
 		private readonly LoggerInterface $logger,
-		private readonly IUserSession $userSession,
 	) {
 	}
 
@@ -43,24 +41,20 @@ private function build(
 	}
 
 	/**
-	 * @throws NotPermittedException if not logged in
 	 * @throws NotFoundException if the file cannot be found
 	 */
-	public function buildForId(
+	public function buildForUser(
+		IUser $user,
 		int $id,
 	): FileContext {
-		$userId = $this->userSession->getUser()?->getUID();
-		if ($userId === null) {
-			throw new NotPermittedException();
-		}
-		$file = $this->fileService->getFileById($id, $userId);
+		$file = $this->fileService->getFileById($id, $user->getUID());
 		return $this->build($file);
 	}
 
 	/**
 	 * @throws NotFoundException if the file cannot be found
 	 */
-	public function buildForShareWithId(
+	public function buildForShare(
 		string $token,
 		int $id,
 	): FileContext {

lib/Listeners/RegisterContextEventListener.php

@@ -12,13 +12,16 @@
 use OCA\Text\Event\RegisterContextEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
+use OCP\Files\NotPermittedException;
+use OCP\IUserSession;
 use Override;
 
 /** @implements IEventListener<Event|RegisterContextEvent> */
 class RegisterContextEventListener implements IEventListener {
 
 	public function __construct(
 		private readonly FileContextFactory $fileContextFactory,
+		private readonly IUserSession $userSession,
 	) {
 	}
 
@@ -32,9 +35,13 @@ public function handle(Event $event): void {
 			'file',
 			function (int $id, string $type, ?string $shareToken) {
 				if ($shareToken === null) {
-					return $this->fileContextFactory->buildForId($id);
+					$user = $this->userSession->getUser();
+					if ($user === null) {
+						throw new NotPermittedException();
+					}
+					return $this->fileContextFactory->buildForUser($user, $id);
 				} else {
-					return $this->fileContextFactory->buildForShareWithId($shareToken, $id);
+					return $this->fileContextFactory->buildForShare($shareToken, $id);
 				}
 			}
 		);