Re-order auth controller.

This commit is contained in:
James Cole 2016-01-19 18:10:07 +01:00
parent 3354d53a48
commit 9957c95c68

View File

@ -44,19 +44,6 @@ class AuthController extends Controller
parent::__construct();
}
/**
* Show the application registration form.
*
* @return \Illuminate\Http\Response
*/
public function showRegistrationForm()
{
$host = Rq::getHttpHost();
return view('auth.register', compact('host'));
}
/**
* Handle a login request to the application.
*
@ -77,6 +64,8 @@ class AuthController extends Controller
$credentials['blocked'] = 0; // most not be blocked.
if (Auth::guard($this->getGuard())->attempt($credentials, $request->has('remember'))) {
Session::flash('isLoggedIn', 'yes');
return $this->handleUserWasAuthenticated($request, $throttles);
}
@ -101,79 +90,6 @@ class AuthController extends Controller
return $this->sendFailedLoginResponse($request, $message);
}
/**
* Get the failed login response instance.
*
* @param \Illuminate\Http\Request $request
*
* @param $message
*
* @return \Illuminate\Http\Response
*/
protected function sendFailedLoginResponse(Request $request, $message)
{
return redirect()->back()
->withInput($request->only($this->loginUsername(), 'remember'))
->withErrors(
[
$this->loginUsername() => $this->getFailedLoginMessage($message),
]
);
}
/**
* Get the failed login message.
*
* @param $message
*
* @return string
*/
protected function getFailedLoginMessage($message)
{
if (strlen($message) > 0) {
return $message;
}
return Lang::has('auth.failed')
? Lang::get('auth.failed')
: 'These credentials do not match our records.';
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
*
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make(
$data, [
'email' => 'required|email|max:255|unique:users',
'password' => 'required|confirmed|min:6',
]
);
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
*
* @return User
*/
protected function create(array $data)
{
return User::create(
[
'email' => $data['email'],
'password' => bcrypt($data['password']),
]
);
}
/**
* Handle a registration request for the application.
*
@ -242,6 +158,35 @@ class AuthController extends Controller
return redirect($this->redirectPath());
}
/**
* Show the application registration form.
*
* @return \Illuminate\Http\Response
*/
public function showRegistrationForm()
{
$host = Rq::getHttpHost();
return view('auth.register', compact('host'));
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
*
* @return User
*/
protected function create(array $data)
{
return User::create(
[
'email' => $data['email'],
'password' => bcrypt($data['password']),
]
);
}
/**
* @return array
*/
@ -259,6 +204,24 @@ class AuthController extends Controller
return $domains;
}
/**
* Get the failed login message.
*
* @param $message
*
* @return string
*/
protected function getFailedLoginMessage($message)
{
if (strlen($message) > 0) {
return $message;
}
return Lang::has('auth.failed')
? Lang::get('auth.failed')
: 'These credentials do not match our records.';
}
/**
* @param $email
*
@ -275,4 +238,41 @@ class AuthController extends Controller
return false;
}
/**
* Get the failed login response instance.
*
* @param \Illuminate\Http\Request $request
*
* @param $message
*
* @return \Illuminate\Http\Response
*/
protected function sendFailedLoginResponse(Request $request, $message)
{
return redirect()->back()
->withInput($request->only($this->loginUsername(), 'remember'))
->withErrors(
[
$this->loginUsername() => $this->getFailedLoginMessage($message),
]
);
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
*
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make(
$data, [
'email' => 'required|email|max:255|unique:users',
'password' => 'required|confirmed|min:6',
]
);
}
}