add feature search name and middleware changes to fix the resit for khazanah
This commit is contained in:
@@ -15,7 +15,18 @@ class Khazanah
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if(Auth::check() && (Auth::user()->roles == 'pc' || Auth::user()->roles == 'ppc')){
|
||||
$Roles = ["teller","admin","penilai","khazanah"];
|
||||
$routeMiddleware = $request->route()->middleware();
|
||||
$filteredMiddleware = array_intersect($routeMiddleware, $Roles);
|
||||
|
||||
$filtered = array_map(function($res){
|
||||
switch($res){
|
||||
case 'teller' : return 'teller';
|
||||
case 'khazanah' : return 'pc';
|
||||
}
|
||||
},$filteredMiddleware);
|
||||
|
||||
if(Auth::check() && (Auth::user()->roles == 'pc' || Auth::user()->roles == 'ppc' || in_array(Auth::user()->roles,$filtered))){
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
|
||||
@@ -15,9 +15,25 @@ class Teller
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if(Auth::check() && Auth::user()->role_harian == 'teller'){
|
||||
$Roles = ["teller","admin","penilai","khazanah"];
|
||||
$routeMiddleware = $request->route()->middleware();
|
||||
$filteredMiddleware = array_intersect($routeMiddleware, $Roles);
|
||||
|
||||
$filtered = array_map(function($res){
|
||||
switch($res){
|
||||
case 'teller' : return 'teller';
|
||||
case 'khazanah' : return 'pc';
|
||||
}
|
||||
},$filteredMiddleware);
|
||||
|
||||
// dd(in_array(Auth::user()->roles,$filtered));
|
||||
if(Auth::check() && (Auth::user()->role_harian == 'teller' || in_array(Auth::user()->roles,$filtered))){
|
||||
return $next($request);
|
||||
}else{
|
||||
dd(Auth::user()->role_harian == 'teller',in_array(Auth::user()->roles,$filtered));
|
||||
dd('not allowed');
|
||||
}
|
||||
dd('test');
|
||||
|
||||
return redirect('/login');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user