More cleaning after auto-add removal

Signed-off-by: Joas Schilling <coding@schilljs.com>

apps/federation/composer/composer/autoload_classmap.php

@@ -15,7 +15,6 @@ return array(
     'OCA\\Federation\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
     'OCA\\Federation\\DAV\\FedAuth' => $baseDir . '/../lib/DAV/FedAuth.php',
     'OCA\\Federation\\DbHandler' => $baseDir . '/../lib/DbHandler.php',
-    'OCA\\Federation\\Hooks' => $baseDir . '/../lib/Hooks.php',
     'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => $baseDir . '/../lib/Listener/SabrePluginAuthInitListener.php',
     'OCA\\Federation\\Middleware\\AddServerMiddleware' => $baseDir . '/../lib/Middleware/AddServerMiddleware.php',
     'OCA\\Federation\\Migration\\Version1010Date20200630191302' => $baseDir . '/../lib/Migration/Version1010Date20200630191302.php',

apps/federation/composer/composer/autoload_static.php

@@ -30,7 +30,6 @@ class ComposerStaticInitFederation
         'OCA\\Federation\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
         'OCA\\Federation\\DAV\\FedAuth' => __DIR__ . '/..' . '/../lib/DAV/FedAuth.php',
         'OCA\\Federation\\DbHandler' => __DIR__ . '/..' . '/../lib/DbHandler.php',
-        'OCA\\Federation\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
         'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => __DIR__ . '/..' . '/../lib/Listener/SabrePluginAuthInitListener.php',
         'OCA\\Federation\\Middleware\\AddServerMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/AddServerMiddleware.php',
         'OCA\\Federation\\Migration\\Version1010Date20200630191302' => __DIR__ . '/..' . '/../lib/Migration/Version1010Date20200630191302.php',

apps/federation/lib/Hooks.php

@@ -1,47 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Federation;
-
-class Hooks {
-
-	/** @var TrustedServers */
-	private $trustedServers;
-
-	public function __construct(TrustedServers $trustedServers) {
-		$this->trustedServers = $trustedServers;
-	}
-
-	/**
-	 * add servers to the list of trusted servers once a federated share was established
-	 *
-	 * @param array $params
-	 */
-	public function addServerHook($params) {
-		if (
-			$this->trustedServers->getAutoAddServers() === true &&
-			$this->trustedServers->isTrustedServer($params['server']) === false
-		) {
-			$this->trustedServers->addServer($params['server']);
-		}
-	}
-}

apps/federation/lib/Settings/Admin.php

@@ -42,7 +42,6 @@ class Admin implements ISettings {
 	public function getForm() {
 		$parameters = [
 			'trustedServers' => $this->trustedServers->getServers(),
-			'autoAddServers' => $this->trustedServers->getAutoAddServers(),
 		];
 
 		return new TemplateResponse('federation', 'settings-admin', $parameters, '');

apps/federation/lib/TrustedServers.php

@@ -130,28 +130,6 @@ class TrustedServers {
 		return $result;
 	}
 
-	/**
-	 * enable/disable to automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @param bool $status
-	 */
-	public function setAutoAddServers($status) {
-		$value = $status ? '1' : '0';
-		$this->config->setAppValue('federation', 'autoAddServers', $value);
-	}
-
-	/**
-	 * return if we automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @return bool
-	 */
-	public function getAutoAddServers() {
-		$value = $this->config->getAppValue('federation', 'autoAddServers', '0');
-		return $value === '1';
-	}
-
 	/**
 	 * get shared secret for the given server
 	 *

apps/federation/tests/HooksTest.php

@@ -1,80 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Federation\Tests;
-
-use OCA\Federation\Hooks;
-use OCA\Federation\TrustedServers;
-use Test\TestCase;
-
-class HooksTest extends TestCase {
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers */
-	private $trustedServers;
-
-	/** @var  Hooks */
-	private $hooks;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
-			->disableOriginalConstructor()->getMock();
-
-		$this->hooks = new Hooks($this->trustedServers);
-	}
-
-	/**
-	 * @dataProvider dataTestAddServerHook
-	 *
-	 * @param bool $autoAddEnabled is auto-add enabled
-	 * @param bool $isTrustedServer is the server already in the list of trusted servers
-	 * @param bool $addServer should the server be added
-	 */
-	public function testAddServerHook($autoAddEnabled, $isTrustedServer, $addServer) {
-		$this->trustedServers->expects($this->any())->method('getAutoAddServers')
-			->willReturn($autoAddEnabled);
-		$this->trustedServers->expects($this->any())->method('isTrustedServer')
-				->with('url')->willReturn($isTrustedServer);
-
-		if ($addServer) {
-			$this->trustedServers->expects($this->once())->method('addServer')
-				->with('url');
-		} else {
-			$this->trustedServers->expects($this->never())->method('addServer');
-		}
-
-		$this->hooks->addServerHook(['server' => 'url']);
-	}
-
-	public function dataTestAddServerHook() {
-		return [
-			[true, true, false],
-			[false, true, false],
-			[true, false, true],
-			[false, false, false],
-		];
-	}
-}

apps/federation/tests/Settings/AdminTest.php

@@ -48,14 +48,9 @@ class AdminTest extends TestCase {
 			->expects($this->once())
 			->method('getServers')
 			->willReturn(['myserver', 'secondserver']);
-		$this->trustedServers
-			->expects($this->once())
-			->method('getAutoAddServers')
-			->willReturn(['autoserver1', 'autoserver2']);
 
 		$params = [
 			'trustedServers' => ['myserver', 'secondserver'],
-			'autoAddServers' => ['autoserver1', 'autoserver2'],
 		];
 		$expected = new TemplateResponse('federation', 'settings-admin', $params, '');
 		$this->assertEquals($expected, $this->admin->getForm());

apps/federation/tests/TrustedServersTest.php

@@ -156,45 +156,6 @@ class TrustedServersTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider dataTrueFalse
-	 *
-	 * @param bool $status
-	 */
-	public function testSetAutoAddServers($status) {
-		if ($status) {
-			$this->config->expects($this->once())->method('setAppValue')
-				->with('federation', 'autoAddServers', '1');
-		} else {
-			$this->config->expects($this->once())->method('setAppValue')
-				->with('federation', 'autoAddServers', '0');
-		}
-
-		$this->trustedServers->setAutoAddServers($status);
-	}
-
-	/**
-	 * @dataProvider dataTestGetAutoAddServers
-	 *
-	 * @param string $status
-	 * @param bool $expected
-	 */
-	public function testGetAutoAddServers($status, $expected) {
-		$this->config->expects($this->once())->method('getAppValue')
-			->with('federation', 'autoAddServers', '0')->willReturn($status);
-
-		$this->assertSame($expected,
-			$this->trustedServers->getAutoAddServers()
-		);
-	}
-
-	public function dataTestGetAutoAddServers() {
-		return [
-			['1', true],
-			['0', false]
-		];
-	}
-
 	public function testAddSharedSecret() {
 		$this->dbHandler->expects($this->once())->method('addSharedSecret')
 			->with('url', 'secret');