user edition; group edition

src/Auth/Business/LuticateBusiness.php

@@ -98,16 +98,18 @@ class LuticateBusiness
         $user_id = "{user_id:$int}";
 
         $route->post("$prefix/users/login", "${ns}LuticateUsersBusiness", "login");
-        $route->put("$prefix/users/logout", "${ns}LuticateUsersBusiness", "logout");
+        $route->post("$prefix/users/logout", "${ns}LuticateUsersBusiness", "logout");
         $route->post("$prefix/users/add", "${ns}LuticateUsersBusiness", "add", LuticatePermissions::USER_ADD);
+        $route->post("$prefix/users/$user_id/del", "${ns}LuticateUsersBusiness", "del", LuticatePermissions::USER_DEL);
         $route->post("$prefix/users/$user_id/edit", "${ns}LuticateUsersBusiness", "edit", LuticatePermissions::USER_EDIT);
-        $route->post("$prefix/users/me/edit", "${ns}LuticateUsersBusiness", "editMe", LuticatePermissions::USER_EDIT_MYSELF);
+        $route->post("$prefix/users/me/edit", "${ns}LuticateUsersBusiness", "editMe", LuticatePermissions::USER_EDIT_ME);
         $route->post("$prefix/users/$user_id/setPassword", "${ns}LuticateUsersBusiness", "setPassword", LuticatePermissions::USER_SET_PASSWORD);
-        $route->post("$prefix/users/me/setPassword", "${ns}LuticateUsersBusiness", "setPasswordMe", LuticatePermissions::USER_SET_PASSWORD_MYSELF);
+        $route->post("$prefix/users/me/setPassword", "${ns}LuticateUsersBusiness", "setPasswordMe", LuticatePermissions::USER_SET_PASSWORD_ME);
 
 
         $route->post("$prefix/groups/add", "${ns}LuticateGroupsBusiness", "add", LuticatePermissions::GROUP_ADD);
-        $route->post("$prefix/groups/del/$group_id", "${ns}LuticateGroupsBusiness", "del", LuticatePermissions::GROUP_DEL);
+        $route->post("$prefix/groups/$group_id/del", "${ns}LuticateGroupsBusiness", "del", LuticatePermissions::GROUP_DEL);
+        $route->post("$prefix/groups/$group_id/edit", "${ns}LuticateGroupsBusiness", "edit", LuticatePermissions::GROUP_EDIT);
         $route->post("$prefix/groups/$group_id/addUser/$user_id", "${ns}LuticateGroupsBusiness", "addUser", LuticatePermissions::GROUP_ADD_USER);
         $route->post("$prefix/groups/$group_id/delUser/$user_id", "${ns}LuticateGroupsBusiness", "delUser", LuticatePermissions::GROUP_DEL_USER);
     }

src/Auth/Business/LuticateGroupsBusiness.php

@@ -12,11 +12,17 @@ class LuticateGroupsBusiness extends LuBusiness {
         return new LuticateGroupsDataAccess();
     }
 
+    /**
+     * @param $group_id
+     * @return LuticateGroupsDbo|null
+     */
     public static function checkGroupId($group_id)
     {
-        if (is_null(self::getById($group_id))) {
+        $group = self::getById($group_id);
+        if (is_null($group)) {
             self::notFound("Group not found");
         }
+        return $group;
     }
 
     public static function getByName($group_name)
@@ -54,12 +60,26 @@ class LuticateGroupsBusiness extends LuBusiness {
             $group->setName($group_name);
             return LuticateGroupsDataAccess::addId($group);
         }
-        return $group->getId();
+        self::badInput("Group name already exists");
+        return false;
     }
 
-    public static function del($group_id)
+    public static function edit($group_id, $group_name)
     {
-        self::checkGroupId($group_id);
+        $group = self::getByName($group_name);
+        if (!is_null($group) && $group->getId() != $group_id) {
+            self::badInput("Group name already exists");
+        }
+        $group = self::checkGroupId($group_id);
+        $group->setName($group_name);
 
+        LuticateGroupsDataAccess::editById($group_id, $group);
+        return true;
+    }
+
+    public static function del($group_id)
+    {
+        LuticateGroupsDataAccess::deleteById($group_id);
+        return true;
     }
 }

src/Auth/Business/LuticatePermissionsBusiness.php

@@ -12,19 +12,19 @@ class LuticatePermissionsBusiness extends LuBusiness {
         return new LuticatePermissionsDataAccess();
     }
 
-    public static function getUserPermission($user_id, $permission_name)
+    public static function getUserPermission($user_id, $permission_name, $default = false)
     {
         $val = LuticatePermissionsDataAccess::getUserPermission($user_id, $permission_name);
         if (is_null($val)) {
-            return false;
+            return $default;
         }
         return $val;
     }
 
-    public static function getUserDynamicPermission($user_id, $permission_name, $action, $resource_id)
+    public static function getUserDynamicPermission($user_id, $permission_name, $action, $resource_id, $default = false)
     {
-        $dynamic_permission_name = "DYN_" . $permission_name . "_" . $action . "_" . $resource_id;
-        $val = LuticatePermissionsDataAccess::getUserPermission($user_id, $dynamic_permission_name);
+        $dynamic_permission_name = "LU_DYN_" . $permission_name . "_" . $action . "_" . $resource_id;
+        $val = LuticatePermissionsDataAccess::getUserPermission($user_id, $dynamic_permission_name, $default);
         if (is_null($val)) {
             return self::getUserPermission($user_id, $permission_name);
         }

src/Auth/DBO/LuticatePermissions.php

@@ -13,10 +13,10 @@ class LuticatePermissions
     const USER_LOGIN = "LU_USER_LOGIN";
     const USER_ADD = "LU_USER_ADD";
     const USER_EDIT = "LU_USER_EDIT";
-    const USER_EDIT_MYSELF = "LU_USER_EDIT_MYSELF";
+    const USER_EDIT_ME = "LU_USER_EDIT_ME";
     const USER_DEL = "LU_USER_DEL";
     const USER_SET_PASSWORD = "LU_USER_SET_PASSWORD";
-    const USER_SET_PASSWORD_MYSELF = "LU_USER_SET_PASSWORD_MYSELF";
+    const USER_SET_PASSWORD_ME = "LU_USER_SET_PASSWORD_ME";
 
     const GROUP_ADD = "LU_GROUP_ADD";
     const GROUP_EDIT = "LU_GROUP_EDIT";