From 62c3d48b4b5098ce34caf1efd433983d456490eb Mon Sep 17 00:00:00 2001 From: Jitendra Singh Date: Thu, 20 Feb 2020 12:44:00 +0530 Subject: [PATCH] Improved user package code style --- packages/Webkul/User/src/Bouncer.php | 6 ++++-- .../src/Database/Seeders/AdminsTableSeeder.php | 14 +++++++------- .../User/src/Database/Seeders/RolesTableSeeder.php | 6 +++--- .../src/Http/Controllers/AccountController.php | 11 ++++++----- .../Http/Controllers/ResetPasswordController.php | 4 ++-- .../User/src/Http/Controllers/RoleController.php | 4 ++-- .../src/Http/Controllers/SessionController.php | 2 +- .../Webkul/User/src/Http/Middleware/Bouncer.php | 3 ++- .../Webkul/User/src/Http/Requests/UserForm.php | 8 ++++---- packages/Webkul/User/src/Models/Admin.php | 3 ++- .../User/src/Notifications/AdminResetPassword.php | 2 +- 11 files changed, 34 insertions(+), 29 deletions(-) diff --git a/packages/Webkul/User/src/Bouncer.php b/packages/Webkul/User/src/Bouncer.php index bd7bb23a2..2e52fe8aa 100755 --- a/packages/Webkul/User/src/Bouncer.php +++ b/packages/Webkul/User/src/Bouncer.php @@ -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'); + } } } \ No newline at end of file diff --git a/packages/Webkul/User/src/Database/Seeders/AdminsTableSeeder.php b/packages/Webkul/User/src/Database/Seeders/AdminsTableSeeder.php index e8a872767..f44b043c7 100755 --- a/packages/Webkul/User/src/Database/Seeders/AdminsTableSeeder.php +++ b/packages/Webkul/User/src/Database/Seeders/AdminsTableSeeder.php @@ -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 ]); } } diff --git a/packages/Webkul/User/src/Database/Seeders/RolesTableSeeder.php b/packages/Webkul/User/src/Database/Seeders/RolesTableSeeder.php index 98d006342..4cb5576b6 100755 --- a/packages/Webkul/User/src/Database/Seeders/RolesTableSeeder.php +++ b/packages/Webkul/User/src/Database/Seeders/RolesTableSeeder.php @@ -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' ]); } diff --git a/packages/Webkul/User/src/Http/Controllers/AccountController.php b/packages/Webkul/User/src/Http/Controllers/AccountController.php index 0ece05d7f..10b5ac42e 100755 --- a/packages/Webkul/User/src/Http/Controllers/AccountController.php +++ b/packages/Webkul/User/src/Http/Controllers/AccountController.php @@ -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); diff --git a/packages/Webkul/User/src/Http/Controllers/ResetPasswordController.php b/packages/Webkul/User/src/Http/Controllers/ResetPasswordController.php index 9f7f301c4..7b6d66b8a 100755 --- a/packages/Webkul/User/src/Http/Controllers/ResetPasswordController.php +++ b/packages/Webkul/User/src/Http/Controllers/ResetPasswordController.php @@ -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', ]); diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php index 7a8c5a0aa..545c7b843 100755 --- a/packages/Webkul/User/src/Http/Controllers/RoleController.php +++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php @@ -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', ]); diff --git a/packages/Webkul/User/src/Http/Controllers/SessionController.php b/packages/Webkul/User/src/Http/Controllers/SessionController.php index de5d7ab6c..d90622588 100755 --- a/packages/Webkul/User/src/Http/Controllers/SessionController.php +++ b/packages/Webkul/User/src/Http/Controllers/SessionController.php @@ -63,7 +63,7 @@ class SessionController extends Controller public function store() { $this->validate(request(), [ - 'email' => 'required|email', + 'email' => 'required|email', 'password' => 'required' ]); diff --git a/packages/Webkul/User/src/Http/Middleware/Bouncer.php b/packages/Webkul/User/src/Http/Middleware/Bouncer.php index f7b5c8efa..7c19a43c3 100755 --- a/packages/Webkul/User/src/Http/Middleware/Bouncer.php +++ b/packages/Webkul/User/src/Http/Middleware/Bouncer.php @@ -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; diff --git a/packages/Webkul/User/src/Http/Requests/UserForm.php b/packages/Webkul/User/src/Http/Requests/UserForm.php index 67b97171c..ea22148f7 100755 --- a/packages/Webkul/User/src/Http/Requests/UserForm.php +++ b/packages/Webkul/User/src/Http/Requests/UserForm.php @@ -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') { diff --git a/packages/Webkul/User/src/Models/Admin.php b/packages/Webkul/User/src/Models/Admin.php index a35fce6e1..ae6f5d34c 100755 --- a/packages/Webkul/User/src/Models/Admin.php +++ b/packages/Webkul/User/src/Models/Admin.php @@ -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); } diff --git a/packages/Webkul/User/src/Notifications/AdminResetPassword.php b/packages/Webkul/User/src/Notifications/AdminResetPassword.php index 3209b1249..fcc7dd3ec 100755 --- a/packages/Webkul/User/src/Notifications/AdminResetPassword.php +++ b/packages/Webkul/User/src/Notifications/AdminResetPassword.php @@ -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 ]); } }