Merge pull request #11884 from owncloud/ext-appframework

Cleanup ext storage CRUD code, introduce storage config id
owncloud · Mar 20, 2015 · e44ab2d · e44ab2d
2 parents 0b1c4bf + c37913b
commit e44ab2d
Show file tree

Hide file tree

Showing 32 changed files with 4,316 additions and 489 deletions.
diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php
diff --git a/apps/files_external/ajax/removeMountPoint.php b/apps/files_external/ajax/removeMountPoint.php
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
@@ -6,6 +6,8 @@
  * later.
  * See the COPYING-README file.
  */
+$app = new \OCA\Files_external\Appinfo\Application();
+
 $l = \OC::$server->getL10N('files_external');
 
 OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php';

diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
@@ -12,12 +12,13 @@
 use \OCP\AppFramework\App;
 use \OCP\IContainer;
 
- /**
-  * @package OCA\Files_External\Appinfo
-  */
+/**
+ * @package OCA\Files_External\Appinfo
+ */
 class Application extends App {
 	public function __construct(array $urlParams=array()) {
 		parent::__construct('files_external', $urlParams);
+
 		$container = $this->getContainer();
 
 		/**

diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
@@ -22,28 +22,29 @@
 
 namespace OCA\Files_External\Appinfo;
 
+/**
+ * @var $this \OC\Route\Router
+ **/
 $application = new Application();
 $application->registerRoutes(
-        $this,
-        array(
-                'routes' => array(
-                        array(
-                                'name' => 'Ajax#getSshKeys',
-                                'url' => '/ajax/sftp_key.php',
-                                'verb' => 'POST',
-                                'requirements' => array()
-                        )
-                )
-        )
+	$this,
+	array(
+		'resources' => array(
+			'global_storages' => array('url' => '/globalstorages'),
+			'user_storages' => array('url' => '/userstorages'),
+		),
+		'routes' => array(
+			array(
+				'name' => 'Ajax#getSshKeys',
+				'url' => '/ajax/sftp_key.php',
+				'verb' => 'POST',
+				'requirements' => array()
+			)
+		)
+	)
 );
 
-/** @var $this OC\Route\Router */
-
-$this->create('files_external_add_mountpoint', 'ajax/addMountPoint.php')
-	->actionInclude('files_external/ajax/addMountPoint.php');
-$this->create('files_external_remove_mountpoint', 'ajax/removeMountPoint.php')
-	->actionInclude('files_external/ajax/removeMountPoint.php');
-
+// TODO: move these to app framework
 $this->create('files_external_add_root_certificate', 'ajax/addRootCertificate.php')
 	->actionInclude('files_external/ajax/addRootCertificate.php');
 $this->create('files_external_remove_root_certificate', 'ajax/removeRootCertificate.php')

diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * ownCloud - files_external
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Vincent Petry <[email protected]>
+ * @copyright Vincent Petry 2015
+ */
+
+namespace OCA\Files_External\Controller;
+
+
+use \OCP\IConfig;
+use \OCP\IUserSession;
+use \OCP\IRequest;
+use \OCP\IL10N;
+use \OCP\AppFramework\Http\DataResponse;
+use \OCP\AppFramework\Controller;
+use \OCP\AppFramework\Http;
+use \OCA\Files_external\Service\GlobalStoragesService;
+use \OCA\Files_external\NotFoundException;
+use \OCA\Files_external\Lib\StorageConfig;
+
+/**
+ * Global storages controller
+ */
+class GlobalStoragesController extends StoragesController {
+	/**
+	 * Creates a new global storages controller.
+	 *
+	 * @param string $AppName application name
+	 * @param IRequest $request request object
+	 * @param IL10N $l10n l10n service
+	 * @param GlobalStoragesService $globalStoragesService storage service
+	 */
+	public function __construct(
+		$AppName,
+		IRequest $request,
+		IL10N $l10n,
+		GlobalStoragesService $globalStoragesService
+	) {
+		parent::__construct(
+			$AppName,
+			$request,
+			$l10n,
+			$globalStoragesService
+		);
+	}
+
+	/**
+	 * Create an external storage entry.
+	 *
+	 * @param string $mountPoint storage mount point
+	 * @param string $backendClass backend class name
+	 * @param array $backendOptions backend-specific options
+	 * @param array $mountOptions mount-specific options
+	 * @param array $applicableUsers users for which to mount the storage
+	 * @param array $applicableGroups groups for which to mount the storage
+	 * @param int $priority priority
+	 *
+	 * @return DataResponse
+	 */
+	public function create(
+		$mountPoint,
+		$backendClass,
+		$backendOptions,
+		$mountOptions,
+		$applicableUsers,
+		$applicableGroups,
+		$priority
+	) {
+		$newStorage = new StorageConfig();
+		$newStorage->setMountPoint($mountPoint);
+		$newStorage->setBackendClass($backendClass);
+		$newStorage->setBackendOptions($backendOptions);
+		$newStorage->setMountOptions($mountOptions);
+		$newStorage->setApplicableUsers($applicableUsers);
+		$newStorage->setApplicableGroups($applicableGroups);
+		$newStorage->setPriority($priority);
+
+		$response = $this->validate($newStorage);
+		if (!empty($response)) {
+			return $response;
+		}
+
+		$newStorage = $this->service->addStorage($newStorage);
+
+		$this->updateStorageStatus($newStorage);
+
+		return new DataResponse(
+			$newStorage,
+			Http::STATUS_CREATED
+		);
+	}
+
+	/**
+	 * Update an external storage entry.
+	 *
+	 * @param int $id storage id
+	 * @param string $mountPoint storage mount point
+	 * @param string $backendClass backend class name
+	 * @param array $backendOptions backend-specific options
+	 * @param array $mountOptions mount-specific options
+	 * @param array $applicableUsers users for which to mount the storage
+	 * @param array $applicableGroups groups for which to mount the storage
+	 * @param int $priority priority
+	 *
+	 * @return DataResponse
+	 */
+	public function update(
+		$id,
+		$mountPoint,
+		$backendClass,
+		$backendOptions,
+		$mountOptions,
+		$applicableUsers,
+		$applicableGroups,
+		$priority
+	) {
+		$storage = new StorageConfig($id);
+		$storage->setMountPoint($mountPoint);
+		$storage->setBackendClass($backendClass);
+		$storage->setBackendOptions($backendOptions);
+		$storage->setMountOptions($mountOptions);
+		$storage->setApplicableUsers($applicableUsers);
+		$storage->setApplicableGroups($applicableGroups);
+		$storage->setPriority($priority);
+
+		$response = $this->validate($storage);
+		if (!empty($response)) {
+			return $response;
+		}
+
+		try {
+			$storage = $this->service->updateStorage($storage);
+		} catch (NotFoundException $e) {
+			return new DataResponse(
+				[
+					'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+				],
+				Http::STATUS_NOT_FOUND
+			);
+		}
+
+		$this->updateStorageStatus($storage);
+
+		return new DataResponse(
+			$storage,
+			Http::STATUS_OK
+		);
+
+	}
+
+}