drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated how require permission works

Browse Source
This commit is contained in:
drkthunder02
2021-08-02 01:30:22 -05:00
parent 669f716112
commit 5b88887f53
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Middleware/RequirePermission.php
View File

@@ -18,9 +18,17 @@ class RequirePermission
*/ */
public function handle($request, Closure $next, $permission) public function handle($request, Closure $next, $permission)
{ {
$perms = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission'=> $permission])->get(['permission']); $role = UserRole::where([
'character_id' => auth()->user()->character_id,
])->get(['role']);
abort_unless(auth()->check() && isset($perms[0]->permission), 403, "You don't have the correct permission to be in this area."); if($role[0]->role != "Admin") {
$perms = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission'=> $permission])->get(['permission']);
abort_unless(auth()->check() && isset($perms[0]->permission), 403, "You don't have the correct permission to be in this area.");
}
return $next($request); return $next($request);
} }

2
resources/views/layouts/user/sidebarmenu/finances.blade.php
View File

@@ -1,5 +1,5 @@
@if((auth()->user()->hasRole('User') && auth()->user()->hasPermission('ceo')) || @if((auth()->user()->hasRole('User') && auth()->user()->hasPermission('ceo')) ||
(auth()->user()->hasRole('Admin') && auth()->user()->hasPermission('ceo'))) auth()->user()->hasRole('Admin'))
<li class="nav-item has-treeview"> <li class="nav-item has-treeview">
<a href="#" class="nav-link"> <a href="#" class="nav-link">
<i class="nav-icon fas fa-file-contract"></i> <i class="nav-icon fas fa-file-contract"></i>