refactor: code style changes
Signed-off-by: miguel456 <me@nogueira.codes>
This commit is contained in:
@@ -35,18 +35,16 @@ use Illuminate\Support\Facades\URL;
|
||||
|
||||
trait HandlesAccountDeletion
|
||||
{
|
||||
|
||||
/**
|
||||
* Starts the user account deletion process.
|
||||
*
|
||||
* @param AccountSuspensionService $suspensionService
|
||||
* @param UserDeleteRequest $request
|
||||
* @param AccountSuspensionService $suspensionService
|
||||
* @param UserDeleteRequest $request
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function userDelete(AccountSuspensionService $suspensionService, UserDeleteRequest $request)
|
||||
{
|
||||
if (config('demo.is_enabled'))
|
||||
{
|
||||
if (config('demo.is_enabled')) {
|
||||
return redirect()
|
||||
->back()
|
||||
->with('error', 'This feature is disabled');
|
||||
@@ -58,7 +56,7 @@ trait HandlesAccountDeletion
|
||||
),
|
||||
'cancelURL' => URL::temporarySignedRoute(
|
||||
'processDeleteConfirmation', now()->addDays(7), ['accountID' => $request->user()->id, 'action' => 'cancel']
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
Mail::to($request->user())
|
||||
@@ -69,33 +67,31 @@ trait HandlesAccountDeletion
|
||||
Auth::logout();
|
||||
|
||||
$request->session()->flash('success', __('Please check your email to finish deleting your account.'));
|
||||
|
||||
return redirect()->to('/');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Dispatches the correct jobs and events to delete the specified user account
|
||||
*
|
||||
* @param Request $request
|
||||
* @param AccountSuspensionService $suspensionService
|
||||
* @param Request $request
|
||||
* @param AccountSuspensionService $suspensionService
|
||||
* @param $accountID
|
||||
* @param $action
|
||||
* @return \Illuminate\Http\RedirectResponse|void
|
||||
*/
|
||||
public function processDeleteConfirmation(Request $request, AccountSuspensionService $suspensionService, $accountID, $action)
|
||||
{
|
||||
if (config('demo.is_enabled') || !$request->hasValidSignature())
|
||||
{
|
||||
abort(403);
|
||||
if (config('demo.is_enabled') || ! $request->hasValidSignature()) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
// It's almost impossible for this to fail, unless the model has already been deleted by someone else, because:
|
||||
// The request URL can't be tampered with and the request can't be initiated without a valid account in the first place
|
||||
$account = User::find($accountID);
|
||||
|
||||
if (!is_null($account))
|
||||
{
|
||||
if (!$suspensionService->isLocked($account)) {
|
||||
if (! is_null($account)) {
|
||||
if (! $suspensionService->isLocked($account)) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
@@ -125,13 +121,11 @@ trait HandlesAccountDeletion
|
||||
|
||||
return redirect()
|
||||
->route('login');
|
||||
|
||||
}
|
||||
|
||||
Log::error("Cannot delete account that doesn't exist!", [
|
||||
'validSignature' => $request->hasValidSignature()
|
||||
'validSignature' => $request->hasValidSignature(),
|
||||
]);
|
||||
abort(400);
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user