diff --git a/app/Http/Controllers/Auth/CustomLoginController.php b/app/Http/Controllers/Auth/CustomLoginController.php index bdf5478..9bdad9e 100644 --- a/app/Http/Controllers/Auth/CustomLoginController.php +++ b/app/Http/Controllers/Auth/CustomLoginController.php @@ -36,15 +36,15 @@ class CustomLoginController extends Controller if ($user && Hash::check($credentials['password'], $user->password)) { // dd($user->group); Auth::attempt(['username' => $request->email, 'password' => $request->password]); - + $instansi = @UserInstansi::where('user_id',$user->id)->first(); $session = [ 'username' => $user->username, 'name' => $user->name, 'email' => $user->email, 'currYear' => date('Y'), 'group_id' => @$user->ms_group_id, - 'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_id'), - 'resource_data' => @UserInstansi::where('user_id',$user->id)->value('resource_data'), + 'instansi_id' => $instansi->ms_instansi_id, + 'resource_data' => @$instansi->instansi->resource_data, 'group_alias' => @$user->group->alias, 'group_name' => @$user->group->name, ]; @@ -66,15 +66,15 @@ class CustomLoginController extends Controller }else{ if ($user && Hash::check($credentials['password'], $user->password)) { Auth::attempt(['email' => $request->email, 'password' => $request->password]); - + $instansi = @UserInstansi::where('user_id',$user->id)->first(); $session = [ 'username' => $user->username, 'name' => $user->name, 'email' => $user->email, 'currYear' => date('Y'), 'group_id' => @$user->ms_group_id, - 'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_id'), - 'resource_data' => @UserInstansi::where('user_id',$user->id)->value('resource_data'), + 'instansi_id' => @$instansi->ms_instansi_id, + 'resource_data' => @$instansi->instansi->resource_data, 'group_alias' => @$user->group->alias, 'group_name' => @$user->group->name, ];