Skip to content

Commit c1d5e7f

Browse files
committed
Added groups check to middleware
1 parent 4871cc9 commit c1d5e7f

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/Http/Middleware/CheckUserPermission.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ class CheckUserPermission
1818
*/
1919
public function handle(Request $request, Closure $next, string ...$keys)
2020
{
21-
if(!config('livecontrols.userpermissions_enabled', false)){
22-
return $next($request);
23-
}
24-
2521
foreach($keys as $key){
2622
$permission = UserPermission::where('key', '=', $key)->first();
2723
if(is_null($permission)){
@@ -31,6 +27,13 @@ public function handle(Request $request, Closure $next, string ...$keys)
3127
if($permission->users()->where('user_id', '=', auth()->id())->exists()){
3228
return $next($request);
3329
}
30+
31+
//Check user group permissions
32+
if(class_exists('\LiveControls\Groups\GroupsServiceProvider', false)){
33+
if($permission->groups()->whereIn('group_id', auth()->user()->groups()->get()->toArray())->count() > 0){
34+
return $next($request);
35+
}
36+
}
3437
}
3538

3639
abort(403);

0 commit comments

Comments
 (0)