5 files changed, 173 insertions, 21 deletions

diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index ddf609129f6..250cbbd00d1 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -35,8 +35,6 @@ require_once __DIR__ . '/../3rdparty/autoload.php';
 \OC_Mount_Config::$app = new \OCA\Files_External\AppInfo\Application();
 $appContainer = \OC_Mount_Config::$app->getContainer();
 
-\OC_Mount_Config::$app->registerSettings();
-
 \OCA\Files\App::getNavigationManager()->add(function () {
 	$l = \OC::$server->getL10N('files_external');
 	return [
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 5772b89ba9e..74cb3e64e43 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -14,7 +14,7 @@ External storage can be configured using the GUI or at the command line. This se
 	<documentation>
 		<admin>admin-external-storage</admin>
 	</documentation>
-	<version>1.4.0</version>
+	<version>1.4.1</version>
 	<types>
 		<filesystem/>
 	</types>
@@ -29,6 +29,8 @@ External storage can be configured using the GUI or at the command line. This se
 	<settings>
 		<admin>OCA\Files_External\Settings\Admin</admin>
 		<admin-section>OCA\Files_External\Settings\Section</admin-section>
+		<personal>OCA\Files_External\Settings\Personal</personal>
+		<personal-section>OCA\Files_External\Settings\PersonalSection</personal-section>
 	</settings>
 
 	<commands>
diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php
index fcf10adb375..0bbb81dfea2 100644
--- a/apps/files_external/lib/AppInfo/Application.php
+++ b/apps/files_external/lib/AppInfo/Application.php
@@ -65,24 +65,6 @@ class Application extends App implements IBackendProvider, IAuthMechanismProvide
 	}
 
 	/**
-	 * Register settings templates
-	 */
-	public function registerSettings() {
-		$container = $this->getContainer();
-		$userSession = $container->getServer()->getUserSession();
-		if (!$userSession->isLoggedIn()) {
-			return;
-		}
-		$backendService = $container->query('OCA\\Files_External\\Service\\BackendService');
-
-		/** @var \OCA\Files_External\Service\UserGlobalStoragesService $userGlobalStoragesService */
-		$userGlobalStoragesService = $container->query('OCA\Files_External\Service\UserGlobalStoragesService');
-		if (count($userGlobalStoragesService->getStorages()) > 0 || $backendService->isUserMountingAllowed()) {
-			\OCP\App::registerPersonal('files_external', 'personal');
-		}
-	}
-
-	/**
 	 * @{inheritdoc}
 	 */
 	public function getBackends() {
diff --git a/apps/files_external/lib/Settings/Personal.php b/apps/files_external/lib/Settings/Personal.php
new file mode 100644
index 00000000000..946ba9f6944
--- /dev/null
+++ b/apps/files_external/lib/Settings/Personal.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files_External\Settings;
+
+use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
+use OCA\Files_External\Service\BackendService;
+use OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\Service\UserGlobalStoragesService;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Encryption\IManager;
+use OCP\IUserSession;
+use OCP\Settings\ISettings;
+
+class Personal implements ISettings {
+
+	/** @var IManager */
+	private $encryptionManager;
+
+	/** @var UserGlobalStoragesService */
+	private $userGlobalStoragesService;
+
+	/** @var BackendService */
+	private $backendService;
+
+	/** @var GlobalAuth	 */
+	private $globalAuth;
+
+	/** @var IUserSession */
+	private $userSession;
+
+	public function __construct(
+		IManager $encryptionManager,
+		UserGlobalStoragesService $userGlobalStoragesService,
+		BackendService $backendService,
+		GlobalAuth $globalAuth,
+		IUserSession $userSession
+	) {
+		$this->encryptionManager = $encryptionManager;
+		$this->userGlobalStoragesService = $userGlobalStoragesService;
+		$this->backendService = $backendService;
+		$this->globalAuth = $globalAuth;
+		$this->userSession = $userSession;
+	}
+
+	/**
+	 * @return TemplateResponse
+	 */
+	public function getForm() {
+		$uid = $this->userSession->getUser()->getUID();
+
+		$parameters = [
+			'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
+			'visibilityType'       => BackendService::VISIBILITY_PERSONAL,
+			'storages'             => $this->userGlobalStoragesService->getStorages(),
+			'backends'             => $this->backendService->getAvailableBackends(),
+			'authMechanisms'       => $this->backendService->getAuthMechanisms(),
+			'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
+			'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
+			'globalCredentials'    => $this->globalAuth->getAuth($uid),
+			'globalCredentialsUid' => $uid,
+		];
+
+		return new TemplateResponse('files_external', 'settings', $parameters, '');
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 */
+	public function getSection() {
+		return 'externalstorages';
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the admin section. The forms are arranged in ascending order of the
+	 * priority values. It is required to return a value between 0 and 100.
+	 *
+	 * E.g.: 70
+	 */
+	public function getPriority() {
+		return 40;
+	}
+
+}
diff --git a/apps/files_external/lib/Settings/PersonalSection.php b/apps/files_external/lib/Settings/PersonalSection.php
new file mode 100644
index 00000000000..32a841c420a
--- /dev/null
+++ b/apps/files_external/lib/Settings/PersonalSection.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files_External\Settings;
+
+
+use OCA\Files_External\Service\BackendService;
+use OCA\Files_External\Service\UserGlobalStoragesService;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUserSession;
+
+class PersonalSection extends Section {
+	/** @var IUserSession */
+	private $userSession;
+
+	/** @var UserGlobalStoragesService */
+	private $userGlobalStoragesService;
+
+	/** @var BackendService */
+	private $backendService;
+
+	public function __construct(
+		IURLGenerator $url,
+		IL10N $l,
+		IUserSession $userSession,
+		UserGlobalStoragesService $userGlobalStoragesService,
+		BackendService $backendService
+	) {
+		parent::__construct($url, $l);
+		$this->userSession = $userSession;
+		$this->userGlobalStoragesService = $userGlobalStoragesService;
+		$this->backendService = $backendService;
+	}
+
+	public function getID() {
+		if (!$this->userSession->isLoggedIn()) {
+			// we need to return the proper id while installing/upgrading the app
+			return parent::getID();
+		}
+
+		if (count($this->userGlobalStoragesService->getStorages()) > 0 || $this->backendService->isUserMountingAllowed()) {
+			return parent::getID();
+		} else {
+			// by returning a different id, no matching settings will be found and the item will be hidden
+			return null;
+		}
+	}
+}
\ No newline at end of file