fix: Use proper file id for direct editing

Signed-off-by: Julius Knorr <jus@bitgrid.net>
nextcloud · Nov 29, 2024 · 249701a · 249701a
1 parent 4b1d0cd
commit 249701a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/lib/Controller/DirectViewController.php b/lib/Controller/DirectViewController.php
@@ -19,6 +19,7 @@
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
@@ -80,7 +81,7 @@ public function show($token) {
 
 		try {
 			$item = $folder->getFirstNodeById($direct->getFileid());
-			if (!($item instanceof Node)) {
+			if (!($item instanceof File)) {
 				throw new \Exception();
 			}
 
@@ -92,8 +93,17 @@ public function show($token) {
 				return $response;
 			}
 
-			$urlSrc = $this->tokenManager->getUrlSrc($item);
-			$wopi = $this->tokenManager->generateWopiToken($item->getId(), null, $direct->getUid(), true);
+			$wopi = null;
+			$template = $direct->getTemplateId() ? $this->templateManager->getTemplateSource($direct->getTemplateId()) : null;
+
+			if ($template !== null) {
+				$wopi = $this->tokenManager->generateWopiTokenForTemplate($template, $direct->getUid(), $item->getId(), true);
+			}
+
+			if ($wopi === null) {
+				$urlSrc = $this->tokenManager->getUrlSrc($item);
+				$wopi = $this->tokenManager->generateWopiToken($item->getId(), null, $direct->getUid(), true);
+			}
 		} catch (\Exception $e) {
 			$this->logger->error('Failed to generate token for existing file on direct editing', ['exception' => $e]);
 			return $this->renderErrorPage('Failed to open the requested file.');

diff --git a/lib/Controller/OCSController.php b/lib/Controller/OCSController.php
@@ -278,7 +278,7 @@ public function createFromTemplate($path, $template) {
 			$name = $folder->getNonExistingName($info['basename']);
 			$file = $folder->newFile($name);
 
-			$direct = $this->directMapper->newDirect($this->userId, $template, $file->getId());
+			$direct = $this->directMapper->newDirect($this->userId, $file->getId(), $template);
 
 			return new DataResponse([
 				'url' => $this->urlGenerator->linkToRouteAbsolute('richdocuments.directView.show', [

diff --git a/lib/Db/DirectMapper.php b/lib/Db/DirectMapper.php
@@ -31,13 +31,13 @@ public function __construct(
 	 * @param int $destination
 	 * @return Direct
 	 */
-	public function newDirect($uid, $fileid, $destination = null, $share = null, $initiatorHost = null, $initiatorToken = null) {
+	public function newDirect($uid, $fileid, $template = null, $share = null, $initiatorHost = null, $initiatorToken = null) {
 		$direct = new Direct();
 		$direct->setUid($uid);
 		$direct->setFileid($fileid);
 		$direct->setToken($this->random->generate(64, ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER));
 		$direct->setTimestamp($this->timeFactory->getTime());
-		$direct->setTemplateDestination($destination);
+		$direct->setTemplateId($template);
 		$direct->setShare($share);
 		$direct->setInitiatorHost($initiatorHost);
 		$direct->setInitiatorToken($initiatorToken);