cleaning

Signed-off-by: Maxence Lange <[email protected]>

Author: ArtificialOwl

appinfo/app.php

@@ -29,9 +29,16 @@
 
 namespace OCA\FilesLock\AppInfo;
 
+use OC;
+use OCP\AppFramework\QueryException;
+
 require_once __DIR__ . '/autoload.php';
 
 /** @var Application $app */
-$app = \OC::$server->query(Application::class);
-$app->registerHooks();
+try {
+	$app = OC::$server->query(Application::class);
+	$app->registerHooks();
+} catch (QueryException $e) {
+	OC::$server->getLogger()->log(1, 'failed to load Application');
+}
 

lib/AppInfo/Application.php

@@ -30,7 +30,6 @@
 namespace OCA\FilesLock\AppInfo;
 
 
-use OC;
 use OC\Files\Filesystem;
 use OCA\DAV\Connector\Sabre\CachingTree;
 use OCA\DAV\Connector\Sabre\ObjectTree;
@@ -41,12 +40,18 @@
 use OCA\FilesLock\Storage\LockWrapper;
 use OCP\AppFramework\App;
 use OCP\AppFramework\QueryException;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IUserSession;
 use OCP\SabrePluginEvent;
 use OCP\Util;
 use Sabre\DAV\Locks\Plugin;
 
 
+/**
+ * Class Application
+ *
+ * @package OCA\FilesLock\AppInfo
+ */
 class Application extends App {
 
 
@@ -58,6 +63,9 @@ class Application extends App {
 	const DAV_PROPERTY_LOCK_TIME = '{http://nextcloud.org/ns}lock-time';
 
 
+	/** @var IEventDispatcher */
+	private $eventDispatcher;
+
 	/** @var IUserSession */
 	private $userSession;
 
@@ -83,18 +91,18 @@ public function __construct(array $params = array()) {
 	 *
 	 */
 	public function registerHooks() {
-		$eventDispatcher = OC::$server->getEventDispatcher();
 		$c = $this->getContainer();
 		try {
-			$this->userSession = OC::$server->getUserSession();
+			$this->eventDispatcher = $c->query(IEventDispatcher::class);
+			$this->userSession = $c->query(IUserSession::class);
 			$this->fileService = $c->query(FileService::class);
 			$this->lockService = $c->query(LockService::class);
 			$this->miscService = $c->query(MiscService::class);
 		} catch (QueryException $e) {
 			return;
 		}
 
-		$eventDispatcher->addListener(
+		$this->eventDispatcher->addListener(
 			'OCA\Files::loadAdditionalScripts',
 			function() {
 				Util::addScript(self::APP_NAME, 'files');
@@ -103,7 +111,7 @@ function() {
 		);
 
 
-		$eventDispatcher->addListener(
+		$this->eventDispatcher->addListener(
 			'OCA\DAV\Connector\Sabre::addPlugin', function(SabrePluginEvent $e) {
 			$server = $e->getServer();
 			$absolute = false;
@@ -136,16 +144,12 @@ function() {
 	 * @internal
 	 */
 	public function addStorageWrapper() {
-		$userSession = $this->getContainer()
-							->getServer()
-							->getUserSession();
-
 		Filesystem::addStorageWrapper(
-			'files_lock', function($mountPoint, $storage) use ($userSession) {
+			'files_lock', function($mountPoint, $storage) {
 			return new LockWrapper(
 				[
 					'storage'      => $storage,
-					'user_session' => $userSession,
+					'user_session' => $this->userSession,
 					'file_service' => $this->fileService,
 					'lock_service' => $this->lockService,
 					'misc_service' => $this->miscService

lib/Db/LocksRequestBuilder.php

@@ -34,7 +34,6 @@
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use OCA\FilesLock\Exceptions\LockNotFoundException;
 use OCA\FilesLock\Model\FileLock;
-use OCA\FilesLock\Service\ConfigService;
 
 
 /**

lib/Service/LockService.php

@@ -44,6 +44,7 @@
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\IUser;
+use OCP\IUserManager;
 use Sabre\DAV\INode;
 use Sabre\DAV\PropFind;
 
@@ -65,6 +66,9 @@ class LockService {
 	/** @var string */
 	private $userId;
 
+	/** @var IUserManager */
+	private $userManager;
+
 	/** @var LocksRequest */
 	private $locksRequest;
 
@@ -89,10 +93,11 @@ class LockService {
 
 
 	public function __construct(
-		$userId, LocksRequest $locksRequest, FileService $fileService, ConfigService $configService,
-		MiscService $miscService
+		$userId, IUserManager $userManager, LocksRequest $locksRequest, FileService $fileService,
+		ConfigService $configService, MiscService $miscService
 	) {
 		$this->userId = $userId;
+		$this->userManager = $userManager;
 		$this->locksRequest = $locksRequest;
 		$this->fileService = $fileService;
 		$this->configService = $configService;
@@ -149,6 +154,8 @@ public function propFind(PropFind $propFind, INode $node) {
 			if ($lock !== false) {
 				return $lock->getUserId();
 			}
+
+			return null;
 		}
 		);
 
@@ -159,6 +166,8 @@ public function propFind(PropFind $propFind, INode $node) {
 			if ($lock !== false) {
 				return $lock->getCreation();
 			}
+
+			return 0;
 		}
 		);
 
@@ -167,12 +176,13 @@ public function propFind(PropFind $propFind, INode $node) {
 			$lock = $this->getLockForNodeId($nodeId);
 
 			if ($lock !== false) {
-				$user = \OC::$server->getUserManager()
-									->get($lock->getUserId());
+				$user = $this->userManager->get($lock->getUserId());
 				if ($user !== null) {
 					return $user->getDisplayName();
 				}
 			}
+
+			return null;
 		}
 		);
 	}

lib/Storage/LockWrapper.php

@@ -86,11 +86,6 @@ protected function checkPermissions($path, $permissions): bool {
 			return true;
 		}
 
-		/** @var FileLock $lock */
-		if (!$this->isLocked($path, $userId, $lock)) {
-			return true;
-		}
-
 		switch ($permissions) {
 			case Constants::PERMISSION_READ:
 				return true;