Merge pull request #22432 from owncloud/files_external-backends

remove login credentails and user provided backends
owncloud · Feb 16, 2016 · c6b2457 · c6b2457
2 parents 6c0e921 + 176fb19
commit c6b2457
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 185 deletions.
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
@@ -108,8 +108,6 @@ protected function loadAuthMechanisms() {
 			// AuthMechanism::SCHEME_PASSWORD mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\Password\Password'),
 			$container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'),
-			$container->query('OCA\Files_External\Lib\Auth\Password\LoginCredentials'),
-			$container->query('OCA\Files_External\Lib\Auth\Password\UserProvided'),
 			$container->query('OCA\Files_External\Lib\Auth\Password\GlobalAuth'),
 
 			// AuthMechanism::SCHEME_OAUTH1 mechanisms

diff --git a/apps/files_external/lib/auth/password/logincredentials.php b/apps/files_external/lib/auth/password/logincredentials.php
diff --git a/apps/files_external/lib/auth/password/userprovided.php b/apps/files_external/lib/auth/password/userprovided.php
diff --git a/apps/files_external/tests/command/listcommandtest.php b/apps/files_external/tests/command/listcommandtest.php
@@ -24,7 +24,7 @@
 use OCA\Files_External\Command\ListCommand;
 use OCA\Files_External\Lib\Auth\NullMechanism;
 use OCA\Files_External\Lib\Auth\Password\Password;
-use OCA\Files_External\Lib\Auth\Password\UserProvided;
+use OCA\Files_External\Lib\Auth\Password\SessionCredentials;
 use OCA\Files_External\Lib\Backend\Local;
 use OCA\Files_external\Lib\StorageConfig;
 use Symfony\Component\Console\Output\BufferedOutput;
@@ -48,13 +48,14 @@ private function getInstance() {
 
 	public function testListAuthIdentifier() {
 		$l10n = $this->getMock('\OC_L10N', null, [], '', false);
-		$credentialsManager = $this->getMock('\OCP\Security\ICredentialsManager');
+		$session = $this->getMock('\OCP\ISession');
+		$crypto = $this->getMock('\OCP\Security\ICrypto');
 		$instance = $this->getInstance();
 		$mount1 = new StorageConfig();
 		$mount1->setAuthMechanism(new Password($l10n));
 		$mount1->setBackend(new Local($l10n, new NullMechanism($l10n)));
 		$mount2 = new StorageConfig();
-		$mount2->setAuthMechanism(new UserProvided($l10n, $credentialsManager));
+		$mount2->setAuthMechanism(new SessionCredentials($l10n, $session, $crypto));
 		$mount2->setBackend(new Local($l10n, new NullMechanism($l10n)));
 		$input = $this->getInput($instance, [], [
 			'output' => 'json'