From da0e51087205f1de74257e248c8bce051dc2eab0 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 25 Nov 2014 15:12:16 -0600 Subject: [PATCH] Cleaning up auth code. --- app/Http/Controllers/Auth/PasswordController.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 879796a0..e4d74de5 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -57,11 +57,11 @@ class PasswordController extends Controller { { switch ($response = $this->passwords->sendResetLink($request->only('email'))) { - case PasswordBroker::INVALID_USER: - return redirect()->back()->withErrors(['email' =>trans($response)]); - case PasswordBroker::RESET_LINK_SENT: return redirect()->back()->with('status', trans($response)); + + case PasswordBroker::INVALID_USER: + return redirect()->back()->withErrors(['email' =>trans($response)]); } } @@ -102,15 +102,13 @@ class PasswordController extends Controller { switch ($response) { - case PasswordBroker::INVALID_PASSWORD: - case PasswordBroker::INVALID_TOKEN: - case PasswordBroker::INVALID_USER: + case PasswordBroker::PASSWORD_RESET: + return $this->loginAndRedirect($request->email); + + default: return redirect()->back() ->withInput($request->only('email')) ->withErrors(['email' => trans($response)]); - - case PasswordBroker::PASSWORD_RESET: - return $this->loginAndRedirect($request->email); } }