StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

allow to use the username for login as well

Browse source 
add translation strings
This commit is contained in:
Jakob Schrettenbrunner 2017-02-16 20:40:21 +01:00
parent 2e134b7a55
commit 0b2c5279a8
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Auth/LoginController.php
View file

@ -87,8 +87,11 @@ class LoginController extends Controller
*/
public function login(Request $request)
{
// Check wether login is an email address or a username
$isEmail = str_contains($request->input('user'), '@');
$this->validate($request, [
'email' => 'required|email',
'user' => $isEmail ? 'required|email' : 'required',
'password' => 'required',
]);
@ -98,9 +101,9 @@ class LoginController extends Controller
return $this->sendLockoutResponse($request);
}
// Is the email & password valid?
// Is the user (email or username) & password valid?
if (! Auth::once([
'email' => $request->input('email'),
$isEmail ? 'email' : 'username' => $request->input('user'),
'password' => $request->input('password'),
], $request->has('remember'))) {
if (! $lockedOut) {