Add check for when a domain already starts with $userId, in which case it should not be prepended again.

Author: Potherca

solid/lib/Controller/GetStorageUrlTrait.php

@@ -44,9 +44,12 @@ protected function getStorageUrl($userId) {
 
 		// @FIXME: $this->getUserSubDomainsEnabled should contain true/false from (?) somewhere
 		if ($this->config->getUserSubDomainsEnabled()) {
-			// @FIXME: Check whether we are already on a domain that starts with $userId,
-			//          in which case it should not be prepended again
 			$url = parse_url($storageUrl);
+
+			if (strpos($url['host'], $userId . '.') !== false) {
+				$url['host'] = str_replace($userId . '.', '', $url['host']);
+			}
+
 			$url['host'] = $userId . '.' . $url['host']; // $storageUrl = $userId . '.' . $storageUrl;
 			$storageUrl = $this->build_url($url);
 		}

solid/tests/Unit/Controller/GetStorageUrlTraitTest.php

@@ -161,8 +161,8 @@ public function provideSubDomainsEnabledUrls()
 			['url' => 'http://example.com/foo', 'userId' => 'alice', 'expected' => 'http://alice.example.com//'],
 			['url' => 'https://bob.example.com/foo', 'userId' => 'alice', 'expected' => 'https://alice.bob.example.com//'],
 			['url' => 'http://bob.example.com/foo', 'userId' => 'alice', 'expected' => 'http://alice.bob.example.com//'],
-			['url' => 'https://bob.example.com/foo', 'userId' => 'bob', 'expected' => 'https://bob.bob.example.com//'],
-			['url' => 'http://bob.example.com/foo', 'userId' => 'bob', 'expected' => 'http://bob.bob.example.com//'],
+			['url' => 'https://bob.example.com/foo', 'userId' => 'bob', 'expected' => 'https://bob.example.com//'],
+			['url' => 'http://bob.example.com/foo', 'userId' => 'bob', 'expected' => 'http://bob.example.com//'],
 		];
 	}
 }