@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | protected function mapWebRoutes() |
| 53 | 53 | { |
| 54 | 54 | Route::middleware('web') |
| 55 | - ->namespace($this->namespace) |
|
| 56 | - ->group(base_path('routes/web.php')); |
|
| 55 | + ->namespace($this->namespace) |
|
| 56 | + ->group(base_path('routes/web.php')); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | protected function mapApiRoutes() |
| 67 | 67 | { |
| 68 | 68 | Route::prefix('api') |
| 69 | - ->middleware('api') |
|
| 70 | - ->namespace($this->namespace) |
|
| 71 | - ->group(base_path('routes/api.php')); |
|
| 69 | + ->middleware('api') |
|
| 70 | + ->namespace($this->namespace) |
|
| 71 | + ->group(base_path('routes/api.php')); |
|
| 72 | 72 | } |
| 73 | 73 | } |
@@ -21,17 +21,17 @@ |
||
| 21 | 21 | public function store(Request $request) |
| 22 | 22 | { |
| 23 | 23 | $request->validate([ |
| 24 | - 'name' => 'required|max:255', |
|
| 25 | - 'username' => 'sometimes|required|max:255|unique:users', |
|
| 26 | - 'email' => 'required|email|max:255|unique:users', |
|
| 27 | - 'password' => 'required|min:6', |
|
| 24 | + 'name' => 'required|max:255', |
|
| 25 | + 'username' => 'sometimes|required|max:255|unique:users', |
|
| 26 | + 'email' => 'required|email|max:255|unique:users', |
|
| 27 | + 'password' => 'required|min:6', |
|
| 28 | 28 | ]); |
| 29 | 29 | |
| 30 | 30 | $user = User::create([ |
| 31 | - 'name' => $request->name, |
|
| 32 | - 'username' => $request->username, |
|
| 33 | - 'email' => $request->email, |
|
| 34 | - 'password' => bcrypt($request->password), |
|
| 31 | + 'name' => $request->name, |
|
| 32 | + 'username' => $request->username, |
|
| 33 | + 'email' => $request->email, |
|
| 34 | + 'password' => bcrypt($request->password), |
|
| 35 | 35 | ]); |
| 36 | 36 | |
| 37 | 37 | return $user; |
@@ -15,7 +15,9 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function authorize() |
| 17 | 17 | { |
| 18 | - if ($this->hasPermissionTo('update-users')) return true; |
|
| 18 | + if ($this->hasPermissionTo('update-users')) { |
|
| 19 | + return true; |
|
| 20 | + } |
|
| 19 | 21 | return false; |
| 20 | 22 | } |
| 21 | 23 | |
@@ -16,7 +16,9 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | public function authorize() |
| 18 | 18 | { |
| 19 | - if ($this->hasPermissionTo('list-users')) return true; |
|
| 19 | + if ($this->hasPermissionTo('list-users')) { |
|
| 20 | + return true; |
|
| 21 | + } |
|
| 20 | 22 | return false; |
| 21 | 23 | } |
| 22 | 24 | |
@@ -15,7 +15,9 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function authorize() |
| 17 | 17 | { |
| 18 | - if ($this->hasPermissionTo('destroy-users')) return true; |
|
| 18 | + if ($this->hasPermissionTo('destroy-users')) { |
|
| 19 | + return true; |
|
| 20 | + } |
|
| 19 | 21 | return false; |
| 20 | 22 | } |
| 21 | 23 | |
@@ -15,7 +15,9 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function authorize() |
| 17 | 17 | { |
| 18 | - if ($this->hasPermissionTo('show-users')) return true; |
|
| 18 | + if ($this->hasPermissionTo('show-users')) { |
|
| 19 | + return true; |
|
| 20 | + } |
|
| 19 | 21 | return false; |
| 20 | 22 | } |
| 21 | 23 | |
@@ -15,7 +15,9 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function authorize() |
| 17 | 17 | { |
| 18 | - if ($this->hasPermissionTo('store-users')) return true; |
|
| 18 | + if ($this->hasPermissionTo('store-users')) { |
|
| 19 | + return true; |
|
| 20 | + } |
|
| 19 | 21 | return false; |
| 20 | 22 | } |
| 21 | 23 | |
@@ -49,11 +49,11 @@ |
||
| 49 | 49 | |
| 50 | 50 | $role = Role::firstOrCreate(['name' => 'users-manager']); |
| 51 | 51 | |
| 52 | - assignPermission($role,'list-users'); |
|
| 53 | - assignPermission($role,'show-users'); |
|
| 54 | - assignPermission($role,'store-users'); |
|
| 55 | - assignPermission($role,'update-users'); |
|
| 56 | - assignPermission($role,'destroy-users'); |
|
| 52 | + assignPermission($role,'list-users'); |
|
| 53 | + assignPermission($role,'show-users'); |
|
| 54 | + assignPermission($role,'store-users'); |
|
| 55 | + assignPermission($role,'update-users'); |
|
| 56 | + assignPermission($role,'destroy-users'); |
|
| 57 | 57 | |
| 58 | 58 | } |
| 59 | 59 | } |
@@ -19,7 +19,9 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | protected function hasPermissionTo($permission) |
| 21 | 21 | { |
| 22 | - if (Auth::user()->hasPermissionTo($permission)) return true; |
|
| 22 | + if (Auth::user()->hasPermissionTo($permission)) { |
|
| 23 | + return true; |
|
| 24 | + } |
|
| 23 | 25 | return false; |
| 24 | 26 | } |
| 25 | 27 | |
@@ -35,7 +37,9 @@ discard block |
||
| 35 | 37 | { |
| 36 | 38 | //todo |
| 37 | 39 | |
| 38 | - if (Auth::user()->id == $this->$model->$field) return true; |
|
| 40 | + if (Auth::user()->id == $this->$model->$field) { |
|
| 41 | + return true; |
|
| 42 | + } |
|
| 39 | 43 | return false; |
| 40 | 44 | } |
| 41 | 45 | } |
| 42 | 46 | \ No newline at end of file |