Merge pull request #16594 from nextcloud/tech-debt/noid/remove-unused…

…-checkPasswordProtectedShare Remove unused OC\Share\Share::checkPasswordProtectedShare
nextcloud · Jul 30, 2019 · d4eb848 · d4eb848
2 parents 53330ce + 98237d2
commit d4eb848
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 58 deletions.
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
@@ -1326,35 +1326,6 @@ private static function insertShare(array $shareData) {
 
 	}
 
-	/**
-	 * In case a password protected link is not yet authenticated this function will return false
-	 *
-	 * @param array $linkItem
-	 * @return boolean
-	 */
-	public static function checkPasswordProtectedShare(array $linkItem) {
-		if (!isset($linkItem['share_with'])) {
-			return true;
-		}
-		if (!isset($linkItem['share_type'])) {
-			return true;
-		}
-		if (!isset($linkItem['id'])) {
-			return true;
-		}
-
-		if ($linkItem['share_type'] != \OCP\Share::SHARE_TYPE_LINK) {
-			return true;
-		}
-
-		if ( \OC::$server->getSession()->exists('public_link_authenticated')
-			&& \OC::$server->getSession()->get('public_link_authenticated') === (string)$linkItem['id'] ) {
-			return true;
-		}
-
-		return false;
-	}
-
 	/**
 	 * construct select statement
 	 * @param int $format

diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php
@@ -222,35 +222,6 @@ public function verifyResult($result, $expected) {
 		$this->assertEmpty($expected, 'did not found all expected values');
 	}
 
-	/**
-	 * @dataProvider checkPasswordProtectedShareDataProvider
-	 * @param $expected
-	 * @param $item
-	 */
-	public function testCheckPasswordProtectedShare($expected, $item) {
-		\OC::$server->getSession()->set('public_link_authenticated', '100');
-		$result = \OC\Share\Share::checkPasswordProtectedShare($item);
-		$this->assertEquals($expected, $result);
-	}
-
-	function checkPasswordProtectedShareDataProvider() {
-		return array(
-			array(true, array()),
-			array(true, array('share_with' => null)),
-			array(true, array('share_with' => '')),
-			array(true, array('share_with' => '1234567890', 'share_type' => '1')),
-			array(true, array('share_with' => '1234567890', 'share_type' => 1)),
-			array(true, array('share_with' => '1234567890', 'share_type' => '3', 'id' => '100')),
-			array(true, array('share_with' => '1234567890', 'share_type' => 3, 'id' => '100')),
-			array(true, array('share_with' => '1234567890', 'share_type' => '3', 'id' => 100)),
-			array(true, array('share_with' => '1234567890', 'share_type' => 3, 'id' => 100)),
-			array(false, array('share_with' => '1234567890', 'share_type' => '3', 'id' => '101')),
-			array(false, array('share_with' => '1234567890', 'share_type' => 3, 'id' => '101')),
-			array(false, array('share_with' => '1234567890', 'share_type' => '3', 'id' => 101)),
-			array(false, array('share_with' => '1234567890', 'share_type' => 3, 'id' => 101)),
-		);
-	}
-
 	/**
 	 * @dataProvider urls
 	 * @param string $url