From 37645153653b0717a8d354aea6d0c13a3a9b7d31 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 27 Jan 2015 13:35:31 +0100
Subject: Allow saving incomplete external storage config

This is needed for Dropbox and others that need a token.
---
 apps/files_external/lib/config.php | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'apps/files_external/lib')

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 823c0bcbfc1..ddfab439879 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -882,6 +882,11 @@ class OC_Mount_Config {
 		return hash('md5', $data);
 	}
 
+	/**
+	 * Add storage id to the storage configurations that did not have any.
+	 *
+	 * @param string $user user for which to process storage configs
+	 */
 	private static function addStorageIdToConfig($user) {
 		$config = self::readData($user);
 
@@ -899,13 +904,35 @@ class OC_Mount_Config {
 		}
 	}
 
+	/**
+	 * Get storage id from the numeric storage id and set
+	 * it into the given options argument. Only do this
+	 * if there was no storage id set yet.
+	 *
+	 * This might also fail if a storage wasn't fully configured yet
+	 * and couldn't be mounted, in which case this will simply return false.
+	 *
+	 * @param array $options storage options
+	 *
+	 * @return bool true if the storage id was added, false otherwise
+	 */
 	private static function addStorageId(&$options) {
 		if (isset($options['storage_id'])) {
 			return false;
 		}
+
 		$class = $options['class'];
-		/** @var \OC\Files\Storage\Storage $storage */
-		$storage = new $class($options['options']);
+		try {
+			/** @var \OC\Files\Storage\Storage $storage */
+			$storage = new $class($options['options']);
+			// TODO: introduce StorageConfigException
+		} catch (\Exception $e) {
+			// storage might not be fully configured yet (ex: Dropbox)
+			// note that storage instances aren't supposed to open any connections
+			// in the constructor, so this exception is likely to be a config exception
+			return false;
+		}
+
 		$options['storage_id'] = $storage->getCache()->getNumericStorageId();
 		return true;
 	}
-- 
cgit v1.2.3