FEAT #10733 TIME 0:20 wip admin update goupPrivilege

lang/en.json

@@ -171,7 +171,8 @@
 		"substitutedSignature": "Substituted signature",
 		"substituteMsg": "You act as",
 		"substitutionWarn": "You choose a substitution, you will not be able to make any action.",
-		"manage_users": "User(s)",
+		"manage_users": "Users",
+		"manage_usersAlt": "User(s)",
 		"manage_usersDesc": "Add / Update / Delete users in application.",
 		"manage_email_configuration": "Email server",
 		"manage_email_configurationDesc": "Configure email server for users notifications.",
@@ -191,6 +192,9 @@
 		"ok": "Ok",
 		"groupAdded" : "Group added",
 		"groupdeleted" : "Group deleted",
-		"groupUpdated" : "Group updated"
+		"groupUpdated" : "Group updated",
+		"privilegeUpdated" : "Privilege added",
+		"removedFromGroup" : "User removed from group",
+		"manage_groups" : "Groups"
 	}
 }

lang/fr.json

@@ -193,7 +193,10 @@
 		"ok": "J'ai compris",
 		"groupAdded" : "Groupe ajouté",
 		"groupdeleted" : "Groupe supprimé",
-		"groupUpdated" : "Groupe mis à jour"
+		"groupUpdated" : "Groupe mis à jour",
+		"privilegeUpdated" : "Privilège Ajouté",
+		"removedFromGroup" : "User removed from group",
+		"manage_groups" : "Groupes"
 
 	}
 }

rest/index.php

@@ -91,8 +91,8 @@ $app->get('/groups/{id}', \Group\controllers\GroupController::class . ':getById'
 $app->delete('/groups/{id}', \Group\controllers\GroupController::class . ':delete');
 $app->put('/groups/{id}', \Group\controllers\GroupController::class . ':update');
 $app->put('/groups/{id}/privilege/{privilegeId}', \Group\controllers\GroupController::class . ':updateGroupPrivilege');
-$app->post('/groups/{id}/addUser/{userId}', \Group\controllers\GroupController::class . ':addUser');
-$app->delete('/groups/{id}/addUser/{userId}', \Group\controllers\GroupController::class . ':removeUser');
+$app->post('/groups/{id}/user/{userId}', \Group\controllers\GroupController::class . ':addUser');
+$app->delete('/groups/{id}/user/{userId}', \Group\controllers\GroupController::class . ':removeUser');
 
 //Users
 $app->post('/users', \User\controllers\UserController::class . ':create');

src/app/group/controllers/GroupController.php

@@ -179,7 +179,7 @@ class GroupController
     public function getById(Request $request, Response $response, array $aArgs)
     {
         if (!PrivilegeController::hasPrivilege(['userId' => $GLOBALS['id'], 'privilege' => 'manage_groups'])) {
-            return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
+            return $response->withStatus(403)->withJson(['errors' => 'Privilege forbidden']);
         }
 
         if (!Validator::intVal()->notEmpty()->validate($aArgs['id'])) {
@@ -202,7 +202,7 @@ class GroupController
     public function addUser(Request $request, Response $response, array $aArgs)
     {
         if (!PrivilegeController::hasPrivilege(['userId' => $GLOBALS['id'], 'privilege' => 'manage_groups']) && !PrivilegeController::hasPrivilege(['userId' => $GLOBALS['id'], 'privilege' => 'manage_users'])) {
-            return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
+            return $response->withStatus(403)->withJson(['errors' => 'Privilege forbidden']);
         }
 
         if (!Validator::intVal()->notEmpty()->validate($aArgs['id'])) {
@@ -232,7 +232,7 @@ class GroupController
             'objectType'    => 'groups',
             'objectId'      => $aArgs['id'],
             'type'          => 'UPDATE',
-            'message'       => "{useradded} : {$user['firstname']} {$user['lastname']}"
+            'message'       => "{userAdded} : {$user['firstname']} {$user['lastname']}"
         ]);
 
         HistoryController::add([
@@ -249,7 +249,7 @@ class GroupController
     public function removeUser(Request $request, Response $response, array $aArgs)
     {
         if (!PrivilegeController::hasPrivilege(['userId' => $GLOBALS['id'], 'privilege' => 'manage_groups']) && !PrivilegeController::hasPrivilege(['userId' => $GLOBALS['id'], 'privilege' => 'manage_users'])) {
-            return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
+            return $response->withStatus(403)->withJson(['errors' => 'Privilege forbidden']);
         }
 
         if (!Validator::intVal()->notEmpty()->validate($aArgs['id'])) {
@@ -277,7 +277,7 @@ class GroupController
             'objectType'    => 'groups',
             'objectId'      => $aArgs['id'],
             'type'          => 'UPDATE',
-            'message'       => "{userRemoved} : {$user['firstname']} {$user['lastname']}"
+            'message'       => "{removedFromGroup} : {$user['firstname']} {$user['lastname']}"
         ]);
 
         HistoryController::add([
@@ -285,7 +285,7 @@ class GroupController
             'objectType'    => 'users',
             'objectId'      => $aArgs['userId'],
             'type'          => 'UPDATE',
-            'message'       => "{groupRemoved} : {$group['label']}"
+            'message'       => "{removedFromGroup} : {$group['label']}"
         ]);
 
         return $response->withStatus(204);