diff options
| author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-08-12 22:09:20 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-08-25 00:22:10 +0100 |
| commit | 88a78237b01bae66786f9c32f30b936240ea6f58 (patch) | |
| tree | b97b4dfabf734df257a25c5aff9e6f3f001b0e6c /apps/files_external/appinfo | |
| parent | a50ef618761ae3588d00e55c39451cba75672e7f (diff) | |
| download | nextcloud-server-88a78237b01bae66786f9c32f30b936240ea6f58.tar.gz nextcloud-server-88a78237b01bae66786f9c32f30b936240ea6f58.zip | |
Migrate Google external storage to new API
Diffstat (limited to 'apps/files_external/appinfo')
| -rw-r--r-- | apps/files_external/appinfo/app.php | 14 | ||||
| -rw-r--r-- | apps/files_external/appinfo/application.php | 4 | ||||
| -rw-r--r-- | apps/files_external/appinfo/routes.php | 4 |
3 files changed, 6 insertions, 16 deletions
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index 14edfe3538b..9db4b0a6330 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\Google', [ - 'backend' => 'Google Drive', - 'priority' => 100, - 'configuration' => [ - 'configured' => '#configured', - 'client_id' => (string)$l->t('Client ID'), - 'client_secret' => '*'.$l->t('Client secret'), - 'token' => '#token', - ], - 'custom' => 'google', - 'has_dependencies' => true, -]); - - OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', [ 'backend' => (string)$l->t('OpenStack Object Storage'), 'priority' => 100, diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php index 4a9a7a6b827..1e43c737408 100644 --- a/apps/files_external/appinfo/application.php +++ b/apps/files_external/appinfo/application.php @@ -67,6 +67,7 @@ class Application extends App { $container->query('OCA\Files_External\Lib\Backend\SFTP'), $container->query('OCA\Files_External\Lib\Backend\AmazonS3'), $container->query('OCA\Files_External\Lib\Backend\Dropbox'), + $container->query('OCA\Files_External\Lib\Backend\Google'), ]); if (!\OC_Util::runningOnWindows()) { @@ -97,6 +98,9 @@ class Application extends App { // AuthMechanism::SCHEME_OAUTH1 mechanisms $container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'), + // AuthMechanism::SCHEME_OAUTH2 mechanisms + $container->query('OCA\Files_External\Lib\Auth\OAuth2\OAuth2'), + // 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 ccc50cbd0f9..5d7018c3476 100644 --- a/apps/files_external/appinfo/routes.php +++ b/apps/files_external/appinfo/routes.php @@ -48,8 +48,8 @@ namespace OCA\Files_External\AppInfo; $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'); +$this->create('files_external_oauth2', 'ajax/oauth2.php') + ->actionInclude('files_external/ajax/oauth2.php'); $this->create('files_external_list_applicable', '/applicable') |