NW/FleetCart
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases Wiki Activity

¨4.0.1¨

Browse Source
This commit is contained in:
¨NW¨
2023-12-03 14:07:47 +00:00
parent c08b36d1b6
commit f35052522d
1112 changed files with 43019 additions and 24987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Modules/User/Http/Controllers/Admin/AuthController.php
View File

@@ -2,12 +2,36 @@
namespace Modules\User\Http\Controllers\Admin;
use Illuminate\Http\Response;
use Modules\User\Entities\User;
use Modules\User\Http\Controllers\BaseAuthController;
class AuthController extends BaseAuthController
{
/**
* Where to redirect users after login..
* Show login form.
*
* @return Response
*/
public function getLogin()
{
return view('user::admin.auth.login');
}
/**
* Show reset password form.
*
* @return Response
*/
public function getReset()
{
return view('user::admin.auth.reset.begin');
}
/**
* Where to redirect users after login.
*
* @return string
*/
@@ -16,6 +40,7 @@ class AuthController extends BaseAuthController
return route('admin.dashboard.index');
}
/**
* The login URL.
*
@@ -26,31 +51,13 @@ class AuthController extends BaseAuthController
return route('admin.login');
}
/**
* Show login form.
*
* @return \Illuminate\Http\Response
*/
public function getLogin()
{
return view('user::admin.auth.login');
}
/**
* Show reset password form.
*
* @return \Illuminate\Http\Response
*/
public function getReset()
{
return view('user::admin.auth.reset.begin');
}
/**
* Reset complete form route.
*
* @param \Modules\User\Entities\User $user
* @param User $user
* @param string $code
*
* @return string
*/
protected function resetCompleteRoute($user, $code)
@@ -58,6 +65,7 @@ class AuthController extends BaseAuthController
return route('admin.reset.complete', [$user->email, $code]);
}
/**
* Password reset complete view.
*

19
Modules/User/Http/Controllers/Admin/ProfileController.php
View File

@@ -2,6 +2,8 @@
namespace Modules\User\Http\Controllers\Admin;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Modules\Admin\Ui\Facades\TabManager;
use Modules\User\Http\Requests\UpdateProfileRequest;
@@ -10,8 +12,9 @@ class ProfileController
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
* @param int $id
*
* @return Response
*/
public function edit()
{
@@ -20,11 +23,13 @@ class ProfileController
return view('user::admin.profile.edit', compact('tabs'));
}
/**
* Update the specified resource in storage.
*
* @param \Modules\User\Http\Requests\UpdateProfileRequest $request
* @return \Illuminate\Http\Response
* @param UpdateProfileRequest $request
*
* @return Response
*/
public function update(UpdateProfileRequest $request)
{
@@ -32,15 +37,17 @@ class ProfileController
auth()->user()->update($request->all());
return back()->withSuccess(trans('admin::messages.resource_saved', [
return back()->withSuccess(trans('admin::messages.resource_updated', [
'resource' => trans('user::users.profile'),
]));
}
/**
* Bcrypt user password.
*
* @param \Illuminate\Http\Request $request
* @param Request $request
*
* @return void
*/
private function bcryptPassword($request)

19
Modules/User/Http/Controllers/Admin/UserController.php
View File

@@ -2,6 +2,7 @@
namespace Modules\User\Http\Controllers\Admin;
use Illuminate\Http\Response;
use Modules\User\Entities\User;
use Modules\Admin\Traits\HasCrudActions;
use Modules\User\Http\Requests\SaveUserRequest;
@@ -39,11 +40,13 @@ class UserController
*/
protected $validation = SaveUserRequest::class;
/**
* Store a newly created resource in storage.
*
* @param \Modules\User\Http\Requests\SaveUserRequest $request
* @return \Illuminate\Http\Response
* @param SaveUserRequest $request
*
* @return Response
*/
public function store(SaveUserRequest $request)
{
@@ -56,15 +59,17 @@ class UserController
Activation::complete($user, Activation::create($user)->code);
return redirect()->route('admin.users.index')
->withSuccess(trans('admin::messages.resource_saved', ['resource' => trans('user::users.user')]));
->withSuccess(trans('admin::messages.resource_created', ['resource' => trans('user::users.user')]));
}
/**
* Update the specified resource in storage.
*
* @param int $id
* @param \Modules\User\Http\Requests\SaveUserRequest $request
* @return \Illuminate\Http\Response
* @param SaveUserRequest $request
*
* @return Response
*/
public function update($id, SaveUserRequest $request)
{
@@ -80,7 +85,7 @@ class UserController
$user->roles()->sync($request->roles);
if (! Activation::completed($user) && $request->activated === '1') {
if (!Activation::completed($user) && $request->activated === '1') {
Activation::complete($user, Activation::create($user)->code);
}
@@ -89,6 +94,6 @@ class UserController
}
return redirect()->route('admin.users.index')
->withSuccess(trans('admin::messages.resource_saved', ['resource' => trans('user::users.user')]));
->withSuccess(trans('admin::messages.resource_updated', ['resource' => trans('user::users.user')]));
}
}

8
Modules/User/Http/Controllers/Admin/UserResetPasswordController.php
View File

@@ -2,6 +2,8 @@
namespace Modules\User\Http\Controllers\Admin;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Modules\User\Entities\User;
use Illuminate\Support\Facades\Mail;
use Modules\User\Mail\ResetPasswordEmail;
@@ -12,8 +14,9 @@ class UserResetPasswordController
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
* @param Request $request
*
* @return Response
*/
public function store($id, Authentication $auth)
{
@@ -28,6 +31,7 @@ class UserResetPasswordController
->withSuccess(trans('user::messages.users.reset_password_email_sent'));
}
private function getResetCompleteURL($user, $code)
{
return route('admin.reset.complete', [$user->email, $code]);

138
Modules/User/Http/Controllers/AuthController.php
View File

@@ -3,6 +3,7 @@
namespace Modules\User\Http\Controllers;
use Exception;
use Illuminate\Http\Response;
use Modules\Page\Entities\Page;
use Modules\User\Entities\User;
use Modules\User\LoginProvider;
@@ -11,30 +12,10 @@ use Laravel\Socialite\Facades\Socialite;
class AuthController extends BaseAuthController
{
/**
* Where to redirect users after login..
*
* @return string
*/
protected function redirectTo()
{
return route('account.dashboard.index');
}
/**
* The login URL.
*
* @return string
*/
protected function loginUrl()
{
return route('login');
}
/**
* Show login form.
*
* @return \Illuminate\Http\Response
* @return Response
*/
public function getLogin()
{
@@ -43,30 +24,34 @@ class AuthController extends BaseAuthController
]);
}
/**
* Redirect the user to the given provider authentication page.
*
* @param string $provider
* @return \Illuminate\Http\Response
*
* @return Response
*/
public function redirectToProvider($provider)
{
if (! LoginProvider::isEnable($provider)) {
if (!LoginProvider::isEnable($provider)) {
abort(404);
}
return Socialite::driver($provider)->redirect();
}
/**
* Obtain the user information from the given provider.
*
* @param string $provider
* @return \Illuminate\Http\Response
*
* @return Response
*/
public function handleProviderCallback($provider)
{
if (! LoginProvider::isEnable($provider)) {
if (!LoginProvider::isEnable($provider)) {
abort(404);
}
@@ -101,15 +86,11 @@ class AuthController extends BaseAuthController
return redirect($this->redirectTo());
}
private function extractName($name)
{
return explode(' ', $name, 2);
}
/**
* Show registrations form.
*
* @return \Illuminate\Http\Response
* @return Response
*/
public function getRegister()
{
@@ -119,6 +100,71 @@ class AuthController extends BaseAuthController
]);
}
/**
* Show reset password form.
*
* @return Response
*/
public function getReset()
{
return view('public.auth.reset.begin');
}
/**
* Where to redirect users after login.
*
* @return string
*/
protected function redirectTo()
{
return route('account.dashboard.index');
}
/**
* The login URL.
*
* @return string
*/
protected function loginUrl()
{
return route('login');
}
/**
* Reset complete form route.
*
* @param User $user
* @param string $code
*
* @return string
*/
protected function resetCompleteRoute($user, $code)
{
return route('reset.complete', [$user->email, $code]);
}
/**
* Password reset complete view.
*
* @return string
*/
protected function resetCompleteView()
{
return view('public.auth.reset.complete');
}
private function extractName($name)
{
return explode(' ', $name, 2);
}
/**
* Get privacy page url.
*
@@ -130,36 +176,4 @@ class AuthController extends BaseAuthController
return Page::urlForPage(setting('storefront_privacy_page'));
});
}
/**
* Show reset password form.
*
* @return \Illuminate\Http\Response
*/
public function getReset()
{
return view('public.auth.reset.begin');
}
/**
* Reset complete form route.
*
* @param \Modules\User\Entities\User $user
* @param string $code
* @return string
*/
protected function resetCompleteRoute($user, $code)
{
return route('reset.complete', [$user->email, $code]);
}
/**
* Password reset complete view.
*
* @return string
*/
protected function resetCompleteView()
{
return view('public.auth.reset.complete');
}
}

149
Modules/User/Http/Controllers/BaseAuthController.php
View File

@@ -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();
}
}