Fixed failing test after drawio default url change

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

diff --git a/app/Auth/Permissions/PermissionsRepo.php b/app/Auth/Permissions/PermissionsRepo.php
index ce61093cc5ed26d4f81ebb01671e4a1e91eac6e1..988146700f80e1760c6d667ac0fe29dc0de22542 100644 (file)
--- a/app/Auth/Permissions/PermissionsRepo.php
+++ b/app/Auth/Permissions/PermissionsRepo.php
@@ -1,14 +1,16 @@
-<?php namespace BookStack\Auth\Permissions;
+<?php

 
 

+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 BookStack\Facades\Activity;

 use Exception;
 use Illuminate\Database\Eloquent\Collection;
 use Exception;
 use Illuminate\Database\Eloquent\Collection;

-use Illuminate\Support\Str;

 
 class PermissionsRepo
 {
 
 class PermissionsRepo
 {

-

     protected $permission;
     protected $role;
     protected $permissionService;
     protected $permission;
     protected $role;
     protected $permissionService;


@@ -55,11 +57,14 @@ class PermissionsRepo
     public function saveNewRole(array $roleData): Role
     {
         $role = $this->role->newInstance($roleData);
     public function saveNewRole(array $roleData): Role
     {
         $role = $this->role->newInstance($roleData);

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

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

+        Activity::add(ActivityType::ROLE_CREATE, $role);
+

         return $role;
     }
 
         return $role;
     }
 


@@ -86,14 +91,16 @@ 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();
         $this->permissionService->buildJointPermissionForRole($role);
         $role->save();
         $this->permissionService->buildJointPermissionForRole($role);

+        Activity::add(ActivityType::ROLE_UPDATE, $role);

     }
 
     /**
      * Assign an list of permission names to an role.
      */
     }
 
     /**
      * Assign an list of permission names to an role.
      */

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

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


@@ -113,6 +120,7 @@ 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.

+     *

      * @throws PermissionsException
      * @throws Exception
      */
      * @throws PermissionsException
      * @throws Exception
      */


@@ -124,7 +132,7 @@ class PermissionsRepo
         // 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'));
         }
 
             throw new PermissionsException(trans('errors.role_registration_default_cannot_delete'));
         }
 


@@ -137,6 +145,7 @@ class PermissionsRepo
         }
 
         $this->permissionService->deleteJointPermissionsForRole($role);
         }
 
         $this->permissionService->deleteJointPermissionsForRole($role);

+        Activity::add(ActivityType::ROLE_DELETE, $role);

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