Allow overwriting isAuthenticated

* Some implementations might check for different things * IT will not change how the current ones work Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Mar 9, 2021 · 30e096f · 30e096f
1 parent 7198bed
commit 30e096f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 20 deletions.
diff --git a/lib/public/AppFramework/PublicShareController.php b/lib/public/AppFramework/PublicShareController.php
@@ -109,7 +109,7 @@ abstract protected function isPasswordProtected(): bool;
 	 *
 	 * @since 14.0.0
 	 */
-	final public function isAuthenticated(): bool {
+	public function isAuthenticated(): bool {
 		// Always authenticated against non password protected shares
 		if (!$this->isPasswordProtected()) {
 			return true;

diff --git a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php
@@ -27,34 +27,53 @@
 use OCP\IRequest;
 use OCP\ISession;
 
+class TestController extends PublicShareController {
+
+	/** @var string */
+	private $hash;
+
+	/** @var bool */
+	private $isProtected;
+
+	public function __construct(string $appName, IRequest $request, ISession $session, string $hash, bool $isProtected) {
+		parent::__construct($appName, $request, $session);
+
+		$this->hash = $hash;
+		$this->isProtected = $isProtected;
+	}
+
+	protected function getPasswordHash(): string {
+		return $this->hash;
+	}
+
+	public function isValidToken(): bool {
+		return false;
+	}
+
+	protected function isPasswordProtected(): bool {
+		return $this->isProtected;
+	}
+}
+
 class PublicShareControllerTest extends \Test\TestCase {
 
 	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
 	private $request;
 	/** @var ISession|\PHPUnit\Framework\MockObject\MockObject */
 	private $session;
 
-	/** @var PublicShareController|\PHPUnit\Framework\MockObject\MockObject */
-	private $controller;
-
-
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
 		$this->session = $this->createMock(ISession::class);
-
-		$this->controller = $this->getMockBuilder(PublicShareController::class)
-			->setConstructorArgs([
-				'app',
-				$this->request,
-				$this->session
-			])->getMock();
 	}
 
 	public function testGetToken() {
-		$this->controller->setToken('test');
-		$this->assertEquals('test', $this->controller->getToken());
+		$controller = new TestController('app', $this->request, $this->session, 'hash', false);
+
+		$controller->setToken('test');
+		$this->assertEquals('test', $controller->getToken());
 	}
 
 	public function dataIsAuthenticated() {
@@ -74,19 +93,16 @@ public function dataIsAuthenticated() {
 	 * @dataProvider dataIsAuthenticated
 	 */
 	public function testIsAuthenticatedNotPasswordProtected(bool $protected, string $token1, string $token2, string $hash1, string $hash2, bool $expected) {
-		$this->controller->method('isPasswordProtected')
-			->willReturn($protected);
+		$controller = new TestController('app', $this->request, $this->session, $hash2, $protected);
 
 		$this->session->method('get')
 			->willReturnMap([
 				['public_link_authenticated_token', $token1],
 				['public_link_authenticated_password_hash', $hash1],
 			]);
 
-		$this->controller->setToken($token2);
-		$this->controller->method('getPasswordHash')
-			->willReturn($hash2);
+		$controller->setToken($token2);
 
-		$this->assertEquals($expected, $this->controller->isAuthenticated());
+		$this->assertEquals($expected, $controller->isAuthenticated());
 	}
 }