diff --git a/app/Http/Middleware/Bancheck.php b/app/Http/Middleware/Bancheck.php index 6c8a8ef..9e17e2c 100755 --- a/app/Http/Middleware/Bancheck.php +++ b/app/Http/Middleware/Bancheck.php @@ -21,12 +21,21 @@ namespace App\Http\Middleware; +use App\Services\AccountSuspensionService; use Closure; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\View; class Bancheck { + private $suspensionService; + + + public function __construct(AccountSuspensionService $suspensionService) { + $this->suspensionService = $suspensionService; + } + + /** * Handle an incoming request. * @@ -37,11 +46,11 @@ class Bancheck public function handle($request, Closure $next) { $userIP = $request->ip(); - $anonymousUser = User::where('ipAddress', $userIP)->get(); + $anonymousUser = User::where('currentIp', $userIP)->get(); - if (Auth::check() && Auth::user()->isBanned()) { + if (Auth::check() && $this->suspensionService->isSuspended($anonymousUser)) { View::share('isBanned', true); - } elseif (! $anonymousUser->isEmpty() && User::find($anonymousUser->id)->isBanned()) { + } elseif (! $anonymousUser->isEmpty() && $this->suspensionService->isSuspended(User::find($anonymousUser->id))) { View::share('isBanned', true); } else { View::share('isBanned', false); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 1c5f6b7..23eb156 100755 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -31,7 +31,7 @@ class RouteServiceProvider extends ServiceProvider * * @var string */ - public const HOME = '/home'; + public const HOME = '/dashboard'; /** * Define your route model bindings, pattern filters, etc.