aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/DirectEditing/Manager.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/DirectEditing/Manager.php')
-rw-r--r--lib/private/DirectEditing/Manager.php89
1 files changed, 26 insertions, 63 deletions
diff --git a/lib/private/DirectEditing/Manager.php b/lib/private/DirectEditing/Manager.php
index d1be1f50330..154002ef340 100644
--- a/lib/private/DirectEditing/Manager.php
+++ b/lib/private/DirectEditing/Manager.php
@@ -1,32 +1,11 @@
<?php
+
/**
- * @copyright Copyright (c) 2019 Julius Härtl <jus@bitgrid.net>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Tobias Kaminsky <tobias@kaminsky.me>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OC\DirectEditing;
-use \OCP\DirectEditing\IManager;
-use \OCP\Files\Folder;
use Doctrine\DBAL\FetchMode;
use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\Response;
@@ -35,9 +14,11 @@ use OCP\Constants;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\DirectEditing\ACreateFromTemplate;
use OCP\DirectEditing\IEditor;
+use OCP\DirectEditing\IManager;
use OCP\DirectEditing\IToken;
use OCP\Encryption\IManager as EncryptionManager;
use OCP\Files\File;
+use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
@@ -58,36 +39,21 @@ class Manager implements IManager {
/** @var IEditor[] */
private $editors = [];
- /** @var IDBConnection */
- private $connection;
- /** @var IUserSession */
- private $userSession;
- /** @var ISecureRandom */
- private $random;
/** @var string|null */
private $userId;
- /** @var IRootFolder */
- private $rootFolder;
/** @var IL10N */
private $l10n;
- /** @var EncryptionManager */
- private $encryptionManager;
public function __construct(
- ISecureRandom $random,
- IDBConnection $connection,
- IUserSession $userSession,
- IRootFolder $rootFolder,
- IFactory $l10nFactory,
- EncryptionManager $encryptionManager
+ private ISecureRandom $random,
+ private IDBConnection $connection,
+ private IUserSession $userSession,
+ private IRootFolder $rootFolder,
+ private IFactory $l10nFactory,
+ private EncryptionManager $encryptionManager,
) {
- $this->random = $random;
- $this->connection = $connection;
- $this->userSession = $userSession;
$this->userId = $userSession->getUser() ? $userSession->getUser()->getUID() : null;
- $this->rootFolder = $rootFolder;
$this->l10n = $l10nFactory->get('lib');
- $this->encryptionManager = $encryptionManager;
}
public function registerDirectEditor(IEditor $directEditor): void {
@@ -153,7 +119,7 @@ class Manager implements IManager {
throw new \RuntimeException('No creator found');
}
- public function open(string $filePath, string $editorId = null, ?int $fileId = null): string {
+ public function open(string $filePath, ?string $editorId = null, ?int $fileId = null): string {
$userFolder = $this->rootFolder->getUserFolder($this->userId);
$file = $userFolder->get($filePath);
if ($fileId !== null && $file instanceof Folder) {
@@ -229,7 +195,7 @@ class Manager implements IManager {
$query = $this->connection->getQueryBuilder();
$query->select('*')->from(self::TABLE_TOKENS)
->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
- $result = $query->execute();
+ $result = $query->executeQuery();
if ($tokenRow = $result->fetch(FetchMode::ASSOCIATIVE)) {
return new Token($this, $tokenRow);
}
@@ -240,7 +206,7 @@ class Manager implements IManager {
$query = $this->connection->getQueryBuilder();
$query->delete(self::TABLE_TOKENS)
->where($query->expr()->lt('timestamp', $query->createNamedParameter(time() - self::TOKEN_CLEANUP_TIME)));
- return $query->execute();
+ return $query->executeStatement();
}
public function refreshToken(string $token): bool {
@@ -248,7 +214,7 @@ class Manager implements IManager {
$query->update(self::TABLE_TOKENS)
->set('timestamp', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
- $result = $query->execute();
+ $result = $query->executeStatement();
return $result !== 0;
}
@@ -257,7 +223,7 @@ class Manager implements IManager {
$query = $this->connection->getQueryBuilder();
$query->delete(self::TABLE_TOKENS)
->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
- $result = $query->execute();
+ $result = $query->executeStatement();
return $result !== 0;
}
@@ -267,21 +233,19 @@ class Manager implements IManager {
->set('accessed', $query->createNamedParameter(true, IQueryBuilder::PARAM_BOOL))
->set('timestamp', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
- $result = $query->execute();
+ $result = $query->executeStatement();
return $result !== 0;
}
public function invokeTokenScope($userId): void {
- \OC_User::setIncognitoMode(true);
\OC_User::setUserId($userId);
}
public function revertTokenScope(): void {
$this->userSession->setUser(null);
- \OC_User::setIncognitoMode(false);
}
- public function createToken($editorId, File $file, string $filePath, 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)
@@ -294,15 +258,14 @@ class Manager implements IManager {
'share_id' => $query->createNamedParameter($share !== null ? $share->getId(): null),
'timestamp' => $query->createNamedParameter(time())
]);
- $query->execute();
+ $query->executeStatement();
return $token;
}
/**
- * @param $userId
- * @param $fileId
- * @param null $filePath
- * @return Node
+ * @param string $userId
+ * @param int $fileId
+ * @param ?string $filePath
* @throws NotFoundException
*/
public function getFileForToken($userId, $fileId, $filePath = null): Node {
@@ -310,11 +273,11 @@ class Manager implements IManager {
if ($filePath !== null) {
return $userFolder->get($filePath);
}
- $files = $userFolder->getById($fileId);
- if (count($files) === 0) {
+ $file = $userFolder->getFirstNodeById($fileId);
+ if (!$file) {
throw new NotFoundException('File nound found by id ' . $fileId);
}
- return $files[0];
+ return $file;
}
public function isEnabled(): bool {
@@ -326,7 +289,7 @@ class Manager implements IManager {
$moduleId = $this->encryptionManager->getDefaultEncryptionModuleId();
$module = $this->encryptionManager->getEncryptionModule($moduleId);
/** @var \OCA\Encryption\Util $util */
- $util = \OC::$server->get(\OCA\Encryption\Util::class);
+ $util = \OCP\Server::get(\OCA\Encryption\Util::class);
if ($module->isReadyForUser($this->userId) && $util->isMasterKeyEnabled()) {
return true;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-14 15:16:40 +0000