Skip to content

[2.x] Made sure that the current session is destroyed when deleting your ac… #742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Http/Controllers/Inertia/CurrentUserController.php
Original file line number Diff line number Diff line change
@@ -28,6 +28,8 @@ public function destroy(Request $request, StatefulGuard $auth)
app(DeletesUsers::class)->delete($request->user()->fresh());

$auth->logout();
$request->session()->invalidate();
$request->session()->regenerateToken();

return Inertia::location(url('/'));
}
8 changes: 6 additions & 2 deletions src/Http/Livewire/DeleteUserForm.php
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
namespace Laravel\Jetstream\Http\Livewire;

use Illuminate\Contracts\Auth\StatefulGuard;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\ValidationException;
@@ -46,9 +47,10 @@ public function confirmUserDeletion()
*
* @param \Laravel\Jetstream\Contracts\DeletesUsers $deleter
* @param \Illuminate\Contracts\Auth\StatefulGuard $auth
* @return void
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse
*/
public function deleteUser(DeletesUsers $deleter, StatefulGuard $auth)
public function deleteUser(DeletesUsers $deleter, StatefulGuard $auth, Request $request)
{
$this->resetErrorBag();

@@ -61,6 +63,8 @@ public function deleteUser(DeletesUsers $deleter, StatefulGuard $auth)
$deleter->delete(Auth::user()->fresh());

$auth->logout();
$request->session()->invalidate();
$request->session()->regenerateToken();

return redirect('/');
}