Guest create page: name field autofocus

[bookstack] / app / Auth / Permissions / PermissionsRepo.php

diff --git a/app/Auth/Permissions/PermissionsRepo.php b/app/Auth/Permissions/PermissionsRepo.php
index 56ef193015f7103a98bb440ec60498e5bf765c25..6dcef72568343d550c169a4ad7124a035c0223ed 100644 (file)
--- a/app/Auth/Permissions/PermissionsRepo.php
+++ b/app/Auth/Permissions/PermissionsRepo.php
@@ -1,92 +1,76 @@
-<?php namespace BookStack\Auth\Permissions;
+<?php

 
 

-use BookStack\Auth\Permissions;
+namespace BookStack\Auth\Permissions;
+
+use BookStack\Actions\ActivityType;

 use BookStack\Auth\Role;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Auth\Role;
 use BookStack\Exceptions\PermissionsException;

-use Illuminate\Support\Str;
+use BookStack\Facades\Activity;
+use Exception;
+use Illuminate\Database\Eloquent\Collection;

 
 class PermissionsRepo
 {
 
 class PermissionsRepo
 {

-
-    protected $permission;
-    protected $role;
-    protected $permissionService;
-
+    protected JointPermissionBuilder $permissionBuilder;

     protected $systemRoles = ['admin', 'public'];
 
     /**
      * PermissionsRepo constructor.
     protected $systemRoles = ['admin', 'public'];
 
     /**
      * PermissionsRepo constructor.

-     * @param RolePermission $permission
-     * @param Role $role
-     * @param \BookStack\Auth\Permissions\PermissionService $permissionService

      */
      */

-    public function __construct(RolePermission $permission, Role $role, Permissions\PermissionService $permissionService)
+    public function __construct(JointPermissionBuilder $permissionBuilder)

     {
     {

-        $this->permission = $permission;
-        $this->role = $role;
-        $this->permissionService = $permissionService;
+        $this->permissionBuilder = $permissionBuilder;

     }
 
     /**
      * Get all the user roles from the system.
     }
 
     /**
      * Get all the user roles from the system.

-     * @return \Illuminate\Database\Eloquent\Collection|static[]

      */
      */

-    public function getAllRoles()
+    public function getAllRoles(): Collection

     {
     {

-        return $this->role->all();
+        return Role::query()->get();

     }
 
     /**
      * Get all the roles except for the provided one.
     }
 
     /**
      * Get all the roles except for the provided one.

-     * @param Role $role
-     * @return mixed

      */
      */

-    public function getAllRolesExcept(Role $role)
+    public function getAllRolesExcept(Role $role): Collection

     {
     {

-        return $this->role->where('id', '!=', $role->id)->get();
+        return Role::query()->where('id', '!=', $role->id)->get();

     }
 
     /**
      * Get a role via its ID.
     }
 
     /**
      * Get a role via its ID.

-     * @param $id
-     * @return mixed

      */
      */

-    public function getRoleById($id)
+    public function getRoleById($id): Role

     {
     {

-        return $this->role->findOrFail($id);
+        return Role::query()->findOrFail($id);

     }
 
     /**
      * Save a new role into the system.
     }
 
     /**
      * Save a new role into the system.

-     * @param array $roleData
-     * @return Role

      */
      */

-    public function saveNewRole($roleData)
+    public function saveNewRole(array $roleData): Role

     {
     {

-        $role = $this->role->newInstance($roleData);
-        $role->name = str_replace(' ', '-', strtolower($roleData['display_name']));
-        // Prevent duplicate names
-        while ($this->role->where('name', '=', $role->name)->count() > 0) {
-            $role->name .= strtolower(Str::random(2));
-        }
+        $role = new Role($roleData);
+        $role->mfa_enforced = ($roleData['mfa_enforced'] ?? 'false') === 'true';

         $role->save();
 
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);
         $role->save();
 
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);

-        $this->permissionService->buildJointPermissionForRole($role);
+        $this->permissionBuilder->rebuildForRole($role);
+
+        Activity::add(ActivityType::ROLE_CREATE, $role);
+

         return $role;
     }
 
     /**
      * Updates an existing role.
      * Ensure Admin role always have core permissions.
         return $role;
     }
 
     /**
      * Updates an existing role.
      * Ensure Admin role always have core permissions.

-     * @param $roleId
-     * @param $roleData
-     * @throws PermissionsException

      */
      */

-    public function updateRole($roleId, $roleData)
+    public function updateRole($roleId, array $roleData)

     {
     {

-        $role = $this->role->findOrFail($roleId);
+        $role = $this->getRoleById($roleId);

 
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         if ($role->system_name === 'admin') {
 
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         if ($role->system_name === 'admin') {


@@ -102,22 +86,28 @@ class PermissionsRepo
         $this->assignRolePermissions($role, $permissions);
 
         $role->fill($roleData);
         $this->assignRolePermissions($role, $permissions);
 
         $role->fill($roleData);

+        $role->mfa_enforced = ($roleData['mfa_enforced'] ?? 'false') === 'true';

         $role->save();
         $role->save();

-        $this->permissionService->buildJointPermissionForRole($role);
+        $this->permissionBuilder->rebuildForRole($role);
+
+        Activity::add(ActivityType::ROLE_UPDATE, $role);

     }
 
     /**
     }
 
     /**

-     * Assign an list of permission names to an role.
-     * @param Role $role
-     * @param array $permissionNameArray
+     * Assign a list of permission names to a role.

      */
      */

-    public function assignRolePermissions(Role $role, $permissionNameArray = [])
+    protected function assignRolePermissions(Role $role, array $permissionNameArray = [])

     {
         $permissions = [];
         $permissionNameArray = array_values($permissionNameArray);
     {
         $permissions = [];
         $permissionNameArray = array_values($permissionNameArray);

-        if ($permissionNameArray && count($permissionNameArray) > 0) {
-            $permissions = $this->permission->whereIn('name', $permissionNameArray)->pluck('id')->toArray();
+
+        if ($permissionNameArray) {
+            $permissions = RolePermission::query()
+                ->whereIn('name', $permissionNameArray)
+                ->pluck('id')
+                ->toArray();

         }
         }

+

         $role->permissions()->sync($permissions);
     }
 
         $role->permissions()->sync($permissions);
     }
 


@@ -126,30 +116,32 @@ class PermissionsRepo
      * Check it's not an admin role or set as default before deleting.
      * If an migration Role ID is specified the users assign to the current role
      * will be added to the role of the specified id.
      * Check it's not an admin role or set as default before deleting.
      * If an migration Role ID is specified the users assign to the current role
      * will be added to the role of the specified id.

-     * @param $roleId
-     * @param $migrateRoleId
+     *

      * @throws PermissionsException
      * @throws PermissionsException

+     * @throws Exception

      */
     public function deleteRole($roleId, $migrateRoleId)
     {
      */
     public function deleteRole($roleId, $migrateRoleId)
     {

-        $role = $this->role->findOrFail($roleId);
+        $role = $this->getRoleById($roleId);

 
         // Prevent deleting admin role or default registration role.
         if ($role->system_name && in_array($role->system_name, $this->systemRoles)) {
             throw new PermissionsException(trans('errors.role_system_cannot_be_deleted'));
 
         // Prevent deleting admin role or default registration role.
         if ($role->system_name && in_array($role->system_name, $this->systemRoles)) {
             throw new PermissionsException(trans('errors.role_system_cannot_be_deleted'));

-        } else if ($role->id === intval(setting('registration-role'))) {
+        } elseif ($role->id === intval(setting('registration-role'))) {

             throw new PermissionsException(trans('errors.role_registration_default_cannot_delete'));
         }
 
         if ($migrateRoleId) {
             throw new PermissionsException(trans('errors.role_registration_default_cannot_delete'));
         }
 
         if ($migrateRoleId) {

-            $newRole = $this->role->find($migrateRoleId);
+            $newRole = Role::query()->find($migrateRoleId);

             if ($newRole) {
             if ($newRole) {

-                $users = $role->users->pluck('id')->toArray();
+                $users = $role->users()->pluck('id')->toArray();

                 $newRole->users()->sync($users);
             }
         }
 
                 $newRole->users()->sync($users);
             }
         }
 

-        $this->permissionService->deleteJointPermissionsForRole($role);
+        $role->entityPermissions()->delete();
+        $role->jointPermissions()->delete();
+        Activity::add(ActivityType::ROLE_DELETE, $role);

         $role->delete();
     }
 }
         $role->delete();
     }
 }