FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed login and added suspended message

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-12-23 08:36:02 -06:00
parent 014aea6ae1
commit 07bcc5f199
4 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Auth/LoginController.php
View File

@@ -26,16 +26,20 @@ class LoginController extends Controller
return $this->view('auth/login');
}
/**
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
protected function sendLoginResponse(Request $request)
{
$request->session()->regenerate();
$this->clearLoginAttempts($request);
$user = Auth::user();
// TODO: How to handle ON_LEAVE?
if($user->state !== PilotState::ACTIVE) {
Log::info('Trying to login '. $user->pilot_id .', state '
. PilotState::label($user->state));
// Log them out
$this->guard()->logout();
$request->session()->invalidate();
@@ -43,14 +47,16 @@ class LoginController extends Controller
// Redirect to one of the error pages
if($user->state === PilotState::PENDING) {
return $this->view('auth.pending');
}
elseif ($user->state === PilotState::REJECTED) {
} elseif ($user->state === PilotState::REJECTED) {
return $this->view('auth.rejected');
} elseif ($user->state === PilotState::SUSPENDED) {
return $this->view('auth.suspended');
}
}
return $this->authenticated($request, $this->guard()->user())
?: redirect()->intended($this->redirectPath());
$request->session()->regenerate();
$this->clearLoginAttempts($request);
return redirect()->intended($this->redirectPath());
}
}