diff --git a/app/Http/Controllers/PermissionsController.php b/app/Http/Controllers/PermissionsController.php index f7b63c5..ebc9ab5 100644 --- a/app/Http/Controllers/PermissionsController.php +++ b/app/Http/Controllers/PermissionsController.php @@ -23,7 +23,7 @@ /** * @var \Illuminate\Contracts\Auth\Authenticatable|null */ - public $user; + protected $user; /** * UsersController constructor. @@ -32,7 +32,14 @@ */ public function __construct() { - $this->user = Auth::guard('web')->user(); + // Mengatur middleware auth + $this->middleware('auth'); + + // Mengatur user setelah middleware auth dijalankan + $this->middleware(function ($request, $next) { + $this->user = Auth::user(); + return $next($request); + }); } /** diff --git a/app/Http/Controllers/PositionsController.php b/app/Http/Controllers/PositionsController.php index 16643f6..dac8350 100644 --- a/app/Http/Controllers/PositionsController.php +++ b/app/Http/Controllers/PositionsController.php @@ -23,7 +23,7 @@ /** * @var \Illuminate\Contracts\Auth\Authenticatable|null */ - public $this->user; + protected $user; /** * UsersController constructor. @@ -32,7 +32,14 @@ */ public function __construct() { - $this->user = Auth::guard('web')->user(); + // Mengatur middleware auth + $this->middleware('auth'); + + // Mengatur user setelah middleware auth dijalankan + $this->middleware(function ($request, $next) { + $this->user = Auth::user(); + return $next($request); + }); } /** diff --git a/app/Http/Controllers/RolesController.php b/app/Http/Controllers/RolesController.php index 98a1a59..a7fe2f3 100644 --- a/app/Http/Controllers/RolesController.php +++ b/app/Http/Controllers/RolesController.php @@ -26,7 +26,7 @@ /** * @var \Illuminate\Contracts\Auth\Authenticatable|null */ - public $user; + protected $user; /** * UsersController constructor. @@ -35,7 +35,14 @@ */ public function __construct() { - $this->user = Auth::guard('web')->user(); + // Mengatur middleware auth + $this->middleware('auth'); + + // Mengatur user setelah middleware auth dijalankan + $this->middleware(function ($request, $next) { + $this->user = Auth::user(); + return $next($request); + }); } /** diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 52a7be5..c8a3de5 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -28,7 +28,7 @@ /** * @var \Illuminate\Contracts\Auth\Authenticatable|null */ - public $user; + protected $user; /** * UsersController constructor. @@ -37,7 +37,14 @@ */ public function __construct() { - $this->user = Auth::guard('web')->user(); + // Mengatur middleware auth + $this->middleware('auth'); + + // Mengatur user setelah middleware auth dijalankan + $this->middleware(function ($request, $next) { + $this->user = Auth::user(); + return $next($request); + }); } /**