Migrate Dropbox external storage to new API

3 files changed, 6 insertions, 16 deletions

diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 241e29be402..14edfe3538b 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -70,20 +70,6 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
 OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook');
 OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login');
 
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', [
-	'backend' => 'Dropbox',
-	'priority' => 100,
-	'configuration' => [
-		'configured' => '#configured',
-		'app_key' => (string)$l->t('App key'),
-		'app_secret' => '*'.$l->t('App secret'),
-		'token' => '#token',
-		'token_secret' => '#token_secret'
-	],
-	'custom' => 'dropbox',
-	'has_dependencies' => true,
-]);
-
 OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', [
 	'backend' => 'Google Drive',
 	'priority' => 100,
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index 5f83e1bf91c..4a9a7a6b827 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -66,6 +66,7 @@ class Application extends App {
 			$container->query('OCA\Files_External\Lib\Backend\OwnCloud'),
 			$container->query('OCA\Files_External\Lib\Backend\SFTP'),
 			$container->query('OCA\Files_External\Lib\Backend\AmazonS3'),
+			$container->query('OCA\Files_External\Lib\Backend\Dropbox'),
 		]);
 
 		if (!\OC_Util::runningOnWindows()) {
@@ -93,6 +94,9 @@ class Application extends App {
 			$container->query('OCA\Files_External\Lib\Auth\Password\Password'),
 			$container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'),
 
+			// AuthMechanism::SCHEME_OAUTH1 mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'),
+
 			// Specialized mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\AmazonS3\AccessKey'),
 		]);
diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index 4462ad1f274..ccc50cbd0f9 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -46,8 +46,8 @@ namespace OCA\Files_External\AppInfo;
 	)
 );
 
-$this->create('files_external_dropbox', 'ajax/dropbox.php')
-	->actionInclude('files_external/ajax/dropbox.php');
+$this->create('files_external_oauth1', 'ajax/oauth1.php')
+	->actionInclude('files_external/ajax/oauth1.php');
 $this->create('files_external_google', 'ajax/google.php')
 	->actionInclude('files_external/ajax/google.php');