webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Abstracted userCanCreatePage helper to work for any permisison

Browse Source 
- Added test to cover scenario where someone with create-own permission
would want to copy a viewable item into a container entity that they
own.
This commit is contained in:
Dan Brown
2019-03-09 16:50:22 +00:00
parent 6be2d3f28c
commit 5c9b528517
4 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Auth/Permissions/PermissionService.php
View File

@ -557,19 +557,17 @@ class PermissionService
}
/**
* Checks if a user has a book or chapter available to create a page
* @param Ownable $ownable
* @param $permission
* Checks if a user has the given permission for any items in the system.
* @param string $permission
* @return bool
*/
public function checkAvailableCreatePageAccess()
public function checkUserHasPermissionOnAnything(string $permission)
{
$userRoleIds = $this->currentUser()->roles()->pluck('id')->toArray();
$userRoleIds = $this->currentUser()->roles()->select('id')->pluck('id')->toArray();
$userId = $this->currentUser()->id;
$canCreatePage = $this->db->table('joint_permissions')
->where('action', '=', 'page-create')
->where('action', '=', $permission)
->whereIn('role_id', $userRoleIds)
->where(function ($query) use ($userId) {
$query->where('has_permission', '=', 1)
@ -580,6 +578,7 @@ class PermissionService
})
->get()->count() > 0;
$this->clean();
return $canCreatePage;
}