miguel456/athenahr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(middleware): update ban check middleware using deprecated method

Browse Source 
Signed-off-by: miguel456 <me@nogueira.codes>
This commit is contained in:
Miguel Nogueira 2022-10-15 19:37:43 +01:00
parent 8c7a1f2859
commit 5ff1b4532a
No known key found for this signature in database
GPG Key ID: 3C6A7E29AF26D370
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Middleware/Bancheck.php
View File

@ -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);

2
app/Providers/RouteServiceProvider.php
View File

@ -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.