added get permission for all edition

src/Auth/Business/LuticateBusiness.php

@@ -111,37 +111,67 @@ class LuticateBusiness
 
         $route->post("$prefix/users/login", "${ns}LuticateUsersBusiness", "login");
         $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_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_ME);
-
-
-        $route->post("$prefix/groups/add", "${ns}LuticateGroupsBusiness", "add", LuticatePermissions::GROUP_ADD);
-        $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);
-
-
-        $route->post("$prefix/permissions/effective/$user_id/$permission_name", "${ns}LuticatePermissionsBusiness", "getEffectivePermission", LuticatePermissions::PERM_EFFECTIVE_GET);
-        $route->post("$prefix/permissions/effective/me/$permission_name", "${ns}LuticatePermissionsBusiness", "getEffectivePermissionMe");
-
-        $route->post("$prefix/permissions/$permission_name", "${ns}LuticatePermissionsBusiness", "get", LuticatePermissions::PERM_GET);
-        $route->post("$prefix/permissions/add/$permission_name/$permission_value", "${ns}LuticatePermissionsBusiness", "add", LuticatePermissions::PERM_ADD);
-        $route->post("$prefix/permissions/$permission_name/del", "${ns}LuticatePermissionsBusiness", "del", LuticatePermissions::PERM_DEL);
-        $route->post("$prefix/permissions/$permission_name/edit/$permission_value", "${ns}LuticatePermissionsBusiness", "edit", LuticatePermissions::PERM_EDIT);
-
-        $route->post("$prefix/permissions/group/$group_id/$permission_name", "${ns}LuticatePermissionsGroupsBusiness", "get", LuticatePermissions::PERM_GROUP_GET);
-        $route->post("$prefix/permissions/group/$group_id/add/$permission_name/$permission_value", "${ns}LuticatePermissionsGroupsBusiness", "add", LuticatePermissions::PERM_GROUP_ADD);
-        $route->post("$prefix/permissions/group/$group_id/$permission_name/del", "${ns}LuticatePermissionsGroupsBusiness", "del", LuticatePermissions::PERM_GROUP_DEL);
-        $route->post("$prefix/permissions/group/$group_id/$permission_name/edit/$permission_value", "${ns}LuticatePermissionsGroupsBusiness", "edit", LuticatePermissions::PERM_GROUP_EDIT);
-
-        $route->post("$prefix/permissions/user/$user_id/$permission_name", "${ns}LuticatePermissionsUsersBusiness", "get", LuticatePermissions::PERM_USER_GET);
-        $route->post("$prefix/permissions/user/$user_id/add/$permission_name/$permission_value", "${ns}LuticatePermissionsUsersBusiness", "add", LuticatePermissions::PERM_USER_ADD);
-        $route->post("$prefix/permissions/user/$user_id/$permission_name/del", "${ns}LuticatePermissionsUsersBusiness", "del", LuticatePermissions::PERM_USER_DEL);
-        $route->post("$prefix/permissions/user/$user_id/$permission_name/edit/$permission_value", "${ns}LuticatePermissionsUsersBusiness", "edit", LuticatePermissions::PERM_USER_EDIT);
+        $route->post("$prefix/users/add", "${ns}LuticateUsersBusiness", "add",
+            array(LuticatePermissions::USER_ADD, LuticatePermissions::USER_GET));
+        $route->post("$prefix/users/$user_id/del", "${ns}LuticateUsersBusiness", "del",
+            array(LuticatePermissions::USER_DEL, LuticatePermissions::USER_GET));
+        $route->post("$prefix/users/$user_id/edit", "${ns}LuticateUsersBusiness", "edit",
+            array(LuticatePermissions::USER_EDIT, LuticatePermissions::USER_GET));
+        $route->post("$prefix/users/me/edit", "${ns}LuticateUsersBusiness", "editMe",
+            LuticatePermissions::USER_EDIT_ME);
+        $route->post("$prefix/users/$user_id/setPassword", "${ns}LuticateUsersBusiness", "setPassword",
+            array(LuticatePermissions::USER_SET_PASSWORD, LuticatePermissions::USER_GET));
+        $route->post("$prefix/users/me/setPassword", "${ns}LuticateUsersBusiness", "setPasswordMe",
+            LuticatePermissions::USER_SET_PASSWORD_ME);
+
+
+        $route->post("$prefix/groups/add", "${ns}LuticateGroupsBusiness", "add",
+            array(LuticatePermissions::GROUP_ADD, LuticatePermissions::GROUP_GET));
+        $route->post("$prefix/groups/$group_id/del", "${ns}LuticateGroupsBusiness", "del",
+            array(LuticatePermissions::GROUP_DEL, LuticatePermissions::GROUP_GET));
+        $route->post("$prefix/groups/$group_id/edit", "${ns}LuticateGroupsBusiness", "edit",
+            array(LuticatePermissions::GROUP_EDIT, LuticatePermissions::GROUP_GET));
+        $route->post("$prefix/groups/$group_id/addUser/$user_id", "${ns}LuticateGroupsBusiness", "addUser",
+            array(LuticatePermissions::GROUP_ADD_USER, LuticatePermissions::GROUP_GET));
+        $route->post("$prefix/groups/$group_id/delUser/$user_id", "${ns}LuticateGroupsBusiness", "delUser",
+            array(LuticatePermissions::GROUP_DEL_USER, LuticatePermissions::GROUP_GET));
+
+
+        $route->post("$prefix/permissions/effective/$user_id/$permission_name", "${ns}LuticatePermissionsBusiness",
+            "getEffectivePermission", LuticatePermissions::PERM_EFFECTIVE_GET);
+        $route->post("$prefix/permissions/effective/me/$permission_name", "${ns}LuticatePermissionsBusiness",
+            "getEffectivePermissionMe");
+
+        $route->post("$prefix/permissions/$permission_name", "${ns}LuticatePermissionsBusiness", "get",
+            LuticatePermissions::PERM_GET);
+        $route->post("$prefix/permissions/add/$permission_name/$permission_value", "${ns}LuticatePermissionsBusiness",
+            "add", array(LuticatePermissions::PERM_ADD, LuticatePermissions::PERM_GET));
+        $route->post("$prefix/permissions/$permission_name/del", "${ns}LuticatePermissionsBusiness", "del",
+            array(LuticatePermissions::PERM_DEL, LuticatePermissions::PERM_GET));
+        $route->post("$prefix/permissions/$permission_name/edit/$permission_value", "${ns}LuticatePermissionsBusiness",
+            "edit", array(LuticatePermissions::PERM_EDIT, LuticatePermissions::PERM_GET));
+
+        $route->post("$prefix/permissions/group/$group_id/$permission_name", "${ns}LuticatePermissionsGroupsBusiness",
+            "get", LuticatePermissions::PERM_GROUP_GET);
+        $route->post("$prefix/permissions/group/$group_id/add/$permission_name/$permission_value",
+            "${ns}LuticatePermissionsGroupsBusiness", "add", array(LuticatePermissions::PERM_GROUP_ADD,
+                LuticatePermissions::PERM_GROUP_GET));
+        $route->post("$prefix/permissions/group/$group_id/$permission_name/del",
+            "${ns}LuticatePermissionsGroupsBusiness", "del", array(LuticatePermissions::PERM_GROUP_DEL,
+                LuticatePermissions::PERM_GROUP_GET));
+        $route->post("$prefix/permissions/group/$group_id/$permission_name/edit/$permission_value",
+            "${ns}LuticatePermissionsGroupsBusiness", "edit", array(LuticatePermissions::PERM_GROUP_EDIT,
+                LuticatePermissions::PERM_GROUP_GET));
+
+        $route->post("$prefix/permissions/user/$user_id/$permission_name", "${ns}LuticatePermissionsUsersBusiness",
+            "get", LuticatePermissions::PERM_USER_GET);
+        $route->post("$prefix/permissions/user/$user_id/add/$permission_name/$permission_value",
+            "${ns}LuticatePermissionsUsersBusiness", "add", array(LuticatePermissions::PERM_USER_ADD,
+                LuticatePermissions::PERM_USER_GET));
+        $route->post("$prefix/permissions/user/$user_id/$permission_name/del", "${ns}LuticatePermissionsUsersBusiness",
+            "del", array(LuticatePermissions::PERM_USER_DEL, LuticatePermissions::PERM_USER_GET));
+        $route->post("$prefix/permissions/user/$user_id/$permission_name/edit/$permission_value",
+            "${ns}LuticatePermissionsUsersBusiness", "edit", array(LuticatePermissions::PERM_USER_EDIT,
+                LuticatePermissions::PERM_USER_GET));
     }
 }

src/Auth/Business/LuticatePermissionsBusiness.php

@@ -36,9 +36,9 @@ class LuticatePermissionsBusiness extends LuBusiness {
         return self::getEffectivePermission($user->getId(), $permission_name);
     }
 
-    public static function getUserDynamicPermission($user_id, $permission_name, $action, $resource_id)
+    public static function getEffectiveDynamicPermission($user_id, $permission_name, $resource_id)
     {
-        $dynamic_permission_name = "LU_DYN_" . $permission_name . "_" . $action . "_" . $resource_id;
+        $dynamic_permission_name = "LU_DYN_" . $permission_name . "_" . $resource_id;
         $val = self::getEffectivePermission($user_id, $dynamic_permission_name);
         if (is_null($val->getValue())) {
             return self::getEffectivePermission($user_id, $permission_name);

src/Auth/DBO/LuticatePermissions.php

@@ -12,6 +12,7 @@ class LuticatePermissions
 {
     const USER_LOGIN = "LU_USER_LOGIN";
     const USER_ADD = "LU_USER_ADD";
+    const USER_GET = "LU_USER_GET";
     const USER_EDIT = "LU_USER_EDIT";
     const USER_EDIT_ME = "LU_USER_EDIT_ME";
     const USER_DEL = "LU_USER_DEL";
@@ -19,6 +20,7 @@ class LuticatePermissions
     const USER_SET_PASSWORD_ME = "LU_USER_SET_PASSWORD_ME";
 
     const GROUP_ADD = "LU_GROUP_ADD";
+    const GROUP_GET = "LU_GROUP_GET";
     const GROUP_EDIT = "LU_GROUP_EDIT";
     const GROUP_DEL = "LU_GROUP_DEL";
     const GROUP_ADD_USER = "LU_GROUP_ADD_USER";

src/Auth/DataAccess/SP/SpLuRemovePermission.php

@@ -1,44 +0,0 @@
-<?php
-
-/**
- * AUTO GENERATED BY LUTICATE GENERATOR
- * ANY CHANGES WILL BE OVERWRITTEN
- */
-
-namespace Luticate\Auth\DataAccess\SP;
-
-use Luticate\Utils\LuSpModel;
-use Illuminate\Support\Facades\DB;
-
-class SpLuRemovePermission extends LuSpModel {
-
-    protected static function damToDbo($dam)
-    {
-        if (is_null($dam))
-            return null;
-        $dbo = new SpLuRemovePermission();
-
-        $dbo->setSpLuRemovePermission($dam->sp_lu_remove_permission);
-
-        return $dbo;
-    }
-
-    public static function execute($_permisson_name)
-    {
-        $values = DB::select('SELECT * FROM sp_lu_remove_permission(?)', array($_permisson_name));
-        return self::damToDbo($values[0]);
-    }
-
-    /**
-    * @var boolean
-    */
-    protected $_spLuRemovePermission;
-    public function getSpLuRemovePermission()
-    {
-        return $this->_spLuRemovePermission;
-    }
-    public function setSpLuRemovePermission($value)
-    {
-        $this->_spLuRemovePermission = $value;
-    }
-}