From e871b887e01f71c347aae41c2a8d756b4d59a42e Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 1 Sep 2020 10:10:33 -0500 Subject: [PATCH] update guard usage --- src/Http/Controllers/Inertia/CurrentUserController.php | 6 ++++-- src/Http/Livewire/DeleteUserForm.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Http/Controllers/Inertia/CurrentUserController.php b/src/Http/Controllers/Inertia/CurrentUserController.php index ff2277a7a..c5ce38f6c 100644 --- a/src/Http/Controllers/Inertia/CurrentUserController.php +++ b/src/Http/Controllers/Inertia/CurrentUserController.php @@ -2,6 +2,7 @@ namespace Laravel\Jetstream\Http\Controllers\Inertia; +use Illuminate\Contracts\Auth\StatefulGuard; use Illuminate\Http\Request; use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Auth; @@ -13,13 +14,14 @@ class CurrentUserController extends Controller * Delete the current user. * * @param \Illuminate\Http\Request $request + * @param \Illuminate\Contracts\Auth\StatefulGuard $auth * @return \Illuminate\Http\RedirectResponse */ - public function destroy(Request $request) + public function destroy(Request $request, StatefulGuard $auth) { app(DeletesUsers::class)->delete($request->user()->fresh()); - Auth::logout(); + $auth->logout(); return response('', 409)->header('X-Inertia-Location', url('/')); } diff --git a/src/Http/Livewire/DeleteUserForm.php b/src/Http/Livewire/DeleteUserForm.php index 0290bbb10..8c9ed4262 100644 --- a/src/Http/Livewire/DeleteUserForm.php +++ b/src/Http/Livewire/DeleteUserForm.php @@ -2,6 +2,7 @@ namespace Laravel\Jetstream\Http\Livewire; +use Illuminate\Contracts\Auth\StatefulGuard; use Illuminate\Support\Facades\Auth; use Laravel\Jetstream\Contracts\DeletesUsers; use Livewire\Component; @@ -19,13 +20,14 @@ class DeleteUserForm extends Component * Delete the current user. * * @param \Laravel\Jetstream\Contracts\DeletesUsers $deleter + * @param \Illuminate\Contracts\Auth\StatefulGuard $auth * @return void */ - public function deleteUser(DeletesUsers $deleter) + public function deleteUser(DeletesUsers $deleter, StatefulGuard $auth) { $deleter->delete(Auth::user()->fresh()); - Auth::logout(); + $auth->logout(); return redirect('/'); }