MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 14:23:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #299 from Pterodactyl/feature/allow-login-with-username

Browse Source 
allow to use the username for login as well
This commit is contained in:
Jakob
2017-02-16 20:47:25 +01:00
committed by GitHub
parent 10164f5a51 bdf8b473d4
commit d230ee179a
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 the user identifier is an email address or a username
$isEmail = str_contains($request->input('user'), '@');
$this->validate($request, [
'email' => 'required|email',
'user' => $isEmail ? 'required|email' : 'required|string',
'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) {