user edition

src/Auth/Business/LuticateBusiness.php

@@ -52,6 +52,9 @@ class LuticateBusiness
             }
         }
         if (is_null($user)) {
+            if ($token != null && $token != "") {
+                return "Invalid token";
+            }
             $user = LuticateUsersBusiness::getById(0);
         }
 
@@ -61,10 +64,10 @@ class LuticateBusiness
         $permissions[] = LuticatePermissions::USER_LOGIN;
         foreach ($permissions as $permission) {
             if (!LuticatePermissionsBusiness::getUserPermission(self::$_currentUser->getId(), $permission)) {
-                return false;
+                return "Permission denied";
             }
         }
-        return true;
+        return null;
     }
 
     /**
@@ -74,7 +77,12 @@ class LuticateBusiness
     {
         $route->setMiddleware(function($permissions, $request)
         {
-            return self::authFilter($permissions, $request);
+            $auth = self::authFilter($permissions, $request);
+            if (is_null($auth)) {
+                return true;
+            }
+            abort(401, $auth);
+            return false;
         });
     }
 
@@ -85,12 +93,22 @@ class LuticateBusiness
     {
         $prefix = "/luticate";
         $ns = 'Luticate\Auth\Business\\';
+        $int = "[0-9]+";
+        $group_id = "{group_id:$int}";
+        $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/add", "${ns}LuticateUsersBusiness", "add", LuticatePermissions::USER_ADD);
+        $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/$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/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/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,14 +12,38 @@ class LuticateGroupsBusiness extends LuBusiness {
         return new LuticateGroupsDataAccess();
     }
 
+    public static function checkGroupId($group_id)
+    {
+        if (is_null(self::getById($group_id))) {
+            self::notFound("Group not found");
+        }
+    }
+
     public static function getByName($group_name)
     {
         return LuticateGroupsDataAccess::getByName($group_name);
     }
 
-    public static function addUserToGroup($user_id, $group_id)
+    public static function hasUser($user_id, $group_id)
     {
-        return LuticateGroupsDataAccess::addUserToGroup($user_id, $group_id);
+        return LuticateGroupsDataAccess::hasUser($user_id, $group_id);
+    }
+
+    public static function addUser($user_id, $group_id)
+    {
+        self::checkGroupId($group_id);
+        LuticateUsersBusiness::checkUserId($user_id);
+        if (self::hasUser($user_id, $group_id)) {
+            return true;
+        }
+        return LuticateGroupsDataAccess::addUser($user_id, $group_id);
+    }
+
+    public static function delUser($user_id, $group_id)
+    {
+        self::checkGroupId($group_id);
+        LuticateUsersBusiness::checkUserId($user_id);
+        return LuticateGroupsDataAccess::delUser($user_id, $group_id);
     }
 
     public static function add($group_name)
@@ -32,4 +56,10 @@ class LuticateGroupsBusiness extends LuBusiness {
         }
         return $group->getId();
     }
+
+    public static function del($group_id)
+    {
+        self::checkGroupId($group_id);
+
+    }
 }

src/Auth/Business/LuticateUsersBusiness.php

@@ -60,6 +60,19 @@ class LuticateUsersBusiness extends LuBusiness {
             ));
     }
 
+    /**
+     * @param $user_id
+     * @return LuticateUsersDbo|null
+     */
+    public static function checkUserId($user_id)
+    {
+        $user = self::getById($user_id);
+        if (is_null($user)) {
+            self::notFound("User not found");
+        }
+        return $user;
+    }
+
     public static function login($username, $password)
     {
         $user = LuticateUsersDataAccess::getByUsernameOrEmail($username);
@@ -117,4 +130,36 @@ class LuticateUsersBusiness extends LuBusiness {
 
         return $user_id;
     }
+
+    public static function edit($user_id, $email)
+    {
+        if ($user_id != 0) {
+            $user = self::checkUserId($user_id);
+            $user->setEmail($email);
+            LuticateUsersDataAccess::editById($user_id, $user);
+        }
+        return true;
+    }
+
+    public static function editMe($email, $user)
+    {
+        return self::edit($user->getId(), $email);
+    }
+
+    public static function setPassword($user_id, $password)
+    {
+        if ($user_id != 0) {
+            $user = self::checkUserId($user_id);
+            $user->setPassword(self::hashPassword($password));
+            $user->setSalt(self::getSalt());
+            LuticateUsersDataAccess::editById($user_id, $user);
+        }
+        return true;
+    }
+
+    public static function setPasswordMe($password, $oldPassword, $user)
+    {
+        self::login($user->getUsername(), $oldPassword);
+        return self::setPassword($user->getId(), $password);
+    }
 }

src/Auth/DBO/LuticatePermissions.php

@@ -13,9 +13,14 @@ 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_DEL = "LU_USER_DEL";
+    const USER_SET_PASSWORD = "LU_USER_SET_PASSWORD";
+    const USER_SET_PASSWORD_MYSELF = "LU_USER_SET_PASSWORD_MYSELF";
 
     const GROUP_ADD = "LU_GROUP_ADD";
     const GROUP_EDIT = "LU_GROUP_EDIT";
     const GROUP_DEL = "LU_GROUP_DEL";
+    const GROUP_ADD_USER = "LU_GROUP_ADD_USER";
+    const GROUP_DEL_USER = "LU_GROUP_DEL_USER";
 }

src/Auth/DataAccess/LuticateGroupsDataAccess.php

@@ -24,9 +24,20 @@ class LuticateGroupsDataAccess extends LuDataAccess {
         return $group->toDbo();
     }
 
-    public static function addUserToGroup($user_id, $group_id)
+    public static function addUser($user_id, $group_id)
     {
         LuticateGroups::find($group_id)->users()->attach($user_id);
         return true;
     }
+
+    public static function delUser($user_id, $group_id)
+    {
+        LuticateGroups::find($group_id)->users()->detach($user_id);
+        return true;
+    }
+
+    public static function hasUser($user_id, $group_id)
+    {
+        return !is_null(LuticateGroups::find($group_id)->users()->find($user_id));
+    }
 }