X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ac80723058ab4c86e6bf024e0c75b60ab6c59624..refs/pull/598/head:/app/Http/Controllers/Auth/LoginController.php diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 0de4a8282..782cfd0ae 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -2,6 +2,7 @@ namespace BookStack\Http\Controllers\Auth; +use BookStack\Exceptions\AuthException; use BookStack\Http\Controllers\Controller; use BookStack\Repos\UserRepo; use BookStack\Services\SocialAuthService; @@ -71,13 +72,13 @@ class LoginController extends Controller // Explicitly log them out for now if they do no exist. if (!$user->exists) auth()->logout($user); - if (!$user->exists && $user->email === null && !$request->has('email')) { + if (!$user->exists && $user->email === null && !$request->filled('email')) { $request->flash(); session()->flash('request-email', true); return redirect('/login'); } - if (!$user->exists && $user->email === null && $request->has('email')) { + if (!$user->exists && $user->email === null && $request->filled('email')) { $user->email = $request->get('email'); } @@ -86,7 +87,7 @@ class LoginController extends Controller // Check for users with same email already $alreadyUser = $user->newQuery()->where('email', '=', $user->email)->count() > 0; if ($alreadyUser) { - throw new AuthException('A user with the email ' . $user->email . ' already exists but with different credentials.'); + throw new AuthException(trans('errors.error_user_exists_different_creds', ['email' => $user->email])); } $user->save();