Use file path for direct editing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

5 files changed, 28 insertions, 12 deletions

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 50730813700..30147e1e1ed 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -804,6 +804,7 @@ return array(
     'OC\\Core\\Migrations\\Version17000Date20190514105811' => $baseDir . '/core/Migrations/Version17000Date20190514105811.php',
     'OC\\Core\\Migrations\\Version18000Date20190920085628' => $baseDir . '/core/Migrations/Version18000Date20190920085628.php',
     'OC\\Core\\Migrations\\Version18000Date20191014105105' => $baseDir . '/core/Migrations/Version18000Date20191014105105.php',
+    'OC\\Core\\Migrations\\Version18000Date20191204114856' => $baseDir . '/core/Migrations/Version18000Date20191204114856.php',
     'OC\\Core\\Notification\\RemoveLinkSharesNotifier' => $baseDir . '/core/Notification/RemoveLinkSharesNotifier.php',
     'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php',
     'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 5f7e8fde989..a4fa77886b4 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -833,6 +833,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Core\\Migrations\\Version17000Date20190514105811' => __DIR__ . '/../../..' . '/core/Migrations/Version17000Date20190514105811.php',
         'OC\\Core\\Migrations\\Version18000Date20190920085628' => __DIR__ . '/../../..' . '/core/Migrations/Version18000Date20190920085628.php',
         'OC\\Core\\Migrations\\Version18000Date20191014105105' => __DIR__ . '/../../..' . '/core/Migrations/Version18000Date20191014105105.php',
+        'OC\\Core\\Migrations\\Version18000Date20191204114856' => __DIR__ . '/../../..' . '/core/Migrations/Version18000Date20191204114856.php',
         'OC\\Core\\Notification\\RemoveLinkSharesNotifier' => __DIR__ . '/../../..' . '/core/Notification/RemoveLinkSharesNotifier.php',
         'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php',
         'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php',
diff --git a/lib/private/DirectEditing/Manager.php b/lib/private/DirectEditing/Manager.php
index 26adad9e572..0ea30953510 100644
--- a/lib/private/DirectEditing/Manager.php
+++ b/lib/private/DirectEditing/Manager.php
@@ -36,6 +36,7 @@ use OCP\DirectEditing\RegisterDirectEditorEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\File;
 use OCP\Files\IRootFolder;
+use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\IDBConnection;
 use OCP\IUserSession;
@@ -103,25 +104,21 @@ class Manager implements IManager {
 		foreach ($creators as $creator) {
 			if ($creator->getId() === $creatorId) {
 				$creator->create($file, $creatorId, $templateId);
-				return $this->createToken($editorId, $file);
+				return $this->createToken($editorId, $file, $path);
 			}
 		}
 		throw new \RuntimeException('No creator found');
 	}
 
-	public function open(int $fileId, string $editorId = null): string {
-		$file = $this->rootFolder->getUserFolder($this->userId)->getById($fileId);
-		if (count($file) === 0 || !($file[0] instanceof File) || $file === null) {
-			throw new NotFoundException();
-		}
+	public function open(string $filePath, string $editorId = null): string {
 		/** @var File $file */
-		$file = $file[0];
+		$file = $this->rootFolder->getUserFolder($this->userId)->get($filePath);
 
 		if ($editorId === null) {
 			$editorId = $this->findEditorForFile($file);
 		}
 
-		return $this->createToken($editorId, $file);
+		return $this->createToken($editorId, $file, $filePath);
 	}
 
 	private function findEditorForFile(File $file) {
@@ -212,7 +209,7 @@ class Manager implements IManager {
 		\OC_User::setUserId($userId);
 	}
 
-	public function createToken($editorId, File $file, IShare $share = null): string {
+	public function createToken($editorId, File $file, string $filePath, IShare $share = null): string {
 		$token = $this->random->generate(64, ISecureRandom::CHAR_HUMAN_READABLE);
 		$query = $this->connection->getQueryBuilder();
 		$query->insert(self::TABLE_TOKENS)
@@ -220,6 +217,7 @@ class Manager implements IManager {
 				'token' => $query->createNamedParameter($token),
 				'editor_id' => $query->createNamedParameter($editorId),
 				'file_id' => $query->createNamedParameter($file->getId()),
+				'file_path' => $query->createNamedParameter($filePath),
 				'user_id' => $query->createNamedParameter($this->userId),
 				'share_id' => $query->createNamedParameter($share !== null ? $share->getId(): null),
 				'timestamp' => $query->createNamedParameter(time())
@@ -228,9 +226,23 @@ class Manager implements IManager {
 		return $token;
 	}
 
-	public function getFileForToken($userId, $fileId) {
+	/**
+	 * @param $userId
+	 * @param $fileId
+	 * @param null $filePath
+	 * @return Node
+	 * @throws NotFoundException
+	 */
+	public function getFileForToken($userId, $fileId, $filePath = null): Node {
 		$userFolder = $this->rootFolder->getUserFolder($userId);
-		return $userFolder->getById($fileId)[0];
+		if ($filePath !== null) {
+			return $userFolder->get($filePath);
+		}
+		$files = $userFolder->getById($fileId);
+		if (count($files) === 0) {
+			throw new NotFoundException('File nound found by id ' . $fileId);
+		}
+		return $files[0];
 	}
 
 }
diff --git a/lib/private/DirectEditing/Token.php b/lib/private/DirectEditing/Token.php
index 148621a2cf3..eac472430cb 100644
--- a/lib/private/DirectEditing/Token.php
+++ b/lib/private/DirectEditing/Token.php
@@ -50,7 +50,7 @@ class Token implements IToken {
 		if ($this->data['share_id'] !== null) {
 			return $this->manager->getShareForToken($this->data['share_id']);
 		}
-		return $this->manager->getFileForToken($this->data['user_id'], $this->data['file_id']);
+		return $this->manager->getFileForToken($this->data['user_id'], $this->data['file_id'], $this->data['file_path']);
 	}
 
 	public function getToken(): string {
diff --git a/lib/public/DirectEditing/IToken.php b/lib/public/DirectEditing/IToken.php
index a7eb415e28e..dc5f1cf748f 100644
--- a/lib/public/DirectEditing/IToken.php
+++ b/lib/public/DirectEditing/IToken.php
@@ -25,6 +25,7 @@ namespace OCP\DirectEditing;
 
 
 use OCP\Files\File;
+use OCP\Files\NotFoundException;
 
 /**
  * @since 18.0.0
@@ -65,6 +66,7 @@ interface IToken {
 	 *
 	 * @since 18.0.0
 	 * @return File
+	 * @throws NotFoundException
 	 */
 	public function getFile(): File;