nextcloud / server

apps/files/lib/Service/DirectEditingService.php

Indentation +47 added lines, -47 removed lines

@@ -33,57 +33,57 @@
 
 class DirectEditingService {
 
-	/** @var IManager */
-	private $directEditingManager;
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
+    /** @var IManager */
+    private $directEditingManager;
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
 
-	public function __construct(IEventDispatcher $eventDispatcher, IManager $directEditingManager) {
-		$this->directEditingManager = $directEditingManager;
-		$this->eventDispatcher = $eventDispatcher;
-	}
+    public function __construct(IEventDispatcher $eventDispatcher, IManager $directEditingManager) {
+        $this->directEditingManager = $directEditingManager;
+        $this->eventDispatcher = $eventDispatcher;
+    }
 
-	public function getDirectEditingETag(): string {
-		return \md5(\json_encode($this->getDirectEditingCapabilitites()));
-	}
+    public function getDirectEditingETag(): string {
+        return \md5(\json_encode($this->getDirectEditingCapabilitites()));
+    }
 
-	public function getDirectEditingCapabilitites(): array {
-		$this->eventDispatcher->dispatchTyped(new RegisterDirectEditorEvent($this->directEditingManager));
+    public function getDirectEditingCapabilitites(): array {
+        $this->eventDispatcher->dispatchTyped(new RegisterDirectEditorEvent($this->directEditingManager));
 
-		$capabilities = [
-			'editors' => [],
-			'creators' => []
-		];
+        $capabilities = [
+            'editors' => [],
+            'creators' => []
+        ];
 
-		if (!$this->directEditingManager->isEnabled()) {
-			return $capabilities;
-		}
+        if (!$this->directEditingManager->isEnabled()) {
+            return $capabilities;
+        }
 
-		/**
-		 * @var string $id
-		 * @var IEditor $editor
-		 */
-		foreach ($this->directEditingManager->getEditors() as $id => $editor) {
-			$capabilities['editors'][$id] = [
-				'id' => $editor->getId(),
-				'name' => $editor->getName(),
-				'mimetypes' => $editor->getMimetypes(),
-				'optionalMimetypes' => $editor->getMimetypesOptional(),
-				'secure' => $editor->isSecure(),
-			];
-			/** @var ACreateEmpty|ACreateFromTemplate $creator */
-			foreach ($editor->getCreators() as $creator) {
-				$id = $creator->getId();
-				$capabilities['creators'][$id] = [
-					'id' => $id,
-					'editor' => $editor->getId(),
-					'name' => $creator->getName(),
-					'extension' => $creator->getExtension(),
-					'templates' => $creator instanceof ACreateFromTemplate,
-					'mimetype' => $creator->getMimetype()
-				];
-			}
-		}
-		return $capabilities;
-	}
+        /**
+         * @var string $id
+         * @var IEditor $editor
+         */
+        foreach ($this->directEditingManager->getEditors() as $id => $editor) {
+            $capabilities['editors'][$id] = [
+                'id' => $editor->getId(),
+                'name' => $editor->getName(),
+                'mimetypes' => $editor->getMimetypes(),
+                'optionalMimetypes' => $editor->getMimetypesOptional(),
+                'secure' => $editor->isSecure(),
+            ];
+            /** @var ACreateEmpty|ACreateFromTemplate $creator */
+            foreach ($editor->getCreators() as $creator) {
+                $id = $creator->getId();
+                $capabilities['creators'][$id] = [
+                    'id' => $id,
+                    'editor' => $editor->getId(),
+                    'name' => $creator->getName(),
+                    'extension' => $creator->getExtension(),
+                    'templates' => $creator instanceof ACreateFromTemplate,
+                    'mimetype' => $creator->getMimetype()
+                ];
+            }
+        }
+        return $capabilities;
+    }
 }

apps/files/lib/Controller/DirectEditingController.php

Indentation +93 added lines, -93 removed lines

@@ -37,97 +37,97 @@
 
 class DirectEditingController extends OCSController {
 
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var IManager */
-	private $directEditingManager;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var DirectEditingService */
-	private $directEditingService;
-
-	public function __construct($appName, IRequest $request, $corsMethods, $corsAllowedHeaders, $corsMaxAge,
-								IEventDispatcher $eventDispatcher, IURLGenerator $urlGenerator, IManager $manager, DirectEditingService $directEditingService, ILogger $logger) {
-		parent::__construct($appName, $request, $corsMethods, $corsAllowedHeaders, $corsMaxAge);
-
-		$this->eventDispatcher = $eventDispatcher;
-		$this->directEditingManager = $manager;
-		$this->directEditingService = $directEditingService;
-		$this->logger = $logger;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function info(): DataResponse {
-		$response = new DataResponse($this->directEditingService->getDirectEditingCapabilitites());
-		$response->setETag($this->directEditingService->getDirectEditingETag());
-		return $response;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function create(string $path, string $editorId, string $creatorId, string $templateId = null): DataResponse {
-		if (!$this->directEditingManager->isEnabled()) {
-			return new DataResponse(['message' => 'Direct editing is not enabled'], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-		$this->eventDispatcher->dispatchTyped(new RegisterDirectEditorEvent($this->directEditingManager));
-
-		try {
-			$token = $this->directEditingManager->create($path, $editorId, $creatorId, $templateId);
-			return new DataResponse([
-				'url' => $this->urlGenerator->linkToRouteAbsolute('files.DirectEditingView.edit', ['token' => $token])
-			]);
-		} catch (Exception $e) {
-			$this->logger->logException($e, ['message' => 'Exception when creating a new file through direct editing']);
-			return new DataResponse(['message' => 'Failed to create file: ' . $e->getMessage()], Http::STATUS_FORBIDDEN);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function open(string $path, string $editorId = null): DataResponse {
-		if (!$this->directEditingManager->isEnabled()) {
-			return new DataResponse(['message' => 'Direct editing is not enabled'], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-		$this->eventDispatcher->dispatchTyped(new RegisterDirectEditorEvent($this->directEditingManager));
-
-		try {
-			$token = $this->directEditingManager->open($path, $editorId);
-			return new DataResponse([
-				'url' => $this->urlGenerator->linkToRouteAbsolute('files.DirectEditingView.edit', ['token' => $token])
-			]);
-		} catch (Exception $e) {
-			$this->logger->logException($e, ['message' => 'Exception when opening a file through direct editing']);
-			return new DataResponse(['message' => 'Failed to open file: ' . $e->getMessage()], Http::STATUS_FORBIDDEN);
-		}
-	}
-
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function templates(string $editorId, string $creatorId): DataResponse {
-		if (!$this->directEditingManager->isEnabled()) {
-			return new DataResponse(['message' => 'Direct editing is not enabled'], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-		$this->eventDispatcher->dispatchTyped(new RegisterDirectEditorEvent($this->directEditingManager));
-
-		try {
-			return new DataResponse($this->directEditingManager->getTemplates($editorId, $creatorId));
-		} catch (Exception $e) {
-			$this->logger->logException($e);
-			return new DataResponse(['message' => 'Failed to obtain template list: ' . $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
+
+    /** @var IManager */
+    private $directEditingManager;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var DirectEditingService */
+    private $directEditingService;
+
+    public function __construct($appName, IRequest $request, $corsMethods, $corsAllowedHeaders, $corsMaxAge,
+                                IEventDispatcher $eventDispatcher, IURLGenerator $urlGenerator, IManager $manager, DirectEditingService $directEditingService, ILogger $logger) {
+        parent::__construct($appName, $request, $corsMethods, $corsAllowedHeaders, $corsMaxAge);
+
+        $this->eventDispatcher = $eventDispatcher;
+        $this->directEditingManager = $manager;
+        $this->directEditingService = $directEditingService;
+        $this->logger = $logger;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function info(): DataResponse {
+        $response = new DataResponse($this->directEditingService->getDirectEditingCapabilitites());
+        $response->setETag($this->directEditingService->getDirectEditingETag());
+        return $response;
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function create(string $path, string $editorId, string $creatorId, string $templateId = null): DataResponse {
+        if (!$this->directEditingManager->isEnabled()) {
+            return new DataResponse(['message' => 'Direct editing is not enabled'], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+        $this->eventDispatcher->dispatchTyped(new RegisterDirectEditorEvent($this->directEditingManager));
+
+        try {
+            $token = $this->directEditingManager->create($path, $editorId, $creatorId, $templateId);
+            return new DataResponse([
+                'url' => $this->urlGenerator->linkToRouteAbsolute('files.DirectEditingView.edit', ['token' => $token])
+            ]);
+        } catch (Exception $e) {
+            $this->logger->logException($e, ['message' => 'Exception when creating a new file through direct editing']);
+            return new DataResponse(['message' => 'Failed to create file: ' . $e->getMessage()], Http::STATUS_FORBIDDEN);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function open(string $path, string $editorId = null): DataResponse {
+        if (!$this->directEditingManager->isEnabled()) {
+            return new DataResponse(['message' => 'Direct editing is not enabled'], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+        $this->eventDispatcher->dispatchTyped(new RegisterDirectEditorEvent($this->directEditingManager));
+
+        try {
+            $token = $this->directEditingManager->open($path, $editorId);
+            return new DataResponse([
+                'url' => $this->urlGenerator->linkToRouteAbsolute('files.DirectEditingView.edit', ['token' => $token])
+            ]);
+        } catch (Exception $e) {
+            $this->logger->logException($e, ['message' => 'Exception when opening a file through direct editing']);
+            return new DataResponse(['message' => 'Failed to open file: ' . $e->getMessage()], Http::STATUS_FORBIDDEN);
+        }
+    }
+
+
+
+    /**
+     * @NoAdminRequired
+     */
+    public function templates(string $editorId, string $creatorId): DataResponse {
+        if (!$this->directEditingManager->isEnabled()) {
+            return new DataResponse(['message' => 'Direct editing is not enabled'], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+        $this->eventDispatcher->dispatchTyped(new RegisterDirectEditorEvent($this->directEditingManager));
+
+        try {
+            return new DataResponse($this->directEditingManager->getTemplates($editorId, $creatorId));
+        } catch (Exception $e) {
+            $this->logger->logException($e);
+            return new DataResponse(['message' => 'Failed to obtain template list: ' . $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
 			]);
 		} catch (Exception $e) {
 			$this->logger->logException($e, ['message' => 'Exception when creating a new file through direct editing']);
-			return new DataResponse(['message' => 'Failed to create file: ' . $e->getMessage()], Http::STATUS_FORBIDDEN);
+			return new DataResponse(['message' => 'Failed to create file: '.$e->getMessage()], Http::STATUS_FORBIDDEN);
 		}
 	}
 
@@ -108,7 +108,7 @@ 
 			]);
 		} catch (Exception $e) {
 			$this->logger->logException($e, ['message' => 'Exception when opening a file through direct editing']);
-			return new DataResponse(['message' => 'Failed to open file: ' . $e->getMessage()], Http::STATUS_FORBIDDEN);
+			return new DataResponse(['message' => 'Failed to open file: '.$e->getMessage()], Http::STATUS_FORBIDDEN);
 		}
 	}
 
@@ -127,7 +127,7 @@ 
 			return new DataResponse($this->directEditingManager->getTemplates($editorId, $creatorId));
 		} catch (Exception $e) {
 			$this->logger->logException($e);
-			return new DataResponse(['message' => 'Failed to obtain template list: ' . $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+			return new DataResponse(['message' => 'Failed to obtain template list: '.$e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
 	}
 }

lib/private/DirectEditing/Manager.php

Indentation +219 added lines, -219 removed lines

@@ -51,251 +51,251 @@
 use function in_array;
 
 class Manager implements IManager {
-	private const TOKEN_CLEANUP_TIME = 12 * 60 * 60 ;
+    private const TOKEN_CLEANUP_TIME = 12 * 60 * 60 ;
 
-	public const TABLE_TOKENS = 'direct_edit';
+    public const TABLE_TOKENS = 'direct_edit';
 
-	/** @var IEditor[] */
-	private $editors = [];
-	/** @var IDBConnection */
-	private $connection;
-	/** @var ISecureRandom */
-	private $random;
-	/** @var string|null */
-	private $userId;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IL10N */
-	private $l10n;
-	/** @var EncryptionManager */
-	private $encryptionManager;
+    /** @var IEditor[] */
+    private $editors = [];
+    /** @var IDBConnection */
+    private $connection;
+    /** @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
-	) {
-		$this->random = $random;
-		$this->connection = $connection;
-		$this->userId = $userSession->getUser() ? $userSession->getUser()->getUID() : null;
-		$this->rootFolder = $rootFolder;
-		$this->l10n = $l10nFactory->get('core');
-		$this->encryptionManager = $encryptionManager;
-	}
+    public function __construct(
+        ISecureRandom $random,
+        IDBConnection $connection,
+        IUserSession $userSession,
+        IRootFolder $rootFolder,
+        IFactory $l10nFactory,
+        EncryptionManager $encryptionManager
+    ) {
+        $this->random = $random;
+        $this->connection = $connection;
+        $this->userId = $userSession->getUser() ? $userSession->getUser()->getUID() : null;
+        $this->rootFolder = $rootFolder;
+        $this->l10n = $l10nFactory->get('core');
+        $this->encryptionManager = $encryptionManager;
+    }
 
-	public function registerDirectEditor(IEditor $directEditor): void {
-		$this->editors[$directEditor->getId()] = $directEditor;
-	}
+    public function registerDirectEditor(IEditor $directEditor): void {
+        $this->editors[$directEditor->getId()] = $directEditor;
+    }
 
-	public function getEditors(): array {
-		return $this->editors;
-	}
+    public function getEditors(): array {
+        return $this->editors;
+    }
 
-	public function getTemplates(string $editor, string $type): array {
-		if (!array_key_exists($editor, $this->editors)) {
-			throw new \RuntimeException('No matching editor found');
-		}
-		$templates = [];
-		foreach ($this->editors[$editor]->getCreators() as $creator) {
-			if ($creator->getId() === $type) {
-				$templates = [
-					'empty' => [
-						'id' => 'empty',
-						'title' => $this->l10n->t('Empty file'),
-						'preview' => null
-					]
-				];
+    public function getTemplates(string $editor, string $type): array {
+        if (!array_key_exists($editor, $this->editors)) {
+            throw new \RuntimeException('No matching editor found');
+        }
+        $templates = [];
+        foreach ($this->editors[$editor]->getCreators() as $creator) {
+            if ($creator->getId() === $type) {
+                $templates = [
+                    'empty' => [
+                        'id' => 'empty',
+                        'title' => $this->l10n->t('Empty file'),
+                        'preview' => null
+                    ]
+                ];
 
-				if ($creator instanceof ACreateFromTemplate) {
-					$templates = $creator->getTemplates();
-				}
+                if ($creator instanceof ACreateFromTemplate) {
+                    $templates = $creator->getTemplates();
+                }
 
-				$templates = array_map(function ($template) use ($creator) {
-					$template['extension'] = $creator->getExtension();
-					$template['mimetype'] = $creator->getMimetype();
-					return $template;
-				}, $templates);
-			}
-		}
-		$return = [];
-		$return['templates'] =  $templates;
-		return $return;
-	}
+                $templates = array_map(function ($template) use ($creator) {
+                    $template['extension'] = $creator->getExtension();
+                    $template['mimetype'] = $creator->getMimetype();
+                    return $template;
+                }, $templates);
+            }
+        }
+        $return = [];
+        $return['templates'] =  $templates;
+        return $return;
+    }
 
-	public function create(string $path, string $editorId, string $creatorId, $templateId = null): string {
-		$userFolder = $this->rootFolder->getUserFolder($this->userId);
-		if ($userFolder->nodeExists($path)) {
-			throw new \RuntimeException('File already exists');
-		} else {
-			$file = $userFolder->newFile($path);
-			$editor = $this->getEditor($editorId);
-			$creators = $editor->getCreators();
-			foreach ($creators as $creator) {
-				if ($creator->getId() === $creatorId) {
-					$creator->create($file, $creatorId, $templateId);
-					return $this->createToken($editorId, $file, $path);
-				}
-			}
-		}
+    public function create(string $path, string $editorId, string $creatorId, $templateId = null): string {
+        $userFolder = $this->rootFolder->getUserFolder($this->userId);
+        if ($userFolder->nodeExists($path)) {
+            throw new \RuntimeException('File already exists');
+        } else {
+            $file = $userFolder->newFile($path);
+            $editor = $this->getEditor($editorId);
+            $creators = $editor->getCreators();
+            foreach ($creators as $creator) {
+                if ($creator->getId() === $creatorId) {
+                    $creator->create($file, $creatorId, $templateId);
+                    return $this->createToken($editorId, $file, $path);
+                }
+            }
+        }
 
-		throw new \RuntimeException('No creator found');
-	}
+        throw new \RuntimeException('No creator found');
+    }
 
-	public function open(string $filePath, string $editorId = null): string {
-		/** @var File $file */
-		$file = $this->rootFolder->getUserFolder($this->userId)->get($filePath);
+    public function open(string $filePath, string $editorId = null): string {
+        /** @var File $file */
+        $file = $this->rootFolder->getUserFolder($this->userId)->get($filePath);
 
-		if ($editorId === null) {
-			$editorId = $this->findEditorForFile($file);
-		}
-		if (!array_key_exists($editorId, $this->editors)) {
-			throw new \RuntimeException("Editor $editorId is unknown");
-		}
+        if ($editorId === null) {
+            $editorId = $this->findEditorForFile($file);
+        }
+        if (!array_key_exists($editorId, $this->editors)) {
+            throw new \RuntimeException("Editor $editorId is unknown");
+        }
 
-		return $this->createToken($editorId, $file, $filePath);
-	}
+        return $this->createToken($editorId, $file, $filePath);
+    }
 
-	private function findEditorForFile(File $file) {
-		foreach ($this->editors as $editor) {
-			if (in_array($file->getMimeType(), $editor->getMimetypes())) {
-				return $editor->getId();
-			}
-		}
-		throw new \RuntimeException('No default editor found for files mimetype');
-	}
+    private function findEditorForFile(File $file) {
+        foreach ($this->editors as $editor) {
+            if (in_array($file->getMimeType(), $editor->getMimetypes())) {
+                return $editor->getId();
+            }
+        }
+        throw new \RuntimeException('No default editor found for files mimetype');
+    }
 
-	public function edit(string $token): Response {
-		try {
-			/** @var IEditor $editor */
-			$tokenObject = $this->getToken($token);
-			if ($tokenObject->hasBeenAccessed()) {
-				throw new \RuntimeException('Token has already been used and can only be used for followup requests');
-			}
-			$editor = $this->getEditor($tokenObject->getEditor());
-			$this->accessToken($token);
-		} catch (Throwable $throwable) {
-			$this->invalidateToken($token);
-			return new NotFoundResponse();
-		}
-		return $editor->open($tokenObject);
-	}
+    public function edit(string $token): Response {
+        try {
+            /** @var IEditor $editor */
+            $tokenObject = $this->getToken($token);
+            if ($tokenObject->hasBeenAccessed()) {
+                throw new \RuntimeException('Token has already been used and can only be used for followup requests');
+            }
+            $editor = $this->getEditor($tokenObject->getEditor());
+            $this->accessToken($token);
+        } catch (Throwable $throwable) {
+            $this->invalidateToken($token);
+            return new NotFoundResponse();
+        }
+        return $editor->open($tokenObject);
+    }
 
-	public function editSecure(File $file, string $editorId): TemplateResponse {
-		// TODO: Implementation in follow up
-	}
+    public function editSecure(File $file, string $editorId): TemplateResponse {
+        // TODO: Implementation in follow up
+    }
 
-	private function getEditor($editorId): IEditor {
-		if (!array_key_exists($editorId, $this->editors)) {
-			throw new \RuntimeException('No editor found');
-		}
-		return $this->editors[$editorId];
-	}
+    private function getEditor($editorId): IEditor {
+        if (!array_key_exists($editorId, $this->editors)) {
+            throw new \RuntimeException('No editor found');
+        }
+        return $this->editors[$editorId];
+    }
 
-	public function getToken(string $token): IToken {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from(self::TABLE_TOKENS)
-			->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
-		$result = $query->execute();
-		if ($tokenRow = $result->fetch(FetchMode::ASSOCIATIVE)) {
-			return new Token($this, $tokenRow);
-		}
-		throw new \RuntimeException('Failed to validate the token');
-	}
+    public function getToken(string $token): IToken {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from(self::TABLE_TOKENS)
+            ->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
+        $result = $query->execute();
+        if ($tokenRow = $result->fetch(FetchMode::ASSOCIATIVE)) {
+            return new Token($this, $tokenRow);
+        }
+        throw new \RuntimeException('Failed to validate the token');
+    }
 
-	public function cleanup(): int {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(self::TABLE_TOKENS)
-			->where($query->expr()->lt('timestamp', $query->createNamedParameter(time() - self::TOKEN_CLEANUP_TIME)));
-		return $query->execute();
-	}
+    public function cleanup(): int {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(self::TABLE_TOKENS)
+            ->where($query->expr()->lt('timestamp', $query->createNamedParameter(time() - self::TOKEN_CLEANUP_TIME)));
+        return $query->execute();
+    }
 
-	public function refreshToken(string $token): bool {
-		$query = $this->connection->getQueryBuilder();
-		$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();
-		return $result !== 0;
-	}
+    public function refreshToken(string $token): bool {
+        $query = $this->connection->getQueryBuilder();
+        $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();
+        return $result !== 0;
+    }
 
 
-	public function invalidateToken(string $token): bool {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(self::TABLE_TOKENS)
-			->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
-		$result = $query->execute();
-		return $result !== 0;
-	}
+    public function invalidateToken(string $token): bool {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(self::TABLE_TOKENS)
+            ->where($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
+        $result = $query->execute();
+        return $result !== 0;
+    }
 
-	public function accessToken(string $token): bool {
-		$query = $this->connection->getQueryBuilder();
-		$query->update(self::TABLE_TOKENS)
-			->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();
-		return $result !== 0;
-	}
+    public function accessToken(string $token): bool {
+        $query = $this->connection->getQueryBuilder();
+        $query->update(self::TABLE_TOKENS)
+            ->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();
+        return $result !== 0;
+    }
 
-	public function invokeTokenScope($userId): void {
-		\OC_User::setIncognitoMode(true);
-		\OC_User::setUserId($userId);
-	}
+    public function invokeTokenScope($userId): void {
+        \OC_User::setIncognitoMode(true);
+        \OC_User::setUserId($userId);
+    }
 
-	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)
-			->values([
-				'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())
-			]);
-		$query->execute();
-		return $token;
-	}
+    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)
+            ->values([
+                '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())
+            ]);
+        $query->execute();
+        return $token;
+    }
 
-	/**
-	 * @param $userId
-	 * @param $fileId
-	 * @param null $filePath
-	 * @return Node
-	 * @throws NotFoundException
-	 */
-	public function getFileForToken($userId, $fileId, $filePath = null): Node {
-		$userFolder = $this->rootFolder->getUserFolder($userId);
-		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];
-	}
+    /**
+     * @param $userId
+     * @param $fileId
+     * @param null $filePath
+     * @return Node
+     * @throws NotFoundException
+     */
+    public function getFileForToken($userId, $fileId, $filePath = null): Node {
+        $userFolder = $this->rootFolder->getUserFolder($userId);
+        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];
+    }
 
-	public function isEnabled(): bool {
-		if (!$this->encryptionManager->isEnabled()) {
-			return true;
-		}
+    public function isEnabled(): bool {
+        if (!$this->encryptionManager->isEnabled()) {
+            return true;
+        }
 
-		try {
-			$moduleId = $this->encryptionManager->getDefaultEncryptionModuleId();
-			$module = $this->encryptionManager->getEncryptionModule($moduleId);
-			/** @var \OCA\Encryption\Util $util */
-			$util = \OC::$server->get(\OCA\Encryption\Util::class);
-			if ($module->isReadyForUser($this->userId) && $util->isMasterKeyEnabled()) {
-				return true;
-			}
-		} catch (Throwable $e) {
-		}
-		return false;
-	}
+        try {
+            $moduleId = $this->encryptionManager->getDefaultEncryptionModuleId();
+            $module = $this->encryptionManager->getEncryptionModule($moduleId);
+            /** @var \OCA\Encryption\Util $util */
+            $util = \OC::$server->get(\OCA\Encryption\Util::class);
+            if ($module->isReadyForUser($this->userId) && $util->isMasterKeyEnabled()) {
+                return true;
+            }
+        } catch (Throwable $e) {
+        }
+        return false;
+    }
 }

lib/public/DirectEditing/IManager.php

Indentation +50 added lines, -50 removed lines

@@ -37,59 +37,59 @@
  */
 interface IManager {
 
-	/**
-	 * Register a new editor
-	 *
-	 * @since 18.0.0
-	 * @param IEditor $directEditor
-	 */
-	public function registerDirectEditor(IEditor $directEditor): void;
+    /**
+     * Register a new editor
+     *
+     * @since 18.0.0
+     * @param IEditor $directEditor
+     */
+    public function registerDirectEditor(IEditor $directEditor): void;
 
-	/**
-	 * Open the editing page for a provided token
-	 *
-	 * @since 18.0.0
-	 * @param string $token
-	 * @return Response
-	 */
-	public function edit(string $token): Response;
+    /**
+     * Open the editing page for a provided token
+     *
+     * @since 18.0.0
+     * @param string $token
+     * @return Response
+     */
+    public function edit(string $token): Response;
 
-	/**
-	 * Create a new token based on the file path and editor details
-	 *
-	 * @since 18.0.0
-	 * @param string $path
-	 * @param string $editorId
-	 * @param string $creatorId
-	 * @param null $templateId
-	 * @return string
-	 * @throws NotPermittedException
-	 * @throws RuntimeException
-	 */
-	public function create(string $path, string $editorId, string $creatorId, $templateId = null): string;
+    /**
+     * Create a new token based on the file path and editor details
+     *
+     * @since 18.0.0
+     * @param string $path
+     * @param string $editorId
+     * @param string $creatorId
+     * @param null $templateId
+     * @return string
+     * @throws NotPermittedException
+     * @throws RuntimeException
+     */
+    public function create(string $path, string $editorId, string $creatorId, $templateId = null): string;
 
-	/**
-	 * Get the token details for a given token
-	 *
-	 * @since 18.0.0
-	 * @param string $token
-	 * @return IToken
-	 */
-	public function getToken(string $token): IToken;
+    /**
+     * Get the token details for a given token
+     *
+     * @since 18.0.0
+     * @param string $token
+     * @return IToken
+     */
+    public function getToken(string $token): IToken;
 
-	/**
-	 * Cleanup expired tokens
-	 *
-	 * @since 18.0.0
-	 * @return int number of deleted tokens
-	 */
-	public function cleanup(): int;
+    /**
+     * Cleanup expired tokens
+     *
+     * @since 18.0.0
+     * @return int number of deleted tokens
+     */
+    public function cleanup(): int;
 
-	/**
-	 * Check if direct editing is enabled
-	 *
-	 * @since 20.0.0
-	 * @return bool
-	 */
-	public function isEnabled(): bool;
+    /**
+     * Check if direct editing is enabled
+     *
+     * @since 20.0.0
+     * @return bool
+     */
+    public function isEnabled(): bool;
 }