[Pkg-owncloud-commits] [owncloud] 16/122: change error codes to 400
David Prévot
taffit at moszumanska.debian.org
Sat May 9 00:00:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit 8c0856779bccb41014f677c5ebdec79aec0a5602
Author: Clark Tomlinson <fallen013 at gmail.com>
Date: Fri Apr 24 09:42:02 2015 -0400
change error codes to 400
---
apps/encryption/controller/recoverycontroller.php | 24 +++++++++++-----------
.../tests/controller/RecoveryControllerTest.php | 16 +++++++--------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/controller/recoverycontroller.php
index f163b8f..f1a2651 100644
--- a/apps/encryption/controller/recoverycontroller.php
+++ b/apps/encryption/controller/recoverycontroller.php
@@ -75,34 +75,34 @@ class RecoveryController extends Controller {
if (empty($recoveryPassword)) {
$errorMessage = (string)$this->l->t('Missing recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
- Http::STATUS_INTERNAL_SERVER_ERROR);
+ Http::STATUS_BAD_REQUEST);
}
if (empty($confirmPassword)) {
$errorMessage = (string)$this->l->t('Please repeat the recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
- Http::STATUS_INTERNAL_SERVER_ERROR);
+ Http::STATUS_BAD_REQUEST);
}
if ($recoveryPassword !== $confirmPassword) {
$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
- Http::STATUS_INTERNAL_SERVER_ERROR);
+ Http::STATUS_BAD_REQUEST);
}
if (isset($adminEnableRecovery) && $adminEnableRecovery === '1') {
if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully enabled')]]);
}
- return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_INTERNAL_SERVER_ERROR);
+ return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
} elseif (isset($adminEnableRecovery) && $adminEnableRecovery === '0') {
if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully disabled')]]);
}
- return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_INTERNAL_SERVER_ERROR);
+ return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
}
// this response should never be sent but just in case.
- return new DataResponse(['data' => ['message' => (string)$this->l->t('Missing parameters')]], Http::STATUS_INTERNAL_SERVER_ERROR);
+ return new DataResponse(['data' => ['message' => (string)$this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
}
/**
@@ -115,22 +115,22 @@ class RecoveryController extends Controller {
//check if both passwords are the same
if (empty($oldPassword)) {
$errorMessage = (string)$this->l->t('Please provide the old recovery password');
- return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_INTERNAL_SERVER_ERROR);
+ return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if (empty($newPassword)) {
$errorMessage = (string)$this->l->t('Please provide a new recovery password');
- return new DataResponse (['data' => ['message' => $errorMessage]], Http::STATUS_INTERNAL_SERVER_ERROR);
+ return new DataResponse (['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if (empty($confirmPassword)) {
$errorMessage = (string)$this->l->t('Please repeat the new recovery password');
- return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_INTERNAL_SERVER_ERROR);
+ return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if ($newPassword !== $confirmPassword) {
$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
- return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_INTERNAL_SERVER_ERROR);
+ return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
$result = $this->recovery->changeRecoveryKeyPassword($newPassword,
@@ -149,7 +149,7 @@ class RecoveryController extends Controller {
'data' => [
'message' => (string)$this->l->t('Could not change the password. Maybe the old password was not correct.')
]
- ], Http::STATUS_INTERNAL_SERVER_ERROR);
+ ], Http::STATUS_BAD_REQUEST);
}
/**
@@ -186,7 +186,7 @@ class RecoveryController extends Controller {
'data' => [
'message' => (string)$this->l->t('Could not enable the recovery key, please try again or contact your administrator')
]
- ], Http::STATUS_INTERNAL_SERVER_ERROR);
+ ], Http::STATUS_BAD_REQUEST);
}
}
diff --git a/apps/encryption/tests/controller/RecoveryControllerTest.php b/apps/encryption/tests/controller/RecoveryControllerTest.php
index 0ac7677..89b541e 100644
--- a/apps/encryption/tests/controller/RecoveryControllerTest.php
+++ b/apps/encryption/tests/controller/RecoveryControllerTest.php
@@ -40,9 +40,9 @@ class RecoveryControllerTest extends TestCase {
public function adminRecoveryProvider() {
return [
['test', 'test', '1', 'Recovery key successfully enabled', HTTP::STATUS_OK],
- ['', 'test', '1', 'Missing recovery key password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
- ['test', '', '1', 'Please repeat the recovery key password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
- ['test', 'soimething that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
+ ['', 'test', '1', 'Missing recovery key password', HTTP::STATUS_BAD_REQUEST],
+ ['test', '', '1', 'Please repeat the recovery key password', HTTP::STATUS_BAD_REQUEST],
+ ['test', 'soimething that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_BAD_REQUEST],
['test', 'test', '0', 'Recovery key successfully disabled', HTTP::STATUS_OK],
];
}
@@ -79,11 +79,11 @@ class RecoveryControllerTest extends TestCase {
public function changeRecoveryPasswordProvider() {
return [
- ['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', HTTP::STATUS_INTERNAL_SERVER_ERROR],
+ ['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', HTTP::STATUS_BAD_REQUEST],
['test', 'test', 'oldtest', 'Password successfully changed.', HTTP::STATUS_OK],
- ['test', 'notmatch', 'oldtest', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
- ['', 'test', 'oldtest', 'Please provide a new recovery password', HTTP::STATUS_INTERNAL_SERVER_ERROR],
- ['test', 'test', '', 'Please provide the old recovery password', HTTP::STATUS_INTERNAL_SERVER_ERROR]
+ ['test', 'notmatch', 'oldtest', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_BAD_REQUEST],
+ ['', 'test', 'oldtest', 'Please provide a new recovery password', HTTP::STATUS_BAD_REQUEST],
+ ['test', 'test', '', 'Please provide the old recovery password', HTTP::STATUS_BAD_REQUEST]
];
}
@@ -117,7 +117,7 @@ class RecoveryControllerTest extends TestCase {
public function userSetRecoveryProvider() {
return [
['1', 'Recovery Key enabled', Http::STATUS_OK],
- ['0', 'Could not enable the recovery key, please try again or contact your administrator', Http::STATUS_INTERNAL_SERVER_ERROR]
+ ['0', 'Could not enable the recovery key, please try again or contact your administrator', Http::STATUS_BAD_REQUEST]
];
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list