diff options
| author | Paul Tirk <paultirk@paultirk.com> | 2021-01-09 18:25:52 +0100 |
|---|---|---|
| committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2021-04-08 10:23:11 +0200 |
| commit | eb849a9be5780434ed025b8c42ba08b0600e7733 (patch) | |
| tree | 629a0cbb73d83d6a213ef6afebdf40ee543d469f /lib/Controller | |
| parent | 26e435fb0563616e5ef0c83af4a6bc2546b95d6e (diff) | |
do not return existing folders when an API request error occurs
Signed-off-by: Paul Tirk <paultirk@paultirk.com>
Diffstat (limited to 'lib/Controller')
| -rw-r--r-- | lib/Controller/FolderApiV2Controller.php | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/lib/Controller/FolderApiV2Controller.php b/lib/Controller/FolderApiV2Controller.php index 4f98c0902..ecc775d3c 100644 --- a/lib/Controller/FolderApiV2Controller.php +++ b/lib/Controller/FolderApiV2Controller.php @@ -61,12 +61,7 @@ class FolderApiV2Controller extends ApiController } catch (ServiceValidationException $ex) { return $this->errorResponse($ex, Http::STATUS_BAD_REQUEST); } catch (ServiceConflictException $ex) { - $responseData = $this->serialize( - $this->folderService->findByName($this->getUserId(), $name) - ); - return $this->response([ - 'folder' => $responseData - ], Http::STATUS_CONFLICT); + return $this->errorResponse($ex, Http::STATUS_CONFLICT); } } @@ -86,15 +81,7 @@ class FolderApiV2Controller extends ApiController } catch (ServiceValidationException $ex) { return $this->errorResponse($ex, Http::STATUS_UNPROCESSABLE_ENTITY); } catch (ServiceConflictException $ex) { - $responseData = $this->serialize( - $this->folderService->findByName($this->getUserId(), $name) - ); - return $this->response( - [ - 'folder' => $responseData - ], - Http::STATUS_CONFLICT - ); + return $this->errorResponse($ex, Http::STATUS_CONFLICT); } catch (ServiceNotFoundException $ex) { return $this->errorResponse($ex, Http::STATUS_NOT_FOUND); } |