refactor(middleware): update ban check middleware using deprecated method
Signed-off-by: miguel456 <me@nogueira.codes>
This commit is contained in:
parent
8c7a1f2859
commit
5ff1b4532a
@ -21,12 +21,21 @@
|
|||||||
|
|
||||||
namespace App\Http\Middleware;
|
namespace App\Http\Middleware;
|
||||||
|
|
||||||
|
use App\Services\AccountSuspensionService;
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Illuminate\Support\Facades\View;
|
use Illuminate\Support\Facades\View;
|
||||||
|
|
||||||
class Bancheck
|
class Bancheck
|
||||||
{
|
{
|
||||||
|
private $suspensionService;
|
||||||
|
|
||||||
|
|
||||||
|
public function __construct(AccountSuspensionService $suspensionService) {
|
||||||
|
$this->suspensionService = $suspensionService;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle an incoming request.
|
* Handle an incoming request.
|
||||||
*
|
*
|
||||||
@ -37,11 +46,11 @@ class Bancheck
|
|||||||
public function handle($request, Closure $next)
|
public function handle($request, Closure $next)
|
||||||
{
|
{
|
||||||
$userIP = $request->ip();
|
$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);
|
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);
|
View::share('isBanned', true);
|
||||||
} else {
|
} else {
|
||||||
View::share('isBanned', false);
|
View::share('isBanned', false);
|
||||||
|
@ -31,7 +31,7 @@ class RouteServiceProvider extends ServiceProvider
|
|||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public const HOME = '/home';
|
public const HOME = '/dashboard';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Define your route model bindings, pattern filters, etc.
|
* Define your route model bindings, pattern filters, etc.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user