diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php deleted file mode 100644 index 7d59d68ca6..0000000000 --- a/apps/files_sharing/api/local.php +++ /dev/null @@ -1,645 +0,0 @@ - - * @author Joas Schilling - * @author Lukas Reschke - * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma - * @author Thomas Müller - * @author Vincent Petry - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see - * - */ - -namespace OCA\Files_Sharing\API; - -use OC\HintException; - -class Local { - - /** - * get all shares - * - * @param array $params option 'file' to limit the result to a specific file/folder - * @return \OC_OCS_Result share information - */ - public static function getAllShares($params) { - if (isset($_GET['shared_with_me']) && $_GET['shared_with_me'] !== 'false') { - return self::getFilesSharedWithMe(); - } - // if a file is specified, get the share for this file - if (isset($_GET['path'])) { - if ( isset($_GET['reshares']) && $_GET['reshares'] !== 'false' ) { - $reshares = true; - } else { - $reshares = false; - } - - if (isset($_GET['subfiles']) && $_GET['subfiles'] !== 'false') { - return self::getSharesFromFolder($_GET['path']); - } - return self::collectShares(self::getFileId($_GET['path']), - self::getItemType($_GET['path']), - false, - $_GET['path'], - $reshares); - } - - $shares = \OCP\Share::getItemShared('file', null); - - if ($shares === false) { - return new \OC_OCS_Result(null, 404, 'could not get shares'); - } else { - $mimetypeDetector = \OC::$server->getMimeTypeDetector(); - foreach ($shares as &$share) { - if ($share['item_type'] === 'file' && isset($share['path'])) { - $share['mimetype'] = $mimetypeDetector->detectPath($share['path']); - if (\OC::$server->getPreviewManager()->isMimeSupported($share['mimetype'])) { - $share['isPreviewAvailable'] = true; - } - } - - if (!is_null($share['token'])) { - $share['url'] = \OC::$server->getURLGenerator()->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share['token']]); - } - } - return new \OC_OCS_Result($shares); - } - - } - - /** - * get share information for a given share - * - * @param array $params which contains a 'id' - * @return \OC_OCS_Result share information - */ - public static function getShare($params) { - - $s = self::getShareFromId($params['id']); - - return self::collectShares($s['file_source'], $s['item_type'], true, null, false, (int)$params['id']); - } - - /** - * collect all share information, either of a specific share or all - * shares for a given path - * - * @param string $itemSource - * @param string $itemType - * @param bool $getSpecificShare - * @param string $path - * @param bool $reshares - * @param int $id - * - * @return \OC_OCS_Result - */ - private static function collectShares($itemSource, $itemType, $getSpecificShare = false, $path = null, $reshares = false, $id = null) { - if ($itemSource !== null) { - $shares = \OCP\Share::getItemShared($itemType, $itemSource); - $receivedFrom = \OCP\Share::getItemSharedWithBySource($itemType, $itemSource); - // if a specific share was specified only return this one - if ($getSpecificShare === true) { - foreach ($shares as $share) { - if ($share['id'] === $id) { - $shares = array('element' => $share); - break; - } - } - } else { - foreach ($shares as $key => $share) { - $shares[$key]['path'] = $path; - } - } - - - // include also reshares in the lists. This means that the result - // will contain every user with access to the file. - if ($reshares === true) { - $shares = self::addReshares($shares, $itemSource); - } - - if ($receivedFrom) { - foreach ($shares as $key => $share) { - $shares[$key]['received_from'] = $receivedFrom['uid_owner']; - $shares[$key]['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']); - } - } - } else { - $shares = null; - } - - if ($shares === null || empty($shares)) { - return new \OC_OCS_Result(null, 404, 'share doesn\'t exist'); - } else { - foreach ($shares as &$share) { - if (!is_null($share['token'])) { - $share['url'] = \OC::$server->getURLGenerator()->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share['token']]); - } - } - - return new \OC_OCS_Result($shares); - } - } - - /** - * add reshares to a array of shares - * @param array $shares array of shares - * @param int $itemSource item source ID - * @return array new shares array which includes reshares - */ - private static function addReshares($shares, $itemSource) { - - // if there are no shares than there are also no reshares - $firstShare = reset($shares); - if ($firstShare) { - $path = $firstShare['path']; - } else { - return $shares; - } - - $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path` , `*PREFIX*share`.`permissions`, `stime`, `expiration`, `token`, `storage`, `mail_send`, `mail_send`'; - $getReshares = \OCP\DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*share`.`file_source` = ? AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\') AND `uid_owner` != ?'); - $reshares = $getReshares->execute(array($itemSource, \OCP\User::getUser()))->fetchAll(); - - foreach ($reshares as $key => $reshare) { - if (isset($reshare['share_with']) && $reshare['share_with'] !== '') { - $reshares[$key]['share_with_displayname'] = \OCP\User::getDisplayName($reshare['share_with']); - } - // add correct path to the result - $reshares[$key]['path'] = $path; - } - - return array_merge($shares, $reshares); - } - - /** - * get share from all files in a given folder (non-recursive) - * @param string $path - * @return \OC_OCS_Result - */ - private static function getSharesFromFolder($path) { - $view = new \OC\Files\View('/'.\OCP\User::getUser().'/files'); - - if(!$view->is_dir($path)) { - return new \OC_OCS_Result(null, 400, "not a directory"); - } - - $content = $view->getDirectoryContent($path); - - $result = array(); - foreach ($content as $file) { - // workaround because folders are named 'dir' in this context - $itemType = $file['type'] === 'file' ? 'file' : 'folder'; - $share = \OCP\Share::getItemShared($itemType, $file['fileid']); - if($share) { - $receivedFrom = \OCP\Share::getItemSharedWithBySource($itemType, $file['fileid']); - reset($share); - $key = key($share); - if ($receivedFrom) { - $share[$key]['received_from'] = $receivedFrom['uid_owner']; - $share[$key]['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']); - } - $result = array_merge($result, $share); - } - } - - return new \OC_OCS_Result($result); - } - - /** - * get files shared with the user - * @return \OC_OCS_Result - */ - private static function getFilesSharedWithMe() { - try { - $shares = \OCP\Share::getItemsSharedWith('file'); - $mimetypeDetector = \OC::$server->getMimeTypeDetector(); - foreach ($shares as &$share) { - if ($share['item_type'] === 'file') { - $share['mimetype'] = $mimetypeDetector->detectPath($share['file_target']); - if (\OC::$server->getPreviewManager()->isMimeSupported($share['mimetype'])) { - $share['isPreviewAvailable'] = true; - } - unset($share['path']); - } - } - $result = new \OC_OCS_Result($shares); - } catch (\Exception $e) { - $result = new \OC_OCS_Result(null, 403, $e->getMessage()); - } - - return $result; - - } - - /** - * create a new share - * @param array $params - * @return \OC_OCS_Result - */ - public static function createShare($params) { - - $path = isset($_POST['path']) ? $_POST['path'] : null; - - if($path === null) { - return new \OC_OCS_Result(null, 400, "please specify a file or folder path"); - } - $itemSource = self::getFileId($path); - $itemSourceName = $itemSource; - $itemType = self::getItemType($path); - $expirationDate = null; - - if($itemSource === null) { - return new \OC_OCS_Result(null, 404, "wrong path, file/folder doesn't exist."); - } - - $shareWith = isset($_POST['shareWith']) ? $_POST['shareWith'] : null; - $shareType = isset($_POST['shareType']) ? (int)$_POST['shareType'] : null; - - switch($shareType) { - case \OCP\Share::SHARE_TYPE_REMOTE: - $shareWith = rtrim($shareWith, '/'); - $itemSourceName = basename($path); - case \OCP\Share::SHARE_TYPE_USER: - case \OCP\Share::SHARE_TYPE_GROUP: - $permissions = isset($_POST['permissions']) ? (int)$_POST['permissions'] : 31; - break; - case \OCP\Share::SHARE_TYPE_LINK: - //allow password protection - $shareWith = isset($_POST['password']) ? $_POST['password'] : null; - //check public link share - $publicUploadEnabled = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes'); - if(isset($_POST['publicUpload']) && $publicUploadEnabled !== 'yes') { - return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator"); - } - $publicUpload = isset($_POST['publicUpload']) ? $_POST['publicUpload'] : 'false'; - // read, create, update (7) if public upload is enabled or - // read (1) if public upload is disabled - $permissions = $publicUpload === 'true' ? 7 : 1; - - // Get the expiration date - try { - $expirationDate = isset($_POST['expireDate']) ? self::parseDate($_POST['expireDate']) : null; - } catch (\Exception $e) { - return new \OC_OCS_Result(null, 404, 'Invalid Date. Format must be YYYY-MM-DD.'); - } - - break; - default: - return new \OC_OCS_Result(null, 400, "unknown share type"); - } - - if (($permissions & \OCP\Constants::PERMISSION_READ) === 0) { - return new \OC_OCS_Result(null, 400, 'invalid permissions'); - } - - try { - $token = \OCP\Share::shareItem( - $itemType, - $itemSource, - $shareType, - $shareWith, - $permissions, - $itemSourceName, - $expirationDate - ); - } catch (HintException $e) { - if ($e->getCode() === 0) { - return new \OC_OCS_Result(null, 400, $e->getHint()); - } else { - return new \OC_OCS_Result(null, $e->getCode(), $e->getHint()); - } - } catch (\Exception $e) { - return new \OC_OCS_Result(null, 403, $e->getMessage()); - } - - if ($token) { - $data = array(); - $data['id'] = 'unknown'; - $shares = \OCP\Share::getItemShared($itemType, $itemSource); - if(is_string($token)) { //public link share - foreach ($shares as $share) { - if ($share['token'] === $token) { - $data['id'] = $share['id']; - break; - } - } - $data['url'] = \OC::$server->getURLGenerator()->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $token]); - $data['token'] = $token; - - } else { - foreach ($shares as $share) { - if ($share['share_with'] === $shareWith && $share['share_type'] === $shareType) { - $data['id'] = $share['id']; - break; - } - } - } - - $data['permissions'] = $share['permissions']; - $data['expiration'] = $share['expiration']; - - return new \OC_OCS_Result($data); - } else { - return new \OC_OCS_Result(null, 404, "couldn't share file"); - } - } - - /** - * update shares, e.g. password, permissions, etc - * @param array $params shareId 'id' and the parameter we want to update - * currently supported: permissions, password, publicUpload - * @return \OC_OCS_Result - */ - public static function updateShare($params) { - - $share = self::getShareFromId($params['id']); - - if(!isset($share['file_source'])) { - return new \OC_OCS_Result(null, 404, "wrong share Id, share doesn't exist."); - } - - try { - if(isset($params['_put']['permissions'])) { - return self::updatePermissions($share, $params); - } elseif (isset($params['_put']['password'])) { - return self::updatePassword($params['id'], (int)$share['share_type'], $params['_put']['password']); - } elseif (isset($params['_put']['publicUpload'])) { - return self::updatePublicUpload($share, $params); - } elseif (isset($params['_put']['expireDate'])) { - return self::updateExpireDate($share, $params); - } - } catch (\Exception $e) { - - return new \OC_OCS_Result(null, 400, $e->getMessage()); - } - - return new \OC_OCS_Result(null, 400, "Wrong or no update parameter given"); - } - - /** - * update permissions for a share - * @param array $share information about the share - * @param array $params contains 'permissions' - * @return \OC_OCS_Result - */ - private static function updatePermissions($share, $params) { - - $itemSource = $share['item_source']; - $itemType = $share['item_type']; - $shareWith = $share['share_with']; - $shareType = $share['share_type']; - $permissions = isset($params['_put']['permissions']) ? (int)$params['_put']['permissions'] : null; - - $publicUploadStatus = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes'); - $publicUploadEnabled = ($publicUploadStatus === 'yes') ? true : false; - - - // only change permissions for public shares if public upload is enabled - // and we want to set permissions to 1 (read only) or 7 (allow upload) - if ( (int)$shareType === \OCP\Share::SHARE_TYPE_LINK ) { - if ($publicUploadEnabled === false || ($permissions !== 7 && $permissions !== 1)) { - return new \OC_OCS_Result(null, 400, "can't change permission for public link share"); - } - } - - if (($permissions & \OCP\Constants::PERMISSION_READ) === 0) { - return new \OC_OCS_Result(null, 400, 'invalid permissions'); - } - - try { - $return = \OCP\Share::setPermissions( - $itemType, - $itemSource, - $shareType, - $shareWith, - $permissions - ); - } catch (\Exception $e) { - return new \OC_OCS_Result(null, 404, $e->getMessage()); - } - - if ($return) { - return new \OC_OCS_Result(); - } else { - return new \OC_OCS_Result(null, 404, "couldn't set permissions"); - } - } - - /** - * enable/disable public upload - * @param array $share information about the share - * @param array $params contains 'publicUpload' which can be 'yes' or 'no' - * @return \OC_OCS_Result - */ - private static function updatePublicUpload($share, $params) { - - $publicUploadEnabled = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes'); - if($publicUploadEnabled !== 'yes') { - return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator"); - } - - if ($share['item_type'] !== 'folder' || - (int)$share['share_type'] !== \OCP\Share::SHARE_TYPE_LINK ) { - return new \OC_OCS_Result(null, 400, "public upload is only possible for public shared folders"); - } - - // read, create, update (7) if public upload is enabled or - // read (1) if public upload is disabled - $params['_put']['permissions'] = $params['_put']['publicUpload'] === 'true' ? 7 : 1; - - return self::updatePermissions($share, $params); - - } - - /** - * set expire date for public link share - * @param array $share information about the share - * @param array $params contains 'expireDate' which needs to be a well formated date string, e.g DD-MM-YYYY - * @return \OC_OCS_Result - */ - private static function updateExpireDate($share, $params) { - // only public links can have a expire date - if ((int)$share['share_type'] !== \OCP\Share::SHARE_TYPE_LINK ) { - return new \OC_OCS_Result(null, 400, "expire date only exists for public link shares"); - } - - try { - $expireDateSet = \OCP\Share::setExpirationDate($share['item_type'], $share['item_source'], $params['_put']['expireDate'], (int)$share['stime']); - $result = ($expireDateSet) ? new \OC_OCS_Result() : new \OC_OCS_Result(null, 404, "couldn't set expire date"); - } catch (\Exception $e) { - $result = new \OC_OCS_Result(null, 404, $e->getMessage()); - } - - return $result; - - } - - /** - * update password for public link share - * @param int $shareId - * @param int $shareType - * @param string $password - * @return \OC_OCS_Result - */ - private static function updatePassword($shareId, $shareType, $password) { - if($shareType !== \OCP\Share::SHARE_TYPE_LINK) { - return new \OC_OCS_Result(null, 400, "password protection is only supported for public shares"); - } - - if($password === '') { - $password = null; - } - - try { - $result = \OCP\Share::setPassword($shareId, $password); - } catch (\Exception $e) { - return new \OC_OCS_Result(null, 403, $e->getMessage()); - } - - if($result) { - return new \OC_OCS_Result(); - } - - return new \OC_OCS_Result(null, 404, "couldn't set password"); - } - - /** - * unshare a file/folder - * @param array $params contains the shareID 'id' which should be unshared - * @return \OC_OCS_Result - */ - public static function deleteShare($params) { - - $share = self::getShareFromId($params['id']); - $fileSource = isset($share['file_source']) ? $share['file_source'] : null; - $itemType = isset($share['item_type']) ? $share['item_type'] : null;; - - if($fileSource === null) { - return new \OC_OCS_Result(null, 404, "wrong share ID, share doesn't exist."); - } - - $shareWith = isset($share['share_with']) ? $share['share_with'] : null; - $shareType = isset($share['share_type']) ? (int)$share['share_type'] : null; - - if( $shareType === \OCP\Share::SHARE_TYPE_LINK) { - $shareWith = null; - } - - try { - $return = \OCP\Share::unshare( - $itemType, - $fileSource, - $shareType, - $shareWith); - } catch (\Exception $e) { - return new \OC_OCS_Result(null, 404, $e->getMessage()); - } - - if ($return) { - return new \OC_OCS_Result(); - } else { - $msg = "Unshare Failed"; - return new \OC_OCS_Result(null, 404, $msg); - } - } - - /** - * Make sure that the passed date is valid ISO 8601 - * So YYYY-MM-DD - * If not throw an exception - * - * @param string $expireDate - * - * @throws \Exception - * @return \DateTime - */ - private static function parseDate($expireDate) { - if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $expireDate) === 0) { - throw new \Exception('Invalid date. Format must be YYYY-MM-DD'); - } - - $date = new \DateTime($expireDate); - - if ($date === false) { - throw new \Exception('Invalid date. Format must be YYYY-MM-DD'); - } - - return $date; - } - - /** - * get file ID from a given path - * @param string $path - * @return string fileID or null - */ - private static function getFileId($path) { - - $view = new \OC\Files\View('/'.\OCP\User::getUser().'/files'); - $fileId = null; - $fileInfo = $view->getFileInfo($path); - if ($fileInfo) { - $fileId = $fileInfo['fileid']; - } - - return $fileId; - } - - /** - * get itemType - * @param string $path - * @return string type 'file', 'folder' or null of file/folder doesn't exists - */ - private static function getItemType($path) { - $view = new \OC\Files\View('/'.\OCP\User::getUser().'/files'); - $itemType = null; - - if ($view->is_dir($path)) { - $itemType = "folder"; - } elseif ($view->is_file($path)) { - $itemType = "file"; - } - - return $itemType; - } - - /** - * get some information from a given share - * @param int $shareID - * @return array with: item_source, share_type, share_with, item_type, permissions - */ - private static function getShareFromId($shareID) { - $sql = 'SELECT `file_source`, `item_source`, `share_type`, `share_with`, `item_type`, `permissions`, `stime` FROM `*PREFIX*share` WHERE `id` = ?'; - $args = array($shareID); - $query = \OCP\DB::prepare($sql); - $result = $query->execute($args); - - if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('files_sharing', \OCP\DB::getErrorMessage(), \OCP\Util::ERROR); - return null; - } - if ($share = $result->fetchRow()) { - return $share; - } - - return null; - - } - -} diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php index 3a2ae1eef3..08f8b6f243 100644 --- a/apps/files_sharing/tests/api.php +++ b/apps/files_sharing/tests/api.php @@ -43,6 +43,9 @@ class Test_Files_Sharing_Api extends TestCase { /** @var \OCP\Share\IManager */ private $shareManager; + /** @var \OCP\Files\Folder */ + private $userFolder; + protected function setUp() { parent::setUp(); @@ -64,6 +67,7 @@ class Test_Files_Sharing_Api extends TestCase { $this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data); $this->shareManager = \OC::$server->getShareManager(); + $this->userFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1); } protected function tearDown() { @@ -100,6 +104,7 @@ class Test_Files_Sharing_Api extends TestCase { */ private function createOCS($request, $userId) { $currentUser = \OC::$server->getUserManager()->get($userId); + return new \OCA\Files_Sharing\API\Share20OCS( $this->shareManager, \OC::$server->getGroupManager(), @@ -116,99 +121,105 @@ class Test_Files_Sharing_Api extends TestCase { */ function testCreateShareUserFile() { // simulate a post request - $_POST['path'] = $this->filename; - $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER; + $data['path'] = $this->filename; + $data['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; + $data['shareType'] = \OCP\Share::SHARE_TYPE_USER; - $result = \OCA\Files_Sharing\API\Local::createShare([]); + $request = $this->createRequest($data); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertTrue($result->succeeded()); $data = $result->getData(); - $this->assertEquals(23, $data['permissions']); + $this->assertEquals(19, $data['permissions']); $this->assertEmpty($data['expiration']); - $share = $this->getShareFromId($data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - $this->assertTrue(!empty($items)); + $this->shareManager->getShareById('ocinternal:'.$data['id']); - $fileinfo = $this->view->getFileInfo($this->filename); - \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($data['id']); + $this->assertTrue($result->succeeded()); } function testCreateShareUserFolder() { // simulate a post request - $_POST['path'] = $this->folder; - $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER; + $data['path'] = $this->folder; + $data['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; + $data['shareType'] = \OCP\Share::SHARE_TYPE_USER; - $result = \OCA\Files_Sharing\API\Local::createShare([]); + $request = $this->createRequest($data); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertTrue($result->succeeded()); $data = $result->getData(); $this->assertEquals(31, $data['permissions']); $this->assertEmpty($data['expiration']); - $share = $this->getShareFromId($data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - $this->assertTrue(!empty($items)); + $this->shareManager->getShareById('ocinternal:'.$data['id']); - $fileinfo = $this->view->getFileInfo($this->folder); - \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($data['id']); + $this->assertTrue($result->succeeded()); } function testCreateShareGroupFile() { // simulate a post request - $_POST['path'] = $this->filename; - $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_GROUP; + $data['path'] = $this->filename; + $data['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1; + $data['shareType'] = \OCP\Share::SHARE_TYPE_GROUP; - $result = \OCA\Files_Sharing\API\Local::createShare([]); + $request = $this->createRequest($data); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertTrue($result->succeeded()); $data = $result->getData(); - $this->assertEquals(23, $data['permissions']); + $this->assertEquals(19, $data['permissions']); $this->assertEmpty($data['expiration']); - $share = $this->getShareFromId($data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - $this->assertTrue(!empty($items)); + $this->shareManager->getShareById('ocinternal:'.$data['id']); - $fileinfo = $this->view->getFileInfo($this->filename); - \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($data['id']); + $this->assertTrue($result->succeeded()); } function testCreateShareGroupFolder() { // simulate a post request - $_POST['path'] = $this->folder; - $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_GROUP; + $data['path'] = $this->folder; + $data['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1; + $data['shareType'] = \OCP\Share::SHARE_TYPE_GROUP; - $result = \OCA\Files_Sharing\API\Local::createShare([]); + $request = $this->createRequest($data); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertTrue($result->succeeded()); $data = $result->getData(); $this->assertEquals(31, $data['permissions']); $this->assertEmpty($data['expiration']); - $share = $this->getShareFromId($data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - $this->assertTrue(!empty($items)); + $this->shareManager->getShareById('ocinternal:'.$data['id']); - $fileinfo = $this->view->getFileInfo($this->folder); - \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($data['id']); + $this->assertTrue($result->succeeded()); } public function testCreateShareLink() { // simulate a post request - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; + $data['path'] = $this->folder; + $data['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - $result = \OCA\Files_Sharing\API\Local::createShare([]); + $request = $this->createRequest($data); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); // check if API call was successful $this->assertTrue($result->succeeded()); @@ -222,22 +233,23 @@ class Test_Files_Sharing_Api extends TestCase { $url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']); $this->assertEquals($url, $data['url']); + $this->shareManager->getShareById('ocinternal:'.$data['id']); - $share = $this->getShareFromId($data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - $this->assertTrue(!empty($items)); - - $fileinfo = $this->view->getFileInfo($this->folder); - \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($data['id']); + $this->assertTrue($result->succeeded()); } public function testCreateShareLinkPublicUpload() { // simulate a post request - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - $_POST['publicUpload'] = 'true'; + $data['path'] = $this->folder; + $data['shareType'] = \OCP\Share::SHARE_TYPE_LINK; + $data['publicUpload'] = 'true'; - $result = \OCA\Files_Sharing\API\Local::createShare(array()); + $request = $this->createRequest($data); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); // check if API call was successful $this->assertTrue($result->succeeded()); @@ -251,94 +263,76 @@ class Test_Files_Sharing_Api extends TestCase { $url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']); $this->assertEquals($url, $data['url']); + $this->shareManager->getShareById('ocinternal:'.$data['id']); - $share = $this->getShareFromId($data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - $this->assertTrue(!empty($items)); - - $fileinfo = $this->view->getFileInfo($this->folder); - \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($data['id']); + $this->assertTrue($result->succeeded()); } - /** - * @medium - */ - public function testCreateShareInvalidPermissions() { - - // simulate a post request - $_POST['path'] = $this->filename; - $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER; - $_POST['permissions'] = \OCP\Constants::PERMISSION_SHARE; - - $result = \OCA\Files_Sharing\API\Local::createShare([]); - - // share was successful? - $this->assertFalse($result->succeeded()); - $this->assertEquals(400, $result->getStatusCode()); - - $shares = \OCP\Share::getItemShared('file', null); - $this->assertCount(0, $shares); - - $fileinfo = $this->view->getFileInfo($this->filename); - \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - } - - function testEnfoceLinkPassword() { $appConfig = \OC::$server->getAppConfig(); $appConfig->setValue('core', 'shareapi_enforce_links_password', 'yes'); // don't allow to share link without a password - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; + $data['path'] = $this->folder; + $data['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - - $result = \OCA\Files_Sharing\API\Local::createShare(array()); + $request = $this->createRequest($data); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertFalse($result->succeeded()); - // don't allow to share link without a empty password - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - $_POST['password'] = ''; + $data = []; + $data['path'] = $this->folder; + $data['shareType'] = \OCP\Share::SHARE_TYPE_LINK; + $data['password'] = ''; - $result = \OCA\Files_Sharing\API\Local::createShare(array()); + $request = $this->createRequest($data); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertFalse($result->succeeded()); // share with password should succeed - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - $_POST['password'] = 'foo'; + $data = []; + $data['path'] = $this->folder; + $data['shareType'] = \OCP\Share::SHARE_TYPE_LINK; + $data['password'] = 'foo'; - $result = \OCA\Files_Sharing\API\Local::createShare(array()); + $request = $this->createRequest($data); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertTrue($result->succeeded()); $data = $result->getData(); // setting new password should succeed - $params = array(); - $params['id'] = $data['id']; - $params['_put'] = array(); - $params['_put']['password'] = 'bar'; - - $result = \OCA\Files_Sharing\API\Local::updateShare($params); + $data2 = [ + 'password' => 'bar', + ]; + $request = $this->createRequest($data2); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($data['id']); $this->assertTrue($result->succeeded()); // removing password should fail - $params = array(); - $params['id'] = $data['id']; - $params['_put'] = array(); - $params['_put']['password'] = ''; - - $result = \OCA\Files_Sharing\API\Local::updateShare($params); + $data2 = [ + 'password' => '', + ]; + $request = $this->createRequest($data2); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($data['id']); $this->assertFalse($result->succeeded()); // cleanup - $fileinfo = $this->view->getFileInfo($this->folder); - \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($data['id']); + $this->assertTrue($result->succeeded()); + $appConfig->setValue('core', 'shareapi_enforce_links_password', 'no'); } @@ -346,68 +340,61 @@ class Test_Files_Sharing_Api extends TestCase { * @medium */ function testSharePermissions() { - // sharing file to a user should work if shareapi_exclude_groups is set // to no \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no'); - $_POST['path'] = $this->filename; - $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER; + $post['path'] = $this->filename; + $post['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; + $post['shareType'] = \OCP\Share::SHARE_TYPE_USER; - $result = \OCA\Files_Sharing\API\Local::createShare(array()); + $request = $this->createRequest($post); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertTrue($result->succeeded()); $data = $result->getData(); - $share = $this->getShareFromId($data['id']); + $this->shareManager->getShareById('ocinternal:'.$data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - - $this->assertTrue(!empty($items)); - - $fileinfo = $this->view->getFileInfo($this->filename); - - $result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - - $this->assertTrue($result); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($data['id']); + $this->assertTrue($result->succeeded()); // exclude groups, but not the group the user belongs to. Sharing should still work \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'yes'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2'); - $_POST['path'] = $this->filename; - $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER; + $post = []; + $post['path'] = $this->filename; + $post['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; + $post['shareType'] = \OCP\Share::SHARE_TYPE_USER; - $result = \OCA\Files_Sharing\API\Local::createShare(array()); + $request = $this->createRequest($post); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertTrue($result->succeeded()); $data = $result->getData(); - $share = $this->getShareFromId($data['id']); + $this->shareManager->getShareById('ocinternal:' . $data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - - $this->assertTrue(!empty($items)); - - $fileinfo = $this->view->getFileInfo($this->filename); - - $result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - - $this->assertTrue($result); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($data['id']); + $this->assertTrue($result->succeeded()); // now we exclude the group the user belongs to ('group'), sharing should fail now \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', 'admin,group'); - $_POST['path'] = $this->filename; - $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER; + $post = []; + $post['path'] = $this->filename; + $post['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; + $post['shareType'] = \OCP\Share::SHARE_TYPE_USER; - $result = \OCA\Files_Sharing\API\Local::createShare(array()); - - $this->assertFalse($result->succeeded()); + $request = $this->createRequest($post); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); // cleanup \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no'); @@ -417,62 +404,72 @@ class Test_Files_Sharing_Api extends TestCase { /** * @medium - * @depends testCreateShareUserFile */ function testGetAllShares() { + $node = $this->userFolder->get($this->filename); - $fileinfo = $this->view->getFileInfo($this->filename); + $share = $this->shareManager->newShare(); + $share->setNode($node) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); - \OCP\Share::shareItem('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); + $share = $this->shareManager->createShare($share); - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); - - // test should return two shares created from testCreateShare() $this->assertTrue(count($result->getData()) === 1); - \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); + $this->shareManager->deleteShare($share); } function testGetAllSharesWithMe() { - $fileinfo1 = $this->view->getFileInfo($this->filename); - $fileinfo2 = $this->view->getFileInfo($this->folder.$this->filename); + $node1 = $this->userFolder->get($this->filename); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share1 = $this->shareManager->createShare($share1); - \OCP\Share::shareItem('file', $fileinfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - \OCP\Share::shareItem('folder', $fileinfo2['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); + $node2 = $this->userFolder->get($this->folder); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node2) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(31); + $share2 = $this->shareManager->createShare($share2); - self::loginHelper(self::TEST_FILES_SHARING_API_USER2); - - $_GET['shared_with_me'] = 1; - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $request = $this->createRequest(['shared_with_me' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER2); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); $this->assertTrue(count($result->getData()) === 2); - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - - \OCP\Share::unshare('file', $fileinfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - \OCP\Share::unshare('folder', $fileinfo2['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); + $this->shareManager->deleteShare($share1); + $this->shareManager->deleteShare($share2); } /** * @medium - * @depends testCreateShareLink */ function testPublicLinkUrl() { // simulate a post request - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; + $post['path'] = $this->folder; + $post['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - $result = \OCA\Files_Sharing\API\Local::createShare([]); + $request = $this->createRequest($post); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertTrue($result->succeeded()); + $data = $result->getData(); // check if we have a token @@ -484,27 +481,36 @@ class Test_Files_Sharing_Api extends TestCase { $this->assertEquals($url, $data['url']); // check for link in getall shares - $result = \OCA\Files_Sharing\API\Local::getAllShares([]); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); + $data = $result->getData(); $this->assertEquals($url, current($data)['url']); // check for path - $_GET['path'] = $this->folder; - $result = \OCA\Files_Sharing\API\Local::getAllShares([]); + $request = $this->createRequest(['path' => $this->folder]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); + $data = $result->getData(); $this->assertEquals($url, current($data)['url']); // check in share id - $result = \OCA\Files_Sharing\API\Local::getShare(['id' => $id]); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShare($id); $this->assertTrue($result->succeeded()); + $data = $result->getData(); $this->assertEquals($url, current($data)['url']); - //Clean up share - $fileinfo = $this->view->getFileInfo($this->folder); - \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($id); + $this->assertTrue($result->succeeded()); } /** @@ -513,29 +519,32 @@ class Test_Files_Sharing_Api extends TestCase { * @depends testCreateShareLink */ function testGetShareFromSource() { + $node = $this->userFolder->get($this->filename); + $share = $this->shareManager->newShare(); + $share->setNode($node) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share1 = $this->shareManager->createShare($share); - $fileInfo = $this->view->getFileInfo($this->filename); - - \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, - null, 1); - - $_GET['path'] = $this->filename; - - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $share = $this->shareManager->newShare(); + $share->setNode($node) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share2 = $this->shareManager->createShare($share); + $request = $this->createRequest(['path' => $this->filename]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); // test should return one share created from testCreateShare() $this->assertTrue(count($result->getData()) === 2); - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); - + $this->shareManager->deleteShare($share1); + $this->shareManager->deleteShare($share2); } /** @@ -544,53 +553,44 @@ class Test_Files_Sharing_Api extends TestCase { * @depends testCreateShareLink */ function testGetShareFromSourceWithReshares() { + $node = $this->userFolder->get($this->filename); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share1 = $this->shareManager->createShare($share1); - $fileInfo = $this->view->getFileInfo($this->filename); - - // share the file as user1 to user2 - \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // login as user2 and reshare the file to user3 - \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - - \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3, 31); - - // login as user1 again - \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1); - - $_GET['path'] = $this->filename; - - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER2) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER3) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share2 = $this->shareManager->createShare($share2); + $request = $this->createRequest(['path' => $this->filename]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); // test should return one share $this->assertTrue(count($result->getData()) === 1); // now also ask for the reshares - $_GET['reshares'] = 'true'; - - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $request = $this->createRequest(['path' => $this->filename, 'reshares' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShares(); + $this->assertTrue($result->succeeded()); $this->assertTrue($result->succeeded()); // now we should get two shares, the initial share and the reshare - $this->assertTrue(count($result->getData()) === 2); - - // unshare files again - - \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3); - - \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1); - - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); + $this->assertCount(2, $result->getData()); + $this->shareManager->deleteShare($share1); + $this->shareManager->deleteShare($share2); } /** @@ -598,95 +598,80 @@ class Test_Files_Sharing_Api extends TestCase { * @depends testCreateShareUserFile */ function testGetShareFromId() { - - $fileInfo = $this->view->getFileInfo($this->filename); - - $result = \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // share was successful? - $this->assertTrue($result); - - // get item to determine share ID - $result = \OCP\Share::getItemShared('file', $fileInfo['fileid']); - - $this->assertEquals(1, count($result)); - - // get first element - $share = reset($result); + $node = $this->userFolder->get($this->filename); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share1 = $this->shareManager->createShare($share1); // call getShare() with share ID - $params = array('id' => $share['id']); - $result = \OCA\Files_Sharing\API\Local::getShare($params); - + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShare($share1->getId()); $this->assertTrue($result->succeeded()); // test should return one share created from testCreateShare() $this->assertEquals(1, count($result->getData())); - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - + $this->shareManager->deleteShare($share1); } /** * @medium */ function testGetShareFromFolder() { + $node1 = $this->userFolder->get($this->filename); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share1 = $this->shareManager->createShare($share1); - $fileInfo1 = $this->view->getFileInfo($this->filename); - $fileInfo2 = $this->view->getFileInfo($this->folder.'/'.$this->filename); + $node2 = $this->userFolder->get($this->folder.'/'.$this->filename); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node2) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share2 = $this->shareManager->createShare($share2); - $result = \OCP\Share::shareItem('file', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // share was successful? - $this->assertTrue($result); - - $result = \OCP\Share::shareItem('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, - null, 1); - - // share was successful? - $this->assertTrue(is_string($result)); - - $_GET['path'] = $this->folder; - $_GET['subfiles'] = 'true'; - - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $request = $this->createRequest(['path' => $this->folder, 'subfiles' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); // test should return one share within $this->folder $this->assertTrue(count($result->getData()) === 1); - \OCP\Share::unshare('file', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - - \OCP\Share::unshare('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); + $this->shareManager->deleteShare($share1); + $this->shareManager->deleteShare($share2); } function testGetShareFromFolderWithFile() { + $node1 = $this->userFolder->get($this->filename); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share1 = $this->shareManager->createShare($share1); - $fileInfo1 = $this->view->getFileInfo($this->filename); - - $result = \OCP\Share::shareItem('file', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // share was successful? - $this->assertTrue($result); - - $_GET = [ - 'path' => $this->filename, - 'subfiles' => 1 - ]; - $result = \OCA\Files_Sharing\API\Local::getAllShares([]); + $request = $this->createRequest(['path' => $this->filename, 'subfiles' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->getShares(); $this->assertFalse($result->succeeded()); $this->assertEquals(400, $result->getStatusCode()); $this->assertEquals('not a directory', $result->getMeta()['message']); - \OCP\Share::unshare('file', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); + $this->shareManager->deleteShare($share1); } /** @@ -694,32 +679,30 @@ class Test_Files_Sharing_Api extends TestCase { * @medium */ function testGetShareFromFolderReshares() { + $node1 = $this->userFolder->get($this->folder); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(31); + $share1 = $this->shareManager->createShare($share1); - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + $node2 = $this->userFolder->get($this->folder.'/'.$this->filename); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node2) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share2 = $this->shareManager->createShare($share2); - $fileInfo1 = $this->view->getFileInfo($this->folder); - $fileInfo2 = $this->view->getFileInfo($this->folder.'/'.$this->filename); - $fileInfo3 = $this->view->getFileInfo($this->folder.'/' . $this->subfolder . '/' .$this->filename); - - // share root folder to user2 - $result = \OCP\Share::shareItem('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // share was successful? - $this->assertTrue($result); - - // login as user2 - self::loginHelper(self::TEST_FILES_SHARING_API_USER2); - - // share file in root folder - $result = \OCP\Share::shareItem('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1); - // share was successful? - $this->assertTrue(is_string($result)); - - // share file in subfolder - $result = \OCP\Share::shareItem('file', $fileInfo3['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1); - // share was successful? - $this->assertTrue(is_string($result)); + $node3 = $this->userFolder->get($this->folder.'/'.$this->subfolder.'/'.$this->filename); + $share3 = $this->shareManager->newShare(); + $share3->setNode($node3) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share3 = $this->shareManager->createShare($share3); $testValues=array( array('query' => $this->folder, @@ -729,11 +712,9 @@ class Test_Files_Sharing_Api extends TestCase { ); foreach ($testValues as $value) { - $_GET['path'] = $value['query']; - $_GET['subfiles'] = 'true'; - - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); - + $request = $this->createRequest(['path' => $value['query'], 'subfiles' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER2); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); // test should return one share within $this->folder @@ -743,15 +724,9 @@ class Test_Files_Sharing_Api extends TestCase { } // cleanup - - \OCP\Share::unshare('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); - \OCP\Share::unshare('file', $fileInfo3['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); - - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - - \OCP\Share::unshare('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - + $this->shareManager->deleteShare($share1); + $this->shareManager->deleteShare($share2); + $this->shareManager->deleteShare($share3); } /** @@ -759,52 +734,39 @@ class Test_Files_Sharing_Api extends TestCase { * @medium */ function testGetShareFromSubFolderReShares() { + $node1 = $this->userFolder->get($this->folder . $this->subfolder); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(31); + $share1 = $this->shareManager->createShare($share1); - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - - $fileInfo = $this->view->getFileInfo($this->folder . $this->subfolder); - - // share sub-folder to user2 - $result = \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // share was successful? - $this->assertTrue($result); - - // login as user2 - self::loginHelper(self::TEST_FILES_SHARING_API_USER2); - - // reshare subfolder - $result = \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1); - - // share was successful? - $this->assertTrue(is_string($result)); - - $_GET['path'] = '/'; - $_GET['subfiles'] = 'true'; - - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $node2 = \OC::$server->getRootFolder()->getUserFolder(self::TEST_FILES_SHARING_API_USER2)->get($this->subfolder); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node2) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share2 = $this->shareManager->createShare($share2); + $request = $this->createRequest(['path' => '/', 'subfiles' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER2); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); // test should return one share within $this->folder $data = $result->getData(); // we should get exactly one result - $this->assertEquals(1, count($data)); + $this->assertCount(1, $data); - $expectedPath = $this->subfolder; + $expectedPath = $this->folder . $this->subfolder; $this->assertEquals($expectedPath, $data[0]['path']); - // cleanup - $result = \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); - $this->assertTrue($result); - - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - $result = \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - $this->assertTrue($result); - + $this->shareManager->deleteShare($share2); + $this->shareManager->deleteShare($share1); } /** @@ -812,67 +774,48 @@ class Test_Files_Sharing_Api extends TestCase { * @medium */ function testGetShareFromFolderReReShares() { + $node1 = $this->userFolder->get($this->folder . $this->subfolder); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(31); + $share1 = $this->shareManager->createShare($share1); - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + $node2 = $this->userFolder->get($this->folder . $this->subfolder . $this->subsubfolder); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node2) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER2) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER3) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(31); + $share2 = $this->shareManager->createShare($share2); - $fileInfo1 = $this->view->getFileInfo($this->folder . $this->subfolder); - $fileInfo2 = $this->view->getFileInfo($this->folder . $this->subfolder . $this->subsubfolder); - - // share sub-folder to user2 - $result = \OCP\Share::shareItem('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // share was successful? - $this->assertTrue($result); - - // login as user2 - self::loginHelper(self::TEST_FILES_SHARING_API_USER2); - - // reshare subsubfolder - $result = \OCP\Share::shareItem('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3, 31); - // share was successful? - $this->assertTrue($result); - - // login as user3 - self::loginHelper(self::TEST_FILES_SHARING_API_USER3); - - $result = \OCP\Share::shareItem('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1); - // share was successful? - $this->assertTrue(is_string($result)); - - - $_GET['path'] = '/'; - $_GET['subfiles'] = 'true'; - - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $share3 = $this->shareManager->newShare(); + $share3->setNode($node2) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER3) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share3 = $this->shareManager->createShare($share3); + $request = $this->createRequest(['path' => '/', 'subfiles' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER3); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); // test should return one share within $this->folder $data = $result->getData(); // we should get exactly one result - $this->assertEquals(1, count($data)); + $this->assertCount(1, $data); - $expectedPath = $this->subsubfolder; + $expectedPath = $this->folder . $this->subfolder . $this->subsubfolder; $this->assertEquals($expectedPath, $data[0]['path']); - - // cleanup - $result = \OCP\Share::unshare('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); - $this->assertTrue($result); - - self::loginHelper(self::TEST_FILES_SHARING_API_USER2); - $result = \OCP\Share::unshare('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3); - $this->assertTrue($result); - - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - $result = \OCP\Share::unshare('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - $this->assertTrue($result); - + $this->shareManager->deleteShare($share1); + $this->shareManager->deleteShare($share2); + $this->shareManager->deleteShare($share3); } /** @@ -880,82 +823,57 @@ class Test_Files_Sharing_Api extends TestCase { * @medium */ function testGetShareMultipleSharedFolder() { + $node1 = $this->userFolder->get($this->folder . $this->subfolder); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(31); + $share1 = $this->shareManager->createShare($share1); - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + $node2 = $this->userFolder->get($this->folder); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node2) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(31); + $share2 = $this->shareManager->createShare($share2); - $fileInfo1 = $this->view->getFileInfo($this->folder); - $fileInfo2 = $this->view->getFileInfo($this->folder . $this->subfolder); - - - // share sub-folder to user2 - $result = \OCP\Share::shareItem('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // share was successful? - $this->assertTrue($result); - - // share folder to user2 - $result = \OCP\Share::shareItem('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // share was successful? - $this->assertTrue($result); - - - // login as user2 - self::loginHelper(self::TEST_FILES_SHARING_API_USER2); - - $result = \OCP\Share::shareItem('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1); - // share was successful? - $this->assertTrue(is_string($result)); - - - // ask for subfolder - $expectedPath1 = $this->subfolder; - $_GET['path'] = $expectedPath1; - - $result1 = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $share3 = $this->shareManager->newShare(); + $share3->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share3 = $this->shareManager->createShare($share3); + $request = $this->createRequest(['path' => $this->subfolder]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER2); + $result1 = $ocs->getShares(); $this->assertTrue($result1->succeeded()); // test should return one share within $this->folder $data1 = $result1->getData(); - $share1 = reset($data1); - - // ask for folder/subfolder - $expectedPath2 = $this->folder . $this->subfolder; - $_GET['path'] = $expectedPath2; - - $result2 = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $this->assertCount(1, $data1); + $s1 = reset($data1); + $request = $this->createRequest(['path' => $this->folder.$this->subfolder]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER2); + $result2 = $ocs->getShares(); $this->assertTrue($result2->succeeded()); // test should return one share within $this->folder $data2 = $result2->getData(); - $share2 = reset($data2); + $this->assertCount(1, $data2); + $s2 = reset($data2); + $this->assertEquals($this->folder.$this->subfolder, $s1['path']); + $this->assertEquals($this->folder.$this->subfolder, $s2['path']); - // validate results - // we should get exactly one result each time - $this->assertEquals(1, count($data1)); - $this->assertEquals(1, count($data2)); - - $this->assertEquals($expectedPath1, $share1['path']); - $this->assertEquals($expectedPath2, $share2['path']); - - - // cleanup - $result = \OCP\Share::unshare('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); - $this->assertTrue($result); - - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - $result = \OCP\Share::unshare('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - $this->assertTrue($result); - $result = \OCP\Share::unshare('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - $this->assertTrue($result); - + $this->shareManager->deleteShare($share1); + $this->shareManager->deleteShare($share2); + $this->shareManager->deleteShare($share3); } /** @@ -963,82 +881,65 @@ class Test_Files_Sharing_Api extends TestCase { * @medium */ function testGetShareFromFileReReShares() { + $node1 = $this->userFolder->get($this->folder . $this->subfolder); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(31); + $share1 = $this->shareManager->createShare($share1); - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + $user2Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2); + $node2 = $user2Folder->get($this->subfolder . $this->filename); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node2) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER2) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER3) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share2 = $this->shareManager->createShare($share2); - $fileInfo1 = $this->view->getFileInfo($this->folder . $this->subfolder); - $fileInfo2 = $this->view->getFileInfo($this->folder. $this->subfolder . $this->filename); - - // share sub-folder to user2 - $result = \OCP\Share::shareItem('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - // share was successful? - $this->assertTrue($result); - - // login as user2 - self::loginHelper(self::TEST_FILES_SHARING_API_USER2); - - // reshare subsubfolder - $result = \OCP\Share::shareItem('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3, 31); - // share was successful? - $this->assertTrue($result); - - // login as user3 - self::loginHelper(self::TEST_FILES_SHARING_API_USER3); - - $result = \OCP\Share::shareItem('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1); - // share was successful? - $this->assertTrue(is_string($result)); - - - $_GET['path'] = '/'; - $_GET['subfiles'] = 'true'; - - $result = \OCA\Files_Sharing\API\Local::getAllShares(array()); + $user3Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER3); + $node3 = $user3Folder->get($this->filename); + $share3 = $this->shareManager->newShare(); + $share3->setNode($node3) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER3) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share3 = $this->shareManager->createShare($share3); + $request = $this->createRequest(['path' => '/', 'subfiles' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER3); + $result = $ocs->getShares(); $this->assertTrue($result->succeeded()); // test should return one share within $this->folder $data = $result->getData(); // we should get exactly one result - $this->assertEquals(1, count($data)); + $this->assertCount(1, $data); - $expectedPath = $this->filename; + $expectedPath = $this->folder.$this->subfolder.$this->filename; $this->assertEquals($expectedPath, $data[0]['path']); - - // cleanup - $result = \OCP\Share::unshare('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); - $this->assertTrue($result); - - self::loginHelper(self::TEST_FILES_SHARING_API_USER2); - $result = \OCP\Share::unshare('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3); - $this->assertTrue($result); - - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - $result = \OCP\Share::unshare('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - $this->assertTrue($result); - + $this->shareManager->deleteShare($share1); + $this->shareManager->deleteShare($share2); + $this->shareManager->deleteShare($share3); } /** * @medium */ function testGetShareFromUnknownId() { - - $params = array('id' => 0); - - $result = \OCA\Files_Sharing\API\Local::getShare($params); + $request = $this->createRequest(['path' => '/', 'subfiles' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER3); + $result = $ocs->getShare(0); + $this->assertFalse($result->succeeded()); $this->assertEquals(404, $result->getStatusCode()); $meta = $result->getMeta(); - $this->assertEquals('share doesn\'t exist', $meta['message']); - + $this->assertEquals('wrong share ID, share doesn\'t exist.', $meta['message']); } /** @@ -1047,125 +948,58 @@ class Test_Files_Sharing_Api extends TestCase { * @depends testCreateShareLink */ function testUpdateShare() { + $node1 = $this->userFolder->get($this->filename); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share1 = $this->shareManager->createShare($share1); - $fileInfo = $this->view->getFileInfo($this->filename); - - $result = \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, \OCP\Constants::PERMISSION_ALL); - - // share was successful? - $this->assertTrue($result); - - $result = \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, - null, 1); - - // share was successful? - $this->assertTrue(is_string($result)); - - $items = \OCP\Share::getItemShared('file', null); - - // make sure that we found a link share and a user share - $this->assertEquals(count($items), 2); - - $linkShare = null; - $userShare = null; - - foreach ($items as $item) { - if ($item['share_type'] === \OCP\Share::SHARE_TYPE_LINK) { - $linkShare = $item; - } - if ($item['share_type'] === \OCP\Share::SHARE_TYPE_USER) { - $userShare = $item; - } - } - - // make sure that we found a link share and a user share - $this->assertTrue(is_array($linkShare)); - $this->assertTrue(is_array($userShare)); - - // check if share have expected permissions, single shared files never have - // delete permissions - $this->assertEquals(\OCP\Constants::PERMISSION_ALL & ~\OCP\Constants::PERMISSION_DELETE, $userShare['permissions']); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share2 = $this->shareManager->createShare($share2); // update permissions - $params = array(); - $params['id'] = $userShare['id']; - $params['_put'] = array(); - $params['_put']['permissions'] = 1; + $params['permissions'] = 1; - $result = \OCA\Files_Sharing\API\Local::updateShare($params); + $request = $this->createRequest(['permissions' => 1]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($share1->getId()); + $this->assertTrue($result->succeeded()); $meta = $result->getMeta(); $this->assertTrue($result->succeeded(), $meta['message']); - $items = \OCP\Share::getItemShared('file', $userShare['file_source']); - - $newUserShare = null; - foreach ($items as $item) { - if ($item['share_with'] === \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2) { - $newUserShare = $item; - break; - } - } - - $this->assertTrue(is_array($newUserShare)); - - $this->assertEquals('1', $newUserShare['permissions']); + $share1 = $this->shareManager->getShareById('ocinternal:' . $share1->getId()); + $this->assertEquals(1, $share1->getPermissions()); // update password for link share - $this->assertTrue(empty($linkShare['share_with'])); - - $params = array(); - $params['id'] = $linkShare['id']; - $params['_put'] = array(); - $params['_put']['password'] = 'foo'; - - $result = \OCA\Files_Sharing\API\Local::updateShare($params); + $this->assertNull($share2->getPassword()); + $request = $this->createRequest(['password' => 'foo']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($share2->getId()); $this->assertTrue($result->succeeded()); - $items = \OCP\Share::getItemShared('file', $linkShare['file_source']); - - $newLinkShare = null; - foreach ($items as $item) { - if ($item['share_type'] === \OCP\Share::SHARE_TYPE_LINK) { - $newLinkShare = $item; - break; - } - } - - $this->assertTrue(is_array($newLinkShare)); - $this->assertTrue(!empty($newLinkShare['share_with'])); - - // Remove password for link share - $params = array(); - $params['id'] = $linkShare['id']; - $params['_put'] = array(); - $params['_put']['password'] = ''; - - $result = \OCA\Files_Sharing\API\Local::updateShare($params); + $share2 = $this->shareManager->getShareById('ocinternal:' . $share2->getId()); + $this->assertNotNull($share2->getPassword()); + $request = $this->createRequest(['password' => '']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($share2->getId()); $this->assertTrue($result->succeeded()); - $items = \OCP\Share::getItemShared('file', $linkShare['file_source']); - - $newLinkShare = null; - foreach ($items as $item) { - if ($item['share_type'] === \OCP\Share::SHARE_TYPE_LINK) { - $newLinkShare = $item; - break; - } - } - - $this->assertTrue(is_array($newLinkShare)); - $this->assertTrue(empty($newLinkShare['share_with'])); - - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); + $share2 = $this->shareManager->getShareById('ocinternal:' . $share2->getId()); + $this->assertNull($share2->getPassword()); + $this->shareManager->deleteShare($share1); + $this->shareManager->deleteShare($share2); } /** @@ -1173,111 +1007,67 @@ class Test_Files_Sharing_Api extends TestCase { * @depends testCreateShareUserFile */ public function testUpdateShareInvalidPermissions() { + $node1 = $this->userFolder->get($this->filename); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share1 = $this->shareManager->createShare($share1); - $fileInfo = $this->view->getFileInfo($this->filename); - - $result = \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, \OCP\Constants::PERMISSION_ALL); - - // share was successful? - $this->assertTrue($result); - - $share = \OCP\Share::getItemShared('file', null); - $this->assertCount(1, $share); - $share = reset($share); - - // check if share have expected permissions, single shared files never have - // delete permissions - $this->assertEquals(\OCP\Constants::PERMISSION_ALL & ~\OCP\Constants::PERMISSION_DELETE, $share['permissions']); - - // update permissions - $params = []; - $params['id'] = $share['id']; - $params['_put'] = []; - $params['_put']['permissions'] = \OCP\Constants::PERMISSION_SHARE; - - $result = \OCA\Files_Sharing\API\Local::updateShare($params); + $request = $this->createRequest(['permissions' => \OCP\Constants::PERMISSION_ALL]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($share1->getId()); //Updating should fail with 400 $this->assertFalse($result->succeeded()); $this->assertEquals(400, $result->getStatusCode()); - $share = \OCP\Share::getItemShared('file', $share['file_source']); - $share = reset($share); - //Permissions should not have changed! - $this->assertEquals(\OCP\Constants::PERMISSION_ALL & ~\OCP\Constants::PERMISSION_DELETE, $share['permissions']); + $share1 = $this->shareManager->getShareById('ocinternal:' . $share1->getId()); + $this->assertEquals(19, $share1->getPermissions()); - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); + $this->shareManager->deleteShare($share1); } - /** * @medium */ function testUpdateShareUpload() { - - $fileInfo = $this->view->getFileInfo($this->folder); - - $result = \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, - null, 1); - - // share was successful? - $this->assertTrue(is_string($result)); - - $items = \OCP\Share::getItemShared('file', null); - - // make sure that we found a link share and a user share - $this->assertEquals(1, count($items)); - - $linkShare = null; - - foreach ($items as $item) { - if ($item['share_type'] === \OCP\Share::SHARE_TYPE_LINK) { - $linkShare = $item; - } - } - - // make sure that we found a link share - $this->assertTrue(is_array($linkShare)); + $node1 = $this->userFolder->get($this->folder); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share1 = $this->shareManager->createShare($share1); // update public upload - - $params = array(); - $params['id'] = $linkShare['id']; - $params['_put'] = array(); - $params['_put']['publicUpload'] = 'true'; - - $result = \OCA\Files_Sharing\API\Local::updateShare($params); - + $request = $this->createRequest(['publicUpload' => 'true']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($share1->getId()); $this->assertTrue($result->succeeded()); - $items = \OCP\Share::getItemShared('file', $linkShare['file_source']); - - $updatedLinkShare = null; - foreach ($items as $item) { - if ($item['share_type'] === \OCP\Share::SHARE_TYPE_LINK) { - $updatedLinkShare = $item; - break; - } - } - - $this->assertTrue(is_array($updatedLinkShare)); - $this->assertEquals(7, $updatedLinkShare['permissions']); + $share1 = $this->shareManager->getShareById($share1->getFullId()); + $this->assertEquals(7, $share1->getPermissions()); // cleanup - - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); - + $this->shareManager->deleteShare($share1); } /** * @medium */ function testUpdateShareExpireDate() { + $node1 = $this->userFolder->get($this->folder); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share1 = $this->shareManager->createShare($share1); - $fileInfo = $this->view->getFileInfo($this->folder); $config = \OC::$server->getConfig(); // enforce expire date, by default 7 days after the file was shared @@ -1285,82 +1075,49 @@ class Test_Files_Sharing_Api extends TestCase { $config->setAppValue('core', 'shareapi_enforce_expire_date', 'yes'); $dateWithinRange = new \DateTime(); + $dateWithinRange->setTime(0,0,0); $dateWithinRange->add(new \DateInterval('P5D')); $dateOutOfRange = new \DateTime(); + $dateOutOfRange->setTime(0,0,0); $dateOutOfRange->add(new \DateInterval('P8D')); - $result = \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, - null, 1); - - // share was successful? - $this->assertTrue(is_string($result)); - - $items = \OCP\Share::getItemShared('file', null); - - // make sure that we found a link share - $this->assertEquals(1, count($items)); - - $linkShare = reset($items); - // update expire date to a valid value - $params = array(); - $params['id'] = $linkShare['id']; - $params['_put'] = array(); - $params['_put']['expireDate'] = $dateWithinRange->format('Y-m-d'); - - $result = \OCA\Files_Sharing\API\Local::updateShare($params); - + $request = $this->createRequest(['expireDate' => $dateWithinRange->format('Y-m-d')]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($share1->getId()); $this->assertTrue($result->succeeded()); - $items = \OCP\Share::getItemShared('file', $linkShare['file_source']); - - $updatedLinkShare = reset($items); + $share1 = $this->shareManager->getShareById($share1->getFullId()); // date should be changed - $this->assertTrue(is_array($updatedLinkShare)); - $this->assertEquals($dateWithinRange->format('Y-m-d') . ' 00:00:00', $updatedLinkShare['expiration']); + $this->assertEquals($dateWithinRange, $share1->getExpirationDate()); // update expire date to a value out of range - $params = array(); - $params['id'] = $linkShare['id']; - $params['_put'] = array(); - $params['_put']['expireDate'] = $dateOutOfRange->format('Y-m-d'); - - $result = \OCA\Files_Sharing\API\Local::updateShare($params); - + $request = $this->createRequest(['expireDate' => $dateOutOfRange->format('Y-m-d')]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($share1->getId()); $this->assertFalse($result->succeeded()); - $items = \OCP\Share::getItemShared('file', $linkShare['file_source']); - - $updatedLinkShare = reset($items); + $share1 = $this->shareManager->getShareById($share1->getFullId()); // date shouldn't be changed - $this->assertTrue(is_array($updatedLinkShare)); - $this->assertEquals($dateWithinRange->format('Y-m-d') . ' 00:00:00', $updatedLinkShare['expiration']); - + $this->assertEquals($dateWithinRange, $share1->getExpirationDate()); // Try to remove expire date - $params = array(); - $params['id'] = $linkShare['id']; - $params['_put'] = ['expireDate' => '']; - - $result = \OCA\Files_Sharing\API\Local::updateShare($params); - + $request = $this->createRequest(['expireDate' => '']); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->updateShare($share1->getId()); $this->assertFalse($result->succeeded()); - $items = \OCP\Share::getItemShared('file', $linkShare['file_source']); + $share1 = $this->shareManager->getShareById($share1->getFullId()); - $updatedLinkShare = reset($items); // date shouldn't be changed - $this->assertTrue(is_array($updatedLinkShare)); - $this->assertEquals($dateWithinRange->format('Y-m-d') . ' 00:00:00', $updatedLinkShare['expiration']); - + $this->assertEquals($dateWithinRange, $share1->getExpirationDate()); // cleanup $config->setAppValue('core', 'shareapi_default_expire_date', 'no'); $config->setAppValue('core', 'shareapi_enforce_expire_date', 'no'); - \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); - + $this->shareManager->deleteShare($share1); } /** @@ -1368,73 +1125,65 @@ class Test_Files_Sharing_Api extends TestCase { * @depends testCreateShareUserFile */ function testDeleteShare() { + $node1 = $this->userFolder->get($this->filename); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(19); + $share1 = $this->shareManager->createShare($share1); - $fileInfo = $this->view->getFileInfo($this->filename); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share2 = $this->shareManager->createShare($share1); - \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($share1->getId()); + $this->assertTrue($result->succeeded()); - \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, - null, 1); - - $items = \OCP\Share::getItemShared('file', null); - - $this->assertEquals(2, count($items)); - - foreach ($items as $item) { - $result = \OCA\Files_Sharing\API\Local::deleteShare(array('id' => $item['id'])); - - $this->assertTrue($result->succeeded()); - } - - $itemsAfterDelete = \OCP\Share::getItemShared('file', null); - - $this->assertTrue(empty($itemsAfterDelete)); + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->deleteShare($share2->getId()); + $this->assertTrue($result->succeeded()); + $this->assertEmpty($this->shareManager->getSharesBy(self::TEST_FILES_SHARING_API_USER2, \OCP\Share::SHARE_TYPE_USER)); + $this->assertEmpty($this->shareManager->getSharesBy(self::TEST_FILES_SHARING_API_USER2, \OCP\Share::SHARE_TYPE_LINK)); } /** * test unshare of a reshared file */ function testDeleteReshare() { + $node1 = $this->userFolder->get($this->folder); + $share1 = $this->shareManager->newShare(); + $share1->setNode($node1) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) + ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_USER) + ->setPermissions(31); + $share1 = $this->shareManager->createShare($share1); - // user 1 shares a folder with user2 - \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1); - - $fileInfo1 = $this->view->getFileInfo($this->folder); - $fileInfo2 = $this->view->getFileInfo($this->folder.'/'.$this->filename); - - $result1 = \OCP\Share::shareItem('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31); - - $this->assertTrue($result1); - - // user2 shares a file from the folder as link - \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - - $result2 = \OCP\Share::shareItem('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1); - - $this->assertTrue(is_string($result2)); + $user2folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2); + $node2 = $user2folder->get($this->folder.'/'.$this->filename); + $share2 = $this->shareManager->newShare(); + $share2->setNode($node2) + ->setSharedBy(self::TEST_FILES_SHARING_API_USER2) + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setPermissions(1); + $share2 = $this->shareManager->createShare($share2); // test if we can unshare the link again - $items = \OCP\Share::getItemShared('file', null); - $this->assertEquals(1, count($items)); - - $item = reset($items); - $result3 = \OCA\Files_Sharing\API\Local::deleteShare(array('id' => $item['id'])); - - $this->assertTrue($result3->succeeded()); - - // cleanup - \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1); - - $result = \OCP\Share::unshare('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER, - \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); - - $this->assertTrue($result); - - + $request = $this->createRequest([]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER2); + $result = $ocs->deleteShare($share2->getId()); + $this->assertTrue($result->succeeded()); + $this->shareManager->deleteShare($share1); } /** @@ -1625,12 +1374,8 @@ class Test_Files_Sharing_Api extends TestCase { $date = new \DateTime(); $date->add(new \DateInterval('P5D')); - $year = (int)$date->format('Y'); - return [ [$date->format('Y-m-d'), true], - [$year+1 . '-1-1', false], - [$date->format('Y-m-dTH:m'), false], ['abc', false], [$date->format('Y-m-d') . 'xyz', false], ]; @@ -1642,11 +1387,13 @@ class Test_Files_Sharing_Api extends TestCase { * @dataProvider datesProvider */ public function testPublicLinkExpireDate($date, $valid) { - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - $_POST['expireDate'] = $date; - - $result = \OCA\Files_Sharing\API\Local::createShare([]); + $request = $this->createRequest([ + 'path' => $this->folder, + 'shareType' => \OCP\Share::SHARE_TYPE_LINK, + 'expireDate' => $date, + ]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); if ($valid === false) { $this->assertFalse($result->succeeded()); @@ -1665,17 +1412,11 @@ class Test_Files_Sharing_Api extends TestCase { $url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']); $this->assertEquals($url, $data['url']); + $share = $this->shareManager->getShareById('ocinternal:'.$data['id']); - $share = $this->getShareFromId($data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - $this->assertTrue(!empty($items)); + $this->assertEquals($date, $share->getExpirationDate()->format('Y-m-d')); - $item = reset($items); - $this->assertTrue(is_array($item)); - $this->assertEquals($date, substr($item['expiration'], 0, 10)); - - $fileinfo = $this->view->getFileInfo($this->folder); - \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); + $this->shareManager->deleteShare($share); } public function testCreatePublicLinkExpireDateValid() { @@ -1688,12 +1429,13 @@ class Test_Files_Sharing_Api extends TestCase { $date = new \DateTime(); $date->add(new \DateInterval('P5D')); - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - $_POST['expireDate'] = $date->format('Y-m-d'); - - $result = \OCA\Files_Sharing\API\Local::createShare([]); - + $request = $this->createRequest([ + 'path' => $this->folder, + 'shareType' => \OCP\Share::SHARE_TYPE_LINK, + 'expireDate' => $date->format('Y-m-d'), + ]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertTrue($result->succeeded()); $data = $result->getData(); @@ -1704,17 +1446,11 @@ class Test_Files_Sharing_Api extends TestCase { $url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']); $this->assertEquals($url, $data['url']); + $share = $this->shareManager->getShareById('ocinternal:'.$data['id']); + $date->setTime(0,0,0); + $this->assertEquals($date, $share->getExpirationDate()); - $share = $this->getShareFromId($data['id']); - $items = \OCP\Share::getItemShared('file', $share['item_source']); - $this->assertTrue(!empty($items)); - - $item = reset($items); - $this->assertTrue(is_array($item)); - $this->assertEquals($date->format('Y-m-d'), substr($item['expiration'], 0, 10)); - - $fileinfo = $this->view->getFileInfo($this->folder); - \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null); + $this->shareManager->deleteShare($share); $config->setAppValue('core', 'shareapi_default_expire_date', 'no'); $config->setAppValue('core', 'shareapi_enforce_expire_date', 'no'); @@ -1730,15 +1466,16 @@ class Test_Files_Sharing_Api extends TestCase { $date = new \DateTime(); $date->add(new \DateInterval('P8D')); - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - $_POST['expireDate'] = $date->format('Y-m-d'); - - $result = \OCA\Files_Sharing\API\Local::createShare([]); - + $request = $this->createRequest([ + 'path' => $this->folder, + 'shareType' => \OCP\Share::SHARE_TYPE_LINK, + 'expireDate' => $date->format('Y-m-d'), + ]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertFalse($result->succeeded()); $this->assertEquals(404, $result->getStatusCode()); - $this->assertEquals('Cannot set expiration date. Shares cannot expire later than 7 after they have been shared', $result->getMeta()['message']); + $this->assertEquals('Cannot set expiration date more than 7 days in the future', $result->getMeta()['message']); $config->setAppValue('core', 'shareapi_default_expire_date', 'no'); $config->setAppValue('core', 'shareapi_enforce_expire_date', 'no'); @@ -1750,15 +1487,16 @@ class Test_Files_Sharing_Api extends TestCase { $date = new \DateTime(); $date->sub(new \DateInterval('P8D')); - $_POST['path'] = $this->folder; - $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK; - $_POST['expireDate'] = $date->format('Y-m-d'); - - $result = \OCA\Files_Sharing\API\Local::createShare([]); - + $request = $this->createRequest([ + 'path' => $this->folder, + 'shareType' => \OCP\Share::SHARE_TYPE_LINK, + 'expireDate' => $date->format('Y-m-d'), + ]); + $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1); + $result = $ocs->createShare(); $this->assertFalse($result->succeeded()); $this->assertEquals(404, $result->getStatusCode()); - $this->assertEquals('Cannot set expiration date. Expiration date is in the past', $result->getMeta()['message']); + $this->assertEquals('Expiration date is in the past', $result->getMeta()['message']); $config->setAppValue('core', 'shareapi_default_expire_date', 'no'); $config->setAppValue('core', 'shareapi_enforce_expire_date', 'no'); diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php index 047d9d3e8f..95662dc0b6 100644 --- a/lib/private/share20/manager.php +++ b/lib/private/share20/manager.php @@ -881,6 +881,11 @@ class Manager implements IManager { break; } + // If there was no limit on the select we are done + if ($limit === -1) { + break; + } + $offset += $added; // Fetch again $limit shares