merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved user package code style

This commit is contained in:
Jitendra Singh 2020-02-20 12:44:00 +05:30
parent 1ef5376a53
commit 62c3d48b4b
11 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/User/src/Bouncer.php
View File

@ -15,8 +15,9 @@ class Bouncer
if (auth()->guard('admin')->check() && auth()->guard('admin')->user()->role->permission_type == 'all') {
return true;
} else {
if (! auth()->guard('admin')->check() || ! auth()->guard('admin')->user()->hasPermission($permission))
if (! auth()->guard('admin')->check() || ! auth()->guard('admin')->user()->hasPermission($permission)) {
return false;
}
}
return true;
@ -30,7 +31,8 @@ class Bouncer
*/
public static function allow($permission)
{
if (! auth()->guard('admin')->check() || ! auth()->guard('admin')->user()->hasPermission($permission))
if (! auth()->guard('admin')->check() || ! auth()->guard('admin')->user()->hasPermission($permission)) {
abort(401, 'This action is unauthorized');
}
}
}

14
packages/Webkul/User/src/Database/Seeders/AdminsTableSeeder.php
View File

@ -13,15 +13,15 @@ class AdminsTableSeeder extends Seeder
DB::table('admins')->delete();
DB::table('admins')->insert([
'id' => 1,
'name' => 'Example',
'email' => 'admin@example.com',
'password' => bcrypt('admin123'),
'api_token' => Str::random(80),
'id' => 1,
'name' => 'Example',
'email' => 'admin@example.com',
'password' => bcrypt('admin123'),
'api_token' => Str::random(80),
'created_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'),
'status' => 1,
'role_id' => 1,
'status' => 1,
'role_id' => 1
]);
}
}

6
packages/Webkul/User/src/Database/Seeders/RolesTableSeeder.php
View File

@ -15,9 +15,9 @@ class RolesTableSeeder extends Seeder
DB::table('roles')->delete();
DB::table('roles')->insert([
'id' => 1,
'name' => 'Administrator',
'description' => 'Administrator rolem',
'id' => 1,
'name' => 'Administrator',
'description' => 'Administrator rolem',
'permission_type' => 'all'
]);
}

11
packages/Webkul/User/src/Http/Controllers/AccountController.php
View File

@ -51,9 +51,9 @@ class AccountController extends Controller
$user = auth()->guard('admin')->user();
$this->validate(request(), [
'name' => 'required',
'email' => 'email|unique:admins,email,' . $user->id,
'password' => 'nullable|min:6|confirmed',
'name' => 'required',
'email' => 'email|unique:admins,email,' . $user->id,
'password' => 'nullable|min:6|confirmed',
'current_password' => 'required|min:6'
]);
@ -65,10 +65,11 @@ class AccountController extends Controller
return redirect()->back();
}
if (! $data['password'])
if (! $data['password']) {
unset($data['password']);
else
} else {
$data['password'] = bcrypt($data['password']);
}
$user->update($data);

4
packages/Webkul/User/src/Http/Controllers/ResetPasswordController.php
View File

@ -59,8 +59,8 @@ class ResetPasswordController extends Controller
{
try {
$this->validate(request(), [
'token' => 'required',
'email' => 'required|email',
'token' => 'required',
'email' => 'required|email',
'password' => 'required|confirmed|min:6',
]);

4
packages/Webkul/User/src/Http/Controllers/RoleController.php
View File

@ -70,7 +70,7 @@ class RoleController extends Controller
public function store()
{
$this->validate(request(), [
'name' => 'required',
'name' => 'required',
'permission_type' => 'required',
]);
@ -107,7 +107,7 @@ class RoleController extends Controller
public function update($id)
{
$this->validate(request(), [
'name' => 'required',
'name' => 'required',
'permission_type' => 'required',
]);

2
packages/Webkul/User/src/Http/Controllers/SessionController.php
View File

@ -63,7 +63,7 @@ class SessionController extends Controller
public function store()
{
$this->validate(request(), [
'email' => 'required|email',
'email' => 'required|email',
'password' => 'required'
]);

3
packages/Webkul/User/src/Http/Middleware/Bouncer.php
View File

@ -29,8 +29,9 @@ class Bouncer
public function checkIfAuthorized($request)
{
if (! $role = auth()->guard('admin')->user()->role)
if (! $role = auth()->guard('admin')->user()->role) {
abort(401, 'This action is unauthorized.');
}
if ($role->permission_type == 'all') {
return;

8
packages/Webkul/User/src/Http/Requests/UserForm.php
View File

@ -26,11 +26,11 @@ class UserForm extends FormRequest
public function rules()
{
$this->rules = [
'name' => 'required',
'email' => 'email|unique:admins,email',
'name' => 'required',
'email' => 'email|unique:admins,email',
'password' => 'nullable|confirmed',
'status' => 'sometimes',
'role_id' => 'required'
'status' => 'sometimes',
'role_id' => 'required'
];
if ($this->method() == 'PUT') {

3
packages/Webkul/User/src/Models/Admin.php
View File

@ -58,8 +58,9 @@ class Admin extends Authenticatable implements AdminContract
*/
public function hasPermission($permission)
{
if ($this->role->permission_type == 'custom' && ! $this->role->permissions)
if ($this->role->permission_type == 'custom' && ! $this->role->permissions) {
return false;
}
return in_array($permission, $this->role->permissions);
}

2
packages/Webkul/User/src/Notifications/AdminResetPassword.php
View File

@ -22,7 +22,7 @@ class AdminResetPassword extends ResetPassword
return (new MailMessage)
->view('shop::emails.admin.forget-password', [
'user_name' => $notifiable->name,
'token' => $this->token
'token' => $this->token
]);
}
}