Permissions: Cleanup after review of enum implementation PR

[bookstack] / app / Users / Controllers / UserApiController.php

diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index 750e87f0ef5f1f695a4720525070f26ed578c2f0..9134b3cc13b32768a00b25ec68dde42ed7398d1b 100644 (file)
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -3,10 +3,10 @@
 namespace BookStack\Users\Controllers;
 
 use BookStack\Exceptions\UserUpdateException;
 namespace BookStack\Users\Controllers;
 
 use BookStack\Exceptions\UserUpdateException;

-use BookStack\Http\Controllers\ApiController;
+use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;

 use BookStack\Users\Models\User;
 use BookStack\Users\UserRepo;
 use BookStack\Users\Models\User;
 use BookStack\Users\UserRepo;

-use Closure;

 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\Rules\Password;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\Rules\Password;


@@ -26,38 +26,39 @@ class UserApiController extends ApiController
 
         // Checks for all endpoints in this controller
         $this->middleware(function ($request, $next) {
 
         // Checks for all endpoints in this controller
         $this->middleware(function ($request, $next) {

-            $this->checkPermission('users-manage');
+            $this->checkPermission(Permission::UsersManage);

             $this->preventAccessInDemoMode();
 
             return $next($request);
         });
     }
 
             $this->preventAccessInDemoMode();
 
             return $next($request);
         });
     }
 

-    protected function rules(int $userId = null): array
+    protected function rules(?int $userId = null): array

     {
         return [
             'create' => [
     {
         return [
             'create' => [

-                'name'  => ['required', 'min:2', 'max:100'],
+                'name'  => ['required', 'string', 'min:1', 'max:100'],

                 'email' => [
                 'email' => [

-                    'required', 'min:2', 'email', new Unique('users', 'email'),
+                    'required', 'string', 'email', 'min:2', new Unique('users', 'email'),

                 ],
                 'external_auth_id' => ['string'],
                 'language'         => ['string', 'max:15', 'alpha_dash'],
                 ],
                 'external_auth_id' => ['string'],
                 'language'         => ['string', 'max:15', 'alpha_dash'],

-                'password'         => [Password::default()],
+                'password'         => ['string', Password::default()],

                 'roles'            => ['array'],
                 'roles.*'          => ['integer'],
                 'send_invite'      => ['boolean'],
             ],
             'update' => [
                 'roles'            => ['array'],
                 'roles.*'          => ['integer'],
                 'send_invite'      => ['boolean'],
             ],
             'update' => [

-                'name'  => ['min:2', 'max:100'],
+                'name'  => ['string', 'min:1', 'max:100'],

                 'email' => [
                 'email' => [

-                    'min:2',
+                    'string',

                     'email',
                     'email',

-                    (new Unique('users', 'email'))->ignore($userId ?? null),
+                    'min:2',
+                    (new Unique('users', 'email'))->ignore($userId),

                 ],
                 'external_auth_id' => ['string'],
                 'language'         => ['string', 'max:15', 'alpha_dash'],
                 ],
                 'external_auth_id' => ['string'],
                 'language'         => ['string', 'max:15', 'alpha_dash'],

-                'password'         => [Password::default()],
+                'password'         => ['string', Password::default()],

                 'roles'            => ['array'],
                 'roles.*'          => ['integer'],
             ],
                 'roles'            => ['array'],
                 'roles.*'          => ['integer'],
             ],


@@ -73,14 +74,14 @@ class UserApiController extends ApiController
      */
     public function list()
     {
      */
     public function list()
     {

-        $users = User::query()->select(['*'])
+        $users = User::query()->select(['users.*'])

             ->scopes('withLastActivityAt')
             ->with(['avatar']);
 
         return $this->apiListingResponse($users, [
             'id', 'name', 'slug', 'email', 'external_auth_id',
             'created_at', 'updated_at', 'last_activity_at',
             ->scopes('withLastActivityAt')
             ->with(['avatar']);
 
         return $this->apiListingResponse($users, [
             'id', 'name', 'slug', 'email', 'external_auth_id',
             'created_at', 'updated_at', 'last_activity_at',

-        ], [Closure::fromCallable([$this, 'listFormatter'])]);
+        ], [$this->listFormatter(...)]);

     }
 
     /**
     }
 
     /**


@@ -90,7 +91,7 @@ class UserApiController extends ApiController
     public function create(Request $request)
     {
         $data = $this->validate($request, $this->rules()['create']);
     public function create(Request $request)
     {
         $data = $this->validate($request, $this->rules()['create']);

-        $sendInvite = ($data['send_invite'] ?? false) === true;
+        $sendInvite = boolval($data['send_invite'] ?? false) === true;

 
         $user = null;
         DB::transaction(function () use ($data, $sendInvite, &$user) {
 
         $user = null;
         DB::transaction(function () use ($data, $sendInvite, &$user) {


@@ -124,7 +125,7 @@ class UserApiController extends ApiController
     {
         $data = $this->validate($request, $this->rules($id)['update']);
         $user = $this->userRepo->getById($id);
     {
         $data = $this->validate($request, $this->rules($id)['update']);
         $user = $this->userRepo->getById($id);

-        $this->userRepo->update($user, $data, userCan('users-manage'));
+        $this->userRepo->update($user, $data, userCan(Permission::UsersManage));

         $this->singleFormatter($user);
 
         return response()->json($user);
         $this->singleFormatter($user);
 
         return response()->json($user);