nextcloud / server

apps/files_versions/lib/Command/CleanUp.php

Indentation +69 added lines, -69 removed lines

@@ -33,83 +33,83 @@
 
 class CleanUp extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IRootFolder */
-	protected $rootFolder;
+    /** @var IRootFolder */
+    protected $rootFolder;
 
-	/**
-	 * @param IRootFolder $rootFolder
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-	}
+    /**
+     * @param IRootFolder $rootFolder
+     * @param IUserManager $userManager
+     */
+    public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+    }
 
-	protected function configure() {
-		$this
-			->setName('versions:cleanup')
-			->setDescription('Delete versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'delete versions of the given user(s), if no user is given all versions will be deleted'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('versions:cleanup')
+            ->setDescription('Delete versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'delete versions of the given user(s), if no user is given all versions will be deleted'
+            );
+    }
 
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Delete versions of   <info>$user</info>");
-					$this->deleteVersions($user);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-					return 1;
-				}
-			}
-		} else {
-			$output->writeln('Delete all versions');
-			foreach ($this->userManager->getBackends() as $backend) {
-				$name = get_class($backend);
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Delete versions of   <info>$user</info>");
+                    $this->deleteVersions($user);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                    return 1;
+                }
+            }
+        } else {
+            $output->writeln('Delete all versions');
+            foreach ($this->userManager->getBackends() as $backend) {
+                $name = get_class($backend);
 
-				if ($backend instanceof IUserBackend) {
-					$name = $backend->getBackendName();
-				}
+                if ($backend instanceof IUserBackend) {
+                    $name = $backend->getBackendName();
+                }
 
-				$output->writeln("Delete versions for users on backend <info>$name</info>");
+                $output->writeln("Delete versions for users on backend <info>$name</info>");
 
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers('', $limit, $offset);
-					foreach ($users as $user) {
-						$output->writeln("   <info>$user</info>");
-						$this->deleteVersions($user);
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-		}
-		return 0;
-	}
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers('', $limit, $offset);
+                    foreach ($users as $user) {
+                        $output->writeln("   <info>$user</info>");
+                        $this->deleteVersions($user);
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+        }
+        return 0;
+    }
 
 
-	/**
-	 * delete versions for the given user
-	 *
-	 * @param string $user
-	 */
-	protected function deleteVersions($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
-		}
-	}
+    /**
+     * delete versions for the given user
+     *
+     * @param string $user
+     */
+    protected function deleteVersions($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
+        if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
+            $this->rootFolder->get('/' . $user . '/files_versions')->delete();
+        }
+    }
 }

apps/files_external/lib/Command/Delete.php

Indentation +62 added lines, -62 removed lines

@@ -39,77 +39,77 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Delete extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	/**
-	 * @var UserStoragesService
-	 */
-	protected $userService;
+    /**
+     * @var UserStoragesService
+     */
+    protected $userService;
 
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
 
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-	}
+    public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:delete')
-			->setDescription('Delete an external mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addOption(
-				'yes',
-				'y',
-				InputOption::VALUE_NONE,
-				'Skip confirmation'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:delete')
+            ->setDescription('Delete an external mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addOption(
+                'yes',
+                'y',
+                InputOption::VALUE_NONE,
+                'Skip confirmation'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$noConfirm = $input->getOption('yes');
+        $noConfirm = $input->getOption('yes');
 
-		if (!$noConfirm) {
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listCommand->listMounts(null, [$mount], $listInput, $output);
+        if (!$noConfirm) {
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listCommand->listMounts(null, [$mount], $listInput, $output);
 
-			$questionHelper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
+            $questionHelper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
 
-			if (!$questionHelper->ask($input, $output, $question)) {
-				return 1;
-			}
-		}
+            if (!$questionHelper->ask($input, $output, $question)) {
+                return 1;
+            }
+        }
 
-		$this->globalService->removeStorage($mountId);
-		return 0;
-	}
+        $this->globalService->removeStorage($mountId);
+        return 0;
+    }
 }

apps/files_external/lib/Command/Create.php

Indentation +178 added lines, -178 removed lines

@@ -44,182 +44,182 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Create extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	private $globalService;
-
-	/**
-	 * @var UserStoragesService
-	 */
-	private $userService;
-
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-
-	/** @var BackendService */
-	private $backendService;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	public function __construct(GlobalStoragesService $globalService,
-						 UserStoragesService $userService,
-						 IUserManager $userManager,
-						 IUserSession $userSession,
-						 BackendService $backendService
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->backendService = $backendService;
-	}
-
-	protected function configure() {
-		$this
-			->setName('files_external:create')
-			->setDescription('Create a new mount configuration')
-			->addOption(
-				'user',
-				'',
-				InputOption::VALUE_OPTIONAL,
-				'user to add the mount configuration for, if not set the mount will be added as system mount'
-			)
-			->addArgument(
-				'mount_point',
-				InputArgument::REQUIRED,
-				'mount point for the new mount'
-			)
-			->addArgument(
-				'storage_backend',
-				InputArgument::REQUIRED,
-				'storage backend identifier for the new mount, see `occ files_external:backends` for possible values'
-			)
-			->addArgument(
-				'authentication_backend',
-				InputArgument::REQUIRED,
-				'authentication backend identifier for the new mount, see `occ files_external:backends` for possible values'
-			)
-			->addOption(
-				'config',
-				'c',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'Mount configuration option in key=value format'
-			)
-			->addOption(
-				'dry',
-				'',
-				InputOption::VALUE_NONE,
-				'Don\'t save the created mount, only list the new mount'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getOption('user');
-		$mountPoint = $input->getArgument('mount_point');
-		$storageIdentifier = $input->getArgument('storage_backend');
-		$authIdentifier = $input->getArgument('authentication_backend');
-		$configInput = $input->getOption('config');
-
-		$storageBackend = $this->backendService->getBackend($storageIdentifier);
-		$authBackend = $this->backendService->getAuthMechanism($authIdentifier);
-
-		if (!Filesystem::isValidPath($mountPoint)) {
-			$output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>');
-			return 1;
-		}
-		if (is_null($storageBackend)) {
-			$output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
-			return 404;
-		}
-		if (is_null($authBackend)) {
-			$output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
-			return 404;
-		}
-		$supportedSchemes = array_keys($storageBackend->getAuthSchemes());
-		if (!in_array($authBackend->getScheme(), $supportedSchemes)) {
-			$output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>');
-			return 1;
-		}
-
-		$config = [];
-		foreach ($configInput as $configOption) {
-			if (!strpos($configOption, '=')) {
-				$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
-				return 1;
-			}
-			list($key, $value) = explode('=', $configOption, 2);
-			if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
-				$output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
-				return 1;
-			}
-			$config[$key] = $value;
-		}
-
-		$mount = new StorageConfig();
-		$mount->setMountPoint($mountPoint);
-		$mount->setBackend($storageBackend);
-		$mount->setAuthMechanism($authBackend);
-		$mount->setBackendOptions($config);
-
-		if ($user) {
-			if (!$this->userManager->userExists($user)) {
-				$output->writeln('<error>User "' . $user . '" not found</error>');
-				return 1;
-			}
-			$mount->setApplicableUsers([$user]);
-		}
-
-		if ($input->getOption('dry')) {
-			$this->showMount($user, $mount, $input, $output);
-		} else {
-			$this->getStorageService($user)->addStorage($mount);
-			if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-				$output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
-			} else {
-				$output->writeln((string)$mount->getId());
-			}
-		}
-		return 0;
-	}
-
-	private function validateParam($key, &$value, Backend $storageBackend, AuthMechanism $authBackend) {
-		$params = array_merge($storageBackend->getParameters(), $authBackend->getParameters());
-		foreach ($params as $param) {
-			/** @var DefinitionParameter $param */
-			if ($param->getName() === $key) {
-				if ($param->getType() === DefinitionParameter::VALUE_BOOLEAN) {
-					$value = ($value === 'true');
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private function showMount($user, StorageConfig $mount, InputInterface $input, OutputInterface $output) {
-		$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-		$listInput = new ArrayInput([], $listCommand->getDefinition());
-		$listInput->setOption('output', $input->getOption('output'));
-		$listInput->setOption('show-password', true);
-		$listCommand->listMounts($user, [$mount], $listInput, $output);
-	}
-
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    /**
+     * @var GlobalStoragesService
+     */
+    private $globalService;
+
+    /**
+     * @var UserStoragesService
+     */
+    private $userService;
+
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /** @var BackendService */
+    private $backendService;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    public function __construct(GlobalStoragesService $globalService,
+                            UserStoragesService $userService,
+                            IUserManager $userManager,
+                            IUserSession $userSession,
+                            BackendService $backendService
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->backendService = $backendService;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files_external:create')
+            ->setDescription('Create a new mount configuration')
+            ->addOption(
+                'user',
+                '',
+                InputOption::VALUE_OPTIONAL,
+                'user to add the mount configuration for, if not set the mount will be added as system mount'
+            )
+            ->addArgument(
+                'mount_point',
+                InputArgument::REQUIRED,
+                'mount point for the new mount'
+            )
+            ->addArgument(
+                'storage_backend',
+                InputArgument::REQUIRED,
+                'storage backend identifier for the new mount, see `occ files_external:backends` for possible values'
+            )
+            ->addArgument(
+                'authentication_backend',
+                InputArgument::REQUIRED,
+                'authentication backend identifier for the new mount, see `occ files_external:backends` for possible values'
+            )
+            ->addOption(
+                'config',
+                'c',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'Mount configuration option in key=value format'
+            )
+            ->addOption(
+                'dry',
+                '',
+                InputOption::VALUE_NONE,
+                'Don\'t save the created mount, only list the new mount'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getOption('user');
+        $mountPoint = $input->getArgument('mount_point');
+        $storageIdentifier = $input->getArgument('storage_backend');
+        $authIdentifier = $input->getArgument('authentication_backend');
+        $configInput = $input->getOption('config');
+
+        $storageBackend = $this->backendService->getBackend($storageIdentifier);
+        $authBackend = $this->backendService->getAuthMechanism($authIdentifier);
+
+        if (!Filesystem::isValidPath($mountPoint)) {
+            $output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>');
+            return 1;
+        }
+        if (is_null($storageBackend)) {
+            $output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+            return 404;
+        }
+        if (is_null($authBackend)) {
+            $output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+            return 404;
+        }
+        $supportedSchemes = array_keys($storageBackend->getAuthSchemes());
+        if (!in_array($authBackend->getScheme(), $supportedSchemes)) {
+            $output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>');
+            return 1;
+        }
+
+        $config = [];
+        foreach ($configInput as $configOption) {
+            if (!strpos($configOption, '=')) {
+                $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+                return 1;
+            }
+            list($key, $value) = explode('=', $configOption, 2);
+            if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
+                $output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
+                return 1;
+            }
+            $config[$key] = $value;
+        }
+
+        $mount = new StorageConfig();
+        $mount->setMountPoint($mountPoint);
+        $mount->setBackend($storageBackend);
+        $mount->setAuthMechanism($authBackend);
+        $mount->setBackendOptions($config);
+
+        if ($user) {
+            if (!$this->userManager->userExists($user)) {
+                $output->writeln('<error>User "' . $user . '" not found</error>');
+                return 1;
+            }
+            $mount->setApplicableUsers([$user]);
+        }
+
+        if ($input->getOption('dry')) {
+            $this->showMount($user, $mount, $input, $output);
+        } else {
+            $this->getStorageService($user)->addStorage($mount);
+            if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
+                $output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
+            } else {
+                $output->writeln((string)$mount->getId());
+            }
+        }
+        return 0;
+    }
+
+    private function validateParam($key, &$value, Backend $storageBackend, AuthMechanism $authBackend) {
+        $params = array_merge($storageBackend->getParameters(), $authBackend->getParameters());
+        foreach ($params as $param) {
+            /** @var DefinitionParameter $param */
+            if ($param->getName() === $key) {
+                if ($param->getType() === DefinitionParameter::VALUE_BOOLEAN) {
+                    $value = ($value === 'true');
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private function showMount($user, StorageConfig $mount, InputInterface $input, OutputInterface $output) {
+        $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+        $listInput = new ArrayInput([], $listCommand->getDefinition());
+        $listInput->setOption('output', $input->getOption('output'));
+        $listInput->setOption('show-password', true);
+        $listCommand->listMounts($user, [$mount], $listInput, $output);
+    }
+
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

apps/files_external/lib/Command/Notify.php

Indentation +224 added lines, -224 removed lines

@@ -46,253 +46,253 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Notify extends Base {
-	/** @var GlobalStoragesService */
-	private $globalService;
-	/** @var IDBConnection */
-	private $connection;
-	/** @var ILogger */
-	private $logger;
+    /** @var GlobalStoragesService */
+    private $globalService;
+    /** @var IDBConnection */
+    private $connection;
+    /** @var ILogger */
+    private $logger;
 
-	public function __construct(GlobalStoragesService $globalService, IDBConnection $connection, ILogger $logger) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->connection = $connection;
-		$this->logger = $logger;
-	}
+    public function __construct(GlobalStoragesService $globalService, IDBConnection $connection, ILogger $logger) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->connection = $connection;
+        $this->logger = $logger;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:notify')
-			->setDescription('Listen for active update notifications for a configured external mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'the mount id of the mount to listen to'
-			)->addOption(
-				'user',
-				'u',
-				InputOption::VALUE_REQUIRED,
-				'The username for the remote mount (required only for some mount configuration that don\'t store credentials)'
-			)->addOption(
-				'password',
-				'p',
-				InputOption::VALUE_REQUIRED,
-				'The password for the remote mount (required only for some mount configuration that don\'t store credentials)'
-			)->addOption(
-				'path',
-				'',
-				InputOption::VALUE_REQUIRED,
-				'The directory in the storage to listen for updates in',
-				'/'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:notify')
+            ->setDescription('Listen for active update notifications for a configured external mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'the mount id of the mount to listen to'
+            )->addOption(
+                'user',
+                'u',
+                InputOption::VALUE_REQUIRED,
+                'The username for the remote mount (required only for some mount configuration that don\'t store credentials)'
+            )->addOption(
+                'password',
+                'p',
+                InputOption::VALUE_REQUIRED,
+                'The password for the remote mount (required only for some mount configuration that don\'t store credentials)'
+            )->addOption(
+                'path',
+                '',
+                InputOption::VALUE_REQUIRED,
+                'The directory in the storage to listen for updates in',
+                '/'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mount = $this->globalService->getStorage($input->getArgument('mount_id'));
-		if (is_null($mount)) {
-			$output->writeln('<error>Mount not found</error>');
-			return 1;
-		}
-		$noAuth = false;
-		try {
-			$authBackend = $mount->getAuthMechanism();
-			$authBackend->manipulateStorageConfig($mount);
-		} catch (InsufficientDataForMeaningfulAnswerException $e) {
-			$noAuth = true;
-		} catch (StorageNotAvailableException $e) {
-			$noAuth = true;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mount = $this->globalService->getStorage($input->getArgument('mount_id'));
+        if (is_null($mount)) {
+            $output->writeln('<error>Mount not found</error>');
+            return 1;
+        }
+        $noAuth = false;
+        try {
+            $authBackend = $mount->getAuthMechanism();
+            $authBackend->manipulateStorageConfig($mount);
+        } catch (InsufficientDataForMeaningfulAnswerException $e) {
+            $noAuth = true;
+        } catch (StorageNotAvailableException $e) {
+            $noAuth = true;
+        }
 
-		if ($input->getOption('user')) {
-			$mount->setBackendOption('user', $input->getOption('user'));
-		} elseif (isset($_ENV['NOTIFY_USER'])) {
-			$mount->setBackendOption('user', $_ENV['NOTIFY_USER']);
-		} elseif (isset($_SERVER['NOTIFY_USER'])) {
-			$mount->setBackendOption('user', $_SERVER['NOTIFY_USER']);
-		}
-		if ($input->getOption('password')) {
-			$mount->setBackendOption('password', $input->getOption('password'));
-		} elseif (isset($_ENV['NOTIFY_PASSWORD'])) {
-			$mount->setBackendOption('password', $_ENV['NOTIFY_PASSWORD']);
-		} elseif (isset($_SERVER['NOTIFY_PASSWORD'])) {
-			$mount->setBackendOption('password', $_SERVER['NOTIFY_PASSWORD']);
-		}
+        if ($input->getOption('user')) {
+            $mount->setBackendOption('user', $input->getOption('user'));
+        } elseif (isset($_ENV['NOTIFY_USER'])) {
+            $mount->setBackendOption('user', $_ENV['NOTIFY_USER']);
+        } elseif (isset($_SERVER['NOTIFY_USER'])) {
+            $mount->setBackendOption('user', $_SERVER['NOTIFY_USER']);
+        }
+        if ($input->getOption('password')) {
+            $mount->setBackendOption('password', $input->getOption('password'));
+        } elseif (isset($_ENV['NOTIFY_PASSWORD'])) {
+            $mount->setBackendOption('password', $_ENV['NOTIFY_PASSWORD']);
+        } elseif (isset($_SERVER['NOTIFY_PASSWORD'])) {
+            $mount->setBackendOption('password', $_SERVER['NOTIFY_PASSWORD']);
+        }
 
-		try {
-			$storage = $this->createStorage($mount);
-		} catch (\Exception $e) {
-			$output->writeln('<error>Error while trying to create storage</error>');
-			if ($noAuth) {
-				$output->writeln('<error>Username and/or password required</error>');
-			}
-			return 1;
-		}
-		if (!$storage instanceof INotifyStorage) {
-			$output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
-			return 1;
-		}
+        try {
+            $storage = $this->createStorage($mount);
+        } catch (\Exception $e) {
+            $output->writeln('<error>Error while trying to create storage</error>');
+            if ($noAuth) {
+                $output->writeln('<error>Username and/or password required</error>');
+            }
+            return 1;
+        }
+        if (!$storage instanceof INotifyStorage) {
+            $output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
+            return 1;
+        }
 
-		$verbose = $input->getOption('verbose');
+        $verbose = $input->getOption('verbose');
 
-		$path = trim($input->getOption('path'), '/');
-		$notifyHandler = $storage->notify($path);
-		$this->selfTest($storage, $notifyHandler, $verbose, $output);
-		$notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
-			if ($verbose) {
-				$this->logUpdate($change, $output);
-			}
-			if ($change instanceof IRenameChange) {
-				$this->markParentAsOutdated($mount->getId(), $change->getTargetPath(), $output);
-			}
-			$this->markParentAsOutdated($mount->getId(), $change->getPath(), $output);
-		});
-		return 0;
-	}
+        $path = trim($input->getOption('path'), '/');
+        $notifyHandler = $storage->notify($path);
+        $this->selfTest($storage, $notifyHandler, $verbose, $output);
+        $notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
+            if ($verbose) {
+                $this->logUpdate($change, $output);
+            }
+            if ($change instanceof IRenameChange) {
+                $this->markParentAsOutdated($mount->getId(), $change->getTargetPath(), $output);
+            }
+            $this->markParentAsOutdated($mount->getId(), $change->getPath(), $output);
+        });
+        return 0;
+    }
 
-	private function createStorage(StorageConfig $mount) {
-		$class = $mount->getBackend()->getStorageClass();
-		return new $class($mount->getBackendOptions());
-	}
+    private function createStorage(StorageConfig $mount) {
+        $class = $mount->getBackend()->getStorageClass();
+        return new $class($mount->getBackendOptions());
+    }
 
-	private function markParentAsOutdated($mountId, $path, OutputInterface $output) {
-		$parent = ltrim(dirname($path), '/');
-		if ($parent === '.') {
-			$parent = '';
-		}
+    private function markParentAsOutdated($mountId, $path, OutputInterface $output) {
+        $parent = ltrim(dirname($path), '/');
+        if ($parent === '.') {
+            $parent = '';
+        }
 
-		try {
-			$storageIds = $this->getStorageIds($mountId);
-		} catch (DriverException $ex) {
-			$this->logger->logException($ex, ['message' => 'Error while trying to find correct storage ids.', 'level' => ILogger::WARN]);
-			$this->connection = $this->reconnectToDatabase($this->connection, $output);
-			$output->writeln('<info>Needed to reconnect to the database</info>');
-			$storageIds = $this->getStorageIds($mountId);
-		}
-		if (count($storageIds) === 0) {
-			throw new StorageNotAvailableException('No storages found by mount ID ' . $mountId);
-		}
-		$storageIds = array_map('intval', $storageIds);
+        try {
+            $storageIds = $this->getStorageIds($mountId);
+        } catch (DriverException $ex) {
+            $this->logger->logException($ex, ['message' => 'Error while trying to find correct storage ids.', 'level' => ILogger::WARN]);
+            $this->connection = $this->reconnectToDatabase($this->connection, $output);
+            $output->writeln('<info>Needed to reconnect to the database</info>');
+            $storageIds = $this->getStorageIds($mountId);
+        }
+        if (count($storageIds) === 0) {
+            throw new StorageNotAvailableException('No storages found by mount ID ' . $mountId);
+        }
+        $storageIds = array_map('intval', $storageIds);
 
-		$result = $this->updateParent($storageIds, $parent);
-		if ($result === 0) {
-			//TODO: Find existing parent further up the tree in the database and register that folder instead.
-			$this->logger->info('Failed updating parent for "' . $path . '" while trying to register change. It may not exist in the filecache.');
-		}
-	}
+        $result = $this->updateParent($storageIds, $parent);
+        if ($result === 0) {
+            //TODO: Find existing parent further up the tree in the database and register that folder instead.
+            $this->logger->info('Failed updating parent for "' . $path . '" while trying to register change. It may not exist in the filecache.');
+        }
+    }
 
-	private function logUpdate(IChange $change, OutputInterface $output) {
-		switch ($change->getType()) {
-			case INotifyStorage::NOTIFY_ADDED:
-				$text = 'added';
-				break;
-			case INotifyStorage::NOTIFY_MODIFIED:
-				$text = 'modified';
-				break;
-			case INotifyStorage::NOTIFY_REMOVED:
-				$text = 'removed';
-				break;
-			case INotifyStorage::NOTIFY_RENAMED:
-				$text = 'renamed';
-				break;
-			default:
-				return;
-		}
+    private function logUpdate(IChange $change, OutputInterface $output) {
+        switch ($change->getType()) {
+            case INotifyStorage::NOTIFY_ADDED:
+                $text = 'added';
+                break;
+            case INotifyStorage::NOTIFY_MODIFIED:
+                $text = 'modified';
+                break;
+            case INotifyStorage::NOTIFY_REMOVED:
+                $text = 'removed';
+                break;
+            case INotifyStorage::NOTIFY_RENAMED:
+                $text = 'renamed';
+                break;
+            default:
+                return;
+        }
 
-		$text .= ' ' . $change->getPath();
-		if ($change instanceof IRenameChange) {
-			$text .= ' to ' . $change->getTargetPath();
-		}
+        $text .= ' ' . $change->getPath();
+        if ($change instanceof IRenameChange) {
+            $text .= ' to ' . $change->getTargetPath();
+        }
 
-		$output->writeln($text);
-	}
+        $output->writeln($text);
+    }
 
-	/**
-	 * @param int $mountId
-	 * @return array
-	 */
-	private function getStorageIds($mountId) {
-		$qb = $this->connection->getQueryBuilder();
-		return $qb
-			->select('storage_id')
-			->from('mounts')
-			->where($qb->expr()->eq('mount_id', $qb->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-			->execute()
-			->fetchAll(\PDO::FETCH_COLUMN);
-	}
+    /**
+     * @param int $mountId
+     * @return array
+     */
+    private function getStorageIds($mountId) {
+        $qb = $this->connection->getQueryBuilder();
+        return $qb
+            ->select('storage_id')
+            ->from('mounts')
+            ->where($qb->expr()->eq('mount_id', $qb->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+            ->execute()
+            ->fetchAll(\PDO::FETCH_COLUMN);
+    }
 
-	/**
-	 * @param array $storageIds
-	 * @param string $parent
-	 * @return int
-	 */
-	private function updateParent($storageIds, $parent) {
-		$pathHash = md5(trim(\OC_Util::normalizeUnicode($parent), '/'));
-		$qb = $this->connection->getQueryBuilder();
-		return $qb
-			->update('filecache')
-			->set('size', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
-			->where($qb->expr()->in('storage', $qb->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY, ':storage_ids')))
-			->andWhere($qb->expr()->eq('path_hash', $qb->createNamedParameter($pathHash, IQueryBuilder::PARAM_STR)))
-			->execute();
-	}
+    /**
+     * @param array $storageIds
+     * @param string $parent
+     * @return int
+     */
+    private function updateParent($storageIds, $parent) {
+        $pathHash = md5(trim(\OC_Util::normalizeUnicode($parent), '/'));
+        $qb = $this->connection->getQueryBuilder();
+        return $qb
+            ->update('filecache')
+            ->set('size', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
+            ->where($qb->expr()->in('storage', $qb->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY, ':storage_ids')))
+            ->andWhere($qb->expr()->eq('path_hash', $qb->createNamedParameter($pathHash, IQueryBuilder::PARAM_STR)))
+            ->execute();
+    }
 
-	/**
-	 * @return \OCP\IDBConnection
-	 */
-	private function reconnectToDatabase(IDBConnection $connection, OutputInterface $output) {
-		try {
-			$connection->close();
-		} catch (\Exception $ex) {
-			$this->logger->logException($ex, ['app' => 'files_external', 'message' => 'Error while disconnecting from DB', 'level' => ILogger::WARN]);
-			$output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
-		}
-		while (!$connection->isConnected()) {
-			try {
-				$connection->connect();
-			} catch (\Exception $ex) {
-				$this->logger->logException($ex, ['app' => 'files_external', 'message' => 'Error while re-connecting to database', 'level' => ILogger::WARN]);
-				$output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
-				sleep(60);
-			}
-		}
-		return $connection;
-	}
+    /**
+     * @return \OCP\IDBConnection
+     */
+    private function reconnectToDatabase(IDBConnection $connection, OutputInterface $output) {
+        try {
+            $connection->close();
+        } catch (\Exception $ex) {
+            $this->logger->logException($ex, ['app' => 'files_external', 'message' => 'Error while disconnecting from DB', 'level' => ILogger::WARN]);
+            $output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
+        }
+        while (!$connection->isConnected()) {
+            try {
+                $connection->connect();
+            } catch (\Exception $ex) {
+                $this->logger->logException($ex, ['app' => 'files_external', 'message' => 'Error while re-connecting to database', 'level' => ILogger::WARN]);
+                $output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
+                sleep(60);
+            }
+        }
+        return $connection;
+    }
 
 
-	private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, $verbose, OutputInterface $output) {
-		usleep(100 * 1000); //give time for the notify to start
-		$storage->file_put_contents('/.nc_test_file.txt', 'test content');
-		$storage->mkdir('/.nc_test_folder');
-		$storage->file_put_contents('/.nc_test_folder/subfile.txt', 'test content');
+    private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, $verbose, OutputInterface $output) {
+        usleep(100 * 1000); //give time for the notify to start
+        $storage->file_put_contents('/.nc_test_file.txt', 'test content');
+        $storage->mkdir('/.nc_test_folder');
+        $storage->file_put_contents('/.nc_test_folder/subfile.txt', 'test content');
 
-		usleep(100 * 1000); //time for all changes to be processed
-		$changes = $notifyHandler->getChanges();
+        usleep(100 * 1000); //time for all changes to be processed
+        $changes = $notifyHandler->getChanges();
 
-		$storage->unlink('/.nc_test_file.txt');
-		$storage->unlink('/.nc_test_folder/subfile.txt');
-		$storage->rmdir('/.nc_test_folder');
+        $storage->unlink('/.nc_test_file.txt');
+        $storage->unlink('/.nc_test_folder/subfile.txt');
+        $storage->rmdir('/.nc_test_folder');
 
-		usleep(100 * 1000); //time for all changes to be processed
-		$notifyHandler->getChanges(); // flush
+        usleep(100 * 1000); //time for all changes to be processed
+        $notifyHandler->getChanges(); // flush
 
-		$foundRootChange = false;
-		$foundSubfolderChange = false;
+        $foundRootChange = false;
+        $foundSubfolderChange = false;
 
-		foreach ($changes as $change) {
-			if ($change->getPath() === '/.nc_test_file.txt' || $change->getPath() === '.nc_test_file.txt') {
-				$foundRootChange = true;
-			} elseif ($change->getPath() === '/.nc_test_folder/subfile.txt' || $change->getPath() === '.nc_test_folder/subfile.txt') {
-				$foundSubfolderChange = true;
-			}
-		}
+        foreach ($changes as $change) {
+            if ($change->getPath() === '/.nc_test_file.txt' || $change->getPath() === '.nc_test_file.txt') {
+                $foundRootChange = true;
+            } elseif ($change->getPath() === '/.nc_test_folder/subfile.txt' || $change->getPath() === '.nc_test_folder/subfile.txt') {
+                $foundSubfolderChange = true;
+            }
+        }
 
-		if ($foundRootChange && $foundSubfolderChange && $verbose) {
-			$output->writeln('<info>Self-test successful</info>');
-		} elseif ($foundRootChange && !$foundSubfolderChange) {
-			$output->writeln('<error>Error while running self-test, change is subfolder not detected</error>');
-		} elseif (!$foundRootChange) {
-			$output->writeln('<error>Error while running self-test, no changes detected</error>');
-		}
-	}
+        if ($foundRootChange && $foundSubfolderChange && $verbose) {
+            $output->writeln('<info>Self-test successful</info>');
+        } elseif ($foundRootChange && !$foundSubfolderChange) {
+            $output->writeln('<error>Error while running self-test, change is subfolder not detected</error>');
+        } elseif (!$foundRootChange) {
+            $output->writeln('<error>Error while running self-test, no changes detected</error>');
+        }
+    }
 }

apps/files_external/lib/Command/ListCommand.php

Indentation +212 added lines, -212 removed lines

@@ -39,241 +39,241 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	/**
-	 * @var UserStoragesService
-	 */
-	protected $userService;
+    /**
+     * @var UserStoragesService
+     */
+    protected $userService;
 
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
 
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	public const ALL = -1;
+    public const ALL = -1;
 
-	public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-	}
+    public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:list')
-			->setDescription('List configured admin or personal mounts')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL,
-				'user id to list the personal mounts for, if no user is provided admin mounts will be listed'
-			)->addOption(
-				'show-password',
-				'',
-				InputOption::VALUE_NONE,
-				'show passwords and secrets'
-			)->addOption(
-				'full',
-				null,
-				InputOption::VALUE_NONE,
-				'don\'t truncate long values in table output'
-			)->addOption(
-				'all',
-				'a',
-				InputOption::VALUE_NONE,
-				'show both system wide mounts and all personal mounts'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:list')
+            ->setDescription('List configured admin or personal mounts')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL,
+                'user id to list the personal mounts for, if no user is provided admin mounts will be listed'
+            )->addOption(
+                'show-password',
+                '',
+                InputOption::VALUE_NONE,
+                'show passwords and secrets'
+            )->addOption(
+                'full',
+                null,
+                InputOption::VALUE_NONE,
+                'don\'t truncate long values in table output'
+            )->addOption(
+                'all',
+                'a',
+                InputOption::VALUE_NONE,
+                'show both system wide mounts and all personal mounts'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if ($input->getOption('all')) {
-			/** @var  $mounts StorageConfig[] */
-			$mounts = $this->globalService->getStorageForAllUsers();
-			$userId = self::ALL;
-		} else {
-			$userId = $input->getArgument('user_id');
-			$storageService = $this->getStorageService($userId);
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        if ($input->getOption('all')) {
+            /** @var  $mounts StorageConfig[] */
+            $mounts = $this->globalService->getStorageForAllUsers();
+            $userId = self::ALL;
+        } else {
+            $userId = $input->getArgument('user_id');
+            $storageService = $this->getStorageService($userId);
 
-			/** @var  $mounts StorageConfig[] */
-			$mounts = $storageService->getAllStorages();
-		}
+            /** @var  $mounts StorageConfig[] */
+            $mounts = $storageService->getAllStorages();
+        }
 
-		$this->listMounts($userId, $mounts, $input, $output);
-		return 0;
-	}
+        $this->listMounts($userId, $mounts, $input, $output);
+        return 0;
+    }
 
-	/**
-	 * @param $userId $userId
-	 * @param StorageConfig[] $mounts
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	public function listMounts($userId, array $mounts, InputInterface $input, OutputInterface $output) {
-		$outputType = $input->getOption('output');
-		if (count($mounts) === 0) {
-			if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-				$output->writeln('[]');
-			} else {
-				if ($userId === self::ALL) {
-					$output->writeln("<info>No mounts configured</info>");
-				} elseif ($userId) {
-					$output->writeln("<info>No mounts configured by $userId</info>");
-				} else {
-					$output->writeln("<info>No admin mounts configured</info>");
-				}
-			}
-			return;
-		}
+    /**
+     * @param $userId $userId
+     * @param StorageConfig[] $mounts
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    public function listMounts($userId, array $mounts, InputInterface $input, OutputInterface $output) {
+        $outputType = $input->getOption('output');
+        if (count($mounts) === 0) {
+            if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+                $output->writeln('[]');
+            } else {
+                if ($userId === self::ALL) {
+                    $output->writeln("<info>No mounts configured</info>");
+                } elseif ($userId) {
+                    $output->writeln("<info>No mounts configured by $userId</info>");
+                } else {
+                    $output->writeln("<info>No admin mounts configured</info>");
+                }
+            }
+            return;
+        }
 
-		$headers = ['Mount ID', 'Mount Point', 'Storage', 'Authentication Type', 'Configuration', 'Options'];
+        $headers = ['Mount ID', 'Mount Point', 'Storage', 'Authentication Type', 'Configuration', 'Options'];
 
-		if (!$userId || $userId === self::ALL) {
-			$headers[] = 'Applicable Users';
-			$headers[] = 'Applicable Groups';
-		}
-		if ($userId === self::ALL) {
-			$headers[] = 'Type';
-		}
+        if (!$userId || $userId === self::ALL) {
+            $headers[] = 'Applicable Users';
+            $headers[] = 'Applicable Groups';
+        }
+        if ($userId === self::ALL) {
+            $headers[] = 'Type';
+        }
 
-		if (!$input->getOption('show-password')) {
-			$hideKeys = ['password', 'refresh_token', 'token', 'client_secret', 'public_key', 'private_key'];
-			foreach ($mounts as $mount) {
-				$config = $mount->getBackendOptions();
-				foreach ($config as $key => $value) {
-					if (in_array($key, $hideKeys)) {
-						$mount->setBackendOption($key, '***');
-					}
-				}
-			}
-		}
+        if (!$input->getOption('show-password')) {
+            $hideKeys = ['password', 'refresh_token', 'token', 'client_secret', 'public_key', 'private_key'];
+            foreach ($mounts as $mount) {
+                $config = $mount->getBackendOptions();
+                foreach ($config as $key => $value) {
+                    if (in_array($key, $hideKeys)) {
+                        $mount->setBackendOption($key, '***');
+                    }
+                }
+            }
+        }
 
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$keys = array_map(function ($header) {
-				return strtolower(str_replace(' ', '_', $header));
-			}, $headers);
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $keys = array_map(function ($header) {
+                return strtolower(str_replace(' ', '_', $header));
+            }, $headers);
 
-			$pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
-				$values = [
-					$config->getId(),
-					$config->getMountPoint(),
-					$config->getBackend()->getStorageClass(),
-					$config->getAuthMechanism()->getIdentifier(),
-					$config->getBackendOptions(),
-					$config->getMountOptions()
-				];
-				if (!$userId || $userId === self::ALL) {
-					$values[] = $config->getApplicableUsers();
-					$values[] = $config->getApplicableGroups();
-				}
-				if ($userId === self::ALL) {
-					$values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'admin' : 'personal';
-				}
+            $pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
+                $values = [
+                    $config->getId(),
+                    $config->getMountPoint(),
+                    $config->getBackend()->getStorageClass(),
+                    $config->getAuthMechanism()->getIdentifier(),
+                    $config->getBackendOptions(),
+                    $config->getMountOptions()
+                ];
+                if (!$userId || $userId === self::ALL) {
+                    $values[] = $config->getApplicableUsers();
+                    $values[] = $config->getApplicableGroups();
+                }
+                if ($userId === self::ALL) {
+                    $values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'admin' : 'personal';
+                }
 
-				return array_combine($keys, $values);
-			}, $mounts);
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($pairs)));
-			} else {
-				$output->writeln(json_encode(array_values($pairs), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$full = $input->getOption('full');
-			$defaultMountOptions = [
-				'encrypt' => true,
-				'previews' => true,
-				'filesystem_check_changes' => 1,
-				'enable_sharing' => false,
-				'encoding_compatibility' => false,
-				'readonly' => false,
-			];
-			$rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
-				$storageConfig = $config->getBackendOptions();
-				$keys = array_keys($storageConfig);
-				$values = array_values($storageConfig);
+                return array_combine($keys, $values);
+            }, $mounts);
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($pairs)));
+            } else {
+                $output->writeln(json_encode(array_values($pairs), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $full = $input->getOption('full');
+            $defaultMountOptions = [
+                'encrypt' => true,
+                'previews' => true,
+                'filesystem_check_changes' => 1,
+                'enable_sharing' => false,
+                'encoding_compatibility' => false,
+                'readonly' => false,
+            ];
+            $rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
+                $storageConfig = $config->getBackendOptions();
+                $keys = array_keys($storageConfig);
+                $values = array_values($storageConfig);
 
-				if (!$full) {
-					$values = array_map(function ($value) {
-						if (is_string($value) && strlen($value) > 32) {
-							return substr($value, 0, 6) . '...' . substr($value, -6, 6);
-						} else {
-							return $value;
-						}
-					}, $values);
-				}
+                if (!$full) {
+                    $values = array_map(function ($value) {
+                        if (is_string($value) && strlen($value) > 32) {
+                            return substr($value, 0, 6) . '...' . substr($value, -6, 6);
+                        } else {
+                            return $value;
+                        }
+                    }, $values);
+                }
 
-				$configStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
-				}, $keys, $values);
-				$configString = implode(', ', $configStrings);
+                $configStrings = array_map(function ($key, $value) {
+                    return $key . ': ' . json_encode($value);
+                }, $keys, $values);
+                $configString = implode(', ', $configStrings);
 
-				$mountOptions = $config->getMountOptions();
-				// hide defaults
-				foreach ($mountOptions as $key => $value) {
-					if ($value === $defaultMountOptions[$key]) {
-						unset($mountOptions[$key]);
-					}
-				}
-				$keys = array_keys($mountOptions);
-				$values = array_values($mountOptions);
+                $mountOptions = $config->getMountOptions();
+                // hide defaults
+                foreach ($mountOptions as $key => $value) {
+                    if ($value === $defaultMountOptions[$key]) {
+                        unset($mountOptions[$key]);
+                    }
+                }
+                $keys = array_keys($mountOptions);
+                $values = array_values($mountOptions);
 
-				$optionsStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
-				}, $keys, $values);
-				$optionsString = implode(', ', $optionsStrings);
+                $optionsStrings = array_map(function ($key, $value) {
+                    return $key . ': ' . json_encode($value);
+                }, $keys, $values);
+                $optionsString = implode(', ', $optionsStrings);
 
-				$values = [
-					$config->getId(),
-					$config->getMountPoint(),
-					$config->getBackend()->getText(),
-					$config->getAuthMechanism()->getText(),
-					$configString,
-					$optionsString
-				];
+                $values = [
+                    $config->getId(),
+                    $config->getMountPoint(),
+                    $config->getBackend()->getText(),
+                    $config->getAuthMechanism()->getText(),
+                    $configString,
+                    $optionsString
+                ];
 
-				if (!$userId || $userId === self::ALL) {
-					$applicableUsers = implode(', ', $config->getApplicableUsers());
-					$applicableGroups = implode(', ', $config->getApplicableGroups());
-					if ($applicableUsers === '' && $applicableGroups === '') {
-						$applicableUsers = 'All';
-					}
-					$values[] = $applicableUsers;
-					$values[] = $applicableGroups;
-				}
-				if ($userId === self::ALL) {
-					$values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'Admin' : 'Personal';
-				}
+                if (!$userId || $userId === self::ALL) {
+                    $applicableUsers = implode(', ', $config->getApplicableUsers());
+                    $applicableGroups = implode(', ', $config->getApplicableGroups());
+                    if ($applicableUsers === '' && $applicableGroups === '') {
+                        $applicableUsers = 'All';
+                    }
+                    $values[] = $applicableUsers;
+                    $values[] = $applicableGroups;
+                }
+                if ($userId === self::ALL) {
+                    $values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'Admin' : 'Personal';
+                }
 
-				return $values;
-			}, $mounts);
+                return $values;
+            }, $mounts);
 
-			$table = new Table($output);
-			$table->setHeaders($headers);
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
+            $table = new Table($output);
+            $table->setHeaders($headers);
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
 
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

apps/files_external/lib/Command/Config.php

Indentation +78 added lines, -78 removed lines

@@ -34,88 +34,88 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Config extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	public function __construct(GlobalStoragesService $globalService) {
-		parent::__construct();
-		$this->globalService = $globalService;
-	}
+    public function __construct(GlobalStoragesService $globalService) {
+        parent::__construct();
+        $this->globalService = $globalService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:config')
-			->setDescription('Manage backend configuration for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addArgument(
-				'key',
-				InputArgument::REQUIRED,
-				'key of the config option to set/get'
-			)->addArgument(
-				'value',
-				InputArgument::OPTIONAL,
-				'value to set the config option to, when no value is provided the existing value will be printed'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:config')
+            ->setDescription('Manage backend configuration for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addArgument(
+                'key',
+                InputArgument::REQUIRED,
+                'key of the config option to set/get'
+            )->addArgument(
+                'value',
+                InputArgument::OPTIONAL,
+                'value to set the config option to, when no value is provided the existing value will be printed'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		$key = $input->getArgument('key');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        $key = $input->getArgument('key');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$value = $input->getArgument('value');
-		if ($value !== null) {
-			$this->setOption($mount, $key, $value, $output);
-		} else {
-			$this->getOption($mount, $key, $output);
-		}
-		return 0;
-	}
+        $value = $input->getArgument('value');
+        if ($value !== null) {
+            $this->setOption($mount, $key, $value, $output);
+        } else {
+            $this->getOption($mount, $key, $output);
+        }
+        return 0;
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param OutputInterface $output
-	 */
-	protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$value = $mount->getMountPoint();
-		} else {
-			$value = $mount->getBackendOption($key);
-		}
-		if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly
-			$value = json_encode($value);
-		}
-		$output->writeln($value);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param OutputInterface $output
+     */
+    protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $value = $mount->getMountPoint();
+        } else {
+            $value = $mount->getBackendOption($key);
+        }
+        if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly
+            $value = json_encode($value);
+        }
+        $output->writeln($value);
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param string $value
-	 * @param OutputInterface $output
-	 */
-	protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
-		$decoded = json_decode($value, true);
-		if (!is_null($decoded) && json_encode($decoded) === $value) {
-			$value = $decoded;
-		}
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$mount->setMountPoint($value);
-		} else {
-			$mount->setBackendOption($key, $value);
-		}
-		$this->globalService->updateStorage($mount);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param string $value
+     * @param OutputInterface $output
+     */
+    protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
+        $decoded = json_decode($value, true);
+        if (!is_null($decoded) && json_encode($decoded) === $value) {
+            $value = $decoded;
+        }
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $mount->setMountPoint($value);
+        } else {
+            $mount->setBackendOption($key, $value);
+        }
+        $this->globalService->updateStorage($mount);
+    }
 }

apps/files_external/lib/Command/Verify.php

Indentation +95 added lines, -95 removed lines

@@ -38,109 +38,109 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Verify extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	public function __construct(GlobalStoragesService $globalService) {
-		parent::__construct();
-		$this->globalService = $globalService;
-	}
+    public function __construct(GlobalStoragesService $globalService) {
+        parent::__construct();
+        $this->globalService = $globalService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:verify')
-			->setDescription('Verify mount configuration')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to check'
-			)->addOption(
-				'config',
-				'c',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'Additional config option to set before checking in key=value pairs, required for certain auth backends such as login credentails'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:verify')
+            ->setDescription('Verify mount configuration')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to check'
+            )->addOption(
+                'config',
+                'c',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'Additional config option to set before checking in key=value pairs, required for certain auth backends such as login credentails'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		$configInput = $input->getOption('config');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        $configInput = $input->getOption('config');
 
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$this->updateStorageStatus($mount, $configInput, $output);
+        $this->updateStorageStatus($mount, $configInput, $output);
 
-		$this->writeArrayInOutputFormat($input, $output, [
-			'status' => StorageNotAvailableException::getStateCodeName($mount->getStatus()),
-			'code' => $mount->getStatus(),
-			'message' => $mount->getStatusMessage()
-		]);
-		return 0;
-	}
+        $this->writeArrayInOutputFormat($input, $output, [
+            'status' => StorageNotAvailableException::getStateCodeName($mount->getStatus()),
+            'code' => $mount->getStatus(),
+            'message' => $mount->getStatusMessage()
+        ]);
+        return 0;
+    }
 
-	private function manipulateStorageConfig(StorageConfig $storage) {
-		/** @var AuthMechanism */
-		$authMechanism = $storage->getAuthMechanism();
-		$authMechanism->manipulateStorageConfig($storage);
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		$backend->manipulateStorageConfig($storage);
-	}
+    private function manipulateStorageConfig(StorageConfig $storage) {
+        /** @var AuthMechanism */
+        $authMechanism = $storage->getAuthMechanism();
+        $authMechanism->manipulateStorageConfig($storage);
+        /** @var Backend */
+        $backend = $storage->getBackend();
+        $backend->manipulateStorageConfig($storage);
+    }
 
-	private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) {
-		try {
-			try {
-				$this->manipulateStorageConfig($storage);
-			} catch (InsufficientDataForMeaningfulAnswerException $e) {
-				if (count($configInput) === 0) { // extra config options might solve the error
-					throw $e;
-				}
-			}
+    private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) {
+        try {
+            try {
+                $this->manipulateStorageConfig($storage);
+            } catch (InsufficientDataForMeaningfulAnswerException $e) {
+                if (count($configInput) === 0) { // extra config options might solve the error
+                    throw $e;
+                }
+            }
 
-			foreach ($configInput as $configOption) {
-				if (!strpos($configOption, '=')) {
-					$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
-					return;
-				}
-				list($key, $value) = explode('=', $configOption, 2);
-				$storage->setBackendOption($key, $value);
-			}
+            foreach ($configInput as $configOption) {
+                if (!strpos($configOption, '=')) {
+                    $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+                    return;
+                }
+                list($key, $value) = explode('=', $configOption, 2);
+                $storage->setBackendOption($key, $value);
+            }
 
-			/** @var Backend */
-			$backend = $storage->getBackend();
-			// update status (can be time-consuming)
-			$storage->setStatus(
-				\OC_Mount_Config::getBackendStatus(
-					$backend->getStorageClass(),
-					$storage->getBackendOptions(),
-					false
-				)
-			);
-		} catch (InsufficientDataForMeaningfulAnswerException $e) {
-			$status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE;
-			$storage->setStatus(
-				$status,
-				$e->getMessage()
-			);
-		} catch (StorageNotAvailableException $e) {
-			$storage->setStatus(
-				$e->getCode(),
-				$e->getMessage()
-			);
-		} catch (\Exception $e) {
-			// FIXME: convert storage exceptions to StorageNotAvailableException
-			$storage->setStatus(
-				StorageNotAvailableException::STATUS_ERROR,
-				get_class($e) . ': ' . $e->getMessage()
-			);
-		}
-	}
+            /** @var Backend */
+            $backend = $storage->getBackend();
+            // update status (can be time-consuming)
+            $storage->setStatus(
+                \OC_Mount_Config::getBackendStatus(
+                    $backend->getStorageClass(),
+                    $storage->getBackendOptions(),
+                    false
+                )
+            );
+        } catch (InsufficientDataForMeaningfulAnswerException $e) {
+            $status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE;
+            $storage->setStatus(
+                $status,
+                $e->getMessage()
+            );
+        } catch (StorageNotAvailableException $e) {
+            $storage->setStatus(
+                $e->getCode(),
+                $e->getMessage()
+            );
+        } catch (\Exception $e) {
+            // FIXME: convert storage exceptions to StorageNotAvailableException
+            $storage->setStatus(
+                StorageNotAvailableException::STATUS_ERROR,
+                get_class($e) . ': ' . $e->getMessage()
+            );
+        }
+    }
 }

apps/files_external/lib/Command/Backends.php

Indentation +78 added lines, -78 removed lines

@@ -33,92 +33,92 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Backends extends Base {
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	public function __construct(BackendService $backendService
-	) {
-		parent::__construct();
+    public function __construct(BackendService $backendService
+    ) {
+        parent::__construct();
 
-		$this->backendService = $backendService;
-	}
+        $this->backendService = $backendService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:backends')
-			->setDescription('Show available authentication and storage backends')
-			->addArgument(
-				'type',
-				InputArgument::OPTIONAL,
-				'only show backends of a certain type. Possible values are "authentication" or "storage"'
-			)->addArgument(
-				'backend',
-				InputArgument::OPTIONAL,
-				'only show information of a specific backend'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:backends')
+            ->setDescription('Show available authentication and storage backends')
+            ->addArgument(
+                'type',
+                InputArgument::OPTIONAL,
+                'only show backends of a certain type. Possible values are "authentication" or "storage"'
+            )->addArgument(
+                'backend',
+                InputArgument::OPTIONAL,
+                'only show information of a specific backend'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$authBackends = $this->backendService->getAuthMechanisms();
-		$storageBackends = $this->backendService->getBackends();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $authBackends = $this->backendService->getAuthMechanisms();
+        $storageBackends = $this->backendService->getBackends();
 
-		$data = [
-			'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends),
-			'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends)
-		];
+        $data = [
+            'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends),
+            'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends)
+        ];
 
-		$type = $input->getArgument('type');
-		$backend = $input->getArgument('backend');
-		if ($type) {
-			if (!isset($data[$type])) {
-				$output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>');
-				return 1;
-			}
-			$data = $data[$type];
+        $type = $input->getArgument('type');
+        $backend = $input->getArgument('backend');
+        if ($type) {
+            if (!isset($data[$type])) {
+                $output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>');
+                return 1;
+            }
+            $data = $data[$type];
 
-			if ($backend) {
-				if (!isset($data[$backend])) {
-					$output->writeln('<error>Unknown backend "' . $backend . '" of type  "' . $type . '"</error>');
-					return 1;
-				}
-				$data = $data[$backend];
-			}
-		}
+            if ($backend) {
+                if (!isset($data[$backend])) {
+                    $output->writeln('<error>Unknown backend "' . $backend . '" of type  "' . $type . '"</error>');
+                    return 1;
+                }
+                $data = $data[$backend];
+            }
+        }
 
-		$this->writeArrayInOutputFormat($input, $output, $data);
-		return 0;
-	}
+        $this->writeArrayInOutputFormat($input, $output, $data);
+        return 0;
+    }
 
-	private function serializeAuthBackend(\JsonSerializable $backend) {
-		$data = $backend->jsonSerialize();
-		$result = [
-			'name' => $data['name'],
-			'identifier' => $data['identifier'],
-			'configuration' => $this->formatConfiguration($data['configuration'])
-		];
-		if ($backend instanceof Backend) {
-			$result['storage_class'] = $backend->getStorageClass();
-			$authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes()));
-			$result['supported_authentication_backends'] = array_keys($authBackends);
-			$authConfig = array_map(function (AuthMechanism $auth) {
-				return $this->serializeAuthBackend($auth)['configuration'];
-			}, $authBackends);
-			$result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
-		}
-		return $result;
-	}
+    private function serializeAuthBackend(\JsonSerializable $backend) {
+        $data = $backend->jsonSerialize();
+        $result = [
+            'name' => $data['name'],
+            'identifier' => $data['identifier'],
+            'configuration' => $this->formatConfiguration($data['configuration'])
+        ];
+        if ($backend instanceof Backend) {
+            $result['storage_class'] = $backend->getStorageClass();
+            $authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes()));
+            $result['supported_authentication_backends'] = array_keys($authBackends);
+            $authConfig = array_map(function (AuthMechanism $auth) {
+                return $this->serializeAuthBackend($auth)['configuration'];
+            }, $authBackends);
+            $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param DefinitionParameter[] $parameters
-	 * @return string[]
-	 */
-	private function formatConfiguration(array $parameters) {
-		$configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
-			return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
-		});
-		return array_map(function (DefinitionParameter $parameter) {
-			return $parameter->getTypeName();
-		}, $configuration);
-	}
+    /**
+     * @param DefinitionParameter[] $parameters
+     * @return string[]
+     */
+    private function formatConfiguration(array $parameters) {
+        $configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
+            return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
+        });
+        return array_map(function (DefinitionParameter $parameter) {
+            return $parameter->getTypeName();
+        }, $configuration);
+    }
 }

apps/files_external/lib/Command/Applicable.php

Indentation +108 added lines, -108 removed lines

@@ -37,123 +37,123 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Applicable extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
 
-	public function __construct(
-		GlobalStoragesService $globalService,
-		IUserManager $userManager,
-		IGroupManager $groupManager
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-	}
+    public function __construct(
+        GlobalStoragesService $globalService,
+        IUserManager $userManager,
+        IGroupManager $groupManager
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:applicable')
-			->setDescription('Manage applicable users and groups for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addOption(
-				'add-user',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'user to add as applicable'
-			)->addOption(
-				'remove-user',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'user to remove as applicable'
-			)->addOption(
-				'add-group',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'group to add as applicable'
-			)->addOption(
-				'remove-group',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'group to remove as applicable'
-			)->addOption(
-				'remove-all',
-				'',
-				InputOption::VALUE_NONE,
-				'Set the mount to be globally applicable'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:applicable')
+            ->setDescription('Manage applicable users and groups for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addOption(
+                'add-user',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'user to add as applicable'
+            )->addOption(
+                'remove-user',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'user to remove as applicable'
+            )->addOption(
+                'add-group',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'group to add as applicable'
+            )->addOption(
+                'remove-group',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'group to remove as applicable'
+            )->addOption(
+                'remove-all',
+                '',
+                InputOption::VALUE_NONE,
+                'Set the mount to be globally applicable'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
+            return 404;
+        }
 
-		if ($mount->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) {
-			$output->writeln('<error>Can\'t change applicables on personal mounts</error>');
-			return 1;
-		}
+        if ($mount->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) {
+            $output->writeln('<error>Can\'t change applicables on personal mounts</error>');
+            return 1;
+        }
 
-		$addUsers = $input->getOption('add-user');
-		$removeUsers = $input->getOption('remove-user');
-		$addGroups = $input->getOption('add-group');
-		$removeGroups = $input->getOption('remove-group');
+        $addUsers = $input->getOption('add-user');
+        $removeUsers = $input->getOption('remove-user');
+        $addGroups = $input->getOption('add-group');
+        $removeGroups = $input->getOption('remove-group');
 
-		$applicableUsers = $mount->getApplicableUsers();
-		$applicableGroups = $mount->getApplicableGroups();
+        $applicableUsers = $mount->getApplicableUsers();
+        $applicableGroups = $mount->getApplicableGroups();
 
-		if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
-			foreach ($addUsers as $addUser) {
-				if (!$this->userManager->userExists($addUser)) {
-					$output->writeln('<error>User "' . $addUser . '" not found</error>');
-					return 404;
-				}
-			}
-			foreach ($addGroups as $addGroup) {
-				if (!$this->groupManager->groupExists($addGroup)) {
-					$output->writeln('<error>Group "' . $addGroup . '" not found</error>');
-					return 404;
-				}
-			}
+        if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
+            foreach ($addUsers as $addUser) {
+                if (!$this->userManager->userExists($addUser)) {
+                    $output->writeln('<error>User "' . $addUser . '" not found</error>');
+                    return 404;
+                }
+            }
+            foreach ($addGroups as $addGroup) {
+                if (!$this->groupManager->groupExists($addGroup)) {
+                    $output->writeln('<error>Group "' . $addGroup . '" not found</error>');
+                    return 404;
+                }
+            }
 
-			if ($input->getOption('remove-all')) {
-				$applicableUsers = [];
-				$applicableGroups = [];
-			} else {
-				$applicableUsers = array_unique(array_merge($applicableUsers, $addUsers));
-				$applicableUsers = array_values(array_diff($applicableUsers, $removeUsers));
-				$applicableGroups = array_unique(array_merge($applicableGroups, $addGroups));
-				$applicableGroups = array_values(array_diff($applicableGroups, $removeGroups));
-			}
-			$mount->setApplicableUsers($applicableUsers);
-			$mount->setApplicableGroups($applicableGroups);
-			$this->globalService->updateStorage($mount);
-		}
+            if ($input->getOption('remove-all')) {
+                $applicableUsers = [];
+                $applicableGroups = [];
+            } else {
+                $applicableUsers = array_unique(array_merge($applicableUsers, $addUsers));
+                $applicableUsers = array_values(array_diff($applicableUsers, $removeUsers));
+                $applicableGroups = array_unique(array_merge($applicableGroups, $addGroups));
+                $applicableGroups = array_values(array_diff($applicableGroups, $removeGroups));
+            }
+            $mount->setApplicableUsers($applicableUsers);
+            $mount->setApplicableGroups($applicableGroups);
+            $this->globalService->updateStorage($mount);
+        }
 
-		$this->writeArrayInOutputFormat($input, $output, [
-			'users' => $applicableUsers,
-			'groups' => $applicableGroups
-		]);
-		return 0;
-	}
+        $this->writeArrayInOutputFormat($input, $output, [
+            'users' => $applicableUsers,
+            'groups' => $applicableGroups
+        ]);
+        return 0;
+    }
 }