Skip to content

Use trashbin dav endpoint to list trash in webui #11037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 13 commits into from
Sep 28, 2018
Merged

Use trashbin dav endpoint to list trash in webui #11037

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6372ae3
expose additional props from trashbin sabre endpoint
icewind1991 Sep 3, 2018
9106695
pass existing data to info parsers
icewind1991 Sep 3, 2018
b4e452a
Use trashbin dav endpoint to list trash in webui
icewind1991 Sep 3, 2018
a623e09
remove old trashbin endpoint
icewind1991 Sep 3, 2018
dea1e55
remove old trashbin api
icewind1991 Sep 10, 2018
0c6e154
use dav trash api for removing from trashbin
icewind1991 Sep 4, 2018
a7a06b2
use dav trashbin api for restore
icewind1991 Sep 4, 2018
26e2957
quote paths in behat.yml
icewind1991 Sep 5, 2018
8491c9b
fix trashbin integration tests and add a few more
icewind1991 Sep 5, 2018
d408781
more trashbin integration tests
icewind1991 Sep 11, 2018
073fddc
fix trashbin infoparsers interfering with other dav clients
icewind1991 Sep 11, 2018
d890cd6
fix sharing trashbin integration tests
icewind1991 Sep 12, 2018
c5f77de
fix trashbin js tests
icewind1991 Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more trashbin integration tests 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Sep 20, 2018
commit d4087811e595989f5e30adfbaaa150a526ea98fc
74 changes: 49 additions & 25 deletions build/integration/features/bootstrap/Trashbin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
*
*/

use GuzzleHttp\Client;
use GuzzleHttp\Message\ResponseInterface;
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
Expand All @@ -42,6 +40,36 @@ public function emptyTrashbin($user) {
Assert::assertEquals(204, $response['statusCode']);
}

private function findFullTrashname($user, $name) {
$rootListing = $this->listTrashbinFolder($user, '/');

foreach ($rootListing as $href => $rootItem) {
if ($rootItem['{http://nextcloud.org/ns}trashbin-filename'] === $name) {
return basename($href);
}
}

return null;
}

/**
* Get the full /startofpath.dxxxx/rest/of/path from /startofpath/rest/of/path
*/
private function getFullTrashPath($user, $path) {
if ($path !== '' && $path !== '/') {
$parts = explode('/', $path);
$fullName = $this->findFullTrashname($user, $parts[1]);
if ($fullName === null) {
Assert::fail("cant find $path in trash");
return '/dummy_full_path_not_found';
}
$parts[1] = $fullName;

$path = implode('/', $parts);
}
return $path;
}

/**
* List trashbin folder
*
Expand All @@ -50,13 +78,21 @@ public function emptyTrashbin($user) {
* @return array response
*/
public function listTrashbinFolder($user, $path) {
$path = $this->getFullTrashPath($user, $path);
$client = $this->getSabreClient($user);

return $client->propfind($this->makeSabrePath($user, 'trash' . $path, 'trashbin'), [
$results = $client->propfind($this->makeSabrePath($user, 'trash' . $path, 'trashbin'), [
'{http://nextcloud.org/ns}trashbin-filename',
'{http://nextcloud.org/ns}trashbin-original-location',
'{http://nextcloud.org/ns}trashbin-deletion-time'
], 1);
$results = array_filter($results, function (array $item) {
return isset($item['{http://nextcloud.org/ns}trashbin-filename']);
});
if ($path !== '' && $path !== '/') {
array_shift($results);
}
return $results;
}

/**
Expand All @@ -67,7 +103,7 @@ public function listTrashbinFolder($user, $path) {
*/
public function checkTrashContents($user, $folder, $expectedElements) {
$elementList = $this->listTrashbinFolder($user, $folder);
$trashContent = array_filter(array_map(function(array $item) {
$trashContent = array_filter(array_map(function (array $item) {
return $item['{http://nextcloud.org/ns}trashbin-filename'];
}, $elementList));
if ($expectedElements instanceof \Behat\Gherkin\Node\TableNode) {
Expand All @@ -90,8 +126,7 @@ public function checkTrashContents($user, $folder, $expectedElements) {
*/
public function checkTrashSize($user, $folder, $expectedCount) {
$elementList = $this->listTrashbinFolder($user, $folder);
// first item is listed folder
Assert::assertEquals($expectedCount, count($elementList) - 1);
Assert::assertEquals($expectedCount, count($elementList));
}

/**
Expand All @@ -100,25 +135,14 @@ public function checkTrashSize($user, $folder, $expectedCount) {
* @param string $file
*/
public function restoreFromTrash($user, $file) {
// find the full name in trashbin
$file = ltrim($file, '/');
$parent = dirname($file);
if ($parent === '.') {
$parent = '';
}
$elementList = $this->listTrashbinFolder($user, $parent);
$name = basename($file);
foreach($elementList as $href => $item) {
if ($item['{http://nextcloud.org/ns}trashbin-filename'] === $name) {
$client = $this->getSabreClient($user);
$response = $client->request('MOVE', $href, null, [
'Destination' => $this->makeSabrePath($user, 'restore/' . $name, 'trashbin'),
]);
Assert::assertEquals(201, $response['statusCode']);
return;
}
}
Assert::fail("$file" . " is not in trash listing");
$file = $this->getFullTrashPath($user, $file);
$url = $this->makeSabrePath($user, 'trash' . $file, 'trashbin');
$client = $this->getSabreClient($user);
$response = $client->request('MOVE', $url, null, [
'Destination' => $this->makeSabrePath($user, 'restore/' . basename($file), 'trashbin'),
]);
Assert::assertEquals(201, $response['statusCode']);
return;
}
}

53 changes: 52 additions & 1 deletion build/integration/features/trashbin.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Feature: trashbin
When User "user0" deletes file "/textfile0.txt"
Then user "user0" in trash folder "/" should have 1 element
And user "user0" in trash folder "/" should have the following elements
| /textfile0.txt |
| textfile0.txt |

Scenario: clearing the trashbin
Given As an "admin"
Expand All @@ -28,3 +28,54 @@ Feature: trashbin
Then user "user0" in trash folder "/" should have 0 elements
And as "user0" the file "/textfile0.txt" exists

Scenario: deleting and restoring a folder
Given As an "admin"
And user "user0" exists
When User "user0" created a folder "/testfolder"
And User "user0" moves file "/textfile0.txt" to "/testfolder/textfile0.txt"
And as "user0" the file "/testfolder/textfile0.txt" exists
And User "user0" deletes file "/testfolder"
And user "user0" in trash folder "/" should have 1 element
And user "user0" in trash folder "/" should have the following elements
| testfolder |
And user "user0" in trash folder "/testfolder" should have 1 element
And user "user0" in trash folder "/testfolder" should have the following elements
| textfile0.txt |
And user "user0" in restores "/testfolder" from trash
Then user "user0" in trash folder "/" should have 0 elements
And as "user0" the file "/testfolder/textfile0.txt" exists

Scenario: deleting a file from a subfolder and restoring it moves it back to the subfolder
Given As an "admin"
And user "user0" exists
When User "user0" created a folder "/testfolder"
And User "user0" moves file "/textfile0.txt" to "/testfolder/textfile0.txt"
And as "user0" the file "/testfolder/textfile0.txt" exists
And User "user0" deletes file "/testfolder/textfile0.txt"
And user "user0" in trash folder "/" should have 1 element
And user "user0" in trash folder "/" should have the following elements
| textfile0.txt |
And user "user0" in restores "/textfile0.txt" from trash
Then user "user0" in trash folder "/" should have 0 elements
And as "user0" the file "/textfile0.txt" does not exist
And as "user0" the file "/testfolder/textfile0.txt" exists

Scenario: deleting and a folder and restoring a file inside it
Given As an "admin"
And user "user0" exists
When User "user0" created a folder "/testfolder"
And User "user0" moves file "/textfile0.txt" to "/testfolder/textfile0.txt"
And as "user0" the file "/testfolder/textfile0.txt" exists
And User "user0" deletes file "/testfolder"
And user "user0" in trash folder "/" should have 1 element
And user "user0" in trash folder "/" should have the following elements
| testfolder |
And user "user0" in trash folder "/testfolder" should have 1 element
And user "user0" in trash folder "/testfolder" should have the following elements
| textfile0.txt |
And user "user0" in restores "/testfolder/textfile0.txt" from trash
Then user "user0" in trash folder "/" should have 1 elements
And user "user0" in trash folder "/testfolder" should have 0 element
And as "user0" the file "/textfile0.txt" exists