Split personal security settings in code

Instead of one big monolitic sections this is the first step in breaking
down the settings. This should make is easiet to see what does what. As
well as nicely splitting up the sections.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

3 files changed, 135 insertions, 72 deletions

diff --git a/tests/Settings/Personal/Security/AuthtokensTest.php b/tests/Settings/Personal/Security/AuthtokensTest.php
new file mode 100644
index 00000000000..f833d1f6ef4
--- /dev/null
+++ b/tests/Settings/Personal/Security/AuthtokensTest.php
@@ -0,0 +1,124 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Test\Settings\Personal\Security;
+
+use OC\Authentication\Token\DefaultToken;
+use OC\Authentication\Token\IProvider as IAuthTokenProvider;
+use OC\Settings\Personal\Security;
+use OC\Settings\Personal\Security\Authtokens;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IInitialStateService;
+use OCP\ISession;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+
+class AuthtokensTest extends TestCase {
+
+	/** @var IAuthTokenProvider|MockObject */
+	private $authTokenProvider;
+
+	/** @var ISession|MockObject */
+	private $session;
+
+	/** @var IInitialStateService|MockObject */
+	private $initialStateService;
+
+	/** @var string */
+	private $uid;
+
+	/** @var Security\Authtokens */
+	private $section;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->authTokenProvider = $this->createMock(IAuthTokenProvider::class);
+		$this->session = $this->createMock(ISession::class);
+		$this->initialStateService = $this->createMock(IInitialStateService::class);
+		$this->uid = 'test123';
+
+		$this->section = new Authtokens(
+			$this->authTokenProvider,
+			$this->session,
+			$this->initialStateService,
+			$this->uid
+		);
+	}
+
+	public function testGetForm() {
+		$token1 = new DefaultToken();
+		$token1->setId(100);
+		$token2 = new DefaultToken();
+		$token2->setId(200);
+		$tokens = [
+			$token1,
+			$token2,
+		];
+		$sessionToken = new DefaultToken();
+		$sessionToken->setId(100);
+
+		$this->authTokenProvider->expects($this->once())
+			->method('getTokenByUser')
+			->with($this->uid)
+			->willReturn($tokens);
+		$this->session->expects($this->once())
+			->method('getId')
+			->willReturn('session123');
+		$this->authTokenProvider->expects($this->once())
+			->method('getToken')
+			->with('session123')
+			->willReturn($sessionToken);
+		$this->initialStateService->expects($this->once())
+			->method('provideInitialState')
+			->with('settings', 'app_tokens', [
+				[
+					'id' => 100,
+					'name' => null,
+					'lastActivity' => 0,
+					'type' => 0,
+					'canDelete' => false,
+					'current' => true,
+					'scope' => ['filesystem' => true],
+					'canRename' => false,
+				],
+				[
+					'id' => 200,
+					'name' => null,
+					'lastActivity' => 0,
+					'type' => 0,
+					'canDelete' => true,
+					'scope' => ['filesystem' => true],
+					'canRename' => true,
+				],
+			]);
+
+		$form = $this->section->getForm();
+
+		$expected = new TemplateResponse('settings', 'settings/personal/security/authtokens');
+		$this->assertEquals($expected, $form);
+	}
+
+}
diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php
index 4128e33aef1..2b2b2250695 100644
--- a/tests/lib/Settings/ManagerTest.php
+++ b/tests/lib/Settings/ManagerTest.php
@@ -244,15 +244,24 @@ class ManagerTest extends TestCase {
 		$section->expects($this->once())
 			->method('getPriority')
 			->willReturn(16);
-		$this->container->expects($this->once())
+		$section2 = $this->createMock(Security\Authtokens::class);
+		$section2->expects($this->once())
+			->method('getPriority')
+			->willReturn(100);
+		$this->container->expects($this->at(0))
 			->method('query')
 			->with(Security::class)
 			->willReturn($section);
+		$this->container->expects($this->at(1))
+			->method('query')
+			->with(Security\Authtokens::class)
+			->willReturn($section2);
 
 		$settings = $this->manager->getPersonalSettings('security');
 
 		$this->assertEquals([
-			16 => [$section]
+			16 => [$section],
+			100 => [$section2],
 		], $settings);
 	}
 
diff --git a/tests/lib/Settings/Personal/SecurityTest.php b/tests/lib/Settings/Personal/SecurityTest.php
index ae9d59e0d44..9944f1fc590 100644
--- a/tests/lib/Settings/Personal/SecurityTest.php
+++ b/tests/lib/Settings/Personal/SecurityTest.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 /**
@@ -25,15 +24,10 @@ declare(strict_types=1);
 
 namespace Test\Settings\Personal;
 
-use OC\Authentication\Token\DefaultToken;
-use OC\Authentication\Token\IProvider as IAuthTokenProvider;
-use OC\Authentication\TwoFactorAuth\Manager as TwoFactorManager;
 use OC\Authentication\TwoFactorAuth\ProviderLoader;
 use OC\Settings\Personal\Security;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
-use OCP\IInitialStateService;
-use OCP\ISession;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
@@ -45,27 +39,15 @@ class SecurityTest extends TestCase {
 	/** @var IUserManager|MockObject */
 	private $userManager;
 
-	/** @var TwoFactorManager|MockObject */
-	private $twoFactorManager;
-
-	/** @var IAuthTokenProvider|MockObject */
-	private $authTokenProvider;
-
 	/** @var ProviderLoader|MockObject */
 	private $providerLoader;
 
 	/** @var IUserSession|MockObject */
 	private $userSession;
 
-	/** @var ISession|MockObject */
-	private $session;
-
 	/** @var IConfig|MockObject */
 	private $config;
 
-	/** @var IInitialStateService|MockObject */
-	private $initialStateService;
-
 	/** @var string */
 	private $uid;
 
@@ -76,39 +58,21 @@ class SecurityTest extends TestCase {
 		parent::setUp();
 
 		$this->userManager = $this->createMock(IUserManager::class);
-		$this->twoFactorManager = $this->createMock(TwoFactorManager::class);
-		$this->authTokenProvider = $this->createMock(IAuthTokenProvider::class);
 		$this->providerLoader = $this->createMock(ProviderLoader::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->config = $this->createMock(IConfig::class);
-		$this->session = $this->createMock(ISession::class);
-		$this->initialStateService = $this->createMock(IInitialStateService::class);
 		$this->uid = 'test123';
 
 		$this->section = new Security(
 			$this->userManager,
-			$this->twoFactorManager,
-			$this->authTokenProvider,
 			$this->providerLoader,
 			$this->userSession,
-			$this->session,
 			$this->config,
-			$this->initialStateService,
 			$this->uid
 		);
 	}
 
 	public function testGetForm() {
-		$token1 = new DefaultToken();
-		$token1->setId(100);
-		$token2 = new DefaultToken();
-		$token2->setId(200);
-		$tokens = [
-			$token1,
-			$token2,
-		];
-		$sessionToken = new DefaultToken();
-		$sessionToken->setId(100);
 		$user = $this->createMock(IUser::class);
 		$this->userManager->expects($this->once())
 			->method('get')
@@ -117,40 +81,6 @@ class SecurityTest extends TestCase {
 		$user->expects($this->once())
 			->method('canChangePassword')
 			->willReturn(true);
-		$this->authTokenProvider->expects($this->once())
-			->method('getTokenByUser')
-			->with($this->uid)
-			->willReturn($tokens);
-		$this->session->expects($this->once())
-			->method('getId')
-			->willReturn('session123');
-		$this->authTokenProvider->expects($this->once())
-			->method('getToken')
-			->with('session123')
-			->willReturn($sessionToken);
-		$this->initialStateService->expects($this->once())
-			->method('provideInitialState')
-			->with('settings', 'app_tokens', [
-				[
-					'id' => 100,
-					'name' => null,
-					'lastActivity' => 0,
-					'type' => 0,
-					'canDelete' => false,
-					'current' => true,
-					'scope' => ['filesystem' => true],
-					'canRename' => false,
-				],
-				[
-					'id' => 200,
-					'name' => null,
-					'lastActivity' => 0,
-					'type' => 0,
-					'canDelete' => true,
-					'scope' => ['filesystem' => true],
-					'canRename' => true,
-				],
-			]);
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->willReturn($user);