From 1ff900561c9ca0753092bfbefc8b5b47761332ce Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Fri, 15 Nov 2019 14:32:52 +0100
Subject: [PATCH] Fix code review
---
rest/index.php | 2 +-
src/app/group/controllers/PrivilegeController.php | 8 ++------
src/app/resource/controllers/ExportController.php | 3 ++-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/rest/index.php b/rest/index.php
index 50d89efec82..2a70da8a101 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -219,7 +219,7 @@ $app->put('/groups/{id}/indexing', \Group\controllers\GroupController::class . '
$app->put('/groups/{id}/reassign/{newGroupId}', \Group\controllers\GroupController::class . ':reassignUsers');
$app->post('/groups/{id}/privileges/{privilegeId}', \Group\controllers\PrivilegeController::class . ':addPrivilege');
$app->delete('/groups/{id}/privileges/{privilegeId}', \Group\controllers\PrivilegeController::class . ':removePrivilege');
-$app->put('/groups/{id}/privileges/{privilegeId}/parameters', \Group\controllers\PrivilegeController::class . ':updatePrivilegeParameters');
+$app->put('/groups/{id}/privileges/{privilegeId}/parameters', \Group\controllers\PrivilegeController::class . ':updateParameters');
//Histories
$app->get('/histories', \History\controllers\HistoryController::class . ':get');
diff --git a/src/app/group/controllers/PrivilegeController.php b/src/app/group/controllers/PrivilegeController.php
index a7f2654f8a6..ad202855125 100644
--- a/src/app/group/controllers/PrivilegeController.php
+++ b/src/app/group/controllers/PrivilegeController.php
@@ -86,7 +86,7 @@ class PrivilegeController
return $response->withStatus(204);
}
- public static function updatePrivilegeParameters(Request $request, Response $response, array $args)
+ public static function updateParameters(Request $request, Response $response, array $args)
{
if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_groups', 'userId' => $GLOBALS['id']])) {
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
@@ -97,10 +97,6 @@ class PrivilegeController
return $response->withStatus(400)->withJson(['errors' => 'Group not found']);
}
- if (!Validator::stringType()->notEmpty()->validate($args['privilegeId'])) {
- return $response->withStatus(400)->withJson(['errors' => 'Query privilegeId is empty or not a string']);
- }
-
$data = $request->getParams();
if (!Validator::arrayType()->validate($data['parameters'])) {
@@ -202,7 +198,7 @@ class PrivilegeController
$privileges = PrivilegeModel::getByUserAndPrivilege(['userId' => $args['userId'], 'privilegeId' => 'admin_users']);
$privileges = array_column($privileges, 'parameters');
- if ($privileges == null) {
+ if (empty($privileges)) {
return false;
}
$assignable = [];
diff --git a/src/app/resource/controllers/ExportController.php b/src/app/resource/controllers/ExportController.php
index be2a5a9ad7f..d94c0f6c854 100644
--- a/src/app/resource/controllers/ExportController.php
+++ b/src/app/resource/controllers/ExportController.php
@@ -819,7 +819,8 @@ class ExportController
return implode("\n", $parentLabels);
}
- private static function getCustomFieldValue(array $args) {
+ private static function getCustomFieldValue(array $args)
+ {
ValidatorModel::notEmpty($args, ['custom', 'resId']);
ValidatorModel::stringType($args, ['custom']);
ValidatorModel::intVal($args, ['resId']);
--
GitLab