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

Rename PilotState class to UserState

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-12-30 20:40:32 -06:00
parent 778780f3f2
commit 81e82629ac
13 changed files with 56 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
use App\Http\Controllers\Controller;
use App\Models\Enums\PilotState;
use App\Models\Enums\UserState;
class LoginController extends Controller
{
@@ -35,21 +35,21 @@ class LoginController extends Controller
$user = Auth::user();
// TODO: How to handle ON_LEAVE?
if($user->state !== PilotState::ACTIVE) {
if($user->state !== UserState::ACTIVE) {
Log::info('Trying to login '. $user->pilot_id .', state '
. PilotState::label($user->state));
. UserState::label($user->state));
// Log them out
$this->guard()->logout();
$request->session()->invalidate();
// Redirect to one of the error pages
if($user->state === PilotState::PENDING) {
if($user->state === UserState::PENDING) {
return $this->view('auth.pending');
} elseif ($user->state === PilotState::REJECTED) {
} elseif ($user->state === UserState::REJECTED) {
return $this->view('auth.rejected');
} elseif ($user->state === PilotState::SUSPENDED) {
} elseif ($user->state === UserState::SUSPENDED) {
return $this->view('auth.suspended');
}
}

4
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -14,7 +14,7 @@ use App\Facades\Utils;
use App\Models\Airport;
use App\Models\Airline;
use App\Services\UserService;
use App\Models\Enums\PilotState;
use App\Models\Enums\UserState;
use App\Http\Controllers\Controller;
use App\Repositories\AirlineRepository;
use App\Repositories\AirportRepository;
@@ -118,7 +118,7 @@ class RegisterController extends Controller
$user = $this->create($request->all());
if($user->state === PilotState::PENDING) {
if($user->state === UserState::PENDING) {
return $this->view('auth.pending');
}