Fixed OIDC Logout

[bookstack] / tests / Helpers / PermissionsProvider.php

diff --git a/tests/Helpers/PermissionsProvider.php b/tests/Helpers/PermissionsProvider.php
index ac9a2a68a61f65a44d71a39c49a8eb76ea82f4f5..512f43fb6cc14bb4e854ad9487fcb3abc526b6b4 100644 (file)
--- a/tests/Helpers/PermissionsProvider.php
+++ b/tests/Helpers/PermissionsProvider.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Helpers;
 
 
 namespace Tests\Helpers;
 

-use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Permissions\RolePermission;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;

 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Entity;

+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Permissions\Models\RolePermission;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;

 
 class PermissionsProvider
 {
 
 class PermissionsProvider
 {


@@ -85,7 +85,7 @@ class PermissionsProvider
 
         if (!$inherit) {
             // Set default permissions to not allow actions so that only the provided role permissions are at play.
 
         if (!$inherit) {
             // Set default permissions to not allow actions so that only the provided role permissions are at play.

-            $permissions[] = ['role_id' => null, 'user_id' => null, 'view' => false, 'create' => false, 'update' => false, 'delete' => false];
+            $permissions[] = ['role_id' => 0, 'view' => false, 'create' => false, 'update' => false, 'delete' => false];

         }
 
         foreach ($roles as $role) {
         }
 
         foreach ($roles as $role) {


@@ -95,9 +95,16 @@ class PermissionsProvider
         $this->addEntityPermissionEntries($entity, $permissions);
     }
 
         $this->addEntityPermissionEntries($entity, $permissions);
     }
 

-    public function addEntityPermission(Entity $entity, array $actionList, ?Role $role = null, ?User $user = null)
+    public function addEntityPermission(Entity $entity, array $actionList, Role $role)

     {
     {

-        $permissionData = $this->actionListToEntityPermissionData($actionList, $role->id ?? null, $user->id ?? null);
+        $permissionData = $this->actionListToEntityPermissionData($actionList, $role->id);
+        $this->addEntityPermissionEntries($entity, [$permissionData]);
+    }
+
+    public function setFallbackPermissions(Entity $entity, array $actionList)
+    {
+        $entity->permissions()->where('role_id', '=', 0)->delete();
+        $permissionData = $this->actionListToEntityPermissionData($actionList, 0);

         $this->addEntityPermissionEntries($entity, [$permissionData]);
     }
 
         $this->addEntityPermissionEntries($entity, [$permissionData]);
     }
 


@@ -107,7 +114,7 @@ class PermissionsProvider
      */
     public function disableEntityInheritedPermissions(Entity $entity): void
     {
      */
     public function disableEntityInheritedPermissions(Entity $entity): void
     {

-        $entity->permissions()->whereNull(['user_id', 'role_id'])->delete();
+        $entity->permissions()->where('role_id', '=', 0)->delete();

         $fallback = $this->actionListToEntityPermissionData([]);
         $this->addEntityPermissionEntries($entity, [$fallback]);
     }
         $fallback = $this->actionListToEntityPermissionData([]);
         $this->addEntityPermissionEntries($entity, [$fallback]);
     }


@@ -124,9 +131,9 @@ class PermissionsProvider
      * the format to entity permission data, where permission is granted if the action is in the
      * given actionList array.
      */
      * the format to entity permission data, where permission is granted if the action is in the
      * given actionList array.
      */

-    protected function actionListToEntityPermissionData(array $actionList, int $roleId = null, int $userId = null): array
+    protected function actionListToEntityPermissionData(array $actionList, int $roleId = 0): array

     {
     {

-        $permissionData = ['role_id' => $roleId, 'user_id' => $userId];
+        $permissionData = ['role_id' => $roleId];

         foreach (EntityPermission::PERMISSIONS as $possibleAction) {
             $permissionData[$possibleAction] = in_array($possibleAction, $actionList);
         }
         foreach (EntityPermission::PERMISSIONS as $possibleAction) {
             $permissionData[$possibleAction] = in_array($possibleAction, $actionList);
         }