Remove unused OC\Share\Share::checkPasswordProtectedShare
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
parent
51197ac622
commit
98237d2a00
|
@ -1326,35 +1326,6 @@ class Share extends Constants {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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
|
* construct select statement
|
||||||
* @param int $format
|
* @param int $format
|
||||||
|
|
|
@ -222,35 +222,6 @@ class ShareTest extends \Test\TestCase {
|
||||||
$this->assertEmpty($expected, 'did not found all expected values');
|
$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
|
* @dataProvider urls
|
||||||
* @param string $url
|
* @param string $url
|
||||||
|
|
Loading…
Reference in New Issue