linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2026-02-21 20:20:34 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Change name to username

Browse Source
This commit is contained in:
Chris
2018-10-16 14:14:14 +01:00
parent 15755a3fd1
commit 6093119dde
11 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Auth/LoginController.php
View File

@@ -43,6 +43,10 @@ class LoginController extends Controller
$this->middleware('guest')->except('logout');
}
public function username()
{
return 'username';
}
/**
* Handle a login request to the application.
@@ -55,7 +59,7 @@ class LoginController extends Controller
public function login(Request $request)
{
$current_user = User::currentUser();
$request->merge(['email' => $current_user->email]);
$request->merge(['username' => $current_user->username]);
//die(print_r($request->all()));
$this->validateLogin($request);

12
app/Http/Controllers/UserController.php
View File

@@ -53,14 +53,14 @@ class UserController extends Controller
public function store(Request $request)
{
$validatedData = $request->validate([
'name' => 'required|max:255|unique:users',
'email' => 'required|email|unique:users',
'username' => 'required|max:255|unique:users',
'email' => 'required|email',
'password' => 'nullable|confirmed',
'password_confirmation' => 'nullable'
]);
$user = new User;
$user->name = $request->input('name');
$user->username = $request->input('username');
$user->email = $request->input('email');
$user->public_front = $request->input('public_front');
@@ -119,14 +119,14 @@ class UserController extends Controller
public function update(Request $request, User $user)
{
$validatedData = $request->validate([
'name' => 'required|max:255|unique:users,name,'.$user->id,
'email' => 'required|email|unique:users,email,'.$user->id,
'username' => 'required|max:255|unique:users,username,'.$user->id,
'email' => 'required|email',
'password' => 'nullable|confirmed',
'password_confirmation' => 'nullable'
]);
//die(print_r($request->all()));
$user->name = $request->input('name');
$user->username = $request->input('username');
$user->email = $request->input('email');
$user->public_front = $request->input('public_front');