remove old trashbin endpoint

Signed-off-by: Robin Appelman <[email protected]>
mobioustrip · Sep 20, 2018 · a623e09 · a623e09
1 parent b4e452a
commit a623e09
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 55 deletions.
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
diff --git a/apps/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php
@@ -39,8 +39,6 @@
 	->actionInclude('files_trashbin/ajax/delete.php');
 $this->create('files_trashbin_ajax_isEmpty', 'ajax/isEmpty.php')
 	->actionInclude('files_trashbin/ajax/isEmpty.php');
-$this->create('files_trashbin_ajax_list', 'ajax/list.php')
-	->actionInclude('files_trashbin/ajax/list.php');
 $this->create('files_trashbin_ajax_undelete', 'ajax/undelete.php')
 	->actionInclude('files_trashbin/ajax/undelete.php');
 
diff --git a/build/integration/features/bootstrap/Trashbin.php b/build/integration/features/bootstrap/Trashbin.php
@@ -51,13 +51,17 @@ public function emptyTrashbin($user) {
 	 */
 	public function listTrashbinFolder($user, $path){
 		$this->asAn($user);
-		$params = '?dir=' . rawurlencode('/' . trim($path, '/'));
-		$this->sendingToWithDirectUrl('GET', '/index.php/apps/files_trashbin/ajax/list.php' . $params, null);
+		$this->sendingToWithDirectUrl('PROPFIND', "/remote.php/dav/trashbin/$user/$path", null);
 		$this->theHTTPStatusCodeShouldBe('200');
 
-		$response = json_decode($this->response->getBody(), true);
-
-		return $response['data']['files'];
+		$body = $this->response->getBody();
+		if($body && substr($body, 0, 1) === '<') {
+			$reader = new Sabre\Xml\Reader();
+			$reader->xml($body);
+			return $reader->parse();
+		} else {
+			return [];
+		}
 	}
 
 	/**