¨4.0.1¨
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace Modules\User\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Response;
|
||||
use Modules\User\Entities\Role;
|
||||
use Modules\User\Entities\User;
|
||||
use Illuminate\Routing\Controller;
|
||||
@@ -21,12 +22,13 @@ abstract class BaseAuthController extends Controller
|
||||
/**
|
||||
* The Authentication instance.
|
||||
*
|
||||
* @var \Modules\User\Contracts\Authentication
|
||||
* @var Authentication
|
||||
*/
|
||||
protected $auth;
|
||||
|
||||
|
||||
/**
|
||||
* @param \Modules\User\Contracts\Authentication $auth
|
||||
* @param Authentication $auth
|
||||
*/
|
||||
public function __construct(Authentication $auth)
|
||||
{
|
||||
@@ -35,39 +37,29 @@ abstract class BaseAuthController extends Controller
|
||||
$this->middleware('guest')->except('getLogout');
|
||||
}
|
||||
|
||||
/**
|
||||
* Where to redirect users after login..
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
abstract protected function redirectTo();
|
||||
|
||||
/**
|
||||
* The login route.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
abstract protected function loginUrl();
|
||||
|
||||
/**
|
||||
* Show login form.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
* @return Response
|
||||
*/
|
||||
abstract public function getLogin();
|
||||
|
||||
|
||||
/**
|
||||
* Show reset password form.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
* @return Response
|
||||
*/
|
||||
abstract public function getReset();
|
||||
|
||||
|
||||
/**
|
||||
* Login a user.
|
||||
*
|
||||
* @param \Modules\User\Http\Requests\LoginRequest $request
|
||||
* @return \Illuminate\Http\Response
|
||||
* @param LoginRequest $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function postLogin(LoginRequest $request)
|
||||
{
|
||||
@@ -75,9 +67,9 @@ abstract class BaseAuthController extends Controller
|
||||
$loggedIn = $this->auth->login([
|
||||
'email' => $request->email,
|
||||
'password' => $request->password,
|
||||
], (bool) $request->get('remember_me', false));
|
||||
], (bool)$request->get('remember_me', false));
|
||||
|
||||
if (! $loggedIn) {
|
||||
if (!$loggedIn) {
|
||||
return back()->withInput()
|
||||
->withError(trans('user::messages.users.invalid_credentials'));
|
||||
}
|
||||
@@ -92,6 +84,7 @@ abstract class BaseAuthController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Logout current user.
|
||||
*
|
||||
@@ -104,11 +97,13 @@ abstract class BaseAuthController extends Controller
|
||||
return redirect($this->loginUrl());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Register a user.
|
||||
*
|
||||
* @param \Modules\User\Http\Requests\RegisterRequest $request
|
||||
* @return \Illuminate\Http\Response
|
||||
* @param RegisterRequest $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function postRegister(RegisterRequest $request)
|
||||
{
|
||||
@@ -128,20 +123,13 @@ abstract class BaseAuthController extends Controller
|
||||
->withSuccess(trans('user::messages.users.account_created'));
|
||||
}
|
||||
|
||||
protected function assignCustomerRole($user)
|
||||
{
|
||||
$role = Role::findOrNew(setting('customer_role'));
|
||||
|
||||
if ($role->exists) {
|
||||
$this->auth->assignRole($user, $role);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Start the reset password process.
|
||||
*
|
||||
* @param \Modules\User\Http\Requests\PasswordResetRequest $request
|
||||
* @return \Illuminate\Http\Response
|
||||
* @param PasswordResetRequest $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function postReset(PasswordResetRequest $request)
|
||||
{
|
||||
@@ -160,28 +148,14 @@ abstract class BaseAuthController extends Controller
|
||||
return back()->withSuccess(trans('user::messages.users.check_email_to_reset_password'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset complete form route.
|
||||
*
|
||||
* @param \Modules\User\Entities\User $user
|
||||
* @param string $code
|
||||
* @return string
|
||||
*/
|
||||
abstract protected function resetCompleteRoute($user, $code);
|
||||
|
||||
/**
|
||||
* Password reset complete view.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
abstract protected function resetCompleteView();
|
||||
|
||||
/**
|
||||
* Show reset password complete form.
|
||||
*
|
||||
* @param string $email
|
||||
* @param string $code
|
||||
* @return \Illuminate\Http\Response
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function getResetComplete($email, $code)
|
||||
{
|
||||
@@ -195,25 +169,15 @@ abstract class BaseAuthController extends Controller
|
||||
return $this->resetCompleteView()->with(compact('user', 'code'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine the given reset code is invalid.
|
||||
*
|
||||
* @param \Modules\User\Entities\User $user
|
||||
* @param string $code
|
||||
* @return bool
|
||||
*/
|
||||
private function invalidResetCode($user, $code)
|
||||
{
|
||||
return $user->reminders()->where('code', $code)->doesntExist();
|
||||
}
|
||||
|
||||
/**
|
||||
* Complete the reset password process.
|
||||
*
|
||||
* @param string $email
|
||||
* @param string $code
|
||||
* @param \Modules\User\Http\Requests\ResetCompleteRequest $request
|
||||
* @return \Illuminate\Http\Response
|
||||
* @param ResetCompleteRequest $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function postResetComplete($email, $code, ResetCompleteRequest $request)
|
||||
{
|
||||
@@ -221,7 +185,7 @@ abstract class BaseAuthController extends Controller
|
||||
|
||||
$completed = $this->auth->completeResetPassword($user, $code, $request->new_password);
|
||||
|
||||
if (! $completed) {
|
||||
if (!$completed) {
|
||||
return back()->withInput()
|
||||
->withError(trans('user::messages.users.invalid_reset_code'));
|
||||
}
|
||||
@@ -229,4 +193,63 @@ abstract class BaseAuthController extends Controller
|
||||
return redirect($this->loginUrl())
|
||||
->withSuccess(trans('user::messages.users.password_has_been_reset'));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Where to redirect users after login.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
abstract protected function redirectTo();
|
||||
|
||||
|
||||
/**
|
||||
* The login route.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
abstract protected function loginUrl();
|
||||
|
||||
|
||||
protected function assignCustomerRole($user)
|
||||
{
|
||||
$role = Role::findOrNew(setting('customer_role'));
|
||||
|
||||
if ($role->exists) {
|
||||
$this->auth->assignRole($user, $role);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Reset complete form route.
|
||||
*
|
||||
* @param User $user
|
||||
* @param string $code
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
abstract protected function resetCompleteRoute($user, $code);
|
||||
|
||||
|
||||
/**
|
||||
* Password reset complete view.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
abstract protected function resetCompleteView();
|
||||
|
||||
|
||||
/**
|
||||
* Determine the given reset code is invalid.
|
||||
*
|
||||
* @param User $user
|
||||
* @param string $code
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
private function invalidResetCode($user, $code)
|
||||
{
|
||||
return $user->reminders()->where('code', $code)->doesntExist();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user