nextcloud / server

apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php

Indentation +400 added lines, -400 removed lines

@@ -37,404 +37,404 @@
 
 class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
 
-	/** @var IResourceManager */
-	private $resourceManager;
-
-	/** @var IRoomManager */
-	private $roomManager;
-
-	/** @var IDBConnection */
-	private $dbConnection;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/**
-	 * UpdateCalendarResourcesRoomsBackgroundJob constructor.
-	 *
-	 * @param IResourceManager $resourceManager
-	 * @param IRoomManager $roomManager
-	 * @param IDBConnection $dbConnection
-	 * @param CalDavBackend $calDavBackend
-	 */
-	public function __construct(IResourceManager $resourceManager,
-								IRoomManager $roomManager,
-								IDBConnection $dbConnection,
-								CalDavBackend $calDavBackend) {
-		$this->resourceManager = $resourceManager;
-		$this->roomManager = $roomManager;
-		$this->dbConnection = $dbConnection;
-		$this->calDavBackend = $calDavBackend;
-
-		// run once an hour
-		$this->setInterval(60 * 60);
-	}
-
-	/**
-	 * @param $argument
-	 */
-	public function run($argument):void {
-		$this->runForBackend(
-			$this->resourceManager,
-			'calendar_resources',
-			'calendar_resources_md',
-			'resource_id',
-			'principals/calendar-resources'
-		);
-		$this->runForBackend(
-			$this->roomManager,
-			'calendar_rooms',
-			'calendar_rooms_md',
-			'room_id',
-			'principals/calendar-rooms'
-		);
-	}
-
-	/**
-	 * Run background-job for one specific backendManager
-	 * either ResourceManager or RoomManager
-	 *
-	 * @param IResourceManager|IRoomManager $backendManager
-	 * @param string $dbTable
-	 * @param string $dbTableMetadata
-	 * @param string $foreignKey
-	 * @param string $principalPrefix
-	 */
-	private function runForBackend($backendManager,
-								   string $dbTable,
-								   string $dbTableMetadata,
-								   string $foreignKey,
-								   string $principalPrefix):void {
-		$backends = $backendManager->getBackends();
-
-		foreach ($backends as $backend) {
-			$backendId = $backend->getBackendIdentifier();
-
-			try {
-				if ($backend instanceof IResourceBackend) {
-					$list = $backend->listAllResources();
-				} else {
-					$list = $backend->listAllRooms();
-				}
-			} catch (BackendTemporarilyUnavailableException $ex) {
-				continue;
-			}
-
-			$cachedList = $this->getAllCachedByBackend($dbTable, $backendId);
-			$newIds = array_diff($list, $cachedList);
-			$deletedIds = array_diff($cachedList, $list);
-			$editedIds = array_intersect($list, $cachedList);
-
-			foreach ($newIds as $newId) {
-				try {
-					if ($backend instanceof IResourceBackend) {
-						$resource = $backend->getResource($newId);
-					} else {
-						$resource = $backend->getRoom($newId);
-					}
-
-					$metadata = [];
-					if ($resource instanceof IMetadataProvider) {
-						$metadata = $this->getAllMetadataOfBackend($resource);
-					}
-				} catch (BackendTemporarilyUnavailableException $ex) {
-					continue;
-				}
-
-				$id = $this->addToCache($dbTable, $backendId, $resource);
-				$this->addMetadataToCache($dbTableMetadata, $foreignKey, $id, $metadata);
-				// we don't create the calendar here, it is created lazily
-				// when an event is actually scheduled with this resource / room
-			}
-
-			foreach ($deletedIds as $deletedId) {
-				$id = $this->getIdForBackendAndResource($dbTable, $backendId, $deletedId);
-				$this->deleteFromCache($dbTable, $id);
-				$this->deleteMetadataFromCache($dbTableMetadata, $foreignKey, $id);
-
-				$principalName = implode('-', [$backendId, $deletedId]);
-				$this->deleteCalendarDataForResource($principalPrefix, $principalName);
-			}
-
-			foreach ($editedIds as $editedId) {
-				$id = $this->getIdForBackendAndResource($dbTable, $backendId, $editedId);
-
-				try {
-					if ($backend instanceof IResourceBackend) {
-						$resource = $backend->getResource($editedId);
-					} else {
-						$resource = $backend->getRoom($editedId);
-					}
-
-					$metadata = [];
-					if ($resource instanceof IMetadataProvider) {
-						$metadata = $this->getAllMetadataOfBackend($resource);
-					}
-				} catch (BackendTemporarilyUnavailableException $ex) {
-					continue;
-				}
-
-				$this->updateCache($dbTable, $id, $resource);
-
-				if ($resource instanceof IMetadataProvider) {
-					$cachedMetadata = $this->getAllMetadataOfCache($dbTableMetadata, $foreignKey, $id);
-					$this->updateMetadataCache($dbTableMetadata, $foreignKey, $id, $metadata, $cachedMetadata);
-				}
-			}
-		}
-	}
-
-	/**
-	 * add entry to cache that exists remotely but not yet in cache
-	 *
-	 * @param string $table
-	 * @param string $backendId
-	 * @param IResource|IRoom $remote
-	 * @return int Insert id
-	 */
-	private function addToCache(string $table,
-								string $backendId,
-								$remote):int {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->insert($table)
-			->values([
-				'backend_id' => $query->createNamedParameter($backendId),
-				'resource_id' => $query->createNamedParameter($remote->getId()),
-				'email' => $query->createNamedParameter($remote->getEMail()),
-				'displayname' => $query->createNamedParameter($remote->getDisplayName()),
-				'group_restrictions' => $query->createNamedParameter(
-					$this->serializeGroupRestrictions(
-						$remote->getGroupRestrictions()
-					))
-			])
-			->execute();
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * @param string $table
-	 * @param string $foreignKey
-	 * @param int $foreignId
-	 * @param array $metadata
-	 */
-	private function addMetadataToCache(string $table,
-										string $foreignKey,
-										int $foreignId,
-										array $metadata):void {
-		foreach ($metadata as $key => $value) {
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->insert($table)
-				->values([
-					$foreignKey => $query->createNamedParameter($foreignId),
-					'key' => $query->createNamedParameter($key),
-					'value' => $query->createNamedParameter($value),
-				])
-				->execute();
-		}
-	}
-
-	/**
-	 * delete entry from cache that does not exist anymore remotely
-	 *
-	 * @param string $table
-	 * @param int $id
-	 */
-	private function deleteFromCache(string $table,
-									 int $id):void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->delete($table)
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)))
-			->execute();
-	}
-
-	/**
-	 * @param string $table
-	 * @param string $foreignKey
-	 * @param int $id
-	 */
-	private function deleteMetadataFromCache(string $table,
-											 string $foreignKey,
-											 int $id):void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->delete($table)
-			->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
-			->execute();
-	}
-
-	/**
-	 * update an existing entry in cache
-	 *
-	 * @param string $table
-	 * @param int $id
-	 * @param IResource|IRoom $remote
-	 */
-	private function updateCache(string $table,
-								 int $id,
-								 $remote):void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->update($table)
-			->set('email', $query->createNamedParameter($remote->getEMail()))
-			->set('displayname', $query->createNamedParameter($remote->getDisplayName()))
-			->set('group_restrictions', $query->createNamedParameter(
-				$this->serializeGroupRestrictions(
-					$remote->getGroupRestrictions()
-				)))
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)))
-			->execute();
-	}
-
-	/**
-	 * @param string $dbTable
-	 * @param string $foreignKey
-	 * @param int $id
-	 * @param array $metadata
-	 * @param array $cachedMetadata
-	 */
-	private function updateMetadataCache(string $dbTable,
-										 string $foreignKey,
-										 int $id,
-										 array $metadata,
-										 array $cachedMetadata):void {
-		$newMetadata = array_diff_key($metadata, $cachedMetadata);
-		$deletedMetadata = array_diff_key($cachedMetadata, $metadata);
-
-		foreach ($newMetadata as $key => $value) {
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->insert($dbTable)
-				->values([
-					$foreignKey => $query->createNamedParameter($id),
-					'key' => $query->createNamedParameter($key),
-					'value' => $query->createNamedParameter($value),
-				])
-				->execute();
-		}
-
-		foreach ($deletedMetadata as $key => $value) {
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->delete($dbTable)
-				->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
-				->andWhere($query->expr()->eq('key', $query->createNamedParameter($key)))
-				->execute();
-		}
-
-		$existingKeys = array_keys(array_intersect_key($metadata, $cachedMetadata));
-		foreach ($existingKeys as $existingKey) {
-			if ($metadata[$existingKey] !== $cachedMetadata[$existingKey]) {
-				$query = $this->dbConnection->getQueryBuilder();
-				$query->update($dbTable)
-					->set('value', $query->createNamedParameter($metadata[$existingKey]))
-					->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
-					->andWhere($query->expr()->eq('key', $query->createNamedParameter($existingKey)))
-					->execute();
-			}
-		}
-	}
-
-	/**
-	 * serialize array of group restrictions to store them in database
-	 *
-	 * @param array $groups
-	 * @return string
-	 */
-	private function serializeGroupRestrictions(array $groups):string {
-		return \json_encode($groups);
-	}
-
-	/**
-	 * Gets all metadata of a backend
-	 *
-	 * @param IResource|IRoom $resource
-	 * @return array
-	 */
-	private function getAllMetadataOfBackend($resource):array {
-		if (!($resource instanceof IMetadataProvider)) {
-			return [];
-		}
-
-		$keys = $resource->getAllAvailableMetadataKeys();
-		$metadata = [];
-		foreach ($keys as $key) {
-			$metadata[$key] = $resource->getMetadataForKey($key);
-		}
-
-		return $metadata;
-	}
-
-	/**
-	 * @param string $table
-	 * @param string $foreignKey
-	 * @param int $id
-	 * @return array
-	 */
-	private function getAllMetadataOfCache(string $table,
-										   string $foreignKey,
-										   int $id):array {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select(['key', 'value'])
-			->from($table)
-			->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)));
-		$stmt = $query->execute();
-		$rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
-
-		$metadata = [];
-		foreach ($rows as $row) {
-			$metadata[$row['key']] = $row['value'];
-		}
-
-		return $metadata;
-	}
-
-	/**
-	 * Gets all cached rooms / resources by backend
-	 *
-	 * @param $tableName
-	 * @param $backendId
-	 * @return array
-	 */
-	private function getAllCachedByBackend(string $tableName,
-										   string $backendId):array {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select('resource_id')
-			->from($tableName)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)));
-		$stmt = $query->execute();
-
-		return array_map(function ($row): string {
-			return $row['resource_id'];
-		}, $stmt->fetchAll());
-	}
-
-	/**
-	 * @param $principalPrefix
-	 * @param $principalUri
-	 */
-	private function deleteCalendarDataForResource(string $principalPrefix,
-												   string $principalUri):void {
-		$calendar = $this->calDavBackend->getCalendarByUri(
-			implode('/', [$principalPrefix, $principalUri]),
-			CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI);
-
-		if ($calendar !== null) {
-			$this->calDavBackend->deleteCalendar($calendar['id']);
-		}
-	}
-
-	/**
-	 * @param $table
-	 * @param $backendId
-	 * @param $resourceId
-	 * @return int
-	 */
-	private function getIdForBackendAndResource(string $table,
-												string $backendId,
-												string $resourceId):int {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select('id')
-			->from($table)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-		$stmt = $query->execute();
-
-		return $stmt->fetch()['id'];
-	}
+    /** @var IResourceManager */
+    private $resourceManager;
+
+    /** @var IRoomManager */
+    private $roomManager;
+
+    /** @var IDBConnection */
+    private $dbConnection;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /**
+     * UpdateCalendarResourcesRoomsBackgroundJob constructor.
+     *
+     * @param IResourceManager $resourceManager
+     * @param IRoomManager $roomManager
+     * @param IDBConnection $dbConnection
+     * @param CalDavBackend $calDavBackend
+     */
+    public function __construct(IResourceManager $resourceManager,
+                                IRoomManager $roomManager,
+                                IDBConnection $dbConnection,
+                                CalDavBackend $calDavBackend) {
+        $this->resourceManager = $resourceManager;
+        $this->roomManager = $roomManager;
+        $this->dbConnection = $dbConnection;
+        $this->calDavBackend = $calDavBackend;
+
+        // run once an hour
+        $this->setInterval(60 * 60);
+    }
+
+    /**
+     * @param $argument
+     */
+    public function run($argument):void {
+        $this->runForBackend(
+            $this->resourceManager,
+            'calendar_resources',
+            'calendar_resources_md',
+            'resource_id',
+            'principals/calendar-resources'
+        );
+        $this->runForBackend(
+            $this->roomManager,
+            'calendar_rooms',
+            'calendar_rooms_md',
+            'room_id',
+            'principals/calendar-rooms'
+        );
+    }
+
+    /**
+     * Run background-job for one specific backendManager
+     * either ResourceManager or RoomManager
+     *
+     * @param IResourceManager|IRoomManager $backendManager
+     * @param string $dbTable
+     * @param string $dbTableMetadata
+     * @param string $foreignKey
+     * @param string $principalPrefix
+     */
+    private function runForBackend($backendManager,
+                                    string $dbTable,
+                                    string $dbTableMetadata,
+                                    string $foreignKey,
+                                    string $principalPrefix):void {
+        $backends = $backendManager->getBackends();
+
+        foreach ($backends as $backend) {
+            $backendId = $backend->getBackendIdentifier();
+
+            try {
+                if ($backend instanceof IResourceBackend) {
+                    $list = $backend->listAllResources();
+                } else {
+                    $list = $backend->listAllRooms();
+                }
+            } catch (BackendTemporarilyUnavailableException $ex) {
+                continue;
+            }
+
+            $cachedList = $this->getAllCachedByBackend($dbTable, $backendId);
+            $newIds = array_diff($list, $cachedList);
+            $deletedIds = array_diff($cachedList, $list);
+            $editedIds = array_intersect($list, $cachedList);
+
+            foreach ($newIds as $newId) {
+                try {
+                    if ($backend instanceof IResourceBackend) {
+                        $resource = $backend->getResource($newId);
+                    } else {
+                        $resource = $backend->getRoom($newId);
+                    }
+
+                    $metadata = [];
+                    if ($resource instanceof IMetadataProvider) {
+                        $metadata = $this->getAllMetadataOfBackend($resource);
+                    }
+                } catch (BackendTemporarilyUnavailableException $ex) {
+                    continue;
+                }
+
+                $id = $this->addToCache($dbTable, $backendId, $resource);
+                $this->addMetadataToCache($dbTableMetadata, $foreignKey, $id, $metadata);
+                // we don't create the calendar here, it is created lazily
+                // when an event is actually scheduled with this resource / room
+            }
+
+            foreach ($deletedIds as $deletedId) {
+                $id = $this->getIdForBackendAndResource($dbTable, $backendId, $deletedId);
+                $this->deleteFromCache($dbTable, $id);
+                $this->deleteMetadataFromCache($dbTableMetadata, $foreignKey, $id);
+
+                $principalName = implode('-', [$backendId, $deletedId]);
+                $this->deleteCalendarDataForResource($principalPrefix, $principalName);
+            }
+
+            foreach ($editedIds as $editedId) {
+                $id = $this->getIdForBackendAndResource($dbTable, $backendId, $editedId);
+
+                try {
+                    if ($backend instanceof IResourceBackend) {
+                        $resource = $backend->getResource($editedId);
+                    } else {
+                        $resource = $backend->getRoom($editedId);
+                    }
+
+                    $metadata = [];
+                    if ($resource instanceof IMetadataProvider) {
+                        $metadata = $this->getAllMetadataOfBackend($resource);
+                    }
+                } catch (BackendTemporarilyUnavailableException $ex) {
+                    continue;
+                }
+
+                $this->updateCache($dbTable, $id, $resource);
+
+                if ($resource instanceof IMetadataProvider) {
+                    $cachedMetadata = $this->getAllMetadataOfCache($dbTableMetadata, $foreignKey, $id);
+                    $this->updateMetadataCache($dbTableMetadata, $foreignKey, $id, $metadata, $cachedMetadata);
+                }
+            }
+        }
+    }
+
+    /**
+     * add entry to cache that exists remotely but not yet in cache
+     *
+     * @param string $table
+     * @param string $backendId
+     * @param IResource|IRoom $remote
+     * @return int Insert id
+     */
+    private function addToCache(string $table,
+                                string $backendId,
+                                $remote):int {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->insert($table)
+            ->values([
+                'backend_id' => $query->createNamedParameter($backendId),
+                'resource_id' => $query->createNamedParameter($remote->getId()),
+                'email' => $query->createNamedParameter($remote->getEMail()),
+                'displayname' => $query->createNamedParameter($remote->getDisplayName()),
+                'group_restrictions' => $query->createNamedParameter(
+                    $this->serializeGroupRestrictions(
+                        $remote->getGroupRestrictions()
+                    ))
+            ])
+            ->execute();
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * @param string $table
+     * @param string $foreignKey
+     * @param int $foreignId
+     * @param array $metadata
+     */
+    private function addMetadataToCache(string $table,
+                                        string $foreignKey,
+                                        int $foreignId,
+                                        array $metadata):void {
+        foreach ($metadata as $key => $value) {
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->insert($table)
+                ->values([
+                    $foreignKey => $query->createNamedParameter($foreignId),
+                    'key' => $query->createNamedParameter($key),
+                    'value' => $query->createNamedParameter($value),
+                ])
+                ->execute();
+        }
+    }
+
+    /**
+     * delete entry from cache that does not exist anymore remotely
+     *
+     * @param string $table
+     * @param int $id
+     */
+    private function deleteFromCache(string $table,
+                                        int $id):void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->delete($table)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)))
+            ->execute();
+    }
+
+    /**
+     * @param string $table
+     * @param string $foreignKey
+     * @param int $id
+     */
+    private function deleteMetadataFromCache(string $table,
+                                                string $foreignKey,
+                                                int $id):void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->delete($table)
+            ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
+            ->execute();
+    }
+
+    /**
+     * update an existing entry in cache
+     *
+     * @param string $table
+     * @param int $id
+     * @param IResource|IRoom $remote
+     */
+    private function updateCache(string $table,
+                                    int $id,
+                                    $remote):void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->update($table)
+            ->set('email', $query->createNamedParameter($remote->getEMail()))
+            ->set('displayname', $query->createNamedParameter($remote->getDisplayName()))
+            ->set('group_restrictions', $query->createNamedParameter(
+                $this->serializeGroupRestrictions(
+                    $remote->getGroupRestrictions()
+                )))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)))
+            ->execute();
+    }
+
+    /**
+     * @param string $dbTable
+     * @param string $foreignKey
+     * @param int $id
+     * @param array $metadata
+     * @param array $cachedMetadata
+     */
+    private function updateMetadataCache(string $dbTable,
+                                            string $foreignKey,
+                                            int $id,
+                                            array $metadata,
+                                            array $cachedMetadata):void {
+        $newMetadata = array_diff_key($metadata, $cachedMetadata);
+        $deletedMetadata = array_diff_key($cachedMetadata, $metadata);
+
+        foreach ($newMetadata as $key => $value) {
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->insert($dbTable)
+                ->values([
+                    $foreignKey => $query->createNamedParameter($id),
+                    'key' => $query->createNamedParameter($key),
+                    'value' => $query->createNamedParameter($value),
+                ])
+                ->execute();
+        }
+
+        foreach ($deletedMetadata as $key => $value) {
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->delete($dbTable)
+                ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
+                ->andWhere($query->expr()->eq('key', $query->createNamedParameter($key)))
+                ->execute();
+        }
+
+        $existingKeys = array_keys(array_intersect_key($metadata, $cachedMetadata));
+        foreach ($existingKeys as $existingKey) {
+            if ($metadata[$existingKey] !== $cachedMetadata[$existingKey]) {
+                $query = $this->dbConnection->getQueryBuilder();
+                $query->update($dbTable)
+                    ->set('value', $query->createNamedParameter($metadata[$existingKey]))
+                    ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
+                    ->andWhere($query->expr()->eq('key', $query->createNamedParameter($existingKey)))
+                    ->execute();
+            }
+        }
+    }
+
+    /**
+     * serialize array of group restrictions to store them in database
+     *
+     * @param array $groups
+     * @return string
+     */
+    private function serializeGroupRestrictions(array $groups):string {
+        return \json_encode($groups);
+    }
+
+    /**
+     * Gets all metadata of a backend
+     *
+     * @param IResource|IRoom $resource
+     * @return array
+     */
+    private function getAllMetadataOfBackend($resource):array {
+        if (!($resource instanceof IMetadataProvider)) {
+            return [];
+        }
+
+        $keys = $resource->getAllAvailableMetadataKeys();
+        $metadata = [];
+        foreach ($keys as $key) {
+            $metadata[$key] = $resource->getMetadataForKey($key);
+        }
+
+        return $metadata;
+    }
+
+    /**
+     * @param string $table
+     * @param string $foreignKey
+     * @param int $id
+     * @return array
+     */
+    private function getAllMetadataOfCache(string $table,
+                                            string $foreignKey,
+                                            int $id):array {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select(['key', 'value'])
+            ->from($table)
+            ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)));
+        $stmt = $query->execute();
+        $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+
+        $metadata = [];
+        foreach ($rows as $row) {
+            $metadata[$row['key']] = $row['value'];
+        }
+
+        return $metadata;
+    }
+
+    /**
+     * Gets all cached rooms / resources by backend
+     *
+     * @param $tableName
+     * @param $backendId
+     * @return array
+     */
+    private function getAllCachedByBackend(string $tableName,
+                                            string $backendId):array {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select('resource_id')
+            ->from($tableName)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)));
+        $stmt = $query->execute();
+
+        return array_map(function ($row): string {
+            return $row['resource_id'];
+        }, $stmt->fetchAll());
+    }
+
+    /**
+     * @param $principalPrefix
+     * @param $principalUri
+     */
+    private function deleteCalendarDataForResource(string $principalPrefix,
+                                                    string $principalUri):void {
+        $calendar = $this->calDavBackend->getCalendarByUri(
+            implode('/', [$principalPrefix, $principalUri]),
+            CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI);
+
+        if ($calendar !== null) {
+            $this->calDavBackend->deleteCalendar($calendar['id']);
+        }
+    }
+
+    /**
+     * @param $table
+     * @param $backendId
+     * @param $resourceId
+     * @return int
+     */
+    private function getIdForBackendAndResource(string $table,
+                                                string $backendId,
+                                                string $resourceId):int {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select('id')
+            ->from($table)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+        $stmt = $query->execute();
+
+        return $stmt->fetch()['id'];
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -399,7 +399,7 @@
 			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)));
 		$stmt = $query->execute();
 
-		return array_map(function ($row): string {
+		return array_map(function($row): string {
 			return $row['resource_id'];
 		}, $stmt->fetchAll());
 	}

apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php

Indentation +434 added lines, -434 removed lines

@@ -36,438 +36,438 @@
 
 abstract class AbstractPrincipalBackend implements BackendInterface {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ProxyMapper */
-	private $proxyMapper;
-
-	/** @var string */
-	private $principalPrefix;
-
-	/** @var string */
-	private $dbTableName;
-
-	/** @var string */
-	private $dbMetaDataTableName;
-
-	/** @var string */
-	private $dbForeignKeyName;
-
-	/** @var string */
-	private $cuType;
-
-	/**
-	 * @param IDBConnection $dbConnection
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param ILogger $logger
-	 * @param string $principalPrefix
-	 * @param string $dbPrefix
-	 * @param string $cuType
-	 */
-	public function __construct(IDBConnection $dbConnection,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								ILogger $logger,
-								ProxyMapper $proxyMapper,
-								string $principalPrefix,
-								string $dbPrefix,
-								string $cuType) {
-		$this->db = $dbConnection;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->logger = $logger;
-		$this->proxyMapper = $proxyMapper;
-		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix . 's';
-		$this->dbMetaDataTableName = $this->dbTableName . '_md';
-		$this->dbForeignKeyName = $dbPrefix . '_id';
-		$this->cuType = $cuType;
-	}
-
-	use PrincipalProxyTrait;
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath) {
-		$principals = [];
-
-		if ($prefixPath === $this->principalPrefix) {
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-				->from($this->dbTableName);
-			$stmt = $query->execute();
-
-			$metaDataQuery = $this->db->getQueryBuilder();
-			$metaDataQuery->select([$this->dbForeignKeyName, 'key', 'value'])
-				->from($this->dbMetaDataTableName);
-			$metaDataStmt = $metaDataQuery->execute();
-			$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
-
-			$metaDataById = [];
-			foreach ($metaDataRows as $metaDataRow) {
-				if (!isset($metaDataById[$metaDataRow[$this->dbForeignKeyName]])) {
-					$metaDataById[$metaDataRow[$this->dbForeignKeyName]] = [];
-				}
-
-				$metaDataById[$metaDataRow[$this->dbForeignKeyName]][$metaDataRow['key']] =
-					$metaDataRow['value'];
-			}
-
-			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-				$id = $row['id'];
-
-				if (isset($metaDataById[$id])) {
-					$principals[] = $this->rowToPrincipal($row, $metaDataById[$id]);
-				} else {
-					$principals[] = $this->rowToPrincipal($row);
-				}
-			}
-
-			$stmt->closeCursor();
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by it's path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		if (strpos($path, $this->principalPrefix) !== 0) {
-			return null;
-		}
-		list(, $name) = \Sabre\Uri\split($path);
-
-		list($backendId, $resourceId) = explode('-',  $name, 2);
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-			->from($this->dbTableName)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-		$stmt = $query->execute();
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if (!$row) {
-			return null;
-		}
-
-		$metaDataQuery = $this->db->getQueryBuilder();
-		$metaDataQuery->select(['key', 'value'])
-			->from($this->dbMetaDataTableName)
-			->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
-		$metaDataStmt = $metaDataQuery->execute();
-		$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
-		$metadata = [];
-
-		foreach ($metaDataRows as $metaDataRow) {
-			$metadata[$metaDataRow['key']] = $metaDataRow['value'];
-		}
-
-		return $this->rowToPrincipal($row, $metadata);
-	}
-
-	/**
-	 * @param int $id
-	 * @return array|null
-	 */
-	public function getPrincipalById($id):?array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-			->from($this->dbTableName)
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		$stmt = $query->execute();
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if (!$row) {
-			return null;
-		}
-
-		$metaDataQuery = $this->db->getQueryBuilder();
-		$metaDataQuery->select(['key', 'value'])
-			->from($this->dbMetaDataTableName)
-			->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
-		$metaDataStmt = $metaDataQuery->execute();
-		$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
-		$metadata = [];
-
-		foreach ($metaDataRows as $metaDataRow) {
-			$metadata[$metaDataRow['key']] = $metaDataRow['value'];
-		}
-
-		return $this->rowToPrincipal($row, $metadata);
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	public function updatePrincipal($path, PropPatch $propPatch) {
-		return 0;
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		$results = [];
-		if (\count($searchProperties) === 0) {
-			return [];
-		}
-		if ($prefixPath !== $this->principalPrefix) {
-			return [];
-		}
-
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return [];
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		foreach ($searchProperties as $prop => $value) {
-			switch ($prop) {
-				case '{http://sabredav.org/ns}email-address':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->execute();
-					$principals = [];
-					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				case '{DAV:}displayname':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->execute();
-					$principals = [];
-					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
-					// If you add support for more search properties that qualify as a user-address,
-					// please also add them to the array below
-					$results[] = $this->searchPrincipals($this->principalPrefix, [
-						'{http://sabredav.org/ns}email-address' => $value,
-					], 'anyof');
-					break;
-
-				default:
-					$rowsByMetadata = $this->searchPrincipalsByMetadataKey($prop, $value);
-					$filteredRows = array_filter($rowsByMetadata, function ($row) use ($usersGroups) {
-						return $this->isAllowedToAccessResource($row, $usersGroups);
-					});
-
-					$results[] = array_map(function ($row): string {
-						return $row['uri'];
-					}, $filteredRows);
-
-					break;
-			}
-		}
-
-		// results is an array of arrays, so this is not the first search result
-		// but the results of the first searchProperty
-		if (count($results) === 1) {
-			return $results[0];
-		}
-
-		switch ($test) {
-			case 'anyof':
-				return array_values(array_unique(array_merge(...$results)));
-
-			case 'allof':
-			default:
-				return array_values(array_intersect(...$results));
-		}
-	}
-
-	/**
-	 * Searches principals based on their metadata keys.
-	 * This allows to search for all principals with a specific key.
-	 * e.g.:
-	 * '{http://nextcloud.com/ns}room-building-address' => 'ABC Street 123, ...'
-	 *
-	 * @param $key
-	 * @param $value
-	 * @return array
-	 */
-	private function searchPrincipalsByMetadataKey($key, $value):array {
-		$query = $this->db->getQueryBuilder();
-		$query->select([$this->dbForeignKeyName])
-			->from($this->dbMetaDataTableName)
-			->where($query->expr()->eq('key', $query->createNamedParameter($key)))
-			->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-		$stmt = $query->execute();
-
-		$rows = [];
-		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$id = $row[$this->dbForeignKeyName];
-
-			$principalRow = $this->getPrincipalById($id);
-			if (!$principalRow) {
-				continue;
-			}
-
-			$rows[] = $principalRow;
-		}
-
-		return $rows;
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return null|string
-	 */
-	public function findByUri($uri, $principalPrefix) {
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return null;
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		if (strpos($uri, 'mailto:') === 0) {
-			$email = substr($uri, 7);
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('email', $query->createNamedParameter($email)));
-
-			$stmt = $query->execute();
-			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-			if (!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		if (strpos($uri, 'principal:') === 0) {
-			$path = substr($uri, 10);
-			if (strpos($path, $this->principalPrefix) !== 0) {
-				return null;
-			}
-
-			list(, $name) = \Sabre\Uri\split($path);
-			list($backendId, $resourceId) = explode('-',  $name, 2);
-
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-				->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-			$stmt = $query->execute();
-			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-			if (!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * convert database row to principal
-	 *
-	 * @param String[] $row
-	 * @param String[] $metadata
-	 * @return Array
-	 */
-	private function rowToPrincipal(array $row, array $metadata = []):array {
-		return array_merge([
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
-			'{DAV:}displayname' => $row['displayname'],
-			'{http://sabredav.org/ns}email-address' => $row['email'],
-			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
-		], $metadata);
-	}
-
-	/**
-	 * @param $row
-	 * @param $userGroups
-	 * @return bool
-	 */
-	private function isAllowedToAccessResource(array $row, array $userGroups):bool {
-		if (!isset($row['group_restrictions']) ||
-			$row['group_restrictions'] === null ||
-			$row['group_restrictions'] === '') {
-			return true;
-		}
-
-		// group restrictions contains something, but not parsable, deny access and log warning
-		$json = json_decode($row['group_restrictions']);
-		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
-			return false;
-		}
-
-		// empty array => no group restrictions
-		if (empty($json)) {
-			return true;
-		}
-
-		return !empty(array_intersect($json, $userGroups));
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ProxyMapper */
+    private $proxyMapper;
+
+    /** @var string */
+    private $principalPrefix;
+
+    /** @var string */
+    private $dbTableName;
+
+    /** @var string */
+    private $dbMetaDataTableName;
+
+    /** @var string */
+    private $dbForeignKeyName;
+
+    /** @var string */
+    private $cuType;
+
+    /**
+     * @param IDBConnection $dbConnection
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param ILogger $logger
+     * @param string $principalPrefix
+     * @param string $dbPrefix
+     * @param string $cuType
+     */
+    public function __construct(IDBConnection $dbConnection,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                ILogger $logger,
+                                ProxyMapper $proxyMapper,
+                                string $principalPrefix,
+                                string $dbPrefix,
+                                string $cuType) {
+        $this->db = $dbConnection;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->logger = $logger;
+        $this->proxyMapper = $proxyMapper;
+        $this->principalPrefix = $principalPrefix;
+        $this->dbTableName = 'calendar_' . $dbPrefix . 's';
+        $this->dbMetaDataTableName = $this->dbTableName . '_md';
+        $this->dbForeignKeyName = $dbPrefix . '_id';
+        $this->cuType = $cuType;
+    }
+
+    use PrincipalProxyTrait;
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+        $principals = [];
+
+        if ($prefixPath === $this->principalPrefix) {
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+                ->from($this->dbTableName);
+            $stmt = $query->execute();
+
+            $metaDataQuery = $this->db->getQueryBuilder();
+            $metaDataQuery->select([$this->dbForeignKeyName, 'key', 'value'])
+                ->from($this->dbMetaDataTableName);
+            $metaDataStmt = $metaDataQuery->execute();
+            $metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
+
+            $metaDataById = [];
+            foreach ($metaDataRows as $metaDataRow) {
+                if (!isset($metaDataById[$metaDataRow[$this->dbForeignKeyName]])) {
+                    $metaDataById[$metaDataRow[$this->dbForeignKeyName]] = [];
+                }
+
+                $metaDataById[$metaDataRow[$this->dbForeignKeyName]][$metaDataRow['key']] =
+                    $metaDataRow['value'];
+            }
+
+            while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                $id = $row['id'];
+
+                if (isset($metaDataById[$id])) {
+                    $principals[] = $this->rowToPrincipal($row, $metaDataById[$id]);
+                } else {
+                    $principals[] = $this->rowToPrincipal($row);
+                }
+            }
+
+            $stmt->closeCursor();
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        if (strpos($path, $this->principalPrefix) !== 0) {
+            return null;
+        }
+        list(, $name) = \Sabre\Uri\split($path);
+
+        list($backendId, $resourceId) = explode('-',  $name, 2);
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+            ->from($this->dbTableName)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+        $stmt = $query->execute();
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if (!$row) {
+            return null;
+        }
+
+        $metaDataQuery = $this->db->getQueryBuilder();
+        $metaDataQuery->select(['key', 'value'])
+            ->from($this->dbMetaDataTableName)
+            ->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
+        $metaDataStmt = $metaDataQuery->execute();
+        $metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
+        $metadata = [];
+
+        foreach ($metaDataRows as $metaDataRow) {
+            $metadata[$metaDataRow['key']] = $metaDataRow['value'];
+        }
+
+        return $this->rowToPrincipal($row, $metadata);
+    }
+
+    /**
+     * @param int $id
+     * @return array|null
+     */
+    public function getPrincipalById($id):?array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+            ->from($this->dbTableName)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $stmt = $query->execute();
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if (!$row) {
+            return null;
+        }
+
+        $metaDataQuery = $this->db->getQueryBuilder();
+        $metaDataQuery->select(['key', 'value'])
+            ->from($this->dbMetaDataTableName)
+            ->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
+        $metaDataStmt = $metaDataQuery->execute();
+        $metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
+        $metadata = [];
+
+        foreach ($metaDataRows as $metaDataRow) {
+            $metadata[$metaDataRow['key']] = $metaDataRow['value'];
+        }
+
+        return $this->rowToPrincipal($row, $metadata);
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    public function updatePrincipal($path, PropPatch $propPatch) {
+        return 0;
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        $results = [];
+        if (\count($searchProperties) === 0) {
+            return [];
+        }
+        if ($prefixPath !== $this->principalPrefix) {
+            return [];
+        }
+
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return [];
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        foreach ($searchProperties as $prop => $value) {
+            switch ($prop) {
+                case '{http://sabredav.org/ns}email-address':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->execute();
+                    $principals = [];
+                    while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                case '{DAV:}displayname':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->execute();
+                    $principals = [];
+                    while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
+                    // If you add support for more search properties that qualify as a user-address,
+                    // please also add them to the array below
+                    $results[] = $this->searchPrincipals($this->principalPrefix, [
+                        '{http://sabredav.org/ns}email-address' => $value,
+                    ], 'anyof');
+                    break;
+
+                default:
+                    $rowsByMetadata = $this->searchPrincipalsByMetadataKey($prop, $value);
+                    $filteredRows = array_filter($rowsByMetadata, function ($row) use ($usersGroups) {
+                        return $this->isAllowedToAccessResource($row, $usersGroups);
+                    });
+
+                    $results[] = array_map(function ($row): string {
+                        return $row['uri'];
+                    }, $filteredRows);
+
+                    break;
+            }
+        }
+
+        // results is an array of arrays, so this is not the first search result
+        // but the results of the first searchProperty
+        if (count($results) === 1) {
+            return $results[0];
+        }
+
+        switch ($test) {
+            case 'anyof':
+                return array_values(array_unique(array_merge(...$results)));
+
+            case 'allof':
+            default:
+                return array_values(array_intersect(...$results));
+        }
+    }
+
+    /**
+     * Searches principals based on their metadata keys.
+     * This allows to search for all principals with a specific key.
+     * e.g.:
+     * '{http://nextcloud.com/ns}room-building-address' => 'ABC Street 123, ...'
+     *
+     * @param $key
+     * @param $value
+     * @return array
+     */
+    private function searchPrincipalsByMetadataKey($key, $value):array {
+        $query = $this->db->getQueryBuilder();
+        $query->select([$this->dbForeignKeyName])
+            ->from($this->dbMetaDataTableName)
+            ->where($query->expr()->eq('key', $query->createNamedParameter($key)))
+            ->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+        $stmt = $query->execute();
+
+        $rows = [];
+        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            $id = $row[$this->dbForeignKeyName];
+
+            $principalRow = $this->getPrincipalById($id);
+            if (!$principalRow) {
+                continue;
+            }
+
+            $rows[] = $principalRow;
+        }
+
+        return $rows;
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return null|string
+     */
+    public function findByUri($uri, $principalPrefix) {
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return null;
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        if (strpos($uri, 'mailto:') === 0) {
+            $email = substr($uri, 7);
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('email', $query->createNamedParameter($email)));
+
+            $stmt = $query->execute();
+            $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            if (!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        if (strpos($uri, 'principal:') === 0) {
+            $path = substr($uri, 10);
+            if (strpos($path, $this->principalPrefix) !== 0) {
+                return null;
+            }
+
+            list(, $name) = \Sabre\Uri\split($path);
+            list($backendId, $resourceId) = explode('-',  $name, 2);
+
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+                ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+            $stmt = $query->execute();
+            $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            if (!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        return null;
+    }
+
+    /**
+     * convert database row to principal
+     *
+     * @param String[] $row
+     * @param String[] $metadata
+     * @return Array
+     */
+    private function rowToPrincipal(array $row, array $metadata = []):array {
+        return array_merge([
+            'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+            '{DAV:}displayname' => $row['displayname'],
+            '{http://sabredav.org/ns}email-address' => $row['email'],
+            '{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
+        ], $metadata);
+    }
+
+    /**
+     * @param $row
+     * @param $userGroups
+     * @return bool
+     */
+    private function isAllowedToAccessResource(array $row, array $userGroups):bool {
+        if (!isset($row['group_restrictions']) ||
+            $row['group_restrictions'] === null ||
+            $row['group_restrictions'] === '') {
+            return true;
+        }
+
+        // group restrictions contains something, but not parsable, deny access and log warning
+        $json = json_decode($row['group_restrictions']);
+        if (!\is_array($json)) {
+            $this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+            return false;
+        }
+
+        // empty array => no group restrictions
+        if (empty($json)) {
+            return true;
+        }
+
+        return !empty(array_intersect($json, $userGroups));
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -89,9 +89,9 @@ 
 		$this->logger = $logger;
 		$this->proxyMapper = $proxyMapper;
 		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix . 's';
-		$this->dbMetaDataTableName = $this->dbTableName . '_md';
-		$this->dbForeignKeyName = $dbPrefix . '_id';
+		$this->dbTableName = 'calendar_'.$dbPrefix.'s';
+		$this->dbMetaDataTableName = $this->dbTableName.'_md';
+		$this->dbForeignKeyName = $dbPrefix.'_id';
 		$this->cuType = $cuType;
 	}
 
@@ -165,7 +165,7 @@ 
 		}
 		list(, $name) = \Sabre\Uri\split($path);
 
-		list($backendId, $resourceId) = explode('-',  $name, 2);
+		list($backendId, $resourceId) = explode('-', $name, 2);
 
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
@@ -198,7 +198,7 @@ 
 	 * @param int $id
 	 * @return array|null
 	 */
-	public function getPrincipalById($id):?array {
+	public function getPrincipalById($id): ?array {
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
 			->from($this->dbTableName)
@@ -261,7 +261,7 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('email', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
@@ -280,7 +280,7 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
@@ -305,11 +305,11 @@ 
 
 				default:
 					$rowsByMetadata = $this->searchPrincipalsByMetadataKey($prop, $value);
-					$filteredRows = array_filter($rowsByMetadata, function ($row) use ($usersGroups) {
+					$filteredRows = array_filter($rowsByMetadata, function($row) use ($usersGroups) {
 						return $this->isAllowedToAccessResource($row, $usersGroups);
 					});
 
-					$results[] = array_map(function ($row): string {
+					$results[] = array_map(function($row): string {
 						return $row['uri'];
 					}, $filteredRows);
 
@@ -348,7 +348,7 @@ 
 		$query->select([$this->dbForeignKeyName])
 			->from($this->dbMetaDataTableName)
 			->where($query->expr()->eq('key', $query->createNamedParameter($key)))
-			->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+			->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 		$stmt = $query->execute();
 
 		$rows = [];
@@ -405,7 +405,7 @@ 
 			}
 
 			list(, $name) = \Sabre\Uri\split($path);
-			list($backendId, $resourceId) = explode('-',  $name, 2);
+			list($backendId, $resourceId) = explode('-', $name, 2);
 
 			$query = $this->db->getQueryBuilder();
 			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
@@ -437,7 +437,7 @@ 
 	 */
 	private function rowToPrincipal(array $row, array $metadata = []):array {
 		return array_merge([
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+			'uri' => $this->principalPrefix.'/'.$row['backend_id'].'-'.$row['resource_id'],
 			'{DAV:}displayname' => $row['displayname'],
 			'{http://sabredav.org/ns}email-address' => $row['email'],
 			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
@@ -459,7 +459,7 @@ 
 		// group restrictions contains something, but not parsable, deny access and log warning
 		$json = json_decode($row['group_restrictions']);
 		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+			$this->logger->info('group_restrictions field could not be parsed for '.$this->dbTableName.'::'.$row['id'].', denying access to resource');
 			return false;
 		}
 

apps/dav/lib/AppInfo/Application.php

Indentation +320 added lines, -320 removed lines

@@ -81,333 +81,333 @@
 use function strpos;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'dav';
+    public const APP_ID = 'dav';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
-		$context->registerService(PhotoCache::class, function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerServiceAlias('CardDAVSyncService', SyncService::class);
+        $context->registerService(PhotoCache::class, function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
 
-			return new PhotoCache(
-				$server->getAppDataDir('dav-photocache'),
-				$c->get(ILogger::class)
-			);
-		});
+            return new PhotoCache(
+                $server->getAppDataDir('dav-photocache'),
+                $c->get(ILogger::class)
+            );
+        });
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$context->registerCapability(Capabilities::class);
+        $context->registerCapability(Capabilities::class);
 
-		/*
+        /*
 		 * Register Search Providers
 		 */
-		$context->registerSearchProvider(ContactsSearchProvider::class);
-		$context->registerSearchProvider(EventsSearchProvider::class);
-		$context->registerSearchProvider(TasksSearchProvider::class);
-
-		/**
-		 * Register event listeners
-		 */
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		// Load all dav apps
-		\OC_App::loadApps(['dav']);
-
-		$context->injectFn([$this, 'registerHooks']);
-		$context->injectFn([$this, 'registerContactsManager']);
-		$context->injectFn([$this, 'registerCalendarManager']);
-		$context->injectFn([$this, 'registerNotifier']);
-		$context->injectFn([$this, 'registerCalendarReminders']);
-	}
-
-	public function registerHooks(HookManager $hm,
-								   EventDispatcherInterface $dispatcher,
-								   IAppContainer $container,
-								   IServerContainer $serverContainer) {
-		$hm->setup();
-
-		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
-			if ($event instanceof GenericEvent) {
-				$hm->firstLogin($event->getSubject());
-			}
-		});
-
-		$birthdayListener = function ($event) use ($container): void {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $container->query(BirthdayService::class);
-				$b->onCardChanged(
-					(int) $event->getArgument('addressBookId'),
-					(string) $event->getArgument('cardUri'),
-					(string) $event->getArgument('cardData')
-				);
-			}
-		};
-
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $container->query(BirthdayService::class);
-				$b->onCardDeleted(
-					(int) $event->getArgument('addressBookId'),
-					(string) $event->getArgument('cardUri')
-				);
-			}
-		});
-
-		$clearPhotoCache = function ($event) use ($container): void {
-			if ($event instanceof GenericEvent) {
-				/** @var PhotoCache $p */
-				$p = $container->query(PhotoCache::class);
-				$p->delete(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri')
-				);
-			}
-		};
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
-
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
-			$user = $event->getSubject();
-			/** @var SyncService $syncService */
-			$syncService = $container->query(SyncService::class);
-			$syncService->updateUser($user);
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarAdd(
-				$event->getArgument('calendarData')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarUpdate(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('propertyMutations')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarDelete(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares')
-			);
-
-			/** @var ReminderBackend $reminderBackend */
-			$reminderBackend = $container->query(ReminderBackend::class);
-			$reminderBackend->cleanRemindersForCalendar(
-				(int) $event->getArgument('calendarId')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarUpdateShares(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('add'),
-				$event->getArgument('remove')
-			);
-
-			// Here we should recalculate if reminders should be sent to new or old sharees
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarPublication(
-				$event->getArgument('calendarData'),
-				$event->getArgument('public')
-			);
-		});
-
-		$listener = function (GenericEvent $event, $eventName) use ($container): void {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-
-			$subject = Event::SUBJECT_OBJECT_ADD;
-			if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_UPDATE;
-			} elseif ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_DELETE;
-			}
-			$backend->onTouchCalendarObject(
-				$subject,
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('objectData')
-			);
-
-			/** @var ReminderService $reminderBackend */
-			$reminderService = $container->query(ReminderService::class);
-
-			$reminderService->onTouchCalendarObject(
-				$eventName,
-				$event->getArgument('objectData')
-			);
-		};
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
-
-		/**
-		 * In case the user has set their default calendar to this one
-		 */
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($serverContainer) {
-			/** @var IConfig $config */
-			$config = $serverContainer->getConfig();
-			$principalUri = $event->getArgument('calendarData')['principaluri'];
-			if (strpos($principalUri, 'principals/users') === 0) {
-				list(, $UID) = \Sabre\Uri\split($principalUri);
-				$uri = $event->getArgument('calendarData')['uri'];
-				if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
-					$config->deleteUserValue($UID, 'dav', 'defaultCalendar');
-				}
-			}
-		});
-
-		$dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-			function (GenericEvent $event) {
-				/** @var CardDavBackend $cardDavBackend */
-				$cardDavBackend = \OC::$server->query(CardDavBackend::class);
-				$addressBookUri = $event->getSubject();
-				$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-				if (!is_null($addressBook)) {
-					$cardDavBackend->deleteAddressBook($addressBook['id']);
-				}
-			}
-		);
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
-				$jobList = $serverContainer->getJobList();
-				$subscriptionData = $event->getArgument('subscriptionData');
-
-				/**
-				 * Initial subscription refetch
-				 *
-				 * @var RefreshWebcalService $refreshWebcalService
-				 */
-				$refreshWebcalService = $container->query(RefreshWebcalService::class);
-				$refreshWebcalService->refreshSubscription(
-					(string) $subscriptionData['principaluri'],
-					(string) $subscriptionData['uri']
-				);
-
-				$jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-					'principaluri' => $subscriptionData['principaluri'],
-					'uri' => $subscriptionData['uri']
-				]);
-			}
-		);
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
-				$jobList = $serverContainer->getJobList();
-				$subscriptionData = $event->getArgument('subscriptionData');
-
-				$jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-					'principaluri' => $subscriptionData['principaluri'],
-					'uri' => $subscriptionData['uri']
-				]);
-
-				/** @var CalDavBackend $calDavBackend */
-				$calDavBackend = $container->query(CalDavBackend::class);
-				$calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
-			}
-		);
-
-		$eventHandler = function () use ($container, $serverContainer): void {
-			try {
-				/** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
-				$job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
-				$job->run([]);
-				$serverContainer->getJobList()->setLastRun($job);
-			} catch (Exception $ex) {
-				$serverContainer->getLogger()->logException($ex);
-			}
-		};
-
-		$dispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
-		$dispatcher->addListener('\OCP\Calendar\Room\ForceRefreshEvent', $eventHandler);
-	}
-
-	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
-			$user = \OC::$server->getUserSession()->getUser();
-			if (!is_null($user)) {
-				$this->setupContactsProvider($cm, $container, $user->getUID());
-			} else {
-				$this->setupSystemContactsProvider($cm, $container);
-			}
-		});
-	}
-
-	private function setupContactsProvider(IContactsManager $contactsManager,
-										   IAppContainer $container,
-										   string $userID): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
-	}
-
-	private function setupSystemContactsProvider(IContactsManager $contactsManager,
-												 IAppContainer $container): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
-	}
-
-	public function registerCalendarManager(ICalendarManager $calendarManager,
-											 IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager) {
-			$user = \OC::$server->getUserSession()->getUser();
-			if ($user !== null) {
-				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());
-			}
-		});
-	}
-
-	private function setupCalendarProvider(ICalendarManager $calendarManager,
-										   IAppContainer $container,
-										   $userId) {
-		$cm = $container->query(CalendarManager::class);
-		$cm->setupCalendarProvider($calendarManager, $userId);
-	}
-
-	public function registerNotifier(INotificationManager $manager): void {
-		$manager->registerNotifierService(Notifier::class);
-	}
-
-	public function registerCalendarReminders(NotificationProviderManager $manager,
-											   ILogger $logger): void {
-		try {
-			$manager->registerProvider(AudioProvider::class);
-			$manager->registerProvider(EmailProvider::class);
-			$manager->registerProvider(PushProvider::class);
-		} catch (Throwable $ex) {
-			$logger->logException($ex);
-		}
-	}
+        $context->registerSearchProvider(ContactsSearchProvider::class);
+        $context->registerSearchProvider(EventsSearchProvider::class);
+        $context->registerSearchProvider(TasksSearchProvider::class);
+
+        /**
+         * Register event listeners
+         */
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        // Load all dav apps
+        \OC_App::loadApps(['dav']);
+
+        $context->injectFn([$this, 'registerHooks']);
+        $context->injectFn([$this, 'registerContactsManager']);
+        $context->injectFn([$this, 'registerCalendarManager']);
+        $context->injectFn([$this, 'registerNotifier']);
+        $context->injectFn([$this, 'registerCalendarReminders']);
+    }
+
+    public function registerHooks(HookManager $hm,
+                                    EventDispatcherInterface $dispatcher,
+                                    IAppContainer $container,
+                                    IServerContainer $serverContainer) {
+        $hm->setup();
+
+        // first time login event setup
+        $dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+            if ($event instanceof GenericEvent) {
+                $hm->firstLogin($event->getSubject());
+            }
+        });
+
+        $birthdayListener = function ($event) use ($container): void {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $container->query(BirthdayService::class);
+                $b->onCardChanged(
+                    (int) $event->getArgument('addressBookId'),
+                    (string) $event->getArgument('cardUri'),
+                    (string) $event->getArgument('cardData')
+                );
+            }
+        };
+
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $container->query(BirthdayService::class);
+                $b->onCardDeleted(
+                    (int) $event->getArgument('addressBookId'),
+                    (string) $event->getArgument('cardUri')
+                );
+            }
+        });
+
+        $clearPhotoCache = function ($event) use ($container): void {
+            if ($event instanceof GenericEvent) {
+                /** @var PhotoCache $p */
+                $p = $container->query(PhotoCache::class);
+                $p->delete(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri')
+                );
+            }
+        };
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
+
+        $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
+            $user = $event->getSubject();
+            /** @var SyncService $syncService */
+            $syncService = $container->query(SyncService::class);
+            $syncService->updateUser($user);
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarAdd(
+                $event->getArgument('calendarData')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarUpdate(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('propertyMutations')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarDelete(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares')
+            );
+
+            /** @var ReminderBackend $reminderBackend */
+            $reminderBackend = $container->query(ReminderBackend::class);
+            $reminderBackend->cleanRemindersForCalendar(
+                (int) $event->getArgument('calendarId')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarUpdateShares(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('add'),
+                $event->getArgument('remove')
+            );
+
+            // Here we should recalculate if reminders should be sent to new or old sharees
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarPublication(
+                $event->getArgument('calendarData'),
+                $event->getArgument('public')
+            );
+        });
+
+        $listener = function (GenericEvent $event, $eventName) use ($container): void {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+
+            $subject = Event::SUBJECT_OBJECT_ADD;
+            if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_UPDATE;
+            } elseif ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_DELETE;
+            }
+            $backend->onTouchCalendarObject(
+                $subject,
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('objectData')
+            );
+
+            /** @var ReminderService $reminderBackend */
+            $reminderService = $container->query(ReminderService::class);
+
+            $reminderService->onTouchCalendarObject(
+                $eventName,
+                $event->getArgument('objectData')
+            );
+        };
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
+
+        /**
+         * In case the user has set their default calendar to this one
+         */
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($serverContainer) {
+            /** @var IConfig $config */
+            $config = $serverContainer->getConfig();
+            $principalUri = $event->getArgument('calendarData')['principaluri'];
+            if (strpos($principalUri, 'principals/users') === 0) {
+                list(, $UID) = \Sabre\Uri\split($principalUri);
+                $uri = $event->getArgument('calendarData')['uri'];
+                if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
+                    $config->deleteUserValue($UID, 'dav', 'defaultCalendar');
+                }
+            }
+        });
+
+        $dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
+            function (GenericEvent $event) {
+                /** @var CardDavBackend $cardDavBackend */
+                $cardDavBackend = \OC::$server->query(CardDavBackend::class);
+                $addressBookUri = $event->getSubject();
+                $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+                if (!is_null($addressBook)) {
+                    $cardDavBackend->deleteAddressBook($addressBook['id']);
+                }
+            }
+        );
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
+            function (GenericEvent $event) use ($container, $serverContainer) {
+                $jobList = $serverContainer->getJobList();
+                $subscriptionData = $event->getArgument('subscriptionData');
+
+                /**
+                 * Initial subscription refetch
+                 *
+                 * @var RefreshWebcalService $refreshWebcalService
+                 */
+                $refreshWebcalService = $container->query(RefreshWebcalService::class);
+                $refreshWebcalService->refreshSubscription(
+                    (string) $subscriptionData['principaluri'],
+                    (string) $subscriptionData['uri']
+                );
+
+                $jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+                    'principaluri' => $subscriptionData['principaluri'],
+                    'uri' => $subscriptionData['uri']
+                ]);
+            }
+        );
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
+            function (GenericEvent $event) use ($container, $serverContainer) {
+                $jobList = $serverContainer->getJobList();
+                $subscriptionData = $event->getArgument('subscriptionData');
+
+                $jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+                    'principaluri' => $subscriptionData['principaluri'],
+                    'uri' => $subscriptionData['uri']
+                ]);
+
+                /** @var CalDavBackend $calDavBackend */
+                $calDavBackend = $container->query(CalDavBackend::class);
+                $calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
+            }
+        );
+
+        $eventHandler = function () use ($container, $serverContainer): void {
+            try {
+                /** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
+                $job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
+                $job->run([]);
+                $serverContainer->getJobList()->setLastRun($job);
+            } catch (Exception $ex) {
+                $serverContainer->getLogger()->logException($ex);
+            }
+        };
+
+        $dispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
+        $dispatcher->addListener('\OCP\Calendar\Room\ForceRefreshEvent', $eventHandler);
+    }
+
+    public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
+        $cm->register(function () use ($container, $cm): void {
+            $user = \OC::$server->getUserSession()->getUser();
+            if (!is_null($user)) {
+                $this->setupContactsProvider($cm, $container, $user->getUID());
+            } else {
+                $this->setupSystemContactsProvider($cm, $container);
+            }
+        });
+    }
+
+    private function setupContactsProvider(IContactsManager $contactsManager,
+                                            IAppContainer $container,
+                                            string $userID): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
+    }
+
+    private function setupSystemContactsProvider(IContactsManager $contactsManager,
+                                                    IAppContainer $container): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
+    }
+
+    public function registerCalendarManager(ICalendarManager $calendarManager,
+                                                IAppContainer $container): void {
+        $calendarManager->register(function () use ($container, $calendarManager) {
+            $user = \OC::$server->getUserSession()->getUser();
+            if ($user !== null) {
+                $this->setupCalendarProvider($calendarManager, $container, $user->getUID());
+            }
+        });
+    }
+
+    private function setupCalendarProvider(ICalendarManager $calendarManager,
+                                            IAppContainer $container,
+                                            $userId) {
+        $cm = $container->query(CalendarManager::class);
+        $cm->setupCalendarProvider($calendarManager, $userId);
+    }
+
+    public function registerNotifier(INotificationManager $manager): void {
+        $manager->registerNotifierService(Notifier::class);
+    }
+
+    public function registerCalendarReminders(NotificationProviderManager $manager,
+                                                ILogger $logger): void {
+        try {
+            $manager->registerProvider(AudioProvider::class);
+            $manager->registerProvider(EmailProvider::class);
+            $manager->registerProvider(PushProvider::class);
+        } catch (Throwable $ex) {
+            $logger->logException($ex);
+        }
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -89,7 +89,7 @@ 
 
 	public function register(IRegistrationContext $context): void {
 		$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
-		$context->registerService(PhotoCache::class, function (ContainerInterface $c) {
+		$context->registerService(PhotoCache::class, function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 
@@ -137,13 +137,13 @@ 
 		$hm->setup();
 
 		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+		$dispatcher->addListener(IUser::class.'::firstLogin', function($event) use ($hm) {
 			if ($event instanceof GenericEvent) {
 				$hm->firstLogin($event->getSubject());
 			}
 		});
 
-		$birthdayListener = function ($event) use ($container): void {
+		$birthdayListener = function($event) use ($container): void {
 			if ($event instanceof GenericEvent) {
 				/** @var BirthdayService $b */
 				$b = $container->query(BirthdayService::class);
@@ -157,7 +157,7 @@ 
 
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) use ($container) {
 			if ($event instanceof GenericEvent) {
 				/** @var BirthdayService $b */
 				$b = $container->query(BirthdayService::class);
@@ -168,7 +168,7 @@ 
 			}
 		});
 
-		$clearPhotoCache = function ($event) use ($container): void {
+		$clearPhotoCache = function($event) use ($container): void {
 			if ($event instanceof GenericEvent) {
 				/** @var PhotoCache $p */
 				$p = $container->query(PhotoCache::class);
@@ -181,21 +181,21 @@ 
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
 
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) use ($container) {
 			$user = $event->getSubject();
 			/** @var SyncService $syncService */
 			$syncService = $container->query(SyncService::class);
 			$syncService->updateUser($user);
 		});
 
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarAdd(
 				$event->getArgument('calendarData')
 			);
 		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarUpdate(
@@ -204,7 +204,7 @@ 
 				$event->getArgument('propertyMutations')
 			);
 		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarDelete(
@@ -218,7 +218,7 @@ 
 				(int) $event->getArgument('calendarId')
 			);
 		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarUpdateShares(
@@ -231,7 +231,7 @@ 
 			// Here we should recalculate if reminders should be sent to new or old sharees
 		});
 
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarPublication(
@@ -240,7 +240,7 @@ 
 			);
 		});
 
-		$listener = function (GenericEvent $event, $eventName) use ($container): void {
+		$listener = function(GenericEvent $event, $eventName) use ($container): void {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 
@@ -272,7 +272,7 @@ 
 		/**
 		 * In case the user has set their default calendar to this one
 		 */
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($serverContainer) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) use ($serverContainer) {
 			/** @var IConfig $config */
 			$config = $serverContainer->getConfig();
 			$principalUri = $event->getArgument('calendarData')['principaluri'];
@@ -286,7 +286,7 @@ 
 		});
 
 		$dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-			function (GenericEvent $event) {
+			function(GenericEvent $event) {
 				/** @var CardDavBackend $cardDavBackend */
 				$cardDavBackend = \OC::$server->query(CardDavBackend::class);
 				$addressBookUri = $event->getSubject();
@@ -298,7 +298,7 @@ 
 		);
 
 		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
+			function(GenericEvent $event) use ($container, $serverContainer) {
 				$jobList = $serverContainer->getJobList();
 				$subscriptionData = $event->getArgument('subscriptionData');
 
@@ -321,7 +321,7 @@ 
 		);
 
 		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
+			function(GenericEvent $event) use ($container, $serverContainer) {
 				$jobList = $serverContainer->getJobList();
 				$subscriptionData = $event->getArgument('subscriptionData');
 
@@ -336,7 +336,7 @@ 
 			}
 		);
 
-		$eventHandler = function () use ($container, $serverContainer): void {
+		$eventHandler = function() use ($container, $serverContainer): void {
 			try {
 				/** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
 				$job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
@@ -352,7 +352,7 @@ 
 	}
 
 	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
+		$cm->register(function() use ($container, $cm): void {
 			$user = \OC::$server->getUserSession()->getUser();
 			if (!is_null($user)) {
 				$this->setupContactsProvider($cm, $container, $user->getUID());
@@ -381,7 +381,7 @@ 
 
 	public function registerCalendarManager(ICalendarManager $calendarManager,
 											 IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager) {
+		$calendarManager->register(function() use ($container, $calendarManager) {
 			$user = \OC::$server->getUserSession()->getUser();
 			if ($user !== null) {
 				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());

apps/accessibility/lib/Controller/ConfigController.php

Indentation +114 added lines, -114 removed lines

@@ -42,118 +42,118 @@
 
 class ConfigController extends OCSController {
 
-	/** @var string */
-	protected $appName;
-
-	/** @var string */
-	protected $userId;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var AccessibilityProvider */
-	private $accessibilityProvider;
-
-	/**
-	 * Config constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param AccessibilityProvider $accessibilityProvider
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserSession $userSession,
-								AccessibilityProvider $accessibilityProvider) {
-		parent::__construct($appName, $request);
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->accessibilityProvider = $accessibilityProvider;
-		$this->userId = $userSession->getUser()->getUID();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Get user accessibility config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 */
-	public function getConfig(): DataResponse {
-		return new DataResponse([
-			'highcontrast' => $this->config->getUserValue($this->userId, $this->appName, 'highcontrast', false),
-			'theme' => $this->config->getUserValue($this->userId, $this->appName, 'theme', false),
-			'font' => $this->config->getUserValue($this->userId, $this->appName, 'font', false)
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Set theme or font config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 * @throws OCSBadRequestException|PreConditionNotMetException
-	 */
-	public function setConfig(string $key, $value): DataResponse {
-		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-			if ($value === false || $value === '') {
-				throw new OCSBadRequestException('Invalid value: ' . $value);
-			}
-
-			$themes = $this->accessibilityProvider->getThemes();
-			$highcontrast = [$this->accessibilityProvider->getHighContrast()];
-			$fonts = $this->accessibilityProvider->getFonts();
-
-			$availableOptions = array_map(function ($option): string {
-				return $option['id'];
-			}, array_merge($themes, $highcontrast, $fonts));
-
-			if (in_array($value, $availableOptions)) {
-				$this->config->setUserValue($this->userId, $this->appName, $key, $value);
-				return new DataResponse();
-			}
-
-			throw new OCSBadRequestException('Invalid value: ' . $value);
-		}
-
-		throw new OCSBadRequestException('Invalid key: ' . $key);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Unset theme or font config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function deleteConfig(string $key): DataResponse {
-		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-			$this->config->deleteUserValue($this->userId, $this->appName, $key);
-			$userValues = $this->config->getUserKeys($this->userId, $this->appName);
-
-			// remove hash if no settings selected
-			if (count($userValues) === 1 && $userValues[0] === 'icons-css') {
-				$this->config->deleteUserValue($this->userId, $this->appName, 'icons-css');
-			}
-
-			return new DataResponse();
-		}
-
-		throw new OCSBadRequestException('Invalid key: ' . $key);
-	}
+    /** @var string */
+    protected $appName;
+
+    /** @var string */
+    protected $userId;
+
+    /** @var string */
+    protected $serverRoot;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var AccessibilityProvider */
+    private $accessibilityProvider;
+
+    /**
+     * Config constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param AccessibilityProvider $accessibilityProvider
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                AccessibilityProvider $accessibilityProvider) {
+        parent::__construct($appName, $request);
+        $this->appName = $appName;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->accessibilityProvider = $accessibilityProvider;
+        $this->userId = $userSession->getUser()->getUID();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Get user accessibility config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     */
+    public function getConfig(): DataResponse {
+        return new DataResponse([
+            'highcontrast' => $this->config->getUserValue($this->userId, $this->appName, 'highcontrast', false),
+            'theme' => $this->config->getUserValue($this->userId, $this->appName, 'theme', false),
+            'font' => $this->config->getUserValue($this->userId, $this->appName, 'font', false)
+        ]);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Set theme or font config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     * @throws OCSBadRequestException|PreConditionNotMetException
+     */
+    public function setConfig(string $key, $value): DataResponse {
+        if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
+            if ($value === false || $value === '') {
+                throw new OCSBadRequestException('Invalid value: ' . $value);
+            }
+
+            $themes = $this->accessibilityProvider->getThemes();
+            $highcontrast = [$this->accessibilityProvider->getHighContrast()];
+            $fonts = $this->accessibilityProvider->getFonts();
+
+            $availableOptions = array_map(function ($option): string {
+                return $option['id'];
+            }, array_merge($themes, $highcontrast, $fonts));
+
+            if (in_array($value, $availableOptions)) {
+                $this->config->setUserValue($this->userId, $this->appName, $key, $value);
+                return new DataResponse();
+            }
+
+            throw new OCSBadRequestException('Invalid value: ' . $value);
+        }
+
+        throw new OCSBadRequestException('Invalid key: ' . $key);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Unset theme or font config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function deleteConfig(string $key): DataResponse {
+        if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
+            $this->config->deleteUserValue($this->userId, $this->appName, $key);
+            $userValues = $this->config->getUserKeys($this->userId, $this->appName);
+
+            // remove hash if no settings selected
+            if (count($userValues) === 1 && $userValues[0] === 'icons-css') {
+                $this->config->deleteUserValue($this->userId, $this->appName, 'icons-css');
+            }
+
+            return new DataResponse();
+        }
+
+        throw new OCSBadRequestException('Invalid key: ' . $key);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -110,14 +110,14 @@ 
 	public function setConfig(string $key, $value): DataResponse {
 		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
 			if ($value === false || $value === '') {
-				throw new OCSBadRequestException('Invalid value: ' . $value);
+				throw new OCSBadRequestException('Invalid value: '.$value);
 			}
 
 			$themes = $this->accessibilityProvider->getThemes();
 			$highcontrast = [$this->accessibilityProvider->getHighContrast()];
 			$fonts = $this->accessibilityProvider->getFonts();
 
-			$availableOptions = array_map(function ($option): string {
+			$availableOptions = array_map(function($option): string {
 				return $option['id'];
 			}, array_merge($themes, $highcontrast, $fonts));
 
@@ -126,10 +126,10 @@ 
 				return new DataResponse();
 			}
 
-			throw new OCSBadRequestException('Invalid value: ' . $value);
+			throw new OCSBadRequestException('Invalid value: '.$value);
 		}
 
-		throw new OCSBadRequestException('Invalid key: ' . $key);
+		throw new OCSBadRequestException('Invalid key: '.$key);
 	}
 
 	/**
@@ -154,6 +154,6 @@ 
 			return new DataResponse();
 		}
 
-		throw new OCSBadRequestException('Invalid key: ' . $key);
+		throw new OCSBadRequestException('Invalid key: '.$key);
 	}
 }