@@ -7,9 +7,6 @@ |
||
| 7 | 7 | |
| 8 | 8 | namespace App\Http\Controllers; |
| 9 | 9 | |
| 10 | -use App\Http\Requests; |
|
| 11 | -use Illuminate\Http\Request; |
|
| 12 | - |
|
| 13 | 10 | /** |
| 14 | 11 | * Class HomeController |
| 15 | 12 | * @package App\Http\Controllers |
@@ -2,10 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers\Auth; |
| 4 | 4 | |
| 5 | -use App\User; |
|
| 6 | -use Validator; |
|
| 7 | 5 | use App\Http\Controllers\Controller; |
| 6 | +use App\User; |
|
| 8 | 7 | use Illuminate\Foundation\Auth\RegistersUsers; |
| 8 | +use Validator; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Class RegisterController |
@@ -4,9 +4,9 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App\Http\Controllers\Controller; |
| 6 | 6 | use Illuminate\Foundation\Auth\ResetsPasswords; |
| 7 | +use Illuminate\Http\JsonResponse; |
|
| 7 | 8 | use Illuminate\Http\Request; |
| 8 | 9 | use Illuminate\Support\Facades\Password; |
| 9 | -use Illuminate\Http\JsonResponse; |
|
| 10 | 10 | |
| 11 | 11 | class ResetPasswordController extends Controller |
| 12 | 12 | { |
@@ -68,7 +68,9 @@ |
||
| 68 | 68 | */ |
| 69 | 69 | protected function attemptLogin(Request $request) |
| 70 | 70 | { |
| 71 | - if ($this->username() === 'email') return $this->attemptLoginAtAuthenticatesUsers($request); |
|
| 71 | + if ($this->username() === 'email') { |
|
| 72 | + return $this->attemptLoginAtAuthenticatesUsers($request); |
|
| 73 | + } |
|
| 72 | 74 | if ( ! $this->attemptLoginAtAuthenticatesUsers($request)) { |
| 73 | 75 | return $this->attempLoginUsingUsernameAsAnEmail($request); |
| 74 | 76 | } |