Add UserSubDomainsEnabled setter and getter to BaseServerConfig.

Author: Potherca

solid/lib/BaseServerConfig.php

@@ -4,7 +4,7 @@
 	use OCP\IConfig;
 
 	class BaseServerConfig {
-		private IConfig $config;
+		protected IConfig $config;
 
 		/**
 		 * @param IConfig $config
@@ -182,4 +182,12 @@ public function getClientRegistration($clientId) {
 			$data = $this->config->getAppValue('solid', "client-" . $clientId, "{}");
 			return json_decode($data, true);
 		}
+
+		public function getUserSubDomainsEnabled(): bool {
+			return $this->config->getAppValue('solid', 'userSubDomainsEnabled', false);
+		}
+
+		public function setUserSubDomainsEnabled(bool $enabled) {
+			$this->config->setAppValue('solid', 'userSubDomainsEnabled', $enabled);
+		}
 	}

solid/lib/Controller/GetStorageUrlTrait.php

@@ -42,7 +42,6 @@ protected function getStorageUrl($userId) {
 		// (?) $storageUrl = preg_replace('/foo$/', '', $storageUrl);
 		$storageUrl = preg_replace('/foo$/', '/', $storageUrl);
 
-		// @FIXME: $this->getUserSubDomainsEnabled should contain true/false from (?) somewhere
 		if ($this->config->getUserSubDomainsEnabled()) {
 			$url = parse_url($storageUrl);
 

solid/lib/ServerConfig.php

@@ -10,24 +10,19 @@
 	 * @package OCA\Solid
 	 */
 	class ServerConfig extends BaseServerConfig {
-		private IConfig $config;
 		private IUrlGenerator $urlGenerator;
 		private IUserManager $userManager;
-//		private bool $userDomains;
 
 		/**
 		 * @param IConfig $config
 		 * @param IUrlGenerator $urlGenerator
 		 * @param IUserManager $userManager
-		 * @param bool $userDomains
 		 */
-		public function __construct(IConfig $config, IUrlGenerator $urlGenerator, IUserManager $userManager
-//			, bool $userDomains
-		) {
+		public function __construct(IConfig $config, IUrlGenerator $urlGenerator, IUserManager $userManager) {
 			$this->config = $config;
 			$this->userManager = $userManager;
 			$this->urlGenerator = $urlGenerator;
-//			$this->userDomains = $userDomains;
+
 			parent::__construct($config);
 		}
 
@@ -67,11 +62,4 @@ public function setProfileData($userId, $profileData) {
 				$user->setDisplayName($fields['name']);
 			}
 		}
-		// public function getUserDomains() {
-		// 	return $this->userDomains;
-		// }
-		// public function setUserDomains($userDomains) {
-		// 	$this->userDomains = $userDomains;
-		// }
-
 	}

solid/tests/Unit/BaseServerConfigTest.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace Unit;
+
+use OCA\Solid\AppInfo\Application;
+use OCA\Solid\BaseServerConfig;
+use OCP\IConfig;
+use PHPUnit\Framework\TestCase;
+use TypeError;
+
+/**
+ * @coversDefaultClass \OCA\Solid\BaseServerConfig
+ * @covers ::__construct
+ */
+class BaseServerConfigTest extends TestCase
+{
+	/////////////////////////////////// TESTS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+	/**
+	 * @testdox BaseServerConfig should complain when called before given a Configuration
+	 * @covers ::__construct
+	 */
+	public function testConstructorWithoutConfig()
+	{
+		$this->expectException(TypeError::class);
+		$this->expectExceptionMessage('Too few arguments to function');
+
+		new BaseServerConfig();
+	}
+
+	/**
+	 * @testdox BaseServerConfig should be instantiated when given a valid Configuration
+	 * @covers ::__construct
+	 */
+	public function testConstructorWithValidConfig()
+	{
+		$configMock = $this->createMock(IConfig::class);
+
+		$baseServerConfig = new BaseServerConfig($configMock);
+
+		$this->assertInstanceOf(BaseServerConfig::class, $baseServerConfig);
+	}
+
+	/**
+	 * @testdox BaseServerConfig should return a boolean when asked whether UserSubDomains are Enabled
+	 * @covers ::getUserSubDomainsEnabled
+	 * @dataProvider provideBooleans
+	 */
+	public function testGetUserSubDomainsEnabled($expected)
+	{
+		$configMock = $this->createMock(IConfig::class);
+		$configMock->method('getAppValue')->willReturn($expected);
+
+		$baseServerConfig = new BaseServerConfig($configMock);
+		$actual = $baseServerConfig->getUserSubDomainsEnabled();
+
+		$this->assertEquals($expected, $actual);
+	}
+
+	/**
+	 * @testdox BaseServerConfig should get value from AppConfig when asked whether UserSubDomains are Enabled
+	 * @covers ::getUserSubDomainsEnabled
+	 */
+	public function testGetUserSubDomainsEnabledFromAppConfig()
+	{
+		$configMock = $this->createMock(IConfig::class);
+		$configMock->expects($this->atLeast(1))
+			->method('getAppValue')
+			->with(Application::APP_ID, 'userSubDomainsEnabled', false)
+			->willReturn(true);
+
+		$baseServerConfig = new BaseServerConfig($configMock);
+		$actual = $baseServerConfig->getUserSubDomainsEnabled();
+
+		$this->assertTrue($actual);
+	}
+
+	/**
+	 * @testdox BaseServerConfig should set value in AppConfig when asked to set UserSubDomainsEnabled
+	 * @covers ::setUserSubDomainsEnabled
+	 *
+	 * @dataProvider provideBooleans
+	 */
+	public function testSetUserSubDomainsEnabled($expected)
+	{
+		$configMock = $this->createMock(IConfig::class);
+		$configMock->expects($this->atLeast(1))
+			->method('setAppValue')
+			->with(Application::APP_ID, 'userSubDomainsEnabled', $expected)
+		;
+
+		$baseServerConfig = new BaseServerConfig($configMock);
+		$baseServerConfig->setUserSubDomainsEnabled($expected);
+	}
+
+	/////////////////////////////// DATAPROVIDERS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+	public function provideBooleans()
+	{
+		return [
+			'false' => [false],
+			'true' => [true],
+		];
+	}
+}