diff --git a/app/Http/Controllers/Admin/LoginController.php b/app/Http/Controllers/Admin/LoginController.php index 58f3592..1a34be4 100644 --- a/app/Http/Controllers/Admin/LoginController.php +++ b/app/Http/Controllers/Admin/LoginController.php @@ -39,7 +39,9 @@ class LoginController extends Controller 'password' => 'required|string', ]); - $user = IamPrincipal::where('email_address', $validatedData['email'])->first(); + $user = IamPrincipal::where('email_address', $validatedData['email']) + ->whereIn('principal_type_xid', [1, 2]) + ->first(); if ($user) { if (Hash::check($validatedData['password'], $user->password)) { diff --git a/app/Http/Middleware/CheckStatus.php b/app/Http/Middleware/CheckStatus.php index eb2dee0..7d0c1fa 100644 --- a/app/Http/Middleware/CheckStatus.php +++ b/app/Http/Middleware/CheckStatus.php @@ -4,6 +4,7 @@ namespace App\Http\Middleware; use Closure; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Log; use Symfony\Component\HttpFoundation\Response; class CheckStatus @@ -17,7 +18,8 @@ class CheckStatus { $admin = auth()->guard('admin')->user(); - if ($admin && $admin->is_active == 1) { + Log::info($admin); + if ($admin && $admin->is_active == 1 && ($admin->principal_type_xid == 1 || $admin->principal_type_xid == 2)) { return $next($request); } else { return redirect('/')->with('error_msg', 'You must be logged in..');