Introduce UserGlobalStoragesService

UserGlobalStoragesService reads the global storage configuration,
cherry-picking storages applicable to a user. Writing storages through
this service is forbidden, on punishment of throwing an exception.
Storage IDs may also be config hashes when retrieved from this service,
as it is unable to update the storages with real IDs.

As UserGlobalStoragesService and UserStoragesService share a bit of code
relating to users, that has been split into UserTrait. UserTrait also
allows for the user set to be overridden, rather than using the user
from IUserSession.

Config\ConfigAdapter has been reworked to use UserStoragesService and
UserGlobalStoragesService instead of
OC_Mount_Config::getAbsoluteMountPoints(), further reducing dependance
on that horrible static class.

1 files changed, 83 insertions, 15 deletions

diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index 6956de1e748..63615e716ae 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -2,6 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
@@ -22,23 +23,67 @@
 
 namespace OCA\Files_External\Config;
 
+use OCP\Files\Storage;
 use OC\Files\Mount\MountPoint;
 use OCP\Files\Storage\IStorageFactory;
 use OCA\Files_External\Lib\PersonalMount;
 use OCP\Files\Config\IMountProvider;
 use OCP\IUser;
 use OCA\Files_external\Service\UserStoragesService;
+use OCA\Files_External\Service\UserGlobalStoragesService;
+use OCA\Files_External\Lib\StorageConfig;
 
 /**
  * Make the old files_external config work with the new public mount config api
  */
 class ConfigAdapter implements IMountProvider {
 
+	/** @var UserStoragesService */
+	private $userStoragesService;
+
+	/** @var UserGlobalStoragesService */
+	private $userGlobalStoragesService;
+
 	/**
 	 * @param UserStoragesService $userStoragesService
+	 * @param UserGlobalStoragesService $userGlobalStoragesService
 	 */
-	public function __construct(UserStoragesService $userStoragesService) {
+	public function __construct(
+		UserStoragesService $userStoragesService,
+		UserGlobalStoragesService $userGlobalStoragesService
+	) {
 		$this->userStoragesService = $userStoragesService;
+		$this->userGlobalStoragesService = $userGlobalStoragesService;
+	}
+
+	/**
+	 * Process storage ready for mounting
+	 *
+	 * @param StorageConfig $storage
+	 */
+	private function prepareStorageConfig(StorageConfig &$storage) {
+		$objectStore = $storage->getBackendOption('objectstore');
+		if ($objectStore) {
+			$objectClass = $objectStore['class'];
+			$storage->setBackendOption('objectstore', new $objectClass($objectStore));
+		}
+
+		$storage->getBackend()->manipulateStorageConfig($storage);
+	}
+
+	/**
+	 * Construct the storage implementation
+	 *
+	 * @param StorageConfig $storageConfig
+	 * @return Storage
+	 */
+	private function constructStorage(StorageConfig $storageConfig) {
+		$class = $storageConfig->getBackend()->getStorageClass();
+		$storage = new $class($storageConfig->getBackendOptions());
+
+		$storage = $storageConfig->getBackend()->wrapStorage($storage);
+
+		return $storage;
 	}
 
 	/**
@@ -49,21 +94,44 @@ class ConfigAdapter implements IMountProvider {
 	 * @return \OCP\Files\Mount\IMountPoint[]
 	 */
 	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$mountPoints = \OC_Mount_Config::getAbsoluteMountPoints($user->getUID());
-		$mounts = array();
-		foreach ($mountPoints as $mountPoint => $options) {
-			if (isset($options['options']['objectstore'])) {
-				$objectClass = $options['options']['objectstore']['class'];
-				$options['options']['objectstore'] = new $objectClass($options['options']['objectstore']);
-			}
-			$mountOptions = isset($options['mountOptions']) ? $options['mountOptions'] : [];
-			if (isset($options['personal']) && $options['personal']) {
-				$mount = new PersonalMount($this->userStoragesService, $options['id'], $options['class'], $mountPoint, $options['options'], $loader, $mountOptions);
-				$mounts[] = $mount;
-			} else {
-				$mounts[] = new MountPoint($options['class'], $mountPoint, $options['options'], $loader, $mountOptions);
-			}
+		$mounts = [];
+
+		$this->userStoragesService->setUser($user);
+		$this->userGlobalStoragesService->setUser($user);
+
+		foreach ($this->userGlobalStoragesService->getAllStorages() as $storage) {
+			$this->prepareStorageConfig($storage);
+			$impl = $this->constructStorage($storage);
+
+			$mount = new MountPoint(
+				$impl,
+				'/'.$user->getUID().'/files' . $storage->getMountPoint(),
+				null,
+				$loader,
+				$storage->getMountOptions()
+			);
+			$mounts[$storage->getMountPoint()] = $mount;
+		}
+
+		foreach ($this->userStoragesService->getAllStorages() as $storage) {
+			$this->prepareStorageConfig($storage);
+			$impl = $this->constructStorage($storage);
+
+			$mount = new PersonalMount(
+				$this->userStoragesService,
+				$storage->getId(),
+				$impl,
+				'/'.$user->getUID().'/files' . $storage->getMountPoint(),
+				null,
+				$loader,
+				$storage->getMountOptions()
+			);
+			$mounts[$storage->getMountPoint()] = $mount;
 		}
+
+		$this->userStoragesService->resetUser();
+		$this->userGlobalStoragesService->resetUser();
+
 		return $mounts;
 	}
 }