Skip to content

Roles permissions are not mixed correctly #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.0
Choose a base branch
from
Open

Roles permissions are not mixed correctly #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/Kodeine/Acl/Traits/HasPermission.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,9 @@ function () {
// true values.
foreach ($this->roles as $role) {
foreach ($role->getPermissions() as $slug => $array) {
if ( array_key_exists($slug, $permissions) ) {
if (array_key_exists($slug, $permissions)) {
foreach ($array as $clearance => $value) {
if( !array_key_exists( $clearance, $permissions[$slug] ) ) {
! $value ?: $permissions[$slug][$clearance] = true;
}
! $value ?: $permissions[$slug][$clearance] = true;
}
} else {
$permissions = array_merge($permissions, [$slug => $array]);
Expand Down Expand Up @@ -102,7 +100,7 @@ public function assignPermission($permission)

$permissionId = $this->parsePermissionId($permission);

if ( ! $this->permissions->keyBy('id')->has($permissionId) ) {
if (! $this->permissions->keyBy('id')->has($permissionId)) {
$this->permissions()->attach($permissionId);

return $permission;
Expand Down Expand Up @@ -173,24 +171,23 @@ public function revokeAllPermissions()
*/
protected function parsePermissionId($permission)
{
if ( is_string($permission) || is_numeric($permission) ) {

if (is_string($permission) || is_numeric($permission)) {
$model = config('acl.permission', 'Kodeine\Acl\Models\Eloquent\Permission');
$key = is_numeric($permission) ? 'id' : 'name';
$alias = (new $model)->where($key, $permission)->first();

if ( ! is_object($alias) || ! $alias->exists ) {
if (! is_object($alias) || ! $alias->exists) {
throw new \InvalidArgumentException('Specified permission ' . $key . ' does not exists.');
}

$permission = $alias->getKey();
}

$model = '\Illuminate\Database\Eloquent\Model';
if ( is_object($permission) && $permission instanceof $model ) {
if (is_object($permission) && $permission instanceof $model) {
$permission = $permission->getKey();
}

return (int) $permission;
}
}
}