Skip to content

Commit 0b2c527

Browse files
committed
allow to use the username for login as well
add translation strings
1 parent 2e134b7 commit 0b2c527

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

app/Http/Controllers/Auth/LoginController.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,11 @@ public function __construct()
8787
*/
8888
public function login(Request $request)
8989
{
90+
// Check wether login is an email address or a username
91+
$isEmail = str_contains($request->input('user'), '@');
92+
9093
$this->validate($request, [
91-
'email' => 'required|email',
94+
'user' => $isEmail ? 'required|email' : 'required',
9295
'password' => 'required',
9396
]);
9497

@@ -98,9 +101,9 @@ public function login(Request $request)
98101
return $this->sendLockoutResponse($request);
99102
}
100103

101-
// Is the email & password valid?
104+
// Is the user (email or username) & password valid?
102105
if (! Auth::once([
103-
'email' => $request->input('email'),
106+
$isEmail ? 'email' : 'username' => $request->input('user'),
104107
'password' => $request->input('password'),
105108
], $request->has('remember'))) {
106109
if (! $lockedOut) {

resources/lang/en/strings.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
return [
44
'email' => 'Email',
5+
'user_identifier' => 'Email or password',
56
'password' => 'Password',
67
'confirm_password' => 'Confirm Password',
78
'login' => 'Login',

resources/themes/pterodactyl/auth/login.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<p class="login-box-msg">@lang('auth.authentication_required')</p>
4848
<form action="{{ route('auth.login') }}" method="POST">
4949
<div class="form-group has-feedback">
50-
<input type="email" name="email" class="form-control" value="{{ old('email') }}" placeholder="@lang('strings.email')">
50+
<input name="user" class="form-control" value="{{ old('user') }}" placeholder="@lang('strings.user_identifier')">
5151
<span class="fa fa-envelope form-control-feedback"></span>
5252
</div>
5353
<div class="form-group has-feedback">

0 commit comments

Comments
 (0)